20 Nov, 2015
2 commits
19 Nov, 2015
4 commits
-
Conflicts: app/models/article.rb app/models/comment.rb
18 Nov, 2015
1 commit
17 Nov, 2015
1 commit
-
* staging: (138 commits) Do not return private token when user is inactive Fix unit test in api search Remove trailing spaces updating juventude plugin access comments through profile author mergin with master updating juventude plugin updating gamification plugin updating juventude plugin Fix gem version of omniauth-oauth2 Fixed bug on /plugins/oauth_client/lib/ext/user.rb -> was referencing a class OauthClientPlugin::UserProvider which was recently renamed to OauthClientPlugin::Auth. [gallery block] display images from a gallery Update translation files Noosfero::VERSION: use only newer git versions Bumping version 1.3~rc2 work_assignment: make sentence meaning clearer Makes LDAP password_recovery configurable Add support to tinymce editor in forum description updating plugin Small change in pt br translation ... Conflicts: test/unit/api/session_test.rb
16 Nov, 2015
1 commit
05 Nov, 2015
3 commits
-
Article privacy fixies * Fix article privacy to not consider invisible profiles * Change feed published method to consider it's parent privacy * Closes #148 See merge request !723
-
* It fix the private feed creation problem * Closes #148 Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
04 Nov, 2015
4 commits
13 Oct, 2015
3 commits
-
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> Conflicts: app/controllers/my_profile/profile_design_controller.rb app/helpers/boxes_helper.rb app/helpers/layout_helper.rb app/views/layouts/_javascript.html.erb public/stylesheets/application.css test/functional/environment_design_controller_test.rb test/functional/profile_design_controller_test.rb
08 Oct, 2015
2 commits
-
Fix highlights_block error on add Noosfero.root @danielafeitosa, can you review this merge request? See merge request !701
-
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>
07 Oct, 2015
2 commits
-
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
-
Favorite enterprises block footer and content fixes Before:  After:  Had to move the "view all" button to the bottom because of this problem:  See merge request !676
06 Oct, 2015
1 commit
-
Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
01 Oct, 2015
1 commit
30 Sep, 2015
1 commit
25 Sep, 2015
1 commit
24 Sep, 2015
1 commit
-
Additional improvements include: - Makes 'Remove Image' checkbox optional - Very ugly css hack to hide duplicated labels in some forms. I couldn't find another way to avoid the labels generated by labelled_form_for nor could I skip adding labels inside the helper since it's supposed to be generic.
22 Sep, 2015
1 commit
14 Sep, 2015
2 commits
-
- Add before_filter for check permission for open edit header and footer page - Change environment feature name of disable_appearance to enable_appearance - Update cucumber test change_appearance.feature Signed-off-by: DylanGuedes <djmgguedes@gmail.com> Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Omar Junior <omarroinuj@gmail.com> Signed-off-by: vitorbaraujo <vitornga15@gmail.com> Signed-off-by: Victor Matias Navarro <victor.matias.navarro@gmail.com>
13 Sep, 2015
1 commit
11 Sep, 2015
4 commits
-
For consistency with other classes
-
* models should use acts_as_having_image transparently * force margin zero in HTML mailing * using require_dependency instead of require to avoid error: "superclass mismatch for class MailingJob" * now plugins can schedule jobs via whenever rubygem * improve 'sample-data' scripts to create some blog posts signed-off-by: Joenio Costa <joenio@colivre.coop.br>
10 Sep, 2015
3 commits
-
Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
-
Conflicts: app/models/article_follower.rb test/unit/article_test.rb
09 Sep, 2015
1 commit