03 Oct, 2016
1 commit
27 Jul, 2016
1 commit
18 Jul, 2016
1 commit
16 Jul, 2016
1 commit
05 Jul, 2016
1 commit
16 Jun, 2016
1 commit
-
- Update facebook provider because facebook changing their API - Add github provider - Add twitter provider - Update README Signed-off-by: Gustavo Jaruga Cruz <darksshades@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com> Signed-off-by: Alessandro Caetano <alesasndro.caetanob@gmail.com>
17 May, 2016
1 commit
-
Conflicts: app/views/shared/not_found.html.erb
16 May, 2016
1 commit
25 Apr, 2016
1 commit
-
Conflicts: .travis.yml app/controllers/my_profile/tasks_controller.rb app/helpers/application_helper.rb app/views/profile_editor/_pending_tasks.html.erb app/views/tasks/processed.html.erb test/functional/tasks_controller_test.rb
22 Apr, 2016
1 commit
-
Anticipating a pattern from Rails 5
11 Apr, 2016
1 commit
08 Apr, 2016
1 commit
29 Mar, 2016
1 commit
23 Mar, 2016
2 commits
-
Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com> Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
-
Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com> Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
08 Mar, 2016
1 commit
01 Mar, 2016
1 commit
29 Jan, 2016
2 commits
25 Jan, 2016
4 commits
-
Conflicts: plugins/oauth_client/Gemfile plugins/oauth_client/lib/ext/user.rb
-
See https://github.com/intridea/omniauth-oauth2/issues/81
22 Jan, 2016
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
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
1 commit