28 Jul, 2014
5 commits
-
Conflicts: app/controllers/my_profile/memberships_controller.rb app/models/profile.rb app/views/friends/index.html.erb test/unit/profile_test.rb
-
Conflicts: app/controllers/application_controller.rb
-
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
27 Jul, 2014
9 commits
-
(ActionItem3234)
-
(ActionItem3234)
-
When the number of a category increases or a new category is verified, the suggestion is updated with the new values (ActionItem3234)
-
Users can: * add a suggestion as community * remove a suggestion from list (ActionItem3234)
-
Users can: * add a suggestion as friend * remove a suggestion from list (ActionItem3234)
-
* Added rules for suggestions * Send e-mail to users with the suggestions (ActionItem3234)
-
Also added some tests (ActionItem3234)
-
(ActionItem3234)
-
(ActionItem3235)
25 Jul, 2014
1 commit
-
To make presentation easier, adds a label to SEARCHABLE_FIELDS as part of a hash.
24 Jul, 2014
3 commits
-
Ai3204 bug person block Fixing https://noosfero.org/Development/ActionItem3204 See merge request !262
22 Jul, 2014
22 commits
-
Ai3211 fix comment list http://noosfero.org/Development/ActionItem3211 See merge request !260
-
Conflicts: app/views/layouts/_javascript.html.erb public/javascripts/jquery.typewatch.js
-
Conflicts: app/models/profile.rb
-
Conflicts: app/views/layouts/_javascript.html.erb
-
Conflicts: public/stylesheets/application.css