Software Público Brasileiro

02 Dec, 2013

1 commit

• bd4954d3   Merge branch 'master' into next-origin ... Browse File »

  Conflicts:
  	app/models/category.rb
  	app/models/uploaded_file.rb
  	test/functional/memberships_controller_test.rb
  	test/functional/profile_controller_test.rb
  	vendor/plugins/action_tracker_has_comments/init.rb

  Rodrigo Souto

  2013-12-02 20:33:51 -0300  

27 Nov, 2013

1 commit

• 96ad392a   Merge branch 'stable' ... Browse File »

  Conflicts:
  	app/controllers/public/content_viewer_controller.rb
  	features/manage_products.feature

  Rodrigo Souto

  2013-11-27 14:13:20 -0300  

25 Nov, 2013

1 commit

• 3829248f   Fixed test ... Browse File »

  (ActionItem2748)

  Daniela Feitosa

  2013-11-25 09:21:22 +0000  

22 Nov, 2013

3 commits

• 73479a2c   application_helper/rolename: improve performance retrieval and readability Browse File »
  Rodrigo Souto

  2013-11-22 16:46:14 -0300  
• cd32f252   changes ugly code to be, what i think is, more ruby-like Browse File »
  Larissa Reis

  2013-11-22 16:46:14 -0300  
• 53d447a8   Lists all roles a user has in a community Browse File »
  Larissa Reis

  2013-11-22 16:46:14 -0300  

20 Nov, 2013

1 commit

• dbdae53c   Merge branches 'ActionItem2748' and 'ActionItem2748_merge' into ActionItem2748_merge Browse File »
  Leandro Nunes dos Santos

  2013-11-20 09:41:38 -0300  

16 Nov, 2013

3 commits

• 04e25fca   Add option to disable enterprises list on user menu ... Browse File »

  (ActionItem2903)

  Daniela Feitosa

  2013-11-16 17:39:17 +0000  
• c3308c85   Changed a setting name to be less confusing ... Browse File »

  (ActionItem2901)

  Daniela Feitosa

  2013-11-16 16:34:06 +0000  
• 0fbd1b38   Merge remote branch 'larissa/makes-my-community-opicional' Browse File »
  Daniela Feitosa

  2013-11-16 14:52:16 +0000  

12 Nov, 2013

1 commit

• ecf5200d   adding pagination in comment group plugin Browse File »
  Leandro Nunes dos Santos

  2013-11-12 16:34:05 -0300  

05 Nov, 2013

1 commit

• 3133eb48   Merge branch 'stable' ... Browse File »

  Conflicts:
  	script/quick-start
  	test/unit/application_helper_test.rb
  	test/unit/environment_statistics_block_test.rb
  	test/unit/environment_test.rb

  Rodrigo Souto

  2013-11-05 19:10:53 -0300  

31 Oct, 2013

1 commit

• 419bcf2a   filter_html: parse only sources that have macros ... Browse File »

  This solves every problem related with Hpticot breaking pages since the
  parse was happening on the MainBlock too. But this does not changes the
  fact tha Hpricot is currently dead and we should move on to nokogiri.
  
  (ActionItem2873)

  Rodrigo Souto

  2013-10-31 17:40:53 -0300  

18 Oct, 2013

1 commit

• da23338a   Makes My Communities menu optional Browse File »
  Larissa Reis

  2013-10-18 11:22:37 -0300  

12 Oct, 2013

1 commit

• 69ce8338   Limit number of items in "my communities" menu ... Browse File »

  This limit the listing to the 5 most popular communities to avoid making
  it unbearable to users that create a lot of communities.

  Antonio Terceiro

  2013-10-12 12:10:32 -0300  

19 Sep, 2013

4 commits

• f5c2a127   hotspot: refactor profile_image_link hotspot ... Browse File »

     * The first_impl method was already implemented as dispatch_first
       (which was probably incorporated after this request was done). But
       I utilized the idea proposed here to use the default value for the
       hotspot instead of nil.
     * I changed the hotspot to pass all the parameters passed to the
       method since it might be useful for the plugins in the future.
  
  (ActionItem2666)

  Rodrigo Souto

  2013-09-19 17:14:03 -0300  
• 83c8889e   Merge commit 'refs/merge-requests/313' of git://gitorious.org/noosfero/noosfero … ... Browse File »

  …into merge-requests/313

  Rodrigo Souto

  2013-09-19 16:32:48 -0300  
