Software Público Brasileiro

07 Jul, 2015

1 commit

• c4d1dd86   Merge branch 'api' into production ... Browse File »

  Conflicts:
  	test/fixtures/article_followers.yml

  Victor Costa

  2015-07-07 11:04:20 -0300  

03 Jul, 2015

1 commit

• 5ce42844   Working with environment settings instead of yaml ... Browse File »

  ready for Serpro's captcha

  Evandro Junior

  2015-07-03 18:58:47 -0300  

16 Jun, 2015

1 commit

• d215b232   Option to choose template to send email to members Browse File »
  Victor Costa

  2015-06-16 11:10:38 -0300  

12 Jun, 2015

1 commit

• b8629708   Add date format option for articles from the environment ... Browse File »

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

  Gabriela Navarro

  2015-06-12 13:03:20 -0300  

01 Jun, 2015

1 commit

• d01c42a2   New permission 'view_tasks' that allow only tasks visualization Browse File »
  Victor Costa

  2015-06-01 16:51:16 -0300  

28 May, 2015

1 commit

• 4c1e0c9f   admin-panel: refactoring of manage organizations ... Browse File »

  Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
  Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
  Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br>

  Gabriela Navarro

  2015-05-28 12:49:23 -0300  

20 May, 2015

1 commit

• b464989a   Add rake task to activate all available plugins Browse File »
  Gabriela Navarro

  2015-05-20 17:05:27 -0300  

12 May, 2015

3 commits

• 8e2f02dc   noosfero-steps: fix box fetch on block creation Browse File »
  Rodrigo Souto

  2015-05-12 13:17:02 -0300  
• 9132007f   Applying merge request revisions ... Browse File »

  Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
  Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>

  André Guedes

  2015-05-12 13:15:35 -0300  
• f82f1955   Add new layout template with 4 boxes ... Browse File »

  Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>

  Luciano Prestes

  2015-05-12 13:15:35 -0300  

24 Feb, 2015

1 commit

• 0531c6a2   merging with master Browse File »
  Leandro Santos

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

04 Feb, 2015

1 commit

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

  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

3 commits

• d2029dc6   Merge branch 'invitation' into stoa ... Browse File »

  Conflicts:
  	db/schema.rb

  Rodrigo Souto

  2015-02-03 18:11:15 -0300  
• 71439c6c   Merge branch 'master' into stoa ... Browse File »

  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  
• da0396de   admins: avoid problems with empty roles or environment on resources Browse File »
  Rodrigo Souto

  2015-02-03 16:16:52 -0300  

29 Jan, 2015

1 commit

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

  2015-01-29 09:12:35 -0300  

28 Jan, 2015

2 commits

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

  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  
• d9c3be28   Fix protocal in generated links ... Browse File »

  When acessing Noosfero through a properly configured HTTPS setup, all
  links will now be generated with https (or without an explicit
  protocol and will just work).
  
  Links generated outside of the scope of a request (models, mailers etc)
  will still use http://. That can be fixed by a localized change to
  Environment#top_url, but for now I expect everyone using HTTPS to have a
  proper HTTP -> HTTPS redirection mechanism.

  Antonio Terceiro

  2015-01-28 11:08:04 -0200  

27 Jan, 2015

1 commit

• 91109fe3   hide license selection in article edition when there is no license available Browse File »
  Leandro Santos

  2015-01-27 16:34:04 -0300  

26 Jan, 2015

2 commits

• b6d2e88c   Merge branch 'master' into AI3268_template_management Browse File »
  Leandro Santos

  2015-01-26 17:37:36 -0300  
• 4f321345   Merge branches 'master' and 'AI3268_template_management' into AI3268_template_management Browse File »
  Leandro Santos

  2015-01-26 10:46:57 -0300  

23 Jan, 2015

1 commit

• e1f69da2   trusted-sites: add openstreetmap.org as default ... Browse File »

  AI:3006

  Eduardo Passos

  2015-01-23 16:35:33 -0300  

13 Jan, 2015

1 commit

• 5b423b02   environment: encapsulate portal_enabled logic inside the model Browse File »
  Rodrigo Souto

  2015-01-13 12:44:06 -0300  

20 Nov, 2014

1 commit

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

  Conflicts:
  	Gemfile.lock
  	script/development

  Larissa Reis

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

20 Oct, 2014

1 commit

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

  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  

10 Oct, 2014

1 commit

• 30560212   Support running Noosfero as a /subdirectory ... Browse File »

  - 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

1 commit

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

  Conflicts:
  	Gemfile
  	Gemfile.lock

  Victor Costa

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

26 Sep, 2014

1 commit

• faeba294   Environment: use contact_email for notifications ... Browse File »

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

  Antonio Terceiro

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

08 Sep, 2014

1 commit

• 79e1ad7b   Merge branch 'master' into stoa ... Browse File »

  Conflicts:
  	app/controllers/application_controller.rb
  	app/controllers/my_profile/memberships_controller.rb
  	app/controllers/public/account_controller.rb
  	app/helpers/application_helper.rb
  	app/helpers/layout_helper.rb
  	app/helpers/token_helper.rb
  	app/views/account/signup.html.erb
  	app/views/layouts/_javascript.html.erb
  	db/schema.rb
  	test/functional/application_controller_test.rb

  Rodrigo Souto

  2014-09-08 12:36:01 -0300  

29 Aug, 2014

1 commit

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

  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 File »

  PeopleBlock plugin overrides the EnvironmentStatisticsBlock
  
  (ActionItem3045)

  Joenio Costa

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

25 Aug, 2014

1 commit

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

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

20 Aug, 2014

1 commit

• 242a3479   user_registration: Add the option on the environment admin panel. ... Browse File »

  (ActionItem3036)
  
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

  Gabriela Navarro

  2014-08-20 21:39:41 -0300  

18 Aug, 2014

2 commits

• f1cafcb8   Merge branch 'master' into AI3191-private_environment Browse File »
  Joenio Costa

  2014-08-18 15:02:17 -0300  
• b7823262   Merge branch 'master' into stoa ... Browse File »

  Conflicts:
  	app/controllers/my_profile/cms_controller.rb
  	db/schema.rb

  Rodrigo Souto

  2014-08-18 12:31:32 -0300  

11 Aug, 2014

4 commits

• 458348bf   Merge branches 'AI3268_template_management' and 'rails3_stable' into rails3_stable Browse File »
  Leandro Santos

  2014-08-11 15:21:28 -0300  
• 3b569fa2   Add set as default method for templates Browse File »
  Leandro Santos

  2014-08-11 14:03:19 -0300  
• 600d8e0f   refactoring enterprise template management Browse File »

  5
  Leandro Santos

  2014-08-11 11:29:50 -0300  
• 07e24499   refactoring community template management Browse File »
  Leandro Santos

  2014-08-11 11:20:14 -0300  

08 Aug, 2014

1 commit

• b2083dec   refactoring person template management Browse File »
  Leandro Santos

  2014-08-08 13:06:57 -0300