Software Público Brasileiro

30 Oct, 2014

2 commits

• a0ef4f25   Merge branch 'fix_lazy_queries' into stable ... Browse Dir »

  2

  Conflicts:
  	app/controllers/public/content_viewer_controller.rb

  Victor Costa

  2014-10-30 15:31:52 -0300  
• b4435ba8   Added includes in models to prevent n+1 queries ... Browse Dir »

  N+1 queries found with the help of bullet gem

  Victor Costa

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

28 Oct, 2014

3 commits

• 41834a8e   Merge branch 'fix_template_creation' into stable Browse Dir »
  Victor Costa

  2014-10-28 14:18:20 -0300  
• 2abf5586   Refactoring extra fields validation for organizations Browse Dir »
  Victor Costa

  2014-10-28 14:15:48 -0300  
• 65ea86e7   Fix creation of profile templates when extra fields are required Browse Dir »
  Victor Costa

  2014-10-28 14:12:01 -0300  

23 Oct, 2014

1 commit

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

  2014-10-23 11:27:12 -0300  

22 Oct, 2014

1 commit

• ad4f98b3   Merge branch 'stable' ... Browse Dir »

  Conflicts:
  	app/helpers/profile_helper.rb
  	app/views/content_viewer/_article_toolbar.rhtml
  	app/views/profile/_common.rhtml
  	app/views/profile/_organization_profile.rhtml
  	app/views/profile/_person_profile.rhtml
  	db/schema.rb
  	public/stylesheets/application.css

  Daniela Feitosa

  2014-10-22 21:39:49 -0300  

21 Oct, 2014

1 commit

• 6a6171ef   Merge branch 'fix_report_abuse' into stable Browse Dir »
  Victor Costa

  2014-10-21 08:19:13 -0300  

20 Oct, 2014

2 commits

• 896b46c3   Merge branch 'master' into stable ... Browse Dir »

  Conflicts:
  	app/views/profile/_person_profile.html.erb
  	app/views/shared/tiny_mce.html.erb
  	public/javascripts/application.js
  	public/javascripts/tinymce/js/tinymce/license.txt
  	public/javascripts/tinymce/js/tinymce/plugins/compat3x/css/dialog.css
  	public/javascripts/tinymce/js/tinymce/plugins/compat3x/utils/editable_selects.js
  	public/javascripts/tinymce/jscripts/tiny_mce/langs/en.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/media.htm
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/props.htm
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/row.htm
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/table.htm
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif
  	public/javascripts/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js
  	public/javascripts/tinymce/jscripts/tiny_mce/tiny_mce.js
  	public/javascripts/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
  	public/javascripts/tinymce/jscripts/tiny_mce/tiny_mce_src.js
  	public/stylesheets/application.css

  Victor Costa

  2014-10-20 17:07:21 -0300  
• 2cbd78d6   Fix report abuse Browse Dir »
  Victor Costa

  2014-10-20 16:45:09 -0300  

10 Oct, 2014

3 commits

• ffd4d09f   Merge branch 'I7-fix_template_with_container_block' into 'master' ... Browse Dir »

  Fix template with container block
  
  Fixes issue #7
  
  See merge request !327

  Antonio Terceiro

  2014-10-10 15:38:07 +0000  
• 1e0c155b   Merge branch 'I11-fix_members_block_cache' into 'master' ... Browse Dir »

  Fix members block cache
  
  Fixes issue #11
  
  See merge request !326

  Antonio Terceiro

  2014-10-10 15:09:56 +0000  
• 30560212   Support running Noosfero as a /subdirectory ... Browse Dir »

  - Remove absolute URL's from stylesheets and javascripts
  - Handle prefix in LinkListBlock
  - add Noosfero.root method as a central data source
  
  The application server needs to be started with the
  RAILS_RELATIVE_URL_ROOT environment variable set to the desired prefix.
  
  In development, this can be tested with
  
    # assuming /social prefix
    $ RAILS_RELATIVE_URL_ROOT=/social thin --prefix /social start
  
  For production, see INSTALL.md

  Antonio Terceiro

  2014-10-10 11:43:43 -0300  

30 Sep, 2014

2 commits

• 2efb80a2   Merge branch 'master' into rails3_stable ... Browse Dir »

  Conflicts:
  	Gemfile
  	Gemfile.lock

  Victor Costa

  2014-09-30 12:06:48 -0300  
• d2e306fe   people_block: fix cache expiration of members_block ... Browse Dir »

  fixes #11

  Victor Costa

  2014-09-30 11:31:26 -0300  

26 Sep, 2014

3 commits

• faa13355   Merge branch 'rails3-custom_fields' into rails3_stable Browse Dir »
  Victor Costa

  2014-09-26 13:54:11 -0300  
• faeba294   Environment: use contact_email for notifications ... Browse Dir »

  There is no point at all in send email to the noreply_email

  Antonio Terceiro

  2014-09-26 13:42:20 -0300  
