24 Feb, 2015

1 commit


22 Feb, 2015

1 commit


13 Feb, 2015

1 commit


11 Feb, 2015

2 commits


10 Feb, 2015

3 commits


06 Feb, 2015

1 commit


03 Feb, 2015

3 commits


02 Feb, 2015

1 commit


30 Jan, 2015

3 commits


27 Jan, 2015

3 commits

  • Conflicts:
    	public/javascripts/application.js
    	public/stylesheets/application.css
    Rodrigo Souto
     
  • Antonio Terceiro
     
  • 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

  • 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


13 Jan, 2015

1 commit


20 Nov, 2014

1 commit


18 Nov, 2014

1 commit


05 Nov, 2014

1 commit


22 Oct, 2014

1 commit

  • 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


18 Sep, 2014

1 commit


12 Sep, 2014

1 commit


11 Sep, 2014

1 commit

  • 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
     

08 Sep, 2014

1 commit

  • 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
     

27 Aug, 2014

1 commit


19 Aug, 2014

2 commits


18 Aug, 2014

1 commit


14 Aug, 2014

2 commits


13 Aug, 2014

1 commit