30 Nov, 2015
1 commit
-
Conflicts: app/helpers/forms_helper.rb app/views/cms/edit.html.erb lib/noosfero/api/entities.rb lib/noosfero/api/v1/comments.rb lib/noosfero/api/v1/search.rb test/unit/api/search_test.rb
19 Nov, 2015
2 commits
-
Conflicts: app/models/article.rb app/models/comment.rb
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
13 Oct, 2015
1 commit
07 Oct, 2015
1 commit
02 Oct, 2015
1 commit
-
This is already handled on rails 3. Fix #62
11 Sep, 2015
1 commit
10 Sep, 2015
2 commits
-
Conflicts: app/models/article_follower.rb test/unit/article_test.rb
04 Sep, 2015
1 commit
28 Aug, 2015
3 commits
27 Aug, 2015
1 commit
21 Aug, 2015
2 commits
-
metadata: marks urls as html safe This also fix a core bug of double escaping urls. See merge request !653
13 Aug, 2015
3 commits
10 Aug, 2015
2 commits
-
user_stamp depends on deprecated Sweeper code and it is quite complicated to understand and use. Use User.current instead
01 Aug, 2015
1 commit
31 Jul, 2015
1 commit
-
ruby-minitest offers "refuse" as a syntatic sugar to "assert not"
24 Jul, 2015
3 commits
23 Jul, 2015
2 commits
20 Jul, 2015
3 commits
12 Jul, 2015
1 commit
15 Jun, 2015
1 commit
-
Conflicts: lib/noosfero/plugin.rb test/unit/article_test.rb test/unit/person_test.rb
02 Jun, 2015
3 commits
21 May, 2015
1 commit
-
Conflicts: app/views/content_viewer/_article_toolbar.html.erb
19 May, 2015
1 commit
14 May, 2015
1 commit