23 Jan, 2014
2 commits
-
(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
17 Jan, 2014
5 commits
-
Conflicts: test/unit/comment_test.rb
16 Jan, 2014
12 commits
-
Conflicts: HACKING
-
(ActionItem2844)
-
- leaving code to be displayed on views (MVC) (ActionItem2844)
15 Jan, 2014
13 commits
-
(ActionItem2923)
-
Conflicts: test/functional/cms_controller_test.rb test/unit/profile_test.rb
-
- Also fixed db/schema (ActionItem2852)
-
(ActionItem2931)
-
Conflicts: plugins/display_content/lib/display_content_block.rb plugins/display_content/test/unit/display_content_block_test.rb
-
Conflicts: app/models/person.rb db/schema.rb
