29 Jan, 2015
6 commits
-
This reverts commit 853cc8ef357b5eeb2d25cf586fb96bbeab36a785, reversing changes made to a0ef4f259127426b96f8a8ba2bbb2c18c67bf980. This reverts commit b8304468ef6de86accdfd442c889f30b2fdd9539, reversing changes made to ed4938b5272fb57a714c84c3443c7d329c9407aa. This reverts commit 77ee15d0896424d4c02de0a61ad8922e5b38304c, reversing changes made to b52c66dba90218f9dd21b10dee85e293ccf52aa7. This reverts commit a0ef4f259127426b96f8a8ba2bbb2c18c67bf980, reversing changes made to 5c4d0723fb8977e29f0e208e6d3c609933281cec.
28 Jan, 2015
6 commits
-
Only shows visible and enabled enterprises on environment statistics block See merge request !441
-
Created a scope to show only visible and enabled enterprises on environment statistics block. Bug fix from #2783
-
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
-
When acessing Noosfero through a properly configured HTTPS setup, all links will now be generated with https (or without an explicit protocol and will just work). Links generated outside of the scope of a request (models, mailers etc) will still use http://. That can be fixed by a localized change to Environment#top_url, but for now I expect everyone using HTTPS to have a proper HTTP -> HTTPS redirection mechanism.
-
Hide license Hide license selection when there is no license available on environment See merge request !438
27 Jan, 2015
5 commits
-
Custom locales for personalized internationalization Support for custom locales for hosted environments using the multitenancy support and noosfero domains. There was a previous commit for custom locales based on environment (see AI3113 and MR195), but we also need it to work with a multitenancy system. See merge request !376
-
- add the checking to be sure that the owner of the block isn't Environment Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
26 Jan, 2015
4 commits
-
Block permission Add privacy of block only to members in a community Add privacy of block only to friends in person. The privacies were added in the block edition. See merge request !418
-
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Hebert Douglas <hebertdougl@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
23 Jan, 2015
1 commit
-
AI:3006
22 Jan, 2015
4 commits
-
Also removed "id" on update of external_feed_data. It must not be updated or mass-assigned
-
Fixes Edit Product page 'Add new qualifiers' in edit product was broken in rails 3 for two reasons: lack of escaping html characters and the qualifiers list wasn't accessible through mass assignment. I came across this while working on another issue but I decided to extract the commits and submit to the master branch so we don't have to wait the other merge request. See merge request !401
-
Always allow admin to change profiles homepage See merge request !412
-
Fix invitation tasks Fix creation of tasks to invite already registered users See merge request !399
21 Jan, 2015
4 commits
-
Article privacity to followers https://gitlab.com/participa/noosfero/issues/324 Feitos para amigos de perfis de pessoas também! See merge request !422
-
Fixed block Make a specific block fixed on a position. Only the environment admin can move and specify this option for the block https://gitlab.com/noosfero/noosfero/issues/26 See merge request !380
-
Fixed blocks can't be modified by regular users, but only by administrators. The main use case is defining a few blocks in the user or community templates, so that users and communities can't remove or change them. Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br> 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: Gustavo Jaruga <darksshades@gmail.com>
-
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>
20 Jan, 2015
1 commit
-
(ActionItem3287) It can be done while edit a profile or in environment administration panel 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: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Gustavo Jaruga <darksshades@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Parley Martins <parley@outlook.com>
15 Jan, 2015
1 commit
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.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
2 commits
-
Conflicts: public/javascripts/application.js
13 Jan, 2015
2 commits
12 Jan, 2015
4 commits
-
Conflicts: app/models/person_notifier.rb test/unit/person_notifier_test.rb