06 Jan, 2014
1 commit
16 Dec, 2013
2 commits
-
…into merge-requests/387 Conflicts: app/helpers/application_helper.rb public/designs/themes/base/style.css
-
…nto merge-requests/390
27 Nov, 2013
1 commit
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
26 Nov, 2013
1 commit
22 Nov, 2013
1 commit
-
(ActionItem2829)
21 Nov, 2013
1 commit
-
Also includes migration to remove already orphaned profiles. (ActionItem2906)
16 Nov, 2013
3 commits
-
(ActionItem2904)
-
(ActionItem2901)
05 Nov, 2013
1 commit
-
Conflicts: script/quick-start test/unit/application_helper_test.rb test/unit/environment_statistics_block_test.rb test/unit/environment_test.rb
31 Oct, 2013
1 commit
-
This solves every problem related with Hpticot breaking pages since the parse was happening on the MainBlock too. But this does not changes the fact tha Hpricot is currently dead and we should move on to nokogiri. (ActionItem2873)
24 Oct, 2013
2 commits
18 Oct, 2013
1 commit
17 Oct, 2013
1 commit
-
That commit makes gravatar helper to work on this context.
15 Oct, 2013
1 commit
-
…into merge-requests/391
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
03 Oct, 2013
1 commit
01 Oct, 2013
1 commit
27 Sep, 2013
1 commit
-
* The env admin link and the user pannel had the same controlpanel id. * The user icon is now recovered. * The #manage-enterprises icons was croped. Closes ActionItem2817
19 Sep, 2013
2 commits
-
…into merge-requests/316 Conflicts: app/helpers/blog_helper.rb
12 Sep, 2013
1 commit
-
…into merge-requests/364 Conflicts: test/unit/person_test.rb
02 Sep, 2013
1 commit
21 Aug, 2013
1 commit
20 Aug, 2013
2 commits
13 Aug, 2013
5 commits
-
Also fixing a test that was sort dependent.
-
Also removing useless methods sub_category and sub_tree.
31 Jul, 2013
1 commit
-
(ActionItem2744)
30 Jul, 2013
1 commit
23 Jul, 2013
1 commit
22 Jul, 2013
1 commit
17 Jul, 2013
1 commit
-
(ActionItem2737)