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
2 commits
30 Oct, 2015
1 commit
-
$ rake updatepo
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 Aug, 2015
2 commits
10 Aug, 2015
1 commit
06 Aug, 2015
2 commits
-
also, add missing .pot files for plugins
31 Jul, 2015
1 commit
-
ruby-minitest offers "refuse" as a syntatic sugar to "assert not"
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
23 Jul, 2015
1 commit
02 Jun, 2015
1 commit
01 Jun, 2015
1 commit
06 Mar, 2015
1 commit
05 Mar, 2015
1 commit
04 Feb, 2015
1 commit
-
Conflicts: app/controllers/public/search_controller.rb app/models/profile.rb app/views/cms/edit.html.erb public/stylesheets/application.css
03 Feb, 2015
2 commits
-
Conflicts: plugins/site_tour/lib/site_tour_plugin/tour_block.rb plugins/site_tour/public/edit_tour_block.css plugins/site_tour/public/main.js plugins/site_tour/test/functional/site_tour_plugin_admin_controller_test.rb plugins/site_tour/test/unit/site_tour_plugin_test.rb plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block_group_item.html.erb plugins/site_tour/views/tour_actions.html.erb
02 Feb, 2015
1 commit
28 Jan, 2015
1 commit
-
Conflicts: app/helpers/article_helper.rb app/helpers/boxes_helper.rb app/models/article.rb app/models/block.rb app/views/content_viewer/view_page.html.erb db/schema.rb plugins/community_track/views/blocks/_track_list_more.html.erb plugins/community_track/views/box_organizer/community_track_plugin/_track_list_block.html.erb public/javascripts/article.js test/unit/block_test.rb test/unit/person_notifier_helper_test.rb
15 Jan, 2015
2 commits
19 May, 2014
1 commit
12 May, 2014
1 commit
17 Mar, 2014
1 commit
-
Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br> (ActionItem2670)