03 Feb, 2015
16 commits
-
Conflicts: plugins/site_tour/lib/site_tour_plugin/tour_block.rb plugins/site_tour/public/edit_tour_block.css plugins/site_tour/public/main.js plugins/site_tour/test/functional/site_tour_plugin_admin_controller_test.rb plugins/site_tour/test/unit/site_tour_plugin_test.rb plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block_group_item.html.erb plugins/site_tour/views/tour_actions.html.erb
02 Feb, 2015
10 commits
-
Conflicts: test/unit/person_notifier_test.rb
-
Conflicts: app/views/profile/_person_profile.html.erb
-
Conflicts: app/helpers/application_helper.rb app/views/profile/_person_profile.html.erb
30 Jan, 2015
3 commits
-
Add the wait cursor when the user try to load comments http://noosfero.org/Development/ActionItem2947 See merge request !87
-
Add Metadata plugin Move code from core and add better support for OpenGraph @aurium See merge request !359
29 Jan, 2015
8 commits
-
This is still untested in practice. I intend to do that when I get a chance to play with putting up a git-based instance for the Noosfero website.
-
Contact without login Currently, unlogged users cannot contact profiles See merge request !437
-
This reverts commit 853cc8ef357b5eeb2d25cf586fb96bbeab36a785, reversing changes made to a0ef4f259127426b96f8a8ba2bbb2c18c67bf980. This reverts commit b8304468ef6de86accdfd442c889f30b2fdd9539, reversing changes made to ed4938b5272fb57a714c84c3443c7d329c9407aa. This reverts commit 77ee15d0896424d4c02de0a61ad8922e5b38304c, reversing changes made to b52c66dba90218f9dd21b10dee85e293ccf52aa7. This reverts commit a0ef4f259127426b96f8a8ba2bbb2c18c67bf980, reversing changes made to 5c4d0723fb8977e29f0e208e6d3c609933281cec.
28 Jan, 2015
3 commits
-
Only shows visible and enabled enterprises on environment statistics block See merge request !441
-
Created a scope to show only visible and enabled enterprises on environment statistics block. Bug fix from #2783
-
update_roles sends back to profile_members See merge request !440