23 Apr, 2013
2 commits
-
Also fixing a typo
19 Apr, 2013
1 commit
17 Apr, 2013
7 commits
-
Basically html_safe in some places that the stable branch had. Conflicts: app/models/article_block.rb app/models/tags_block.rb
-
This is in fact Lucas Melo, but since I noticed only now that his commits were not with the correct author, we'll keep it that way for now.
16 Apr, 2013
3 commits
-
…into merge-requests/296
15 Apr, 2013
8 commits
-
…into merge-requests/303
-
…into merge-requests/302
-
ActionItem2638
-
ActionItem2608
-
ActionItem2608 Note: tests for users templates were made in the previous commit.
12 Apr, 2013
1 commit
-
ActionItem2608
11 Apr, 2013
4 commits
-
…into merge-requests/299
-
We improved some extra requests on the shopping cart, like: visibility and list actions. They are now being retrieved on the get action all together. Also forbidding the user to request more the one action on the cart simultaneously because the cart in the cookie doesn't supports it. (We need the session stored in the database!)
10 Apr, 2013
4 commits
-
(ActionItem2630)
-
ActionItem2632
05 Apr, 2013
6 commits
-
…into merge-requests/297
-
ActionItem2217
-
…into merge-requests/289
-
…into merge-requests/290
-
…into merge-requests/288
04 Apr, 2013
1 commit
03 Apr, 2013
3 commits
-
…into merge-requests/275 Conflicts: test/unit/application_helper_test.rb