13 Aug, 2015

1 commit

10 Aug, 2015

1 commit

03 Jul, 2015

1 commit

25 Jun, 2015

1 commit

12 May, 2015

1 commit

07 May, 2015

1 commit

  • b3632c6b   Merge branch 'alternative_redirect_behavior' into 'next' ... Browse File » 
    Add alternative redirect's behavior when user is '~'

This is a new feature to create generic URL's related to usernames in Noosfero. It is useful for internal links on articles and for general links on themes.

Examples:
 - If you're logged in as "test" and you go to /~/blog it will redirect you to /test/blog
 - If you're logged in as "test" and you go to /myprofile/~ it will redirect you to /myprofile/test
 - If you're not logged in and you go to /profile/~ or any other link using "~" it will give you a not found page(404).

See merge request !518
    Rodrigo Souto
     

27 Apr, 2015

1 commit

  • 38e1a327   Use ~ as placeholder for current user in URLs ... Browse File » 
    When the :profile parameter is '~', replace it with the identifier of
the currently logged-in user and redirect. This is useful for example
for adding direct links to the control panel of the current user in
documentation.

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    David Silva
     

26 Mar, 2015

2 commits

24 Feb, 2015

1 commit

04 Feb, 2015

1 commit

03 Feb, 2015

1 commit

  • 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
     

28 Jan, 2015

1 commit

  • 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
     

01 Dec, 2014

1 commit

13 Nov, 2014

1 commit

18 Sep, 2014

1 commit

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
     

03 Sep, 2014

1 commit

02 Sep, 2014

1 commit

17 Jul, 2014

1 commit

08 Jul, 2014

1 commit

07 Jul, 2014

1 commit

04 Jul, 2014

1 commit

30 Jun, 2014

1 commit

22 May, 2014

1 commit

13 May, 2014

1 commit

  • 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
     

05 May, 2014

1 commit

03 Apr, 2014

1 commit

07 Mar, 2014

2 commits

25 Feb, 2014

1 commit

11 Feb, 2014

1 commit

  • 712b5f51   Merge branch 'ai2977' into 'stable' ... Browse File » 
    Don't render layout for javascript format

This is the default behaviour for Rails when rendering .js.erb files. Check http://stackoverflow.com/questions/4060300/when-rendering-js-erb-file-it-renders-layout-with-the-javascript-is-it-a-bug
    Rodrigo Souto
     

05 Feb, 2014

1 commit

23 Jan, 2014

1 commit

20 Jan, 2014

1 commit

09 Jan, 2014

1 commit

  • 6adc8bc2   Merge branch 'master' into rails3 ... Browse File » 
    Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb
    Rodrigo Souto
     

07 Jan, 2014

3 commits

16 Dec, 2013

1 commit