Software Público Brasileiro

19 Nov, 2015

1 commit

• 46549f70   Merge branch 'master_rails3' into staging ... Browse Dir »

  Conflicts:
  	app/models/article.rb
  	app/models/comment.rb

  Victor Costa

  2015-11-19 17:27:30 -0300  

16 Nov, 2015

1 commit

• a86306b1   New feature archive articles to avoid create comments, associate children articles and perform votes Browse Dir »

  5
  Michel Felipe

  2015-11-16 16:48:41 -0300  

13 Oct, 2015

4 commits

• e0a87b2f   merging with next Browse Dir »
  Leandro Santos

  2015-10-13 16:14:37 -0300  
• 878b67a8   merging with master Browse Dir »
  Leandro Santos

  2015-10-13 15:52:57 -0300  
• 6633066c   adding block store css Browse Dir »
  Leandro Santos

  2015-10-13 13:19:38 -0300  
• 66c7b785   Block store: improve usability of adding/moving blocks ... Browse Dir »

  Signed-off-by: Victor Costa <vfcosta@gmail.com>
  Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
  
  Conflicts:
  	app/controllers/my_profile/profile_design_controller.rb
  	app/helpers/boxes_helper.rb
  	app/helpers/layout_helper.rb
  	app/views/layouts/_javascript.html.erb
  	public/stylesheets/application.css
  	test/functional/environment_design_controller_test.rb
  	test/functional/profile_design_controller_test.rb

  Victor Costa

  2015-10-13 13:10:58 -0300  

05 Oct, 2015

1 commit

• 4dd11514   Give more space to text-editor-sidebar Browse Dir »

  1
  Daniela Feitosa

  2015-10-05 18:46:58 -0300  

02 Oct, 2015

1 commit

• 47aff270   Merge tasks.css file Browse Dir »
  Braulio Bhavamitra

  2015-10-02 17:21:01 -0300  

01 Oct, 2015

1 commit

• 64b98a9e   Improve pagination default ... Browse Dir »

  1

  Also %s/will_paginate/pagination_links to use the default on forum, blog
  and cms
  
  Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
  Signed-off-by: Melissa Wen <melissa@colivre.coop.br>

  Daniela Feitosa

  2015-10-01 18:55:05 -0300  

30 Sep, 2015

1 commit

• d66aa24c   merging with master Browse Dir »
  Leandro Santos

  2015-09-30 20:12:05 -0300  

29 Sep, 2015

1 commit

• b62774ed   Merge branch 'noosfero' into redemoinho-improvements Browse Dir »
  Braulio Bhavamitra

  2015-09-29 20:39:19 -0300  

26 Sep, 2015

3 commits

• 540eb8cb   Split application.css into several partials ... Browse Dir »

  Keeped controllers/views structure

  Braulio Bhavamitra

  2015-09-26 15:14:34 -0300  
• 7eabb5ed   Revert "Fix placement of "Remove image" checkbox label" ... Browse Dir »

  This reverts commit 83c318e66c66d82671cccaf3acc7f29c2bacf8d2.

  Antonio Terceiro

  2015-09-26 09:52:10 -0300  
• 83c318e6   Fix placement of "Remove image" checkbox label Browse Dir »

  2
  Antonio Terceiro

  2015-09-26 09:27:23 -0300  

24 Sep, 2015

1 commit

• ef41c154   Allow user to remove article or profile image ... Browse Dir »

  2

  Additional improvements include:
  
  - Makes 'Remove Image' checkbox optional
  - Very ugly css hack to hide duplicated labels in some forms. I couldn't
  find another way to avoid the labels generated by labelled_form_for nor
  could I skip adding labels inside the helper since it's supposed to be
  generic.

  Larissa Reis

  2015-09-24 12:38:04 -0300  

22 Sep, 2015

1 commit

• 06bf7862   merging with master Browse Dir »
  Leandro Santos

  2015-09-22 16:12:48 -0300  

11 Sep, 2015

1 commit

• e22434f3   Merge branch 'master' into redemoinho-improvements Browse Dir »
  Rodrigo Souto

  2015-09-11 15:36:49 -0300  

08 Sep, 2015

1 commit

• 57b5f5bf   Merge branch 'master' into api Browse Dir »
  Antonio Terceiro

  2015-09-08 11:43:55 -0300  

05 Sep, 2015

1 commit

• 8f571a5e   Split members page in admins and non-admins ... Browse Dir »

    - Order members by name
    - Removed white spaces
    - Changed strings to be translated
    - Renamed div id and test
    - Adjust ul tag members
    - Fixed plugin dependency
  
  Signed-off-by: Omar Junior <omarroinuj@gmail.com>
  Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
  Signed-off-by: Vitor Barbosa <vitormga15@gmail.com>
  Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
  Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
  Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>

  Omar Junior

  2015-09-05 12:28:06 +0000  

04 Sep, 2015

1 commit

• db0d70fc   Merge branch 'master' into api Browse Dir »
  Antonio Terceiro

  2015-09-04 16:05:04 -0300  

