21 May, 2015
1 commit
-
Conflicts: app/views/content_viewer/_article_toolbar.html.erb
19 May, 2015
1 commit
13 May, 2015
1 commit
-
Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
12 May, 2015
2 commits
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
13 Apr, 2015
2 commits
-
Conflicts: app/helpers/layout_helper.rb app/views/layouts/_javascript.html.erb
10 Apr, 2015
1 commit
24 Mar, 2015
1 commit
19 Mar, 2015
1 commit
-
Conflicts: app/models/profile.rb app/views/profile_editor/edit.html.erb
16 Mar, 2015
1 commit
-
See merge request !481
27 Feb, 2015
2 commits
26 Feb, 2015
2 commits
-
- created 'secret' attribute for profiles - redefined scope for secret communities Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: Dylan Guedes <djmgguedes@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Filipe Ribeiro <firibeiro77@live.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
25 Feb, 2015
3 commits
-
This reverts commit 025643a62df719a6cfe63f5927d45585d655a1da.
24 Feb, 2015
3 commits
23 Feb, 2015
1 commit
11 Feb, 2015
1 commit
10 Feb, 2015
2 commits
-
Use materialized path for parents lookup http://noosfero.org/Development/ActionItem2809 See merge request !7
03 Feb, 2015
2 commits
-
Conflicts: db/schema.rb
-
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
02 Feb, 2015
1 commit
30 Jan, 2015
2 commits
27 Jan, 2015
2 commits
-
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
22 Jan, 2015
2 commits
16 Dec, 2014
2 commits
-
Conflicts: app/controllers/box_organizer_controller.rb app/controllers/my_profile/profile_design_controller.rb app/helpers/layout_helper.rb
-
Conflicts: Gemfile Gemfile.lock app/controllers/admin/environment_design_controller.rb app/helpers/layout_helper.rb app/models/block.rb script/quick-start
17 Oct, 2014
1 commit
-
Conflicts: app/models/comment.rb
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