03 Feb, 2015

1 commit

27 Jan, 2015

3 commits

  • a9c67a1b   Merge branch 'chat' into master-with-chat ... Browse Dir » 
    Conflicts:
	public/javascripts/application.js
	public/stylesheets/application.css
    Rodrigo Souto
     
  • 3bf272b1   db/schema.rb: update Browse Dir »
    Antonio Terceiro
     
  • f7c05bdf   Merge branch 'allow-external-feed-big-addresses' into 'master' ... Browse Dir » 
    Allow external feed with big addresses

Fix:
  PG::StringDataRightTruncation: ERRO:  valor é muito longo para tipo character varying(255)
: UPDATE "external_feeds" SET "enabled" = 't', "fetched_at" = NULL, "address" = 'http://www.mncr.org.br/search_rss?advanced_search=True&SearchableText=&Subject_usage%3Aignore_empty=operator%3Aand&pt_toggle=%23&portal_type%3Alist=Document&portal_type%3Alist=Event&portal_type%3Alist=File&portal_type%3Alist=Google+Video&portal_type%3Alist=News+Item&created%3Alist%3Adate=1970%2F02%2F01&created_usage=range%3Amin&Creator=&sort_on=created&b_size%3Aint=30&submit=Buscar', "updated_at" = '2015-01-05 12:15:29.155544' WHERE "external_feeds"."id" = 993
  activerecord (3.2.21) lib/active_record/connection_adapters/postgresql_adapter.rb:1163:in `async_exec'

See merge request !429
    Antonio Terceiro
     

22 Jan, 2015

2 commits

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
     

14 Jan, 2015

1 commit

08 Dec, 2014

2 commits

18 Nov, 2014

1 commit

05 Nov, 2014

1 commit

22 Oct, 2014

1 commit

  • ad4f98b3   Merge branch 'stable' ... Browse Dir » 
    Conflicts:
	app/helpers/profile_helper.rb
	app/views/content_viewer/_article_toolbar.rhtml
	app/views/profile/_common.rhtml
	app/views/profile/_organization_profile.rhtml
	app/views/profile/_person_profile.rhtml
	db/schema.rb
	public/stylesheets/application.css
    Daniela Feitosa
     

17 Oct, 2014

1 commit

12 Sep, 2014

1 commit

11 Sep, 2014

1 commit

  • 6bc2c9c5   Merge branch 'stable' into stable-merge ... Browse Dir » 
    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
     

27 Aug, 2014

1 commit

19 Aug, 2014

2 commits

14 Aug, 2014

2 commits

13 Aug, 2014

1 commit

12 Aug, 2014

1 commit

11 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
     

30 Jul, 2014

1 commit

25 Jul, 2014

1 commit

24 Jul, 2014

5 commits

22 Jul, 2014

2 commits

26 Jun, 2014

1 commit

15 Jun, 2014

1 commit

04 Jun, 2014

1 commit

13 May, 2014

1 commit

  • 23914711   Merge branch 'master' into rails3 ... Browse Dir » 
    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
     

07 May, 2014

1 commit