22 Jan, 2014
1 commit
-
…into merge-requests/342 Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
17 Jan, 2014
2 commits
16 Jan, 2014
1 commit
-
Conflicts: HACKING
15 Jan, 2014
4 commits
-
Conflicts: test/functional/cms_controller_test.rb test/unit/profile_test.rb
-
(ActionItem2931)
-
Conflicts: plugins/display_content/lib/display_content_block.rb plugins/display_content/test/unit/display_content_block_test.rb
14 Jan, 2014
2 commits
-
(ActionItem2934)
-
…4-pg_search_profile_fix
13 Jan, 2014
6 commits
-
(ActionItem2871)
-
(ActionItem2871)
-
(ActionItem2871)
-
…into merge-requests/423
07 Jan, 2014
1 commit
-
Conflicts: db/schema.rb test/unit/person_test.rb
03 Jan, 2014
2 commits
18 Dec, 2013
7 commits
-
Conflicts: plugins/display_content/lib/display_content_block.rb
-
…participa/noosfero into next
-
… into order-attributes
-
Conflicts: test/unit/profile_test.rb
17 Dec, 2013
11 commits
-
Fix problem when calling content types plugin hotspot outside of a profile. This is needed by community track plugin to display available content types for selection at step edition.
16 Dec, 2013
3 commits