29 Oct, 2013
1 commit
22 Oct, 2013
1 commit
01 Oct, 2013
1 commit
-
Signed-off-by: Leandro Nunes dos Santos <leandronunes@gmail.com> Signed-off-by: Marcos da Silva Ramos <ms.ramos@outlook.com> Signed-off-by: Fábio Teixeira <fabio1079@gmail.com> Signed-off-by: Luiz Matos <luizff.matos@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
25 Jul, 2013
1 commit
23 Jul, 2013
1 commit
17 Jul, 2013
1 commit
-
(ActionItem2737)
16 Jul, 2013
1 commit
-
…into merge-requests/343 Also replacing the load_comments method by a filter that receives a scope. Conflicts: app/controllers/public/content_viewer_controller.rb app/models/comment.rb app/views/content_viewer/view_page.rhtml test/functional/content_viewer_controller_test.rb test/unit/comment_test.rb
15 Jul, 2013
1 commit
13 Jul, 2013
2 commits
-
…into merge-requests/283 Conflicts: test/unit/comment_test.rb
12 Jul, 2013
6 commits
-
Removing obsolete FIXME's, trailing whitespaces and so.
-
…into merge-requests/282
11 Jul, 2013
8 commits
-
…into merge-requests/331
-
…into merge-requests/301
-
The first one should not test the redirect since it's not its concerns. The second one wasn't test if there was a confirmation at all.
-
…into merge-requests/291
-
…into merge-requests/287 Conflicts: app/models/environment.rb
-
…into merge-requests/285
08 Jul, 2013
2 commits
28 Jun, 2013
1 commit
27 Jun, 2013
1 commit
10 Jun, 2013
1 commit
-
ActionItem2675
21 May, 2013
1 commit
15 May, 2013
1 commit
14 May, 2013
1 commit
13 May, 2013
1 commit
07 May, 2013
1 commit
-
Conflicts: app/models/article.rb app/views/layouts/application-ng.rhtml lib/noosfero/plugin.rb script/noosfero-plugins
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
16 Apr, 2013
1 commit
15 Apr, 2013
1 commit
-
ActionItem2608
