Software Público Brasileiro

06 Mar, 2015

1 commit

• 2e349278   Merge branches 'master' and 'stable' into stable Browse Dir »
  Leandro Santos

  2015-03-06 16:51:56 -0300  

05 Mar, 2015

1 commit

• 87992619   Remove unused file Browse Dir »
  Antonio Terceiro

  2015-03-05 13:58:13 -0300  

27 Feb, 2015

1 commit

• 55a167ed   Merge branch 'master' into stable Browse Dir »
  Leandro Santos

  2015-02-27 10:55:35 -0300  

26 Feb, 2015

2 commits

• 0d3ca253   fix conflit with master Browse Dir »
  Leandro Santos

  2015-02-26 10:38:14 -0300  
• cf00ed96   Use jrails >= 0.9.5 Browse Dir »
  Antonio Terceiro

  2015-02-26 09:45:02 -0300  

25 Feb, 2015

2 commits

• 5204221c   apply BSB time zone Browse Dir »
  Leandro Santos

  2015-02-25 13:13:36 -0300  
• fb48ecc5   Load jrails the right way ... Browse Dir »

  This fixes a bunch of tests for me

  Antonio Terceiro

  2015-02-25 13:12:05 -0300  

24 Feb, 2015

1 commit

• 0531c6a2   merging with master Browse Dir »
  Leandro Santos

  2015-02-24 11:37:25 -0300  

23 Feb, 2015

1 commit

• 8ca9865d   profile-suggestions: reduce suggestions calculation period to 30 days Browse Dir »
  Rodrigo Souto

  2015-02-23 15:27:39 -0300  

22 Feb, 2015

2 commits

• 2baa37a9   Merge branch 'multitenancy' into 'master' ... Browse Dir »

  Fixes multitenancy documentation and task
  
  Multitenancy installation is not currently working as described on documentation.
  This patch fixes the create task and updates the documentation.
  
  See merge request !377

  Braulio Bhavamitra

  2015-02-22 23:29:21 +0000  
• 9d1bd7a8   Merge branch 'custom_activation_check_time' into 'master' ... Browse Dir »

  New configuration to define when user activation check will perform
  
  See merge request !455

  Braulio Bhavamitra

  2015-02-22 23:09:17 +0000  

11 Feb, 2015

1 commit

• 592a3c64   Replace prototype calls/callbacks to jquery/jrails Browse Dir »
  Braulio Bhavamitra

  2015-02-11 09:21:21 -0300  

09 Feb, 2015

1 commit

• 9ba92dcc   New config to define when user activation check will perform Browse Dir »
  Victor Costa

  2015-02-09 13:13:46 -0300  

04 Feb, 2015

1 commit

• 60262a33   Merge branch 'master' into stable ... Browse Dir »

  Conflicts:
  	app/controllers/public/search_controller.rb
  	app/models/profile.rb
  	app/views/cms/edit.html.erb
  	public/stylesheets/application.css

  Victor Costa

  2015-02-04 13:02:40 -0300  

03 Feb, 2015

1 commit

• 71439c6c   Merge branch 'master' into stoa ... Browse Dir »

  Conflicts:
  	app/controllers/my_profile/profile_editor_controller.rb
  	app/helpers/search_helper.rb
  	app/models/invitation.rb
  	app/models/person.rb
  	app/views/cms/view.html.erb
  	app/views/templates/index.html.erb
  	plugins/community_track/views/content_viewer/_step_item.html.erb
  	test/functional/home_controller_test.rb
  	test/unit/person_test.rb
  	test/unit/profile_test.rb

  Rodrigo Souto

  2015-02-03 18:06:21 -0300  

29 Jan, 2015

2 commits

• fb293ae3   Merge branch 'master' into stable Browse Dir »
  Victor Costa

  2015-01-29 09:12:35 -0300  
• da3e25aa   Revert "Merge branch 'fix_lazy_queries' into stable" ... Browse Dir »

  This reverts commit 853cc8ef357b5eeb2d25cf586fb96bbeab36a785, reversing
  changes made to a0ef4f259127426b96f8a8ba2bbb2c18c67bf980.
  
  This reverts commit b8304468ef6de86accdfd442c889f30b2fdd9539, reversing
  changes made to ed4938b5272fb57a714c84c3443c7d329c9407aa.
  
  This reverts commit 77ee15d0896424d4c02de0a61ad8922e5b38304c, reversing
  changes made to b52c66dba90218f9dd21b10dee85e293ccf52aa7.
  
  This reverts commit a0ef4f259127426b96f8a8ba2bbb2c18c67bf980, reversing
  changes made to 5c4d0723fb8977e29f0e208e6d3c609933281cec.

  Victor Costa

  2015-01-29 08:51:51 -0300  

28 Jan, 2015

4 commits

