Software Público Brasileiro

29 Oct, 2014

2 commits

• 57753e00   Merge branch 'fix_tinymce_video' into stable Browse Dir »
  Victor Costa

  2014-10-29 18:56:47 -0300  
• 34f4326d   Allow trusted url without protocol for iframe in tinymce Browse Dir »
  Victor Costa

  2014-10-29 18:52:22 -0300  

28 Oct, 2014

2 commits

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

  2014-10-28 14:18:20 -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

4 commits

• 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  
• 0f01bf09   Added article tags list on profiles Browse Dir »
  Daniela Feitosa

  2014-10-22 18:42:24 -0300  
• e7e132e7   Fix: profile_controller tests Browse Dir »
  Daniela Feitosa

  2014-10-22 19:11:34 +0000  
• 5c42f6c1   Fix: profile_helper tests Browse Dir »
  Daniela Feitosa

  2014-10-22 15:23:37 +0000  

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

3 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  
• 4ebcbe31   Added a way to set a proxy for https requests in feed handler Browse Dir »

  3
  Victor Costa

  2014-10-20 13:51:09 -0300  

14 Oct, 2014

2 commits

• 99fa04df   Don't cache error responses (status >= 400) Browse Dir »
  Antonio Terceiro

  2014-10-14 12:06:39 -0300  
• 3c206e7b   Rewrite HTTP caching tests as integration tests ... Browse Dir »

  Total runtime drops from ~21s to ~7s

  Antonio Terceiro

  2014-10-14 11:00:35 -0300  

13 Oct, 2014

2 commits

• 258b63ca   Added a way to set a proxy for feed handler Browse Dir »
  Victor Costa

  2014-10-13 15:04:40 -0300  
• 4fbe9f50   Merge branch 'I13-fix_partial_for_class' into 'master' ... Browse Dir »

  I13 fix partial for class
  
  Fixes #13
  
  See merge request !333

  Antonio Terceiro

  2014-10-13 13:37:28 +0000  

10 Oct, 2014

1 commit

• 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  

07 Oct, 2014

2 commits

• fdac7614   Merge branch 'I13-fix_partial_for_class' into stable Browse Dir »
  Victor Costa

  2014-10-07 14:48:17 -0300  
• 36b7ff2f   Fix partial for class method Browse Dir »
  Victor Costa

  2014-10-07 14:35:10 -0300  

30 Sep, 2014

1 commit

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

  Conflicts:
  	Gemfile
  	Gemfile.lock

  Victor Costa

  2014-09-30 12:06:48 -0300  

26 Sep, 2014

10 commits

• 03614d52   fix functional tests that fail without notification emails Browse Dir »
  Antonio Terceiro

  2014-09-26 13:43:26 -0300  
• 70359d29   ProfileEditorController: fix test that sends email Browse Dir »
  Antonio Terceiro

  2014-09-26 13:42:21 -0300  
• 656e245a   CommentNotifier: drop test that does not apply anymore ... Browse Dir »

  There will be always a notification email now.

  Antonio Terceiro

  2014-09-26 13:42:21 -0300  
• d2d3baf5   FeedReaderBlockTest: use fixed timestamp for test Browse Dir »
  Antonio Terceiro

  2014-09-26 13:42:21 -0300  
• b36352d3   Fix tests to work with `mail` 2.5 ... Browse Dir »

  creating a mail intance crashes it there is no valid recipient; so we
  change places to use create_user.person instead of fast_create(Person)
  to make sure the user person instances have a valid email address.

  Antonio Terceiro

  2014-09-26 13:42:21 -0300  
• 04ed091f   Provide default email for test environments Browse Dir »
  Antonio Terceiro

  2014-09-26 13:42:20 -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  
• 8d2e48e9   ProfileController: fix fragile tests Browse Dir »
  Antonio Terceiro

  2014-09-26 13:42:04 -0300  
• fa694deb   Merge branch 'master' into rails3_stable Browse Dir »
  Victor Costa

  2014-09-26 13:29:29 -0300  

24 Sep, 2014

2 commits

• df002879   ArticleTest: another attempt at fixing this fragile test Browse Dir »
  Antonio Terceiro

  2014-09-24 18:12:36 -0300  
• d9f771c3   Fix broken test Browse Dir »
  Antonio Terceiro

  2014-09-24 15:02:10 -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  

18 Sep, 2014

2 commits

• 50c2d5c8   Merge branch 'AI3292_signup_image_upload' into 'master' ... Browse Dir »

  Ai3292 signup image upload
  
  Action Item: http://noosfero.org/Development/ActionItem3292
  
  See merge request !318

  Antonio Terceiro

  2014-09-18 19:42:39 +0000  
• 08b0c25c   ProfileInfoBlockTest: remove useless test Browse Dir »
  Antonio Terceiro

  2014-09-18 15:42:39 -0300  

15 Sep, 2014

1 commit

• 8ee125a8   signup_image_upload: Add image on user signup ... Browse Dir »

  Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

  Fabio Teixeira

  2014-09-15 15:56:21 -0300  

12 Sep, 2014

3 commits

• 3e384886   BlocksTest: remove pagination tests for ArticleBlock ... Browse Dir »

  This feature was removed and the test was not updated. It makes no sense
  for an article block displaying a blog to display pagination links.

  Antonio Terceiro

  2014-09-12 11:33:34 -0300  
• 6d4b2ddc   Fix category-related tests ... Browse Dir »

  At some point the display color became an arbitrary color and the tests
  were never updated.

  Antonio Terceiro

  2014-09-12 11:23:18 -0300  
• 83716d8a   Remove integration test for exception_notification ... Browse Dir »

  It was breaking the integration tests (messing with internals of an old
  version of exception_notification), and the tests are testing that
  exception_notification actually works which is _not_ a job for the
  Noosfero test suite.

  Antonio Terceiro

  2014-09-12 11:06:55 -0300