Software Público Brasileiro

21 May, 2013

1 commit

• e7b5205f   Merge branch 'pluginize-solr' into merge-solr Browse Dir »
  Rodrigo Souto

  2013-05-21 19:45:04 -0300  

13 May, 2013

1 commit

• ef9f1a79   Removing obsolete test Browse Dir »
  Rodrigo Souto

  2013-05-13 13:46:05 -0300  

07 May, 2013

1 commit

• b2a0c431   Merge branch 'master' into pluginize-solr ... Browse Dir »

  Conflicts:
  	app/models/article.rb
  	app/views/layouts/application-ng.rhtml
  	lib/noosfero/plugin.rb
  	script/noosfero-plugins

  Rodrigo Souto

  2013-05-07 13:36:10 -0300  

24 Apr, 2013

1 commit

• 1451d7e5   Merge commit 'refs/merge-requests/259' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

  …into merge-requests/259
  
  Conflicts:
  	app/controllers/admin/environment_design_controller.rb

  Rodrigo Souto

  2013-04-24 21:36:25 -0300  

20 Apr, 2013

1 commit

• 2d5abd83   mergin with master Browse Dir »
  root

  2013-04-20 21:31:06 -0300  

17 Apr, 2013

2 commits

• 97fe0f50   Fixing master tests after merge with stable Browse Dir »
  Rodrigo Souto

  2013-04-17 22:16:28 -0300  
• 527ee379   Merge branch 'stable' ... Browse Dir »

  Basically html_safe in some places that the stable branch had.
  
  Conflicts:
  	app/models/article_block.rb
  	app/models/tags_block.rb

  Rodrigo Souto

  2013-04-17 17:12:26 -0300  

16 Apr, 2013

1 commit

• d8c5b8ef   Fixing content_viewwer translation link test Browse Dir »
  Rodrigo Souto

  2013-04-16 13:45:30 -0300  

15 Apr, 2013

2 commits

• e909e2c6   Adding tests for enterprise templates ... Browse Dir »

  ActionItem2608

  Visita

  2013-04-15 11:31:31 -0300  
• 862ea7b0   Adding tests for communities templates ... Browse Dir »

  ActionItem2608
  
  Note: tests for users templates were made in the previous commit.

  Visita

  2013-04-15 11:14:01 -0300  

12 Apr, 2013

1 commit

• 3599b17b   Restricting template alternatives to those inside the current environment ... Browse Dir »

  ActionItem2608

  Visita

  2013-04-12 19:40:37 -0300  

05 Apr, 2013

1 commit

• 7c6b674e   Apply admin/users_controller::index() optimization to stable ... Browse Dir »

  ActionItem2217

  Visita

  2013-04-05 16:08:33 -0300  

03 Apr, 2013

2 commits

• aa318276   Completing folder select test Browse Dir »
  Rodrigo Souto

  2013-04-03 22:05:25 -0300  
• 256b8bf2   Merge commit 'refs/merge-requests/275' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

  …into merge-requests/275
  
  Conflicts:
  	test/unit/application_helper_test.rb

  Rodrigo Souto

  2013-04-03 21:51:17 -0300  

28 Mar, 2013

1 commit

• c5b9f977   Merge branch 'master' into solr-commits Browse Dir »
  Rodrigo Souto

  2013-03-28 16:55:47 +0000  

27 Mar, 2013

1 commit

• 5d0a0e66   Fixing test: content_viewer Browse Dir »
  Rodrigo Souto

  2013-03-27 15:22:24 +0000  

18 Mar, 2013

1 commit

• 67e8ceed   Merge branch 'master' into pluginize-solr Browse Dir »
  Rodrigo Souto

  2013-03-18 21:16:54 -0300  

15 Mar, 2013

2 commits

• eee333db   Adding option to add TagsBlock on environment through interface Browse Dir »
  Rodrigo Souto

  2013-03-15 20:55:17 +0000  
• 0e26cea3   Fixing noosfero tests Browse Dir »
  Rodrigo Souto

  2013-03-15 17:31:31 +0000  

13 Mar, 2013

1 commit

• 0c1d441e   Fixing some funcitonal tests and moving solr server start to plugin Browse Dir »
  Rodrigo Souto

  2013-03-13 21:14:16 +0000  

