07 Jan, 2016
1 commit
06 Jan, 2016
4 commits
-
(cherry picked from commit 1c90626d0df95f0478cf3dec23fb32dbbe5230d6)
-
(cherry picked from commit f3085abc80ff6485b6b17908da2acaa3d2377942)
-
(cherry picked from commit f79ff688f8a623c30607d8a9ca107d6b0d2dceaf) Conflicts: Rakefile
05 Jan, 2016
1 commit
28 Dec, 2015
1 commit
18 Dec, 2015
2 commits
-
Adding tests for multi env remote user Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Macartur Sousa <macartur.sc@gmail.com Closes !753 (cherry picked from commit e9c353c4c26f973935d2bb3177023d7e27149c2c)
17 Dec, 2015
1 commit
15 Dec, 2015
3 commits
-
(cherry picked from commit d9561154087742a2d20d219cc5a1fdc6003f2272)
-
(cherry picked from commit ef4af465f34062264bd969cf6fcddc28a8ed3d75)
-
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
14 Dec, 2015
2 commits
-
(cherry picked from commit 5b9ea2513b90770ccafd42e5ce571090b2f4fc3f)
-
(cherry picked from commit 370e1d19dbbd0d617946b9394afe62f84743c552)
10 Dec, 2015
1 commit
07 Dec, 2015
1 commit
04 Dec, 2015
3 commits
-
Checking if comments is empty before execute delete statement because the clause IN has to have a argument. Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
-
- 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
2 commits
-
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)
-
Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> (cherry picked from commit 675895176abd1c50fe5c110de6dc6a5658899618)
24 Nov, 2015
4 commits
-
(cherry picked from commit 1e5370563a661ed048c466a45eddd7fa33b290b8)
-
Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> (cherry picked from commit 0ac23124e3948954d082c3c8348f29814ec34afd) Conflicts: test/unit/api/test_helper.rb
-
- Add several endpoints - Add some API documentation - Fix plugins API hotspot Signed-off-by: Victor Costa <vfcosta@gmail.com> Signed-off-by: Leandro Nunes dos Santos <leandronunes@gmail.com> Signed-off-by: Evandro Junior <evandrojr@gmail.com> Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br> Signed-off-by: Caio SBA <caio@colivre.coop.br> Signed-off-by: Carlos Purificacao <carloseugenio@gmail.com> Signed-off-by: Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br> Signed-off-by: Aurelio A. Heckert <aurelio@colivre.coop.br> Signed-off-by: Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br> Signed-off-by: Marcelo Júnior <maljunior@gmail.com> Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br> Signed-off-by: Larissa Reis <larissa@colivre.coop.br> Signed-off-by: ABNER SILVA DE OLIVEIRA <abner.oliveira@serpro.gov.br> Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Simião Carvalho <simiaosimis@gmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> (cherry picked from commit b164af65d19f0cd78afd2886e112129867e394a9)
23 Nov, 2015
1 commit
20 Nov, 2015
6 commits
-
Events from the past was being displayed with "future" class and vice-versa (cherry picked from commit 36f1b7bc55ad7d77c2badfadedb184d95d76bbac)
-
(cherry picked from commit 7f19dfe82f9ec7ce00daa20fc2c728a351f8c629)
-
Each cronjob has to run for all environments. I use `whenever --update-crontab` to append jobs for each environment, using the environment name as a whenever identifier, and then I have to clean the crontab of each environment generated jobs using the same identifier. (cherry picked from commit 348b6cb5d48effc34b8aa24a15144db49ad78567)
-
The only image for an article in the newsletter has to be the article's image. The lead for the article also can't have any paragraph or other crazy stuff. Instead of manually using gsub to remove undesired tags, I'm using ActionView::Helpers::SanitizeHelper#sanitize and whitelisting only tags for emphasis in text. (cherry picked from commit 4075f24dc1d96791bc361c336efd459a26ffdcd6)
-
(cherry picked from commit dcddcdead7477cd0f58af11e904a2f890cd8785b)
06 Nov, 2015
1 commit
05 Nov, 2015
5 commits
-
In some situations 'localhost' will just not work. See https://github.com/mperham/dalli/issues/150
-
Article privacy fixies * Fix article privacy to not consider invisible profiles * Change feed published method to consider it's parent privacy * Closes #148 See merge request !723
-
* It fix the private feed creation problem * Closes #148 Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
04 Nov, 2015
1 commit
-
This avoid crashes against a database where I was testing upgrades from Noosfero 1.2