25 Feb, 2015
1 commit
24 Feb, 2015
1 commit
06 Feb, 2015
1 commit
-
Conflicts: app/helpers/application_helper.rb
05 Feb, 2015
2 commits
-
Conflicts: app/helpers/application_helper.rb app/views/profile/_person_profile.html.erb
04 Feb, 2015
2 commits
-
Conflicts: app/controllers/public/search_controller.rb app/models/profile.rb app/views/cms/edit.html.erb public/stylesheets/application.css
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>
02 Feb, 2015
2 commits
-
Conflicts: app/views/profile/_person_profile.html.erb
-
Conflicts: app/helpers/application_helper.rb app/views/profile/_person_profile.html.erb
30 Jan, 2015
1 commit
-
Add the wait cursor when the user try to load comments http://noosfero.org/Development/ActionItem2947 See merge request !87
28 Jan, 2015
2 commits
-
Google Maps lib was being loaded on every submit. I moved the include to the search page, outside the search content.
-
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
26 Jan, 2015
3 commits
21 Jan, 2015
1 commit
-
Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Filipe Ribeiro <firibeiro77@live.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
14 Jan, 2015
3 commits
-
Conflicts: public/javascripts/application.js
-
Conflicts: public/javascripts/application.js
-
Conflicts: public/javascripts/application.js
13 Jan, 2015
1 commit
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
08 Jan, 2015
1 commit
05 Jan, 2015
1 commit
19 Dec, 2014
1 commit
16 Dec, 2014
2 commits
-
Conflicts: app/controllers/box_organizer_controller.rb app/controllers/my_profile/profile_design_controller.rb app/helpers/layout_helper.rb
-
Conflicts: Gemfile Gemfile.lock app/controllers/admin/environment_design_controller.rb app/helpers/layout_helper.rb app/models/block.rb script/quick-start
11 Dec, 2014
1 commit
04 Dec, 2014
1 commit
20 Nov, 2014
7 commits
-
Uses pagination and loads the pages using ajax.
-
Some users have a profile search block in their pages, so sometimes there are more than one search input per page. I changed the autocomplete to use class instead of id to select all inputs.
-
.live() is deprecated starting from jQuery 1.7 so I replaced it with .on()
-
Conflicts: Gemfile.lock script/development
30 Oct, 2014
1 commit
24 Oct, 2014
2 commits
-
Conflicts: public/javascripts/comment_form.js