20 Jan, 2014
1 commit
06 Jan, 2014
1 commit
16 Dec, 2013
1 commit
-
…nto merge-requests/390
02 Dec, 2013
1 commit
27 Nov, 2013
2 commits
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
26 Nov, 2013
1 commit
22 Nov, 2013
1 commit
24 Oct, 2013
1 commit
14 Oct, 2013
1 commit
-
ActionItem2691
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
23 Sep, 2013
2 commits
19 Sep, 2013
3 commits
-
…into merge-requests/316 Conflicts: app/helpers/blog_helper.rb
-
…into merge-requests/295
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
3 commits
-
Removing obsolete FIXME's, trailing whitespaces and so.
-
…into merge-requests/282