03 Feb, 2015
3 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>
26 Jan, 2015
1 commit
-
This needs to be done for all plugins as well, but it's more complicated there because several plugins have their own test_helper (which will also load the core test_helper).
14 Jan, 2015
1 commit
06 Aug, 2014
1 commit
-
Conflicts: app/controllers/application_controller.rb app/models/profile.rb app/views/friends/index.html.erb app/views/invite/_personalize_invitation_mail.html.erb test/functional/invite_controller_test.rb
28 Jul, 2014
1 commit
-
Conflicts: app/views/friends/index.rhtml app/views/invite/_select_address_book.rhtml app/views/invite/select_friends.rhtml app/views/profile/friends.rhtml config/routes.rb plugins/stoa/lib/ext/person.rb test/functional/invite_controller_test.rb test/unit/invite_member_test.rb
19 Jul, 2014
2 commits
-
Removes the need of a hotspot to offer the possibility of searching members by usp_id on invite page. The previous hotspot to provide extra search fields was deemed too specific and complicated. Refactor from commits: 844304db138e2c7bb6234be39301f054b7a657cb 8470293887b42804d572dcffc5ee02af1a0d2ff6 -
Removes the need of a hotspot to offer the possibility of searching members by usp_id on invite page. The previous hotspot to provide extra search fields was deemed too specific and complicated. Refactor from commits: 844304db138e2c7bb6234be39301f054b7a657cb 8470293887b42804d572dcffc5ee02af1a0d2ff6
25 Jun, 2014
1 commit
24 Jun, 2014
1 commit
13 May, 2014
1 commit
-
Testing the difference of the exact job instead of all jobs. Also including class methods on Delayed::Job to fetch jobs by_handler and with handler_like (using sql LIKE).
06 May, 2014
1 commit
-
* rails235: (168 commits) L10n: support for custom locales enhancements: visualization of suggested usernames Allowing translation for url checking string Removed unnecessary lines on test Removed unit tests from functionals file Fixed html and test syntax Removed needless condition Fixed suggestions of usernames Test files should ends with "_test.rb" Added pagination on events_by_day on profile agenda Fix missing variable in funcional test Fix unit tests Change routes from embed controller Remove unused code Autocomplete fields on page load Blocks can returns a block of code to be evaluated Avoid randomness on tests comment-group-plugin: avoid randomness on tests community-track-plugin: fix tests by creating a profile with default boxes anti-spam-plugin-wrapper: ensure to load concrete wrappers ... Conflicts: app/helpers/application_helper.rb app/models/comment.rb app/models/contact.rb app/models/event.rb app/models/mailing.rb app/models/organization.rb app/models/organization_mailing.rb app/models/pending_task_notifier.rb app/models/person.rb app/models/profile.rb app/models/scrap.rb app/models/task_mailer.rb app/models/user.rb app/views/account/_signup_form.rhtml app/views/blocks/profile_image.rhtml app/views/blocks/profile_info.rhtml app/views/box_organizer/_link_list_block.rhtml app/views/box_organizer/edit.rhtml app/views/features/_manage_community_fields.rhtml app/views/features/_manage_enterprise_fields.rhtml app/views/features/_manage_person_fields.rhtml app/views/features/index.rhtml app/views/layouts/application-ng.rhtml app/views/users/_users_list.rhtml db/schema.rb features/forum.feature lib/feed_handler.rb lib/noosfero/plugin.rb plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb plugins/spaminator/lib/spaminator_plugin/mailer.rb test/functional/content_viewer_controller_test.rb test/functional/profile_controller_test.rb test/functional/profile_design_controller_test.rb test/functional/search_controller_test.rb test/unit/contact_sender_test.rb test/unit/content_viewer_helper_test.rb test/unit/environment_mailing_test.rb test/unit/mailing_test.rb test/unit/organization_mailing_test.rb test/unit/person_test.rb test/unit/profile_test.rb test/unit/uploaded_file_test.rb vendor/plugins/action_tracker/lib/action_tracker_model.rb
20 Mar, 2014
1 commit
19 Mar, 2014
1 commit
22 Jan, 2014
1 commit
20 Jan, 2014
1 commit
10 Jan, 2014
2 commits
-
Clear all jobs in setup method of invite_controller_test to avoid confusion in tests that look at delayed jobs.
06 Jan, 2014
2 commits
05 Apr, 2012
1 commit
-
…into merge-requests/142 Conflicts: test/functional/invite_controller_test.rb (ActionItem2313)
09 Mar, 2012
1 commit
-
(ActionItem2313)
08 Dec, 2011
1 commit
30 Aug, 2010
2 commits
-
(ActionItem1640)
-
(ActionItem1640)
27 Aug, 2010
1 commit
-
* Added message if user wants to fetch from hotmail * Added <url> to message if user removed it * Refactored invite_controller * Added ContactList * Added get_email_contacts_job * Added invitation_job (ActionItem1640)
22 Aug, 2010
1 commit
-
Added delayed_job plugin Added a daemon to start/stop delayed_job Added invitation on a queue to be processed later (ActionItem1640)
23 Jul, 2010
1 commit
-
After creation/edition of an article, the user is redirected to the article Used back_to to store the page to return (ActionItem1424)
02 Feb, 2010
1 commit
-
- invite friends refactored (ActionItem1275)
