03 Feb, 2015

3 commits

  • d2029dc6   Merge branch 'invitation' into stoa ... Browse Dir » 
    Conflicts:
	db/schema.rb
    Rodrigo Souto
     
  • 71439c6c   Merge branch 'master' into stoa ... Browse Dir » 
    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
     
  • 23f8a40a   invite: allow network member/friend invitation ... Browse Dir » 
    This feature allows organizations to invite people and users to request
friendship from other users from the network instead of only through
email.

Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br>
Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Pedro de Lyra  <pedrodelyra@gmail.com>
    David Silva
     

30 Jan, 2015

1 commit

28 Jan, 2015

1 commit

21 Jan, 2015

1 commit

  • b3068b11   Add option to all community and users followers view a private article ... Browse Dir » 
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
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: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Gabriela Navarro
     

13 Jan, 2015

1 commit

08 Jan, 2015

1 commit

19 Dec, 2014

1 commit

04 Dec, 2014

1 commit

20 Nov, 2014

7 commits

27 Oct, 2014

1 commit

24 Oct, 2014

1 commit

20 Oct, 2014

1 commit

13 Oct, 2014

1 commit

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
     

07 Oct, 2014

1 commit

18 Sep, 2014

1 commit

08 Sep, 2014

1 commit

  • 79e1ad7b   Merge branch 'master' into stoa ... Browse Dir » 
    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
     

25 Aug, 2014

1 commit

18 Aug, 2014

2 commits

15 Aug, 2014

1 commit

14 Aug, 2014

1 commit

13 Aug, 2014

2 commits

12 Aug, 2014

1 commit

08 Aug, 2014

1 commit

07 Aug, 2014

1 commit

  • 34f8f4d7   Merge remote-tracking branch 'origin/stable' ... Browse Dir » 
    Hopefully this is the very last time we do this.

Conflicts:
	Rakefile
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/content_viewer_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/product_categories_block.rb
	app/models/products_block.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/my_network.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/blocks/profile_info_actions/_community.html.erb
	app/views/blocks/profile_info_actions/_enterprise.html.erb
	app/views/blocks/profile_info_actions/_person.html.erb
	app/views/content_viewer/view_page.rhtml
	app/views/profile/index.rhtml
	app/views/shared/_disabled_enterprise.html.erb
	app/views/shared/articles_list.html.erb
	db/schema.rb
	debian/changelog
	lib/file_presenter.rb
	lib/noosfero.rb
	plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
	public/javascripts/application.js
	script/sample-articles
	script/sample-enterprises
	script/sample-products
	script/sample-profiles
	test/functional/cms_controller_test.rb
	test/functional/comment_controller_test.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/application_helper_test.rb
	test/unit/article_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/folder_helper_test.rb
	test/unit/forum_helper_test.rb
    Antonio Terceiro
     

05 Aug, 2014

1 commit

04 Aug, 2014

4 commits