27 Nov, 2013
1 commit
26 Nov, 2013
1 commit
22 Nov, 2013
1 commit
07 Oct, 2013
2 commits
-
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. Conflicts: app/controllers/public/catalog_controller.rb
-
closes ActionItem2519
12 Sep, 2013
4 commits
-
…into merge-requests/362
-
…into merge-requests/361
-
…into merge-requests/359
-
…into merge-requests/346
22 Aug, 2013
1 commit
19 Aug, 2013
1 commit
-
Also, added max-width on css to avoid overflowing when using those tags (ActionItem2740)
13 Aug, 2013
1 commit
-
(ActionItem2768)
09 Aug, 2013
2 commits
-
ActionItem2752
22 Jul, 2013
1 commit
17 Jul, 2013
1 commit
16 Jul, 2013
2 commits
-
…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
4 commits
13 Jul, 2013
2 commits
-
…into merge-requests/283 Conflicts: test/unit/comment_test.rb
12 Jul, 2013
4 commits
-
Removing obsolete FIXME's, trailing whitespaces and so.
-
…into merge-requests/282
11 Jul, 2013
5 commits
-
…into merge-requests/331
-
…into merge-requests/323
-
…into merge-requests/307
-
…into merge-requests/264 Conflicts: app/controllers/public/catalog_controller.rb app/views/catalog/index.rhtml
08 Jul, 2013
5 commits
01 Jul, 2013
1 commit
28 Jun, 2013
1 commit