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
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
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
11 Jul, 2013
8 commits
-
…into merge-requests/331
-
…into merge-requests/301
-
The first one should not test the redirect since it's not its concerns. The second one wasn't test if there was a confirmation at all.
-
…into merge-requests/291
-
…into merge-requests/287 Conflicts: app/models/environment.rb
-
…into merge-requests/285
08 Jul, 2013
2 commits
28 Jun, 2013
1 commit
27 Jun, 2013
1 commit
10 Jun, 2013
1 commit
-
ActionItem2675
01 Jun, 2013
1 commit
-
The disable_* settings for environment are incoherent with the user interface and with the code itself. This changes correct only one incoherent setting as an example how to do with all others.
21 May, 2013
1 commit
15 May, 2013
1 commit