19 Aug, 2015

1 commit

• 121912b3   Merge branch 'shopping-cart-with-orders-and-delivery-plugins' ... Browse Dir »

  Conflicts:
  	Gemfile
  	app/models/profile.rb
  	plugins/shopping_cart/lib/shopping_cart_plugin.rb
  	plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb
  	plugins/shopping_cart/po/de/shopping_cart.po
  	plugins/shopping_cart/po/es/shopping_cart.po
  	plugins/shopping_cart/po/fr/shopping_cart.po
  	plugins/shopping_cart/po/hy/shopping_cart.po
  	plugins/shopping_cart/po/pt/shopping_cart.po
  	plugins/shopping_cart/po/ru/shopping_cart.po
  	plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb
  	plugins/shopping_cart/views/cart.html.erb
  	plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
  	plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb

  Rodrigo Souto

  2015-08-19 13:05:49 -0300  

13 Aug, 2015

1 commit

• eb070c85   fixing conflit with master Browse Dir »
  Leandro Santos

  2015-08-13 17:44:13 -0300  

10 Aug, 2015

2 commits

• 5d003955   Use standard method for RSS-feed icon ... Browse Dir »

  Move icon to the icon theme structure (awesome also have an icon for
  this)

  dtygel

  2015-08-10 19:27:46 -0300  
• ac306a5b   Add download icon Browse Dir »
  dtygel

  2015-08-10 16:56:59 -0300  

09 Aug, 2015

1 commit

• 2f07775b   Merge branch 'responsive' into 'master' ... Browse Dir »

  Responsive
  
  
  
  See merge request !607

  Braulio Bhavamitra

  2015-08-09 23:26:45 +0000  

28 Jul, 2015

1 commit

• 3ccdd527   Merge branch 'master' into api Browse Dir »
  Antonio Terceiro

  2015-07-28 11:38:41 -0300  

25 Jul, 2015

1 commit

• f508e4e8   merging with serpro context Browse Dir »
  Leandro Santos

  2015-07-25 09:00:59 -0300  

23 Jul, 2015

4 commits

• 70a7683f   search: realign search box and search button ... Browse Dir »

  I know this is ridiculous, but will we have to rewrite all the HTML at some
  point anyway ...

  Antonio Terceiro

  2015-07-23 16:39:00 -0300  
• 793315ae   Merge branch 'master' of https://gitlab.com/noosfero/noosfero into responsive Browse Dir »
  Braulio Bhavamitra

  2015-07-23 16:09:41 -0300  
• 6c55ce14   Remove letfover selectordie files Browse Dir »
  Antonio Terceiro

  2015-07-23 11:05:49 -0300  
• 5063822a   Drop selectordie ... Browse Dir »

  - first it breaks selenium tests because it hides the original select
    and replaces it with its own thing.
  
  - second, IMO is is too much overhead to add a style that (again IMO) is
    not even that better than the default select widget in Firefox.

  Antonio Terceiro

  2015-07-23 10:22:47 -0300  

16 Jul, 2015

1 commit

• 8e515c3e   responsive: fix problems with bootstrap's border-box Browse Dir »
  Braulio Bhavamitra

  2015-07-16 11:45:29 -0300  

08 Jul, 2015

2 commits

• df9cc0e2   Merge branch 'api' into production ... Browse Dir »

  Conflicts:
  	Gemfile

  Evandro Junior

  2015-07-08 19:05:52 -0300  
• 2b942cdf   merge with noosfero api branch Browse Dir »
  Ábner Silva de Oliveira

  2015-07-08 17:06:37 -0300  

03 Jul, 2015

1 commit

• ea468c0e   Merge branch 'block-admin-mail' into production ... Browse Dir »

  Conflicts:
  	app/models/event.rb
  	app/models/profile.rb
  	po/fr/noosfero.po

  Victor Costa

  2015-07-03 10:45:54 -0300  

01 Jul, 2015

1 commit

• 06f96ca8   fix conflit with add_members_community Browse Dir »
  Leandro Santos

  2015-07-01 18:10:44 -0300  

30 Jun, 2015

4 commits

• 3d9ba6b1   Merge branch 'processed_tasks' into production ... Browse Dir »

  Conflicts:
  	app/views/tasks/processed.html.erb
  	public/stylesheets/tasks.css

  Victor Costa

  2015-06-30 11:34:19 -0300  
• 6905648c   Improve listing of processed tasks Browse Dir »
  Victor Costa

  2015-06-30 11:32:42 -0300  
• 786d3c66   Merge branch 'processed_tasks' into production ... Browse Dir »

  Conflicts:
  	app/views/tasks/processed.html.erb
  	public/stylesheets/tasks.css

  Victor Costa

  2015-06-30 10:52:31 -0300  
• e9c22c7f   Improve listing of processed tasks Browse Dir »
  Victor Costa

  2015-06-30 10:35:35 -0300