• d9a3fdb3   Merge branch 'master' into stable ... Browse Dir »

  Conflicts:
  	app/helpers/article_helper.rb
  	app/helpers/boxes_helper.rb
  	app/models/article.rb
  	app/models/block.rb
  	app/views/content_viewer/view_page.html.erb
  	db/schema.rb
  	plugins/community_track/views/blocks/_track_list_more.html.erb
  	plugins/community_track/views/box_organizer/community_track_plugin/_track_list_block.html.erb
  	public/javascripts/article.js
  	test/unit/block_test.rb
  	test/unit/person_notifier_helper_test.rb

  Victor Costa

  2015-01-28 15:22:56 -0300  
• 4c229767   Revert "Set default timezone as needed by rails 3.2" ... Browse Dir »

  This actually breaks things. See the discussion on !430
  
  https://gitlab.com/noosfero/noosfero/merge_requests/430

  Antonio Terceiro

  2015-01-28 12:03:29 -0200  
• cd62616e   noosfero_urls: skip standard HTTP/HTTPS ports Browse Dir »
  Antonio Terceiro

  2015-01-28 09:59:20 -0200  
• e3b70593   noosfero_urls: move to config/initializers/ Browse Dir »
  Antonio Terceiro

  2015-01-28 09:52:06 -0200  

22 Jan, 2015

1 commit

• dbc6d527   Fix passenger class load to not depend on memcache gem ... Browse Dir »

  Use class name as string instead of constant

  Braulio Bhavamitra

  2015-01-22 13:39:37 -0300  

15 Jan, 2015

1 commit

• 31c025cc   calculate-suggestions-score: change periodicity to once a day Browse Dir »
  Rodrigo Souto

  2015-01-15 16:32:53 -0300  

14 Jan, 2015

1 commit

• 48c34b8c   Merge branch 'master' into stable ... Browse Dir »

  Conflicts:
  	public/javascripts/application.js

  Victor Costa

  2015-01-14 17:55:35 -0300  

12 Jan, 2015

1 commit

• 62419e2b   noosfero_caching: fix HTTP caching with Rails 3 Browse Dir »
  Antonio Terceiro

  2015-01-12 15:50:28 -0200  

09 Jan, 2015

1 commit

• a858f087   Merge branch 'master' into stoa Browse Dir »
  Larissa Reis

  2015-01-09 09:23:21 -0300  

05 Jan, 2015

2 commits

• e781c190   Merge branch 'hotfixes' into stable ... Browse Dir »

  * hotfixes:
    Allow shape and coords html attributes

  Victor Costa

  2015-01-05 10:03:18 -0300  
• 22517787   Allow shape and coords html attributes Browse Dir »
  Victor Costa

  2015-01-05 10:00:30 -0300  

23 Dec, 2014

1 commit

• 1cd31972   Merge branch 'sanitize_comment' into stable Browse Dir »
  Victor Costa

  2014-12-23 11:00:08 -0300  

22 Dec, 2014

1 commit

• ec952935   Change default gravatar fallback ... Browse Dir »

  wavatar produces shitty little monsters which is annoying

  Antonio Terceiro

  2014-12-22 10:57:00 -0200  

16 Dec, 2014

1 commit

• 9dbf625a   Allow image map html tags Browse Dir »
  Victor Costa

  2014-12-16 15:55:26 -0300  

20 Nov, 2014

1 commit

• 94eaff08   Merge branch 'master' into stoa ... Browse Dir »

  Conflicts:
  	Gemfile.lock
  	script/development

  Larissa Reis

  2014-11-20 01:24:55 -0300  

13 Nov, 2014

1 commit

• 79477411   Uses YAML alias to reference default environment in multitenancy ... Browse Dir »

    Using the previous documented syntax got me an error since environment
    wasn't expected to be a string. I could only get it to work using YAML
    alias and anchors, so I'm changing the documentation.

  Larissa Reis

  2014-11-13 10:27:55 -0300  

03 Nov, 2014

1 commit

• 67d07fd9   Merge branch 'master' into stable Browse Dir »
  Victor Costa

  2014-11-03 11:17:56 -0300  

31 Oct, 2014

1 commit

• f9538a7a   silence annyoing warning from I18n Browse Dir »
  Antonio Terceiro

  2014-10-31 15:08:36 -0200  

30 Oct, 2014

1 commit

• a1ec80fb   Added support to bullet gem in development Browse Dir »
  Victor Costa

  2014-10-30 15:24:23 -0300  

28 Oct, 2014

2 commits

• afa406c6   Fix baseplugins addition Browse Dir »
  Braulio Bhavamitra

  2014-10-28 15:25:09 -0300  
• 270d334b   Add plugins migrations paths Browse Dir »
  Braulio Bhavamitra

  2014-10-28 14:31:46 -0300  

27 Oct, 2014

1 commit

• 36442057   Set default timezone as needed by rails 3.2 ... Browse Dir »

  Without this, rails won't convert back to system timezone when reading
  timestamṕ/datatime fields from database.
  
  https://github.com/rails/rails/issues/6816

  Hugo Melo

  2014-10-27 15:21:26 -0300  

11 Oct, 2014

1 commit

• 289e838f   Load locales inside plugins' path Browse Dir »
  Braulio Bhavamitra

  2014-10-11 22:26:13 -0300