02 Oct, 2015
11 commits
-
(cherry picked from commit bb9580ee00c20caa533a40d40eae57bd35e9332d)
-
(cherry picked from commit edcc13059b31341eb78e58079ac2322f1142f206)
-
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. (cherry picked from commit aed63bb6b431105d5ff2081b14f4c2d5d9dc0051) -
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> Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br> (cherry picked from commit 64b98a9ea0ee1ed54adbf3456730101bca04ef43; required porting the CSS changes back to the huge application.css present in 1.2)
-
Windows systems with pt_br have problem in exporting CSV with comma as delimiter through Excel, so to improve compatibility I decided to loop through delimiter types when parsing and importing recipients. Since I try different types of delimiter and stick with the first one that gives me a valid content, it's always possible (albeit unlikely) the file can be parsed incorrectly. (cherry picked from commit df2897b2afec602fbe3f9c6892589f5ef11a52af)
-
(cherry picked from commit b5fff02ebdc764821500a136bc838b5cf31513d4)
-
(cherry picked from commit d89434517dff21b4fd682bd926d6279fe01cc77e)
-
The plugin still has some structural problems (cherry picked from commit 1414c2864df4e2d73c8b01f1b7c0c437ee2279b5)
-
(cherry picked from commit c838edfa0058fe706784fa5085f9570984b68373)
-
(cherry picked from commit 603ea7017cf4cfc41644976b694f1280d69db9e5)
-
This fixes a bug in which some pages (eg. a profile page) were visible to unlogged users even if the environment has enabled "show content only to members". The problem happened because some controllers use `before_filter :login_required` so they can apply it to some specific methods, effectively overriding the one set in `application_controller`. That before filter set in `application_controller` is the one used to make the environment private when that feature is enabled, so when a controller overrides it, some methods are not required login even when the environment is private. So I fixed the problem by using a different `before_filter` to take care specifically of private environments. Now every page requires login when an environment is private, except the pages in `account_controller` necessary for login and signup. (cherry picked from commit 48f51755bc02fae929e8d62d7bf86aee8b2811ec)
26 Sep, 2015
10 commits
-
This reverts commit 92f1244691a2c7ff8c376924d6e7ef310e3d3740.
-
(cherry picked from commit 83c318e66c66d82671cccaf3acc7f29c2bacf8d2)
-
This is useful for testing packages, since regular packages created with `noosfero:deb` would have the same version number as the last release ondes. (cherry picked from commit 6b803d700b71384b36e7c169de1c018ee7e93212)
-
(this is a backport of the combination of commits 51f7d2b30adde7d306b3090555d7de25db74e73d and 00d46ded33a612a7366561500ea2d6194afdc9ed) Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br> Signed-off-by: Larissa Reis <larissa@colivre.coop.br>
-
Error with feeds encoded with 8-bit ascii: "#<Encoding::CompatibilityError: incompatible encoding regexp match (UTF-8 regexp with ASCII-8BIT string)>" (cherry picked from commit 288199b70036035c7c67e9617a1264851d438d6c)
-
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)
-
(cherry picked from commit 0c116baa4dfb158ea813848913741c72c9afe0b2)
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Jéssica Cristina <jessica.cris1127@gmail.com> Signed-off-by: Simião Carvalho <simiaosimis@gmail.com> Signed-off-by: Victor Navarro <victor.matias.navarro@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br> (cherry picked from commit e1ab4612e1133ff198ea04d42954b8aab3b18419)
18 Sep, 2015
6 commits
-
This will hopefully prevent users who are creating forms for e.g. registration for an event from adding fields for name and email, which will already be added by default. (cherry picked from commit 5ef4eba7cac4a9a075c13218555f84555cfd6f6b)
-
(cherry picked from commit 11bee2c19c2f980a892d226b36b978c5b963e70a)
-
(cherry picked from commit c532fef50c731130da75504fb0b99b1b30274945)
-
(cherry picked from commit 47e5f1891b19e98ee20f0df55cb97fb70365562c)
-
(cherry picked from commit 75a9f6014513c61520eb0c57b678ff07ce92bc32)
11 Sep, 2015
11 commits
-
For consistency with other classes (cherry picked from commit e870895f4feefb94b1ba021eede3223c60b361ad)
-
a plugin that periodically sends newsletter via email to network users signed-off-by: Larissa Reis <larissa@colivre.coop.br> signed-off-by: Melissa Wen <melissa@colivre.coop.br> (cherry picked from commit 4df54eb8b390b627c677c6969f18af2e39b49fa2)
-
* 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> (cherry picked from commit 296a549df0c02837907f36de114fac4ee6da320d)
-
Elements with position absolute inside main-content were being shown in wrong place, like text-editor-sidebar (cherry picked from commit 7ec5240f427d2a7fec9772c30d406339ebe6d1ef)
-
(cherry picked from commit 8dfded9fc2839934fb1a43de88c99e52e7594448)
-
Also changed method used to guess encoding (cherry picked from commit 873f1d46d2dc8e0da70e66d6cd57341a31b4b285)
-
(cherry picked from commit f67035139f05c753d1f71973c0f8c1d45608694f)
-
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> (cherry picked from commit ad3e1722e4f1cf1131529c7f6e553b0be5d49c0e)
-
(cherry picked from commit aff3d549819e4e5cb1409cecb4de188f19859882)
28 Aug, 2015
2 commits
-
(cherry picked from commit aae521753d8a8f2c447cfef2feebc1f2758fcfdd)