15 Dec, 2015
2 commits
-
(cherry picked from commit d9561154087742a2d20d219cc5a1fdc6003f2272)
-
(cherry picked from commit ef4af465f34062264bd969cf6fcddc28a8ed3d75)
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)
23 Nov, 2015
1 commit
28 Oct, 2015
1 commit
-
time_ago_as_sentence has been replaced in a refactor and *_description now takes the action tracker record as an argument. This just updates product related notifications to work after these changes.
08 Oct, 2015
1 commit
-
Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com> Signed-off-by: Jessica Cristina <jessica.cris1127@gmail.com> Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
07 Oct, 2015
1 commit
-
Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com> Signed-off-by: Jessica Cristina <jessica.cris1127@gmail.com> Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
02 Oct, 2015
6 commits
-
Fixes test broken after changing spread button to use modal api. Also removes colorbox class that I forgot to remove in previous commit, since now we are using modal api. For reference see commit: edcc13059b31341eb78e58079ac2322f1142f206
-
Replaces remaining colorbox in the code with modal Colorbox was replaced with modal api, but we still had instances in the code of colorbox uses and they were broken so this patch is to fix those. See merge request !689
-
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>
-
search: resolve translations at runtime If you resolve the translation calls -- _("...") -- at load time they will not be translated based on the current user's language. SearchHelper::FILTERS_TRANSLATIONS was not used anywhere, so it got removed. See merge request !686 -
If you resolve the translation calls -- _("...") -- at load time they will not be translated based on the current user's language. SearchHelper::FILTERS_TRANSLATIONS was not used anywhere, so it got removed.
01 Oct, 2015
1 commit
-
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>
30 Sep, 2015
1 commit
-
Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com> Signed-off-by: Simião Carvalho <simiaosimis@gmail.com>
29 Sep, 2015
3 commits
-
(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)
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
2 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.
01 Sep, 2015
1 commit
-
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
28 Aug, 2015
1 commit
27 Aug, 2015
1 commit
26 Aug, 2015
2 commits
-
Links and images are saved with relative path but it wasn't considering the profile domain. Because of this, the links were broken on article visualization. This commit also fix the url on edition of tinymce articles.
-
If stylesheet_link_tag gets's an absolute path starting with /assets, it won't append a hash of the file contents to the URL, so if you update a theme you won't get a new URL and varnish will cache the old stylesheet for a month or so.
13 Aug, 2015
1 commit
12 Aug, 2015
1 commit
11 Aug, 2015
2 commits
-
The id was necessary for the has_many :through. Also add indexes and timestamps and fix typo on table name
-
…ons (create, update and destroy)
09 Aug, 2015
1 commit
-
html_safe: fix action tracker description mess See merge request !647
06 Aug, 2015
1 commit
31 Jul, 2015
1 commit
24 Jul, 2015
2 commits
18 Jun, 2015
1 commit
-
This reverts commit 190a130ea45fb5911016be68cfb1038f762ea313.
17 Jun, 2015
4 commits
-
Use profile homepage The profile homepage is not used in some places See merge request !555
-
- Added image label - Added image to article body - Changed some minor positioning Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fábio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>