30 Nov, 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
05 Nov, 2015
1 commit
04 Nov, 2015
1 commit
11 Sep, 2015
3 commits
-
Signed-off-by: Braulio Bhavamitra <brauliobo@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
27 Jul, 2015
2 commits
24 Jul, 2015
2 commits
-
:conditions will replace previous scopes in rails4
22 Jul, 2015
1 commit
16 Jul, 2015
2 commits
-
Conflicts: app/views/admin_panel/index.html.erb
13 Jul, 2015
1 commit
12 Jul, 2015
1 commit
10 Jul, 2015
1 commit
-
Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
03 Jul, 2015
1 commit
-
Conflicts: app/models/event.rb app/models/profile.rb po/fr/noosfero.po
01 Jul, 2015
2 commits
29 Jun, 2015
4 commits
-
Conflicts: public/stylesheets/tasks.css
25 Jun, 2015
1 commit
17 Jun, 2015
1 commit
-
Conflicts: Gemfile public/proposal-app public/stylesheets/application.css
16 Jun, 2015
1 commit
15 Jun, 2015
1 commit
-
Conflicts: lib/noosfero/plugin.rb test/unit/article_test.rb test/unit/person_test.rb
05 Jun, 2015
2 commits
02 Jun, 2015
2 commits
31 May, 2015
1 commit
30 May, 2015
1 commit
27 May, 2015
1 commit
-
Conflicts: public/stylesheets/tasks.css
26 May, 2015
5 commits
-
Conflicts: app/controllers/my_profile/tasks_controller.rb app/models/task.rb test/functional/tasks_controller_test.rb
