18 Jun, 2015
1 commit
17 Jun, 2015
15 commits
-
Conflicts: app/models/article.rb
-
Conflicts: app/models/article.rb
-
Conflicts: app/views/cms/_event.html.erb
-
Conflicts: app/views/cms/_event.html.erb
-
Conflicts: Gemfile public/proposal-app public/stylesheets/application.css
-
This reverts commit dca569a4b682f150e8e9e3116ea7b14843651e44, reversing changes made to 364e52a3cfbc1b6a0943d99e31dba1880e1111fa.
16 Jun, 2015
10 commits
-
Conflicts: lib/noosfero/plugin.rb
-
This also removes short_filename as it is now unused
-
Expire LocationBlock cache on profile's location change http://noosfero.org/Development/ActionItem3217 See merge request !259
-
(ActionItem3149)
-
Conflicts: app/views/cms/_view_items.html.erb config/locales/en.yml
15 Jun, 2015
1 commit
12 Jun, 2015
5 commits
-
Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
11 Jun, 2015
6 commits
-
Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
-
- Refactoring CSS to better display folder itens - Creating method to display uploaded file names with extension in upper case Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
-
Signed-off-by: André Guedes <andrebsguedes@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
-
raw-html-article: escape body before rendering on edit See merge request !557
08 Jun, 2015
2 commits