18 Feb, 2016
2 commits
-
Signed-off-by: Carlos Purificacao <carloseugenio@gmail.com> Acked-by: Antonio Terceiro <terceiro@colivre.coop.br>
17 Feb, 2016
1 commit
16 Feb, 2016
1 commit
12 Feb, 2016
2 commits
-
Conflicts: app/helpers/forms_helper.rb plugins/comment_paragraph/controllers/profile/comment_paragraph_plugin_profile_controller.rb
-
Conflicts: app/helpers/forms_helper.rb app/views/cms/edit.html.erb plugins/comment_paragraph/controllers/profile/comment_paragraph_plugin_profile_controller.rb plugins/comment_paragraph/test/functional/comment_paragraph_plugin_profile_controller_test.rb
11 Feb, 2016
7 commits
-
This reverts commit b463f35095dcdf4f6dda4e897792b0a485a32dba.
-
This reverts commit b8f3f3f3a0f3d152424f21e8eaf8c6c00f33895d. Conflicts: app/controllers/application_controller.rb
-
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
-
fix signup with custom_fields Fixes bugs with signup with required custom fields, as well as required custom values not being saved for new communities. See merge request !783
-
- 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>
04 Feb, 2016
2 commits
-
Conflicts: config/application.rb
-
These changes avoid searching for sessions with a wrong schema in a multi domain setup.
03 Feb, 2016
3 commits
02 Feb, 2016
2 commits
-
This was previously done to avoid crashes on development environment, but some selenium tests, for unknown reasons, produces requests where Environment.default returns nil even though all steps passes.
27 Jan, 2016
1 commit
25 Jan, 2016
1 commit
-
Conflicts: plugins/oauth_client/Gemfile plugins/oauth_client/lib/ext/user.rb
22 Jan, 2016
1 commit
-
Signed-off-by: Marcos Ramos <msramos@outlook.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
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
29 Dec, 2015
1 commit
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
15 Dec, 2015
3 commits
14 Dec, 2015
1 commit
-
When articles with big images were displayed, the width of the table was overflowing the content
12 Dec, 2015
2 commits
11 Dec, 2015
1 commit
