09 May, 2013
2 commits
08 May, 2013
1 commit
-
The idea is never to give a Upload File to a view. That must always work with a File Presenter providing overwrite methods and specific views/partials. ActionItem2373
24 Apr, 2013
1 commit
-
…into merge-requests/259 Conflicts: app/controllers/admin/environment_design_controller.rb
20 Apr, 2013
1 commit
17 Apr, 2013
2 commits
-
Basically html_safe in some places that the stable branch had. Conflicts: app/models/article_block.rb app/models/tags_block.rb
15 Apr, 2013
5 commits
-
…into merge-requests/303
-
…into merge-requests/302
-
ActionItem2638
12 Apr, 2013
1 commit
-
ActionItem2608
11 Apr, 2013
1 commit
-
…into merge-requests/299
10 Apr, 2013
3 commits
-
(ActionItem2630)
-
ActionItem2632
05 Apr, 2013
4 commits
-
…into merge-requests/297
-
ActionItem2217
-
…into merge-requests/289
03 Apr, 2013
7 commits
-
…into merge-requests/275 Conflicts: test/unit/application_helper_test.rb
-
…into merge-requests/254 Conflicts: app/helpers/application_helper.rb app/views/layouts/application-ng.rhtml
-
…into merge-requests/188
28 Mar, 2013
5 commits
26 Mar, 2013
2 commits
22 Mar, 2013
2 commits
20 Mar, 2013
2 commits
-
Also removing the :url param on 2 admin view forms that were breaking the tests. They were originally include to avoid linking to the wrong page on profiles with own domain. But this pages will not be visualized if they are not using the environment domain, therefore there is no need to used this params.
-
…into merge-requests/267 Conflicts: features/signup.feature features/step_definitions/noosfero_steps.rb Making tests on signup wait for the bot trap time and use selenium.
18 Mar, 2013
1 commit