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
24 Jul, 2015
2 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 ""'"
21 Nov, 2014
2 commits
11 Nov, 2014
1 commit
19 Nov, 2013
1 commit
-
* removed whitespaces * fixes on texts (ActionItem2823)
16 Nov, 2013
3 commits
-
(ActionItem2903)
-
(ActionItem2901)
29 Oct, 2013
1 commit
22 Oct, 2013
1 commit
18 Oct, 2013
1 commit
07 Oct, 2013
2 commits
-
…into merge-requests/328 Conflicts: app/controllers/public/catalog_controller.rb
-
Conflicts: app/views/cms/view.rhtml test/functional/profile_controller_test.rb
01 Oct, 2013
1 commit
-
Signed-off-by: Leandro Nunes dos Santos <leandronunes@gmail.com> Signed-off-by: Marcos da Silva Ramos <ms.ramos@outlook.com> Signed-off-by: Fábio Teixeira <fabio1079@gmail.com> Signed-off-by: Luiz Matos <luizff.matos@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
24 Sep, 2013
1 commit
-
Rails.root is now a Pathname. The best use of it is with the #join method instead of concatenation and such. I therefore am rewriting all this calls to fix/avoid problems.
19 Sep, 2013
2 commits
-
…into merge-requests/316 Conflicts: app/helpers/blog_helper.rb
-
…into merge-requests/295
12 Sep, 2013
1 commit
-
…into merge-requests/361
22 Aug, 2013
1 commit
21 Aug, 2013
1 commit
20 Aug, 2013
3 commits
13 Aug, 2013
1 commit
-
(ActionItem2768)
25 Jul, 2013
1 commit
23 Jul, 2013
1 commit
19 Jul, 2013
1 commit
-
Conflicts: app/helpers/boxes_helper.rb app/models/comment.rb app/views/comment/_comment.rhtml app/views/comment/_comment_form.rhtml app/views/content_viewer/_comment.html.erb app/views/content_viewer/_comment.rhtml app/views/content_viewer/_comment_form.html.erb app/views/content_viewer/_comment_form.rhtml app/views/profile/send_mail.html.erb config/routes.rb debian/control
17 Jul, 2013
1 commit
-
(ActionItem2737)
16 Jul, 2013
1 commit
-
…into merge-requests/343 Also replacing the load_comments method by a filter that receives a scope. Conflicts: app/controllers/public/content_viewer_controller.rb app/models/comment.rb app/views/content_viewer/view_page.rhtml test/functional/content_viewer_controller_test.rb test/unit/comment_test.rb
15 Jul, 2013
1 commit
13 Jul, 2013
2 commits
-
…into merge-requests/283 Conflicts: test/unit/comment_test.rb
12 Jul, 2013
6 commits
-
Removing obsolete FIXME's, trailing whitespaces and so.
-
…into merge-requests/282