27 Nov, 2013
1 commit
21 Nov, 2013
2 commits
-
Also: - removed whitespaces - added class with plugin name to style a view (ActionItem2837)
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
23 Sep, 2013
1 commit
19 Sep, 2013
2 commits
-
…into merge-requests/316 Conflicts: app/helpers/blog_helper.rb
-
…into merge-requests/295
12 Sep, 2013
3 commits
-
…into merge-requests/362
-
…into merge-requests/359
-
…into merge-requests/346
19 Aug, 2013
1 commit
-
Also, added max-width on css to avoid overflowing when using those tags (ActionItem2740)
14 Aug, 2013
1 commit
09 Aug, 2013
1 commit
-
ActionItem2752
29 Jul, 2013
3 commits
-
…into merge-requests/348
-
(ActionItem2743)
-
(ActionItem2742)
22 Jul, 2013
1 commit
19 Jul, 2013
1 commit
-
Conflicts: app/helpers/boxes_helper.rb app/models/comment.rb app/views/comment/_comment.rhtml app/views/comment/_comment_form.rhtml app/views/content_viewer/_comment.html.erb app/views/content_viewer/_comment.rhtml app/views/content_viewer/_comment_form.html.erb app/views/content_viewer/_comment_form.rhtml app/views/profile/send_mail.html.erb config/routes.rb debian/control
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