04 Feb, 2015
3 commits
-
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
31 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
-
Use git information in Noosfero::VERSION the commit message is self-explanatory See merge request !435
-
For code in development, this produces version numbers like "1.0-119-g124a746", which is useful when running from git. Those running Noosfero forks can even make their own tags and get version numbers like "1.0+vendor1".
-
Boot development environment on CentOS 7 Added script to install dependencies on CentOS 7. To boot on CentOS 7 only run ./script/quisck-start, remember to install the package "redhat-lsb" that will be able to execute lsb binary used in quick-start script. See merge request !448
-
Link original article when spread it The community administrator has the option to create a link to original article when approve publication tasks. More details Ai3269 See merge request !449
-
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>
-
Created script to install CentOS 7 dependencies
02 Feb, 2015
6 commits
-
If the user is profile/environment admin, bypasses the permissions check so that he/she always has access to everything related to the profile. The absence of this feature caused many strange behaviors like env admins unable to access a community control panel section. This also caused many complex permission checking codes where we were forced to test lots of combinations instead of a straight check (e.g. user is env admin or user is profile admin or user has permission x or ...). After this change, there might still be redundant testing around the code, but that might be reviewed slowly.
-
This is required to boot Noosfero on Centos 7 (with Ruby 2.0).