15 Apr, 2015
3 commits
13 Apr, 2015
7 commits
-
Conflicts: config.ru lib/noosfero/plugin.rb
-
Conflicts: app/helpers/layout_helper.rb app/views/layouts/_javascript.html.erb
10 Apr, 2015
3 commits
09 Apr, 2015
4 commits
08 Apr, 2015
12 commits
-
This reverts commit 58eb25a99fcea0876b1ce8da86b8605493bf6fa1.
-
This reverts commit 82742464704b48dce6337fa31610da3db7a6bce4. This commit broke searches pagination when using solr
07 Apr, 2015
1 commit
06 Apr, 2015
2 commits
-
This reverts commit b17cbf221f90477b52622fdef03e4917dc3f12fe. Conflicts: app/controllers/my_profile/profile_editor_controller.rb app/views/profile_editor/edit.html.erb plugins/pairwise plugins/proposals_discussion
31 Mar, 2015
2 commits
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
5 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
