23 May, 2013
1 commit
21 May, 2013
3 commits
17 May, 2013
1 commit
-
(ActionItem2650)
16 May, 2013
1 commit
-
…into merge-requests/309
09 May, 2013
2 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
07 May, 2013
1 commit
-
Conflicts: app/models/article.rb app/views/layouts/application-ng.rhtml lib/noosfero/plugin.rb script/noosfero-plugins
29 Apr, 2013
1 commit
-
ActionItem2451 Including: migration and test.
20 Apr, 2013
1 commit
17 Apr, 2013
2 commits
-
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
1 commit
12 Apr, 2013
1 commit
-
ActionItem2608
10 Apr, 2013
1 commit
-
ActionItem2632
03 Apr, 2013
4 commits
-
…into merge-requests/275 Conflicts: test/unit/application_helper_test.rb
-
…into merge-requests/188
28 Mar, 2013
3 commits
25 Mar, 2013
1 commit
18 Mar, 2013
1 commit
15 Mar, 2013
2 commits
-
…into merge-requests/253
-
…into merge-requests/171
14 Mar, 2013
1 commit
-
(ActionItem2618)
07 Mar, 2013
1 commit
05 Mar, 2013
2 commits
-
Also removing region unit tests that are already being done in the functional test.
28 Feb, 2013
1 commit
27 Feb, 2013
3 commits
-
Conflicts: app/models/comment.rb app/views/layouts/application-ng.rhtml test/unit/category_test.rb
06 Feb, 2013
1 commit
-
closes ActionItem2567
21 Jan, 2013
1 commit
-
…pment into ActionItem2544
17 Jan, 2013
1 commit
-
Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb plugins/shopping_cart/lib/shopping_cart_plugin.rb plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb
15 Jan, 2013
1 commit
08 Jan, 2013
1 commit