13 Oct, 2015
19 commits
-
(cherry picked from commit 73a8a59f858bc361865fcb0b0b1bbc6fa4cabda4)
-
- Fixes slide up of field box when removing a field, since the outer box was being left behind and only the content was being slided up. - Fixes date pick on Firefox/Iceweasel, which was not showing the date stored on the database and instead was always being initialized with the current date because the format with dashes '1995-12-17 03:24:00' is not a valid date format for Date(), while '1995-12-17T03:24:00' or '1995/12/17 03:24:00' are correct formats. (cherry picked from commit d693abc49c4fcdeb851db093c1c437ac52b9e857)
-
Also does some security enhancement for custom forms by sanitizing content. (cherry picked from commit c3f4ea2b96b37539085f36aa0f7be48128a8f054)
-
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com> (cherry picked from commit 74a61295d8e5bda43670d2cc283b0fe473b69929)
-
(cherry picked from commit c62a8f56bc09ab0315a50e0247beff1e5e90ffde)
-
Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> (cherry picked from commit 48b50f8829052e384c1c78ba70051fb70c72d716)
-
Only marking the strings for translation with `N_()` wasn't enough and strings weren't being translated for mailing. (cherry picked from commit 117471e2132b5ec348d3daebfa38c7be33db5272)
-
Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com> Signed-off-by: Simião Carvalho <simiaosimis@gmail.com> Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> Closes merge request !688 (cherry picked from commit 70d40ab534163196c225ab27289b34a7b865b416)
-
Only organizations can manage roles (cherry picked from commit eb4178406f1c00d43543884c734efe486fe66c7b)
-
(cherry picked from commit 4dd11514eb9995c23171987f554421ccb965b82b)
-
This is useful when you are loading a database dump from a production database for local tests, and you don't want people's emails there in order to avoid accidental outgoing email. (cherry picked from commit 83d521927f8c2aa9684c38f0e2ccc81cbbbd6aa4)
-
this helps local tests, since one can use ANYTHING@localhost.localdomain for registering users (cherry picked from commit e01744f23ea4a0f411ddc60fb8720e03abeaf7db)
-
(cherry picked from commit 7d617038d64d41cca34b1c36b4e2f99a3373e97a)
-
(cherry picked from commit 9c497c0bb53de7df26c76e7bdb4dfb639cd06c5a)
-
On Ruby 1.9+ these are no-ops (cherry picked from commit 41bd751985bbf11b3bc8707d8b691fdc07d2a8fe)
-
This is already handled on rails 3. Fix #62 (cherry picked from commit 5640070915e3b18a29e3a941dc96a603529fb40c)
-
(cherry picked from commit 20bb372127925572495708d817c1aefb3418b911)
-
With some translations the view all button gets overlaped by the title. (cherry picked from commit 2d94b1d500518df58027f8c679c30e11f4e3da6b)
-
(cherry picked from commit 09c3d5b0b68508285c0f6afaaa9f76720aec7d5d)
03 Oct, 2015
1 commit
-
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 (cherry picked from commit e2feaba3c19d38a977898fe3c7367361bddb06eb)
02 Oct, 2015
13 commits
-
(cherry picked from commit 849780be1a3373b834c0402c57e431a0dc542b0b)
-
(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
7 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)