12 Mar, 2015
4 commits
11 Mar, 2015
4 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
10 Mar, 2015
1 commit
-
Signed-off-by: Victor Costa <vfcosta@gmail.com> Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
06 Mar, 2015
2 commits
03 Mar, 2015
2 commits
-
Without this it is not possible to load the modal programatically. This follows the responsive plugin API.
27 Feb, 2015
1 commit
26 Feb, 2015
1 commit
25 Feb, 2015
1 commit
24 Feb, 2015
4 commits
-
Adding temporary copy of jrails.js; when we move to the asset pipeline we'll be able to use the copy provided by eita-jrails itself.
22 Feb, 2015
3 commits
-
Colorbox was updated for the onCleanup callback
20 Feb, 2015
1 commit
13 Feb, 2015
1 commit
-
See merge request !454
11 Feb, 2015
1 commit
06 Feb, 2015
3 commits
-
Conflicts: public/stylesheets/application.css
-
Conflicts: app/helpers/application_helper.rb
05 Feb, 2015
4 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
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
1 commit
-
Conflicts: app/views/profile/_person_profile.html.erb