05 Jan, 2016
1 commit
-
Conflicts: Gemfile app/models/article.rb test/unit/user_test.rb
09 Dec, 2015
1 commit
17 Nov, 2015
1 commit
-
Conflicts: Gemfile Rakefile app/controllers/box_organizer_controller.rb app/controllers/my_profile/tasks_controller.rb app/controllers/public/profile_controller.rb app/mailers/user_mailer.rb app/models/article.rb app/models/person.rb app/models/product_category.rb app/models/task.rb config/application.rb config/routes.rb lib/acts_as_having_settings.rb lib/noosfero/api/entities.rb lib/noosfero/api/helpers.rb lib/noosfero/api/session.rb lib/noosfero/api/v1/articles.rb lib/noosfero/api/v1/contacts.rb lib/noosfero/api/v1/search.rb lib/noosfero/api/v1/users.rb test/functional/tasks_controller_test.rb test/unit/api/articles_test.rb test/unit/api/helpers_test.rb test/unit/api/people_test.rb test/unit/api/search_test.rb test/unit/api/session_test.rb test/unit/api/users_test.rb test/unit/person_notifier_test.rb test/unit/task_test.rb vendor/plugins/access_control/lib/acts_as_accessible.rb
13 Oct, 2015
1 commit
02 Oct, 2015
3 commits
-
Replaces remaining colorbox in the code with modal Colorbox was replaced with modal api, but we still had instances in the code of colorbox uses and they were broken so this patch is to fix those. See merge request !689
01 Oct, 2015
1 commit
-
Also %s/will_paginate/pagination_links to use the default on forum, blog and cms Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br> Signed-off-by: Melissa Wen <melissa@colivre.coop.br>
30 Sep, 2015
1 commit
26 Sep, 2015
1 commit
24 Sep, 2015
1 commit
-
Additional improvements include: - Makes 'Remove Image' checkbox optional - Very ugly css hack to hide duplicated labels in some forms. I couldn't find another way to avoid the labels generated by labelled_form_for nor could I skip adding labels inside the helper since it's supposed to be generic.
28 Aug, 2015
3 commits
26 Aug, 2015
1 commit
-
Links and images are saved with relative path but it wasn't considering the profile domain. Because of this, the links were broken on article visualization. This commit also fix the url on edition of tinymce articles.
24 Jul, 2015
1 commit
06 Jul, 2015
2 commits
-
Conflicts: app/models/article.rb test/functional/tasks_controller_test.rb
03 Jul, 2015
1 commit
-
Conflicts: app/models/event.rb app/models/profile.rb po/fr/noosfero.po
01 Jul, 2015
1 commit
17 Jun, 2015
1 commit
16 Jun, 2015
1 commit
-
Conflicts: lib/noosfero/plugin.rb
12 Jun, 2015
1 commit
-
Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
02 Jun, 2015
1 commit
28 May, 2015
1 commit
26 May, 2015
2 commits
-
Conflicts: app/controllers/my_profile/tasks_controller.rb app/models/task.rb test/functional/tasks_controller_test.rb
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
12 May, 2015
2 commits
-
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
13 Apr, 2015
1 commit
-
Conflicts: app/helpers/layout_helper.rb app/views/layouts/_javascript.html.erb
10 Apr, 2015
1 commit
08 Apr, 2015
1 commit
31 Mar, 2015
1 commit
26 Mar, 2015
1 commit
-
When the env theme has `global.css`, `global_header.html.erb`, or `global_footer.html.erb`, that content is added to any customized profile theme.
19 Mar, 2015
1 commit
-
…be checked by created_at field in role_assignment entity
06 Mar, 2015
1 commit
02 Mar, 2015
1 commit
-
…er is a admin of environment
26 Feb, 2015
1 commit
24 Feb, 2015
2 commits