16 Apr, 2015
2 commits
-
Conflicts: test/unit/api/articles_test.rb
15 Apr, 2015
4 commits
14 Apr, 2015
3 commits
13 Apr, 2015
4 commits
-
Conflicts: config.ru lib/noosfero/plugin.rb
-
Conflicts: app/helpers/layout_helper.rb app/views/layouts/_javascript.html.erb
10 Apr, 2015
1 commit
09 Apr, 2015
3 commits
08 Apr, 2015
13 commits
-
This reverts commit 8a3fb6f312e27c4225b95dff84ea365432e361ed.
-
This reverts commit da84575ee29154fa4f24c9acdfce9ec16a7acb5b.
-
This reverts commit 51d3ac08b10f2f063a6915b83e95329dd14613dd.
-
This allow proper use of default values defined in Noosfero::Plugin abstract class.
-
few image_destroy adjustments
07 Apr, 2015
1 commit
31 Mar, 2015
1 commit
27 Mar, 2015
1 commit
-
Add global theme intervention spaces When the env theme has `global.css`, `global_header.html.erb`, or `global_footer.html.erb`, that content is added to any customized profile theme. See merge request !529
26 Mar, 2015
3 commits
-
When the env theme has `global.css`, `global_header.html.erb`, or `global_footer.html.erb`, that content is added to any customized profile theme.
-
Conflicts: app/helpers/layout_helper.rb
24 Mar, 2015
4 commits