21 May, 2013
2 commits
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
3 commits
-
ActionItem2608
-
ActionItem2608 Note: tests for users templates were made in the previous commit.
12 Apr, 2013
1 commit
-
ActionItem2608
10 Apr, 2013
1 commit
-
ActionItem2632
05 Apr, 2013
2 commits
-
…into merge-requests/297
-
ActionItem2217
03 Apr, 2013
6 commits
-
…into merge-requests/275 Conflicts: test/unit/application_helper_test.rb
-
…into merge-requests/188
28 Mar, 2013
4 commits
27 Mar, 2013
1 commit
18 Mar, 2013
3 commits
-
This commit has the participation of Lucas Prado Melo It includes: * Make blog pagination link to absolute path * Configure blog display on block view * List blogs on article block selection * Auto select the first text article (if there is one) * Testing!
-
ActionItem2381
15 Mar, 2013
4 commits
-
…into merge-requests/253
-
…into merge-requests/171
14 Mar, 2013
1 commit
-
(ActionItem2618)
13 Mar, 2013
3 commits
12 Mar, 2013
1 commit
07 Mar, 2013
1 commit
06 Mar, 2013
1 commit