• bbfaed44   Organization: mail the environment with no contacts ... Browse Dir »

  When an organization (community or enterprise) has no admins and no
  recorded contact email, redirect any mails sent to that org to the
  environment contact email.

  Antonio Terceiro

  2014-09-26 13:42:20 -0300  

24 Sep, 2014

1 commit

• c50b4ad8   Avoid infinite loop with person notification Browse Dir »
  Victor Costa

  2014-09-24 12:56:01 -0300  

23 Sep, 2014

2 commits

• e1fa81e8   Merge branch 'fix_template_with_container_block' into rails3_stable Browse Dir »
  Victor Costa

  2014-09-23 16:17:44 -0300  
• df2206b2   container_block: fix the use of container blocks with templates ... Browse Dir »

  fixes #7

  Victor Costa

  2014-09-23 16:16:29 -0300  

22 Sep, 2014

1 commit

• 9804917f   Merge branch 'master' into rails3_stable ... Browse Dir »

  Conflicts:
  	Gemfile
  	Gemfile.lock
  	lib/tasks/gettext.rake
  	test/unit/dates_helper_test.rb

  Victor Costa

  2014-09-22 16:38:12 -0300  

17 Sep, 2014

1 commit

• d50d9438   bug fixes Browse Dir »
  Francisco Júnior

  2014-09-17 16:54:13 -0300  

16 Sep, 2014

1 commit

• b21e3e52   Fix crash from nil content Browse Dir »
  Braulio Bhavamitra

  2014-09-16 21:25:45 -0300  

11 Sep, 2014

1 commit

• 1a2951af   ExternalFeed: use feed title as author name Browse Dir »
  Antonio Terceiro

  2014-09-11 12:11:05 -0300  

09 Sep, 2014

3 commits

• 098a2def   *Block: remove unecessary editable? methods ... Browse Dir »

  The superclass methos alteady returns true anyway.

  Antonio Terceiro

  2014-09-09 18:18:31 -0300  
• 6ad2b6c1   making editable ProfileInfoBlock ... Browse Dir »

  'def editable' was removed because it was overriding (of Block) and setting to false
  AI3298

  Junior Silva

  2014-09-09 18:12:43 -0300  
• 85bd2779   gettext: fix string extraction and runtime usage ... Browse Dir »

  Closes #307
  
  Signed-off-by: Victor Costa <vfcosta@gmail.com>
  Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>

  Victor Costa

  2014-09-09 16:22:24 -0300  

05 Sep, 2014

3 commits

• 3a320e4b   Merge branch 'rails3-custom_fields' into rails3_stable Browse Dir »
  Francisco Marcelo de Araújo Lima Júnior

  2014-09-05 17:08:13 -0300  
• 3193dfa1   Merge branch 'master' into rails3-custom_fields Browse Dir »
  Francisco Marcelo de Araújo Lima Júnior

  2014-09-05 15:29:56 -0300  
• 5d6ae4ae   fixes Browse Dir »
  Francisco Marcelo de Araújo Lima Júnior

  2014-09-05 15:15:26 -0300  

01 Sep, 2014

2 commits

• ac001d2a   put white_list on comment validation to avoid wrong parsers Browse Dir »

  1
  Leandro Santos

  2014-09-01 16:29:51 -0300  
• 1cc40a0b   hotfix to manage translation Browse Dir »
  Leandro Santos

  2014-09-01 15:55:55 -0300  

29 Aug, 2014

1 commit

• 7d5483f1   Merge branch 'master' into rails3_stable ... Browse Dir »

  Conflicts:
  	app/helpers/layout_helper.rb
  	db/schema.rb

  Victor Costa

  2014-08-29 11:35:34 -0300  

27 Aug, 2014

1 commit

• 914ea967   Removing EnvironmentStatisticsBlock from core ... Browse Dir »

  PeopleBlock plugin overrides the EnvironmentStatisticsBlock
  
  (ActionItem3045)

  Joenio Costa

  2014-08-27 20:41:41 -0300  

26 Aug, 2014

1 commit

• 8cc18ab5   change solution: custom fields per profile Browse Dir »
  Francisco Marcelo de Araújo Lima Júnior

  2014-08-26 18:49:08 -0300  

25 Aug, 2014

1 commit

• 32968c83   Merge branch 'master' into rails3_stable Browse Dir »
  Victor Costa

  2014-08-25 12:24:07 -0300  

21 Aug, 2014

2 commits

• f1a6c012   Merge branch 'rails3_chat' into rails3_stable Browse Dir »
  Victor Costa

  2014-08-21 18:45:25 -0300  
• 2598c37e   Merge branch 'master' into rails3_stable Browse Dir »
  Victor Costa

  2014-08-21 18:45:21 -0300  

20 Aug, 2014

1 commit

• ee4b142a   AI3036 Code Refactoring ... Browse Dir »

  Modified conditional to be more logical on User model.
  Renamed moderation task to a more intuitive name.
  Added unit test for moderate_user_registration task.
  
  Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
  Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

  André Guedes

  2014-08-20 21:54:33 -0300