• beef0083   Encapsulate logic for manage_{communityes|enterprises} Browse File »
  Rodrigo Souto

  2013-09-19 15:57:05 -0300  
• fec8c9a7   Merge commit 'refs/merge-requests/295' of git://gitorious.org/noosfero/noosfero … ... Browse File »

  …into merge-requests/295

  Rodrigo Souto

  2013-09-19 15:30:45 -0300  

17 Jul, 2013

1 commit

• 630d2384   Merge branch 'stable' Browse File »
  Rodrigo Souto

  2013-07-17 02:04:04 -0300  

16 Jul, 2013

1 commit

• b90b8b84   [macro-support-review] Refactoring broken parse_content and creating pipeline manager method Browse File »
  Rodrigo Souto

  2013-07-16 11:44:18 -0300  

15 Jul, 2013

1 commit

• 07caf3d4   [macro-support-review] Refactoring macros infra-structure Browse File »
  Rodrigo Souto

  2013-07-15 19:14:08 -0300  

13 Jul, 2013

1 commit

• ba61c659   Merge commit 'refs/merge-requests/283' of git://gitorious.org/noosfero/noosfero … ... Browse File »

  …into merge-requests/283
  
  Conflicts:
  	test/unit/comment_test.rb

  Rodrigo Souto

  2013-07-13 14:10:04 -0300  

12 Jul, 2013

1 commit

• 4891d3e9   [comments-refactor-review] Removing obsolete FIXME's ... Browse File »

  About the FIXME on the helper, I guess it can't hurt to support css
  class throught the options parameter.

  Rodrigo Souto

  2013-07-12 18:23:14 -0300  

08 Jul, 2013

2 commits

• c916579e   Merge branch 'ActionItem2562' into ActionItem2520 Browse File »
  Leandro Nunes dos Santos

  2013-07-08 18:48:45 -0300  
• d0a55e25   merging with stable Browse File »
  Leandro Nunes dos Santos

  2013-07-08 16:50:24 -0300  

28 Jun, 2013

1 commit

• 7989a4c7   merging with stable Browse File »
  Leandro Nunes dos Santos

  2013-06-28 09:13:53 -0300  

27 Jun, 2013

1 commit

• 8f42e790   merging with stable Browse File »
  Leandro Nunes dos Santos

  2013-06-27 10:05:35 -0300  

25 Jun, 2013

1 commit

• 53e21f85   Fixed html escape on suborganization plugin ... Browse File »

  (ActionItem2699)

  Daniela Feitosa

  2013-06-25 18:34:12 +0000  

21 May, 2013

1 commit

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

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

09 May, 2013

2 commits

• 429f21d0   Hotspot for customize profile_image_link (profile block) Browse File »
  Caio Formiga

  2013-05-09 17:16:08 -0300  
• 7d51ce8b   Merge commit 'refs/merge-requests/298' of git://gitorious.org/noosfero/noosfero … ... Browse File »

  …into merge-requests/298
  
  Added html_safe that was missing on the block_helper new method
  
  Conflicts:
  	app/views/box_organizer/_highlights_block.rhtml
  	test/unit/application_helper_test.rb

  Rodrigo Souto

  2013-05-09 15:36:19 -0300  

07 May, 2013

1 commit

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

  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  

17 Apr, 2013

1 commit

• 527ee379   Merge branch 'stable' ... Browse File »

  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  

15 Apr, 2013

1 commit

• 09dd907e   Just changing the tempalates named_scope to receive environment instead of environment_id Browse File »
  Rodrigo Souto

  2013-04-15 15:12:01 -0300  

12 Apr, 2013

1 commit

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

  ActionItem2608

  Visita

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

11 Apr, 2013

1 commit

• dc107520   adding a menu to display comment actions Browse File »
  Victor Costa

  2013-04-11 13:55:46 -0300  

10 Apr, 2013

1 commit

• 086f3729   Fixing escapes due to debian security release 2.3.5-1.2+squeeze8 ... Browse File »

  (ActionItem2630)

  Rodrigo Souto

  2013-04-10 16:24:05 -0300  

03 Apr, 2013

2 commits

• 256b8bf2   Merge commit 'refs/merge-requests/275' of git://gitorious.org/noosfero/noosfero … ... Browse File »

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

  Rodrigo Souto

  2013-04-03 21:51:17 -0300  
• c4fe95aa   Fixing conflicting link_to_article method signature Browse File »
  Rodrigo Souto

  2013-04-03 21:46:20 -0300