23 Jan, 2014
8 commits
-
Conflicts: public/stylesheets/application.css
-
(ActionItem896)
22 Jan, 2014
4 commits
-
…into merge-requests/342 Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
21 Jan, 2014
4 commits
-
…into merge-requests/339 Conflicts: app/models/block.rb public/designs/icons/tango/style.css test/unit/block_test.rb
-
…into merge-requests/337 Conflicts: app/controllers/public/catalog_controller.rb app/helpers/application_helper.rb app/helpers/catalog_helper.rb app/views/catalog/index.rhtml public/stylesheets/application.css
19 Jan, 2014
2 commits
-
- Added pagination to versions - Treating access denied and not found (ActionItem2822)
18 Jan, 2014
6 commits
-
Removed setting as versioned column revert button is following the pattern styling link-this-page (ActionItem2822)
-
(ActionItem2822)
-
Also included revision number on cache key Signed-off-by: Daniela Feitosa (ActionItem2822)
-
(ActionItem2822) Signed-off-by: Daniela Feitosa Signed-off-by: Ana Losnak <analosnak@gmail.com> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
17 Jan, 2014
5 commits
-
Conflicts: test/unit/comment_test.rb
16 Jan, 2014
11 commits
-
Conflicts: HACKING
-
(ActionItem2844)
-
- leaving code to be displayed on views (MVC) (ActionItem2844)