12 Mar, 2013

1 commit

• 5cac53de   Fixing plugin tests on search controller Browse Dir »
  Rodrigo Souto

  2013-03-12 20:05:52 +0000  

06 Mar, 2013

1 commit

• 1bac841f   Fixing search controller tests Browse Dir »
  Rodrigo Souto

  2013-03-06 19:52:59 +0000  

05 Mar, 2013

2 commits

• 755f9431   Fixing search controller tests Browse Dir »
  Rodrigo Souto

  2013-03-05 19:37:28 -0300  
• 0fb41209   Removing solr from region tests ... Browse Dir »

  Also removing region unit tests that are already being done in the
  functional test.

  Rodrigo Souto

  2013-03-05 16:32:16 -0300  

04 Mar, 2013

2 commits

• 32510c0a   Sorting catalog categories by name ... Browse Dir »

  (ActionItem2606)

  Rodrigo Souto

  2013-03-04 19:46:11 -0300  
• c9f4c639   Show block plugins for specified types only Browse Dir »
  Victor Costa

  2013-03-04 13:09:18 -0300  

27 Feb, 2013

1 commit

• de5477c7   Merge branch 'stable' into pluginize-solr ... Browse Dir »

  Conflicts:
  	app/models/comment.rb
  	app/views/layouts/application-ng.rhtml
  	test/unit/category_test.rb

  Rodrigo Souto

  2013-02-27 16:57:56 -0300  

18 Feb, 2013

1 commit

• c0807e52   Merge commit 'refs/merge-requests/272' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

  …into merge-requests/272

  Rodrigo Souto

  2013-02-18 18:17:14 -0300  

06 Feb, 2013

1 commit

• 4de6c173   Filter useful folders to upload images and pre-select a gallery ... Browse Dir »

  closes ActionItem2567

  Aurélio A. Heckert

  2013-02-06 17:09:46 -0300  

30 Jan, 2013

2 commits

• 78d697c4   Removed outdated code Browse Dir »
  Daniela Feitosa

  2013-01-30 14:39:06 -0200  
• 127cd3fb   Allowing search form to use goggle_cse plugin ... Browse Dir »

  (ActionItem2560)

  Daniela Feitosa

  2013-01-30 14:31:19 -0200  

26 Jan, 2013

2 commits

• 97f28847   Merge branch 'honeypot' Browse Dir »
  Rodrigo Souto

  2013-01-26 01:48:10 +0000  
• c55f2333   Adjusting signup anti-bot Browse Dir »
  Rodrigo Souto

  2013-01-26 01:45:38 +0000  

22 Jan, 2013

1 commit

• 84d30c71   Adding honeypot to signup page Browse Dir »
  Rodrigo Souto

  2013-01-22 23:04:49 +0000  

21 Jan, 2013

1 commit

• 096a8402   Merge branch 'ActionItem2544' of git://gitorious.serpro/noosfero/noosfero-develo… ... Browse Dir »

  …pment into ActionItem2544

  Leandro Nunes dos Santos

  2013-01-21 15:27:21 -0300  

19 Jan, 2013

1 commit

• 4e1edc60   Merge branch 'stable' Browse Dir »
  Rodrigo Souto

  2013-01-19 21:25:45 +0000  

17 Jan, 2013

1 commit

• 8f69c31b   Merge branch 'redemoinho-improvements' ... Browse Dir »

  Conflicts:
  	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
  	plugins/shopping_cart/lib/shopping_cart_plugin.rb
  	plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb
  	plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
  	plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb
  	plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb

  Rodrigo Souto

  2013-01-17 00:56:16 +0000  

16 Jan, 2013

1 commit

• fad353e4   Passing only product to asset_product_extras hotspot Browse Dir »
  Rodrigo Souto

  2013-01-16 19:27:24 +0000  

15 Jan, 2013

1 commit

• af3c320b   adding hotspots to make possible add other blocks Browse Dir »
  Leandro Nunes dos Santos

  2013-01-15 14:06:26 -0300  

10 Jan, 2013

1 commit

• e1b600b8   [otw] Fixing search controller tests Browse Dir »
  Rodrigo Souto

  2013-01-10 07:07:19 +0000