30 Nov, 2015
1 commit
-
Conflicts: app/helpers/forms_helper.rb app/views/cms/edit.html.erb lib/noosfero/api/entities.rb lib/noosfero/api/v1/comments.rb lib/noosfero/api/v1/search.rb test/unit/api/search_test.rb
23 Nov, 2015
1 commit
-
Custom fields can be added to any profile through the admin panel in the 'Fields' section. They have the same behaviour as the current Noosfero's fields (active, signup, required and privacy). Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com> Signed-off-by: Joenio Costa <joenio@colivre.coop.br> Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com> Signed-off-by: Marcos Ramos <ms.ramos@outlook.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
19 Nov, 2015
1 commit
-
Conflicts: app/models/article.rb app/models/comment.rb
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
16 Nov, 2015
1 commit
11 Sep, 2015
1 commit
09 Sep, 2015
2 commits
-
Conflicts: app/models/article.rb app/models/article_follower.rb app/models/person.rb test/unit/article_follower_test.rb
04 Sep, 2015
1 commit
28 Aug, 2015
1 commit
13 Aug, 2015
2 commits
12 Aug, 2015
1 commit
11 Aug, 2015
2 commits
-
The id was necessary for the has_many :through. Also add indexes and timestamps and fix typo on table name
-
All scraps and action trackers from profile were loaded at once as will_paginate can't change SQL when find_by_sql is used. Also, eager load activities to make it O(3) instead of O(n). This increases performance by ~30% on profiles with lots of scraps/action trackers.
10 Aug, 2015
1 commit
25 Jul, 2015
1 commit
24 Jul, 2015
3 commits
-
:conditions will replace previous scopes in rails4
12 Jul, 2015
2 commits
-
Select filter query from 8ms to 1ms
08 Jul, 2015
2 commits
-
Conflicts: Gemfile
03 Jul, 2015
1 commit
-
Conflicts: app/models/event.rb app/models/profile.rb po/fr/noosfero.po
25 Jun, 2015
1 commit
17 Jun, 2015
9 commits
-
Conflicts: app/models/article.rb
-
- Added image label - Added image to article body - Changed some minor positioning Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fábio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
-
Conflicts: app/views/cms/_event.html.erb
-
Conflicts: app/views/cms/_event.html.erb
-
Conflicts: Gemfile public/proposal-app public/stylesheets/application.css
-
This reverts commit dca569a4b682f150e8e9e3116ea7b14843651e44, reversing changes made to 364e52a3cfbc1b6a0943d99e31dba1880e1111fa.
16 Jun, 2015
4 commits
-
Conflicts: lib/noosfero/plugin.rb
-
Speed up role assignments fetch http://noosfero.org/Development/ActionItem3197 See merge request !252
15 Jun, 2015
1 commit