07 Jul, 2015
4 commits
06 Jul, 2015
2 commits
-
Conflicts: app/models/article.rb test/functional/tasks_controller_test.rb
03 Jul, 2015
1 commit
-
Conflicts: app/models/event.rb app/models/profile.rb po/fr/noosfero.po
01 Jul, 2015
5 commits
-
Conflicts: app/controllers/my_profile/tasks_controller.rb app/views/tasks/processed.html.erb test/functional/tasks_controller_test.rb
30 Jun, 2015
7 commits
-
Conflicts: app/views/tasks/processed.html.erb public/stylesheets/tasks.css
-
Conflicts: app/views/tasks/processed.html.erb public/stylesheets/tasks.css
29 Jun, 2015
6 commits
-
Conflicts: public/stylesheets/tasks.css
25 Jun, 2015
3 commits
-
This also removes short_filename as it is now unused
-
(ActionItem3149)
-
Conflicts: app/views/cms/_view_items.html.erb config/locales/en.yml
23 Jun, 2015
1 commit
-
This reverts commit 82fc99e4c9a1001771a94c5a585944b2cb9001e3.
20 Jun, 2015
1 commit
19 Jun, 2015
1 commit
18 Jun, 2015
5 commits
17 Jun, 2015
4 commits
-
Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
-
- 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>
-
Conflicts: app/views/cms/_event.html.erb