Software Público Brasileiro

11 Jul, 2013

5 commits

• 2e6acc56   Fixing typo on trusted sites permission name Browse Dir »
  Rodrigo Souto

  2013-07-11 18:29:18 -0300  
• f3bfbfc0   Merge commit 'refs/merge-requests/331' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

  …into merge-requests/331

  Rodrigo Souto

  2013-07-11 17:37:43 -0300  
• b3806ad2   Adding name config for templates Browse Dir »
  Rodrigo Souto

  2013-07-11 16:56:58 -0300  
• e61a0cba   Merge commit 'refs/merge-requests/287' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

  …into merge-requests/287
  
  Conflicts:
  	app/models/environment.rb

  Rodrigo Souto

  2013-07-11 13:00:57 -0300  
• 81ca0e3a   Merge commit 'refs/merge-requests/264' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

  …into merge-requests/264
  
  Conflicts:
  	app/controllers/public/catalog_controller.rb
  	app/views/catalog/index.rhtml

  Rodrigo Souto

  2013-07-11 12:20:28 -0300  

14 Jun, 2013

1 commit

• caf26446   Merge branch 'stable' Browse Dir »
  Rodrigo Souto

  2013-06-14 11:47:08 -0300  

10 Jun, 2013

1 commit

• 36d9601b   provide interface to manage trusted sites ... Browse Dir »

  ActionItem2675

  Lucas Melo

  2013-06-10 16:03:56 -0300  

06 Jun, 2013

2 commits

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

  …into merge-requests/314

  Rodrigo Souto

  2013-06-06 15:13:44 -0300  
• ae6f3cfe   Merge commit 'refs/merge-requests/330' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

  …into merge-requests/330

  Rodrigo Souto

  2013-06-06 15:00:47 -0300  

04 Jun, 2013

2 commits

• b2745d8a   Filtering events links only with white_list ... Browse Dir »

  (ActionItem2684)

  Daniela Feitosa

  2013-06-04 06:00:15 -0300  
• 3ba4ed31   Escaped html when displaying leads of events ... Browse Dir »

  Leads of events returns the date of the event concatened with the lead
  defined on article. As on article the lead was not returning a safe
  html, the html was being escaped
  
  (ActionItem2658)

  Daniela Feitosa

  2013-06-04 05:55:46 -0300  

21 May, 2013

1 commit

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

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

17 May, 2013

2 commits

• 083eca4e   Fixing enterprise activities crash on postgres ... Browse Dir »

  (ActionItem2668)

  Rodrigo Souto

  2013-05-17 14:09:06 -0300  
• 50a53370   external_feed: strip attributes style and class ... Browse Dir »

  (ActionItem2650)

  Lucas Melo

  2013-05-17 12:53:14 -0300  

16 May, 2013

2 commits

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

  …into merge-requests/309

  Rodrigo Souto

  2013-05-16 15:30:36 -0300  
• f511eb49   Merge branch 'master' into stable Browse Dir »
  Rodrigo Souto

  2013-05-16 15:16:29 -0300  

10 May, 2013

1 commit

• cfb0d900   Fixed chat ... Browse Dir »

  - Syntax error on chat
  - Reviewed INSTALL.chat
  - Added function to update the list of users online on main window
  
  (ActionItem2667)

  Daniela Feitosa

  2013-05-10 18:02:38 +0000  

09 May, 2013

1 commit

• df6d2864   Including a link to the start of the catalog on catalog categories left block Browse Dir »
  Rodrigo Souto

  2013-05-09 13:34:35 -0300  

08 May, 2013

1 commit

• 3bfc2f78   Fix nil production cost Browse Dir »
  Braulio Bhavamitra

  2013-05-08 15:36:39 -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  

29 Apr, 2013

1 commit

• 48ed4027   destroy AbuseComplaint when reported is destroyed ... Browse Dir »

  ActionItem2451
  
  Including: migration and test.

  Lucas Melo

  2013-04-29 19:14:21 -0300  

24 Apr, 2013

1 commit

• 81fd61af   Html_safe on the raw_html_block ... Browse Dir »

  The problem only happens on production environment...
  
  (ActionItem2658)

  Rodrigo Souto

  2013-04-24 20:25:02 -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  

15 Apr, 2013

1 commit

• 09dd907e   Just changing the tempalates named_scope to receive environment instead of environment_id Browse Dir »
  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 Dir »

  ActionItem2608

  Visita

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

10 Apr, 2013

2 commits

• cb82652b   Merge branch 'html-escape' into stable Browse Dir »
  Rodrigo Souto

  2013-04-10 16:24:27 -0300  
• 086f3729   Fixing escapes due to debian security release 2.3.5-1.2+squeeze8 ... Browse Dir »

  (ActionItem2630)

  Rodrigo Souto

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

03 Apr, 2013

1 commit

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

  …into merge-requests/188

  Rodrigo Souto

  2013-04-03 19:41:21 -0300  

28 Mar, 2013

4 commits

• d66fe2c0   enable lead view for events Browse Dir »
  Aurélio A. Heckert

  2013-03-28 22:53:15 -0300  
• 8664a324   code beauty to article_block Browse Dir »
  Aurélio A. Heckert

  2013-03-28 22:50:06 -0300  
• aaccd5c4   makes Article::to_html finally configurable Browse Dir »
  Aurélio A. Heckert

  2013-03-28 22:43:45 -0300  
• c5b9f977   Merge branch 'master' into solr-commits Browse Dir »
  Rodrigo Souto

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

20 Mar, 2013

1 commit

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

  …into merge-requests/267
  
  Conflicts:
  	features/signup.feature
  	features/step_definitions/noosfero_steps.rb
  
  Making tests on signup wait for the bot trap time and use selenium.

  Rodrigo Souto

  2013-03-20 15:28:46 -0300  

18 Mar, 2013

3 commits

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

  2013-03-18 21:16:54 -0300  
• c4c81bc9   Better support for blogs on ArticleBlocks ... Browse Dir »

  This commit has the participation of Lucas Prado Melo
  
  It includes:
  * Make blog pagination link to absolute path
  * Configure blog display on block view
  * List blogs on article block selection
  * Auto select the first text article (if there is one)
  * Testing!

  Aurélio A. Heckert

  2013-03-18 18:09:14 -0300  
• 02eedc73   Enable Blog in the ArticleBlock ... Browse Dir »

  ActionItem2381

  Aurelio A. Heckert

  2013-03-18 10:41:47 -0300  

15 Mar, 2013

3 commits

• 5034abbb   Adding email to login label Browse Dir »
  Rodrigo Souto

  2013-03-15 23:43:55 +0000  
• c6bf7b15   Merge commit 'refs/merge-requests/253' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

  …into merge-requests/253

  Rodrigo Souto

  2013-03-15 20:07:18 -0300  
• 94a1c70a   Merge commit 'refs/merge-requests/171' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

  …into merge-requests/171

  Rodrigo Souto

  2013-03-15 20:43:42 +0000