12 Mar, 2015
2 commits
11 Mar, 2015
2 commits
-
Conflicts: app/controllers/box_organizer_controller.rb app/controllers/my_profile/profile_design_controller.rb app/helpers/box_organizer_helper.rb app/helpers/boxes_helper.rb app/helpers/layout_helper.rb app/models/block.rb app/models/communities_block.rb app/models/theme.rb app/views/box_organizer/index.html.erb app/views/box_organizer/show_block_type_info.html.erb test/functional/environment_design_controller_test.rb test/functional/profile_design_controller_test.rb
06 Mar, 2015
3 commits
05 Mar, 2015
1 commit
-
…ent. Added functional test for this feature
24 Feb, 2015
1 commit
23 Feb, 2015
3 commits
22 Feb, 2015
2 commits
20 Feb, 2015
1 commit
13 Feb, 2015
3 commits
-
Allow admins to define the number of news on portal See merge request !470
-
Private profile pages When the profile is private, some pages are still shown if using the URL. For example, pages like agenda and contact email. We added a before_filter to make sure that doesn't happen. See merge request !459
12 Feb, 2015
1 commit
10 Feb, 2015
3 commits
-
Hide translation Hide translation on article and event creation if there is no languages defined in environment See merge request !443
09 Feb, 2015
1 commit
-
- Create tests for private and invisible communities using the privace methods - Executing filters for events and contact pages in private profiles Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
05 Feb, 2015
1 commit
-
This reverts commit 3f8af20484a57772d7243c8998d7a9f2656ddd1c. Conflicts: app/controllers/public/search_controller.rb
04 Feb, 2015
1 commit
-
Conflicts: app/controllers/public/search_controller.rb app/models/profile.rb app/views/cms/edit.html.erb public/stylesheets/application.css
03 Feb, 2015
4 commits
-
Conflicts: db/schema.rb
-
Conflicts: app/controllers/my_profile/profile_editor_controller.rb app/helpers/search_helper.rb app/models/invitation.rb app/models/person.rb app/views/cms/view.html.erb app/views/templates/index.html.erb plugins/community_track/views/content_viewer/_step_item.html.erb test/functional/home_controller_test.rb test/unit/person_test.rb test/unit/profile_test.rb
-
This feature allows organizations to invite people and users to request friendship from other users from the network instead of only through email. Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br> Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
02 Feb, 2015
2 commits
-
Conflicts: app/views/profile/_person_profile.html.erb
30 Jan, 2015
2 commits
29 Jan, 2015
3 commits
-
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
1 commit
-
Conflicts: app/helpers/article_helper.rb app/helpers/boxes_helper.rb app/models/article.rb app/models/block.rb app/views/content_viewer/view_page.html.erb db/schema.rb plugins/community_track/views/blocks/_track_list_more.html.erb plugins/community_track/views/box_organizer/community_track_plugin/_track_list_block.html.erb public/javascripts/article.js test/unit/block_test.rb test/unit/person_notifier_helper_test.rb
27 Jan, 2015
3 commits