04 Dec, 2015
1 commit
-
- Adds hostspot in Organization Rating task details - Improvements on task and organization ratings layout - Added one hotspot for task contents and another for ratings container content - Rejected rating comments are only displayed to env admins and comment owners - All task messages now refers to "a Report" instead of Comment: i.g. "Report waiting for approval" instead of "Comment waiting for approval" - Also added css style to auto expand task div Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com> Signed-off-by: Dylan Guedes <djmgguedes@gmail.com> Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> See merge request !737
25 Nov, 2015
1 commit
-
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> See merge request !709 (cherry picked from commit 139ef7fe71f2a59b1236eabbaa8d44e1038a6614)
05 Nov, 2015
1 commit
28 Oct, 2015
1 commit
07 Oct, 2015
1 commit
-
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
05 Oct, 2015
1 commit
02 Oct, 2015
2 commits
-
Also %s/will_paginate/pagination_links to use the default on forum, blog and cms Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br> Signed-off-by: Melissa Wen <melissa@colivre.coop.br>
01 Oct, 2015
2 commits
-
Also %s/will_paginate/pagination_links to use the default on forum, blog and cms Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br> Signed-off-by: Melissa Wen <melissa@colivre.coop.br>
29 Sep, 2015
6 commits
-
(cherry picked from commit 014031e1f34ab5508ce9d9b421f8b98f517111c7)
-
(cherry picked from commit d1e742857fda7a58183db49a4d3c34d36f80f624)
-
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. (cherry picked from commit ef41c1547dced46029b4f7292ad8613b1c9b110f)
26 Sep, 2015
3 commits
-
Keeped controllers/views structure
-
This reverts commit 83c318e66c66d82671cccaf3acc7f29c2bacf8d2.
25 Sep, 2015
2 commits
-
With some translations the view all button gets overlaped by the title.
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.
15 Sep, 2015
3 commits
-
For some reason, tinymce is not working on production environment. After some investigation, we discovered that it wasn't working on production due to the compression of tinymce.min.js. After using the non-minified version, the problem was solved. We also upgraded to 4.2.5.
-
For some reason, tinymce is not working on production environment. After some investigation, we discovered that it wasn't working on production due to the compression of tinymce.min.js. After using the non-minified version, the problem was solved.
11 Sep, 2015
2 commits
-
Elements with position absolute inside main-content were being shown in wrong place, like text-editor-sidebar
08 Sep, 2015
1 commit
05 Sep, 2015
1 commit
-
- Order members by name - Removed white spaces - Changed strings to be translated - Renamed div id and test - Adjust ul tag members - Fixed plugin dependency Signed-off-by: Omar Junior <omarroinuj@gmail.com> Signed-off-by: DylanGuedes <djmgguedes@gmail.com> Signed-off-by: Vitor Barbosa <vitormga15@gmail.com> Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br> Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
04 Sep, 2015
1 commit
01 Sep, 2015
1 commit
27 Aug, 2015
1 commit
26 Aug, 2015
1 commit
19 Aug, 2015
2 commits
-
Conflicts: Gemfile app/models/profile.rb plugins/shopping_cart/lib/shopping_cart_plugin.rb plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb plugins/shopping_cart/po/de/shopping_cart.po plugins/shopping_cart/po/es/shopping_cart.po plugins/shopping_cart/po/fr/shopping_cart.po plugins/shopping_cart/po/hy/shopping_cart.po plugins/shopping_cart/po/pt/shopping_cart.po plugins/shopping_cart/po/ru/shopping_cart.po plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb plugins/shopping_cart/views/cart.html.erb plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
-
Make lefttopright only use CSS Add a solution that uses only CSS See merge request !651
12 Aug, 2015
1 commit
11 Aug, 2015
1 commit
-
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
10 Aug, 2015
3 commits