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
03 Nov, 2015
4 commits
-
The version 1.4 of omniauth-oauth2 causes a problem in google oauth login. See https://github.com/intridea/omniauth-oauth2/issues/81#issuecomment-151038559
-
…uthClientPlugin::UserProvider which was recently renamed to OauthClientPlugin::Auth. Conflicts: plugins/serpro_captcha
30 Oct, 2015
1 commit
-
$ rake updatepo
05 Oct, 2015
1 commit
02 Oct, 2015
1 commit
30 Sep, 2015
1 commit
25 Sep, 2015
1 commit
22 Sep, 2015
1 commit
16 Sep, 2015
1 commit
13 Sep, 2015
1 commit
02 Sep, 2015
1 commit
01 Sep, 2015
1 commit
28 Aug, 2015
5 commits
21 Aug, 2015
1 commit
13 Aug, 2015
2 commits
10 Aug, 2015
1 commit
06 Aug, 2015
3 commits
-
Also added test/unit/i18n_test.rb which will warn us if any others pop up.
-
also, add missing .pot files for plugins
31 Jul, 2015
1 commit
-
ruby-minitest offers "refuse" as a syntatic sugar to "assert not"
27 Jul, 2015
1 commit
24 Jul, 2015
4 commits
-
Use these two commands inside vim: :!ag -l '..\/..\/..\/..\/test' | xargs perl -pi -E "s/require.*test_helper.*/require 'test_helper'/g" :!ag -l "require File.*'/" | xargs perl -pi -E "s/require File.*'\//require_relative '/g":e ""'"
-
:conditions will replace previous scopes in rails4
16 Jul, 2015
1 commit
15 Jul, 2015
6 commits