13 May, 2013
3 commits
10 May, 2013
2 commits
09 May, 2013
4 commits
-
…into merge-requests/298 Added html_safe that was missing on the block_helper new method Conflicts: app/views/box_organizer/_highlights_block.rhtml test/unit/application_helper_test.rb
01 May, 2013
1 commit
-
Note that on Debian stable we will still use whatever is linked in vendor/rails, since we known that that Debian already has the bits from 2.3.15 we need in its patched 2.3.5.
24 Apr, 2013
2 commits
-
…into merge-requests/260
-
…into merge-requests/259 Conflicts: app/controllers/admin/environment_design_controller.rb
23 Apr, 2013
3 commits
-
Also fixing a typo
20 Apr, 2013
2 commits
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
3 commits
-
…into merge-requests/299