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

3 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  
• 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  

01 Oct, 2015

1 commit

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

  2015-10-01 10:02:32 -0300  

30 Sep, 2015

1 commit

• d66aa24c   merging with master Browse Dir »
  Leandro Santos

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

29 Sep, 2015

3 commits

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

  2015-09-29 20:39:19 -0300  
• 014031e1   api: ensure relative root is prefixed to the api path Browse Dir »

  1
  Rodrigo Souto

  2015-09-29 18:28:48 -0300  
• d1e74285   tiny-mce: add translations Browse Dir »

  1
  Rodrigo Souto

  2015-09-29 14:52:33 -0300  

26 Sep, 2015

1 commit

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

  Keeped controllers/views structure

  Braulio Bhavamitra

  2015-09-26 15:14:34 -0300  

22 Sep, 2015

1 commit

• 06bf7862   merging with master Browse Dir »
  Leandro Santos

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

15 Sep, 2015

2 commits

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

  2015-09-15 17:22:19 -0300  
• e0b52790   tinymce: upgrade and use non-minified version ... Browse Dir »

  For some reason, tinymce is not working on production environment. After
  some investigation, we discovered that it wasn't working on production
  due to the compression of tinymce.min.js. After using the non-minified
  version, the problem was solved.
  
  We also upgraded to 4.2.5.

  Rodrigo Souto

  2015-09-15 10:49:30 -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  

01 Sep, 2015

1 commit

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

  2015-09-01 15:49:46 -0300  

28 Aug, 2015

1 commit

• 1ed260f3   Merge branch 'master' into staging Browse Dir »
  Leandro Santos

  2015-08-28 18:11:21 -0300  

27 Aug, 2015

1 commit

• c9149e85   Fixed js that fills in the slug field of blog Browse Dir »

  1
  Daniela Feitosa

  2015-08-27 02:41:53 +0000  

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

3 commits

• 90db0fd7   Merge branch 'confirm-leave' into noosfero Browse Dir »
  Braulio Bhavamitra

  2015-08-10 21:10:15 -0300  
• f9b414da   community: confirm leave Browse Dir »
  Braulio Bhavamitra

  2015-08-10 20:41:16 -0300  
• e32dafb8   Allow customization of URL to redirect after login ... Browse Dir »

  Besides, allow session to hold a value for after signup redirection

  Braulio Bhavamitra

  2015-08-10 19:19:20 -0300  

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

2 commits

• ef70a151   mergin with article_datetime branch Browse Dir »
  Leandro Santos

  2015-07-25 11:10:04 -0300  
• f508e4e8   merging with serpro context Browse Dir »
  Leandro Santos

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

23 Jul, 2015

1 commit

• 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  

20 Jul, 2015

1 commit

• 02d5269c   Merge branch 'master' into api Browse Dir »
  Rodrigo Souto

  2015-07-20 14:48:59 -0300  

17 Jul, 2015

1 commit

• 0c93a29d   merge with master - changed to keep tasks filter after tasks close action Browse Dir »
  Ábner Silva de Oliveira

  2015-07-17 15:23:11 -0300  

16 Jul, 2015

1 commit

• 4812b285   Fix JS behaviour to show categories when noosfero is in a subdir environment ... Browse Dir »

  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

  Gabriela Navarro

  2015-07-16 13:24:24 +0000  

14 Jul, 2015

2 commits

• 973b71d6   Merge branch 'task_taggable' into production Browse Dir »
  Michel Felipe

  2015-07-14 14:33:09 -0300  
• d875f803   Fix problem when remove the last tag Browse Dir »
  Michel Felipe

  2015-07-14 14:30:21 -0300  

08 Jul, 2015

4 commits

• ca09712b   Merge branch 'production' of https://gitlab.com/participa/noosfero into production Browse Dir »
  Evandro Junior

  2015-07-08 19:06:11 -0300  
• df9cc0e2   Merge branch 'api' into production ... Browse Dir »

  Conflicts:
  	Gemfile

  Evandro Junior

  2015-07-08 19:05:52 -0300  
• 071efeec   Merge branch 'task_taggable' into production Browse Dir »
  Michel Felipe

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

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

06 Jul, 2015

1 commit

• 933d3771   Merge branch 'email_template' into production ... Browse Dir »

  Conflicts:
  	app/models/article.rb
  	test/functional/tasks_controller_test.rb

  Victor Costa

  2015-07-06 17:03:26 -0300