18 Feb, 2016
2 commits
-
Signed-off-by: Carlos Purificacao <carloseugenio@gmail.com> Acked-by: Antonio Terceiro <terceiro@colivre.coop.br>
11 Feb, 2016
4 commits
-
This reverts commit a1e9a84903d733877a1a1016423709d9e92c20c8.
-
Fixes crash when processing suggest an article task - Removes an old line that was left behind during merge of support for different types of article. It was overriding the correct decision made by #article_type. - Defines SuggestArticle#author_name the same as the sender so noosfero task page doesn't crash in case the processing of the task throws an error, since it will try to show the author name in the task error page. Fixes #166 See merge request !786
-
- Removes an old line that was left behind during merge of support for different types of article. It was overriding the correct decision made by #article_type. - Defines SuggestArticle#author_name the same as the sender so noosfero task page doesn't crash in case the processing of the task throws an error, since it will try to show the author name in the task error page. Fixes #166
05 Feb, 2016
1 commit
-
Signed-off-by: Joenio Costa <joenio@colivre.coop.br> Signed-off-by: Marcos Ramos <ms.ramos@outlook.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
02 Feb, 2016
1 commit
18 Jan, 2016
1 commit
-
* staging: (359 commits) Makes travis run all the tests via ./script/ci api: paginate members endpoint adds - TASK=rake test:all:db Added specific things for noosferogov api: return profile members Wont stop travis if Gemfile.lock does not exist api: expose profile type api: expose entities related to activity api: add activities endpoint api: fix login from cookie api: add endpoint for profiles api: create boxes enpoint api: login from noosfero cookie api: expose article type fix script production in app restart api: search profile by identifier api: expose boxes and blocks for profiles - rm Gemfile.lock Removing Gemfile.lock Setting will paginate to the version at debian stable ... Conflicts: .gitmodules app/models/environment.rb lib/noosfero/api/v1/articles.rb test/unit/api/helpers_test.rb test/unit/api/test_helper.rb
14 Jan, 2016
1 commit
05 Jan, 2016
2 commits
-
Conflicts: Gemfile app/models/article.rb test/unit/user_test.rb
28 Dec, 2015
3 commits
-
removing category icons from enterprise list remove some specific code that display category icons on enterprise images See merge request !744
18 Dec, 2015
1 commit
-
Conflicts: Rakefile
12 Dec, 2015
2 commits
09 Dec, 2015
2 commits
08 Dec, 2015
1 commit
-
This reverts commit 3057b70bfe7e25e4dee80cae10c408238f040a02, which caused several tests to fail.
07 Dec, 2015
1 commit
05 Dec, 2015
1 commit
-
Also drop wrong files copied from old repo
01 Dec, 2015
2 commits
30 Nov, 2015
2 commits
-
Conflicts: app/helpers/forms_helper.rb app/views/cms/edit.html.erb lib/noosfero/api/entities.rb lib/noosfero/api/v1/comments.rb lib/noosfero/api/v1/search.rb test/unit/api/search_test.rb
23 Nov, 2015
2 commits
-
Custom fields can be added to any profile through the admin panel in the 'Fields' section. They have the same behaviour as the current Noosfero's fields (active, signup, required and privacy). Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com> Signed-off-by: Joenio Costa <joenio@colivre.coop.br> Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com> Signed-off-by: Marcos Ramos <ms.ramos@outlook.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
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
2 commits
-
* 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
-
Conflicts: Gemfile Rakefile app/controllers/box_organizer_controller.rb app/controllers/my_profile/tasks_controller.rb app/controllers/public/profile_controller.rb app/mailers/user_mailer.rb app/models/article.rb app/models/person.rb app/models/product_category.rb app/models/task.rb config/application.rb config/routes.rb lib/acts_as_having_settings.rb lib/noosfero/api/entities.rb lib/noosfero/api/helpers.rb lib/noosfero/api/session.rb lib/noosfero/api/v1/articles.rb lib/noosfero/api/v1/contacts.rb lib/noosfero/api/v1/search.rb lib/noosfero/api/v1/users.rb test/functional/tasks_controller_test.rb test/unit/api/articles_test.rb test/unit/api/helpers_test.rb test/unit/api/people_test.rb test/unit/api/search_test.rb test/unit/api/session_test.rb test/unit/api/users_test.rb test/unit/person_notifier_test.rb test/unit/task_test.rb vendor/plugins/access_control/lib/acts_as_accessible.rb
16 Nov, 2015
1 commit
12 Nov, 2015
1 commit