27 Jul, 2015

1 commit

13 Jul, 2015

2 commits

22 May, 2015

1 commit

  • 8808f617   Chat package ... Browse File » 
    Now noosfero will generate a debian package to install the chat. The
generated package is named 'noosfero-chat'.

Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
    Rodrigo Souto
     

08 May, 2015

1 commit

04 May, 2015

1 commit

04 Apr, 2015

1 commit

09 Mar, 2015

1 commit

05 Mar, 2015

1 commit

22 Dec, 2014

1 commit

18 Dec, 2014

1 commit

19 Nov, 2014

1 commit

27 Oct, 2014

2 commits

23 Oct, 2014

1 commit

12 Sep, 2014

2 commits

11 Sep, 2014

1 commit

  • 6bc2c9c5   Merge branch 'stable' into stable-merge ... Browse File » 
    Conflicts:
	AUTHORS
	app/controllers/public/content_viewer_controller.rb
	debian/changelog
	lib/noosfero.rb
	po/de/noosfero.po
	po/eo/noosfero.po
	po/es/noosfero.po
	po/fr/noosfero.po
	po/hy/noosfero.po
	po/it/noosfero.po
	po/noosfero.pot
	po/pt/noosfero.po
	po/ru/noosfero.po
    Antonio Terceiro
     

21 Aug, 2014

1 commit

15 Aug, 2014

1 commit

07 Aug, 2014

1 commit

  • 34f8f4d7   Merge remote-tracking branch 'origin/stable' ... Browse File » 
    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
     

20 Jun, 2014

1 commit

18 Jun, 2014

1 commit

13 Jun, 2014

1 commit

16 May, 2014

1 commit

15 May, 2014

1 commit

05 May, 2014

1 commit

23 Apr, 2014

1 commit

22 Apr, 2014

1 commit

17 Apr, 2014

1 commit

09 Apr, 2014

1 commit

20 Mar, 2014

1 commit

19 Mar, 2014

1 commit

07 Mar, 2014

1 commit

20 Feb, 2014

1 commit

20 Jan, 2014

1 commit

14 Jan, 2014

1 commit

07 Jan, 2014

1 commit

10 Dec, 2013

1 commit

02 Dec, 2013

1 commit