28 Jul, 2014
2 commits
-
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
25 Jul, 2014
1 commit
-
To make presentation easier, adds a label to SEARCHABLE_FIELDS as part of a hash.
22 Jul, 2014
33 commits
-
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
-
(ActionItem3075)
-
(ActionItem3075)
-
(ActionItem3075)
-
(ActionItem3075)
-
(ActionItem3075)
-
* Move welcome page a separate action under the HomeController instead of cranking it under the signup. * May show welcome page to both signup (with or without confirmation). (ActionItem3075) -
Also removing string.js lib since it's now unecessary.
21 Jul, 2014
2 commits
-
Ai3206 profile categories bug Fixing bug: http://noosfero.org/Development/ActionItem3206 See merge request !253
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