06 Feb, 2015
1 commit
-
Conflicts: app/helpers/application_helper.rb
05 Feb, 2015
9 commits
-
Do not show the "profile actions buttons" twice in MyNetworkBlock See merge request !453
-
This reverts commit 4ba820dd80cd8ec6cbab620e1430a4fee396abc7.
-
This reverts commit 3f8af20484a57772d7243c8998d7a9f2656ddd1c. Conflicts: app/controllers/public/search_controller.rb
-
Conflicts: app/helpers/application_helper.rb app/views/profile/_person_profile.html.erb
-
Conflicts: debian/control
04 Feb, 2015
8 commits
-
This repository will get new packages, differently from the wheezy one which is frozen at the dependencies required for Noosfero 1.0
-
Conflicts: app/controllers/public/search_controller.rb app/models/profile.rb app/views/cms/edit.html.erb public/stylesheets/application.css
-
Quick bug fix: Missing brace on Person.rb Missing brace "}" on Person.rb and identation fix See merge request !452
03 Feb, 2015
22 commits
-
Conflicts: plugins/site_tour/lib/site_tour_plugin/tour_block.rb plugins/site_tour/public/edit_tour_block.css plugins/site_tour/public/main.js plugins/site_tour/test/functional/site_tour_plugin_admin_controller_test.rb plugins/site_tour/test/unit/site_tour_plugin_test.rb plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block_group_item.html.erb plugins/site_tour/views/tour_actions.html.erb
-
Stoa Network Features This merge-request groups 6 features developed majorly by me, @danielafeitosa and @larissa funded by Stoa Network. These features were finished during the freezing time and only now we were able to update it to the current master. I'm sorry that we'll merge them all together in a single request, but we had to group them on a single branch do improve the efficiency of our work. Here are the features grouped here: - Media gallery complete refactoring - Welcome page improvements - Better interaction with other networks - Friends and communities suggestions - Invitation improvements - Search improvements All 6 features were reviewed by at least one of us and since we are committers, I'm merging this right away. This merge-request was made more for information sake. See merge request !451
-
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
-
Add awesome icon theme See merge request !423
