08 May, 2013
1 commit
07 May, 2013
1 commit
-
Conflicts: app/models/article.rb app/views/layouts/application-ng.rhtml lib/noosfero/plugin.rb script/noosfero-plugins
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
2 commits
-
(ActionItem2630)
03 Apr, 2013
1 commit
-
…into merge-requests/188
28 Mar, 2013
4 commits
20 Mar, 2013
1 commit
-
…into merge-requests/267 Conflicts: features/signup.feature features/step_definitions/noosfero_steps.rb Making tests on signup wait for the bot trap time and use selenium.
18 Mar, 2013
3 commits
-
This commit has the participation of Lucas Prado Melo It includes: * Make blog pagination link to absolute path * Configure blog display on block view * List blogs on article block selection * Auto select the first text article (if there is one) * Testing!
-
ActionItem2381
15 Mar, 2013
3 commits
-
…into merge-requests/253
-
…into merge-requests/171
14 Mar, 2013
1 commit
-
(ActionItem2618)
13 Mar, 2013
1 commit
11 Mar, 2013
1 commit
06 Mar, 2013
1 commit
05 Mar, 2013
1 commit
28 Feb, 2013
2 commits
27 Feb, 2013
4 commits
-
Conflicts: app/models/comment.rb app/views/layouts/application-ng.rhtml test/unit/category_test.rb
25 Feb, 2013
1 commit
26 Jan, 2013
1 commit
23 Jan, 2013
1 commit
-
ActionItem2556
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
07 Jan, 2013
2 commits
-
…nto merge-requests/95 Since this patch is very old, I needed to fix the correction in the model a little. Also replaced the "profile2" variable name used to "author". Conflicts: app/models/comment.rb test/unit/comment_notifier_test.rb
-
…into merge-requests/252
03 Jan, 2013
2 commits
-
(ActionItem2529)
02 Jan, 2013
1 commit
-
…into merge-requests/260