17 Jul, 2013
3 commits
-
g wrong happens with comment creation Conflicts: public/javascripts/comment_form.js
16 Jul, 2013
3 commits
-
…into merge-requests/325
-
Fixing the js method and also correcting the controller orders to calculate the total count.
12 Jul, 2013
3 commits
-
These borders and shadow are breaking other colorboxes so I'm commenting them for now until the other cases are properly treated.
-
…into merge-requests/282
11 Jul, 2013
3 commits
-
…into merge-requests/321
08 Jul, 2013
3 commits
01 Jul, 2013
1 commit
28 Jun, 2013
3 commits
27 Jun, 2013
1 commit
31 May, 2013
1 commit
-
ActionItem2682
23 May, 2013
1 commit
15 May, 2013
1 commit
10 May, 2013
3 commits
-
(ActionItem2667)
-
- Syntax error on chat - Reviewed INSTALL.chat - Added function to update the list of users online on main window (ActionItem2667)
09 May, 2013
3 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
17 Apr, 2013
1 commit
-
Basically html_safe in some places that the stable branch had. Conflicts: app/models/article_block.rb app/models/tags_block.rb
15 Apr, 2013
2 commits
-
ActionItem2638
11 Apr, 2013
1 commit
10 Apr, 2013
1 commit
05 Apr, 2013
1 commit
03 Apr, 2013
1 commit
28 Mar, 2013
1 commit
27 Mar, 2013
1 commit
-
* erase code is fun; * better name for "Area 1". Users can understand it now; * inline style for layout sux! Stop doing this! * add block dialog looks nice, with simpler code.
26 Mar, 2013
2 commits