Software Público Brasileiro

03 Jul, 2015

1 commit

• ea468c0e   Merge branch 'block-admin-mail' into production ... Browse File »

  Conflicts:
  	app/models/event.rb
  	app/models/profile.rb
  	po/fr/noosfero.po

  Victor Costa

  2015-07-03 10:45:54 -0300  

23 Jun, 2015

1 commit

• 5911b3bf   Revert "Disable piwik" ... Browse File »

  This reverts commit 82fc99e4c9a1001771a94c5a585944b2cb9001e3.

  Victor Costa

  2015-06-23 16:15:48 -0300  

19 Jun, 2015

1 commit

• 82fc99e4   Disable piwik Browse File »

  1
  Victor Costa

  2015-06-19 09:02:54 -0300  

17 Jun, 2015

1 commit

• 1910a1d6   Send profile data on user data Browse File »
  Braulio Bhavamitra

  2015-06-17 13:24:20 -0300  

13 Apr, 2015

1 commit

• 3d6dc6c4   Fix integration with feedback Browse File »
  Victor Costa

  2015-04-13 15:32:38 -0300  

08 Apr, 2015

1 commit

• 1f3600fd   fix conflit with next Browse File »
  Leandro Santos

  2015-04-08 20:07:48 -0300  

27 Mar, 2015

1 commit

• fe3c0b17   Merge branch 'env-bars' into 'next' ... Browse File »

  Add global theme intervention spaces
  
  When the env theme has `global.css`, `global_header.html.erb`, or `global_footer.html.erb`, that content is added to any customized profile theme.
  
  See merge request !529

  Rodrigo Souto

  2015-03-27 18:23:26 +0000  

26 Mar, 2015

1 commit

• 8a831990   Add global theme intervention spaces ... Browse File »

  When the env theme has `global.css`, `global_header.html.erb`, or `global_footer.html.erb`, that content is added to any customized profile theme.

  Aurélio A. Heckert

  2015-03-26 19:10:52 -0300  

19 Mar, 2015

1 commit

• 3e5d8c76   Merge branch 'serpro-context' into stable ... Browse File »

  Conflicts:
  	app/models/profile.rb
  	app/views/profile_editor/edit.html.erb

  Victor Costa

  2015-03-19 17:52:01 -0300  

18 Mar, 2015

1 commit

• 1e4cabef   Revert "layout: remove tag on metadata_plugin" ... Browse File »

  This reverts commit e99db083e4bb10047cc8b543bbc5151abbe36372.

  Braulio Bhavamitra

  2015-03-18 09:17:55 -0300  

17 Mar, 2015

1 commit

• 998a5390   merging with master Browse File »
  Leandro Santos

  2015-03-17 22:19:37 -0300  

16 Mar, 2015

1 commit

• e99db083   layout: remove tag on metadata_plugin Browse File »

  9
  Braulio Bhavamitra

  2015-03-16 13:23:18 -0300  

09 Mar, 2015

1 commit

• cda5fd8a   Fix script tag in application-ng layout Browse File »
  Victor Costa

  2015-03-09 13:38:54 -0300  

27 Feb, 2015

3 commits

• b1a2a1ae   fixing feedback Browse File »
  Leandro Santos

  2015-02-27 10:46:10 -0300  
• b03eaf3a   updating feedback message Browse File »
  Leandro Santos

  2015-02-27 10:20:35 -0300  
• 1b8ae012   adding feedback app Browse File »
  Leandro Santos

  2015-02-27 08:51:27 -0300  

24 Feb, 2015

1 commit

• 0531c6a2   merging with master Browse File »
  Leandro Santos

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

02 Feb, 2015

1 commit

• 26edc24e   Merge branch 'rails3-custom_fields' into stable ... Browse File »

  Conflicts:
  	app/views/profile/_person_profile.html.erb

  Victor Costa

  2015-02-02 11:17:20 -0300  

30 Jan, 2015

1 commit

• db301dca   Add metadata plugin Browse File »
  Braulio Bhavamitra

  2015-01-30 09:13:45 -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  

21 Jan, 2015

1 commit

• 0c38e980   Adds ClassCommunityPlugin ... Browse File »

  Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
  Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br>

  Arthur Esposte

  2015-01-21 22:42:24 +0000  

14 Jan, 2015

1 commit

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

  Conflicts:
  	public/javascripts/application.js

  Victor Costa

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

08 Jan, 2015

2 commits

• 0085008d   Move theme js into head Browse File »
  Braulio Bhavamitra

  2015-01-08 22:22:05 -0300  
• 0ab9e1e9   Put content in a partial Browse File »
  Braulio Bhavamitra

  2015-01-08 22:22:05 -0300  

03 Dec, 2014

2 commits

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

  2014-12-03 09:54:28 -0300  
• 57e4738a   Fix XSS possibility caused by quotes in article title/body Browse File »
  Antonio Terceiro

  2014-12-03 10:28:35 -0200  

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  

24 Sep, 2014

1 commit

• 143bd4b0   Add piwik of estatisticas.presidencia.gov.br Browse File »
  Victor Costa

  2014-09-24 13:03:53 -0300  

14 Aug, 2014

1 commit

• 01c3bad8   Use xmpp_chat to render new chat layout Browse File »
  Victor Costa

  2014-08-14 09:47:36 -0300  

13 Aug, 2014

1 commit

• 3fab4790   New chat layout Browse File »
  Victor Costa

  2014-08-13 19:04:52 -0300  

13 Jun, 2014

1 commit

• aa47fe88   added piwik plugin ... Browse File »

  added new hotstop "body_ending"

  Joenio Costa

  2014-06-13 23:33:36 -0300  

22 May, 2014

1 commit

• 409f4f8a   rails3: use cookie to store csrf token Browse File »
  Victor Costa

  2014-05-22 11:29:08 -0300  

13 May, 2014

2 commits

• a39c63db   Replace instance_eval by instance_exec to avoid api break ... Browse File »

  http://makandracards.com/makandra/14725-instance_eval-behaves-different-in-ruby-1-8-and-ruby-1-9-use-instance_exec-instead

  Rodrigo Souto

  2014-05-13 20:38:15 +0000  
• 23914711   Merge branch 'master' into rails3 ... Browse File »

  Conflicts:
  	app/helpers/application_helper.rb
  	app/helpers/layout_helper.rb
  	app/models/community.rb
  	app/models/enterprise.rb
  	app/models/product_category.rb
  	app/views/account/change_password.html.erb
  	config/boot.rb
  	config/environment.rb
  	config/routes.rb
  	lib/noosfero/plugin.rb
  	test/unit/enterprise_activation_test.rb
  	test/unit/person_notifier_test.rb

  Rodrigo Souto

  2014-05-13 10:43:37 -0300  

06 May, 2014

1 commit

• 1182476c   Merge branch 'rails235' into rails3 ... Browse File »

  * rails235: (168 commits)
    L10n: support for custom locales
    enhancements: visualization of suggested usernames
    Allowing translation for url checking string
    Removed unnecessary lines on test
    Removed unit tests from functionals file
    Fixed html and test syntax
    Removed needless condition
    Fixed suggestions of usernames
    Test files should ends with "_test.rb"
    Added pagination on events_by_day on profile agenda
    Fix missing variable in funcional test
    Fix unit tests
    Change routes from embed controller
    Remove unused code
    Autocomplete fields on page load
    Blocks can returns a block of code to be evaluated
    Avoid randomness on tests
    comment-group-plugin: avoid randomness on tests
    community-track-plugin: fix tests by creating a profile with default boxes
    anti-spam-plugin-wrapper: ensure to load concrete wrappers
    ...
  
  Conflicts:
  	app/helpers/application_helper.rb
  	app/models/comment.rb
  	app/models/contact.rb
  	app/models/event.rb
  	app/models/mailing.rb
  	app/models/organization.rb
  	app/models/organization_mailing.rb
  	app/models/pending_task_notifier.rb
  	app/models/person.rb
  	app/models/profile.rb
  	app/models/scrap.rb
  	app/models/task_mailer.rb
  	app/models/user.rb
  	app/views/account/_signup_form.rhtml
  	app/views/blocks/profile_image.rhtml
  	app/views/blocks/profile_info.rhtml
  	app/views/box_organizer/_link_list_block.rhtml
  	app/views/box_organizer/edit.rhtml
  	app/views/features/_manage_community_fields.rhtml
  	app/views/features/_manage_enterprise_fields.rhtml
  	app/views/features/_manage_person_fields.rhtml
  	app/views/features/index.rhtml
  	app/views/layouts/application-ng.rhtml
  	app/views/users/_users_list.rhtml
  	db/schema.rb
  	features/forum.feature
  	lib/feed_handler.rb
  	lib/noosfero/plugin.rb
  	plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
  	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
  	plugins/spaminator/lib/spaminator_plugin/mailer.rb
  	test/functional/content_viewer_controller_test.rb
  	test/functional/profile_controller_test.rb
  	test/functional/profile_design_controller_test.rb
  	test/functional/search_controller_test.rb
  	test/unit/contact_sender_test.rb
  	test/unit/content_viewer_helper_test.rb
  	test/unit/environment_mailing_test.rb
  	test/unit/mailing_test.rb
  	test/unit/organization_mailing_test.rb
  	test/unit/person_test.rb
  	test/unit/profile_test.rb
  	test/unit/uploaded_file_test.rb
  	vendor/plugins/action_tracker/lib/action_tracker_model.rb

  Victor Costa

  2014-05-06 18:00:26 -0300  

11 Feb, 2014

1 commit

• e9fea38f   Merge branch 'master' into rails3-merge ... Browse File »

  Conflicts:
  	app/controllers/my_profile/cms_controller.rb
  	app/controllers/public/content_viewer_controller.rb
  	app/helpers/application_helper.rb
  	app/helpers/article_helper.rb
  	app/helpers/catalog_helper.rb
  	app/helpers/comment_helper.rb
  	app/models/article.rb
  	app/models/enterprise.rb
  	app/models/members_block.rb
  	app/models/person.rb
  	app/models/profile.rb
  	app/views/blocks/profile_info.html.erb
  	app/views/blocks/profile_info_actions/community.html.erb
  	config/initializers/dependencies.rb
  	config/routes.rb
  	db/schema.rb
  	debian/control
  	lib/noosfero/plugin.rb
  	lib/tasks/plugins.rake
  	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
  	script/sample-products
  	test/functional/catalog_controller_test.rb
  	test/functional/manage_products_controller_test.rb
  	test/functional/map_balloon_controller_test.rb
  	test/functional/profile_controller_test.rb
  	test/functional/search_controller_test.rb
  	test/unit/box_test.rb
  	test/unit/cms_helper_test.rb
  	test/unit/enterprise_test.rb
  	test/unit/environment_test.rb
  	test/unit/featured_products_block_test.rb
  	test/unit/person_test.rb
  	test/unit/product_category_test.rb
  	test/unit/product_test.rb
  	test/unit/profile_test.rb
  	test/unit/user_test.rb
  	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb

  Rodrigo Souto

  2014-02-11 17:35:19 -0300  

06 Feb, 2014

1 commit

• 7f92419a   rails3: fix ajax requests with csrf protection Browse File »
  Victor Costa

  2014-02-06 13:44:22 -0300