21 May, 2015
1 commit
-
Conflicts: app/views/content_viewer/_article_toolbar.html.erb
19 May, 2015
1 commit
12 May, 2015
2 commits
-
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
07 May, 2015
1 commit
-
Conflicts: test/unit/boxes_helper_test.rb
27 Apr, 2015
2 commits
-
Conflicts: test/unit/block_test.rb
21 Apr, 2015
1 commit
17 Apr, 2015
1 commit
16 Apr, 2015
2 commits
-
Improve blog posts listing A help for armengeless themes. See merge request !543
14 Apr, 2015
1 commit
-
A help for armengeless themes.
13 Apr, 2015
2 commits
-
Conflicts: app/helpers/layout_helper.rb app/views/layouts/_javascript.html.erb
10 Apr, 2015
2 commits
09 Apr, 2015
1 commit
08 Apr, 2015
4 commits
07 Apr, 2015
1 commit
06 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
23 Mar, 2015
1 commit
-
It resolves issue #38 Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
17 Mar, 2015
1 commit
16 Mar, 2015
3 commits
12 Mar, 2015
1 commit
11 Mar, 2015
6 commits
-
Conflicts: app/controllers/box_organizer_controller.rb app/controllers/my_profile/profile_design_controller.rb app/helpers/box_organizer_helper.rb app/helpers/boxes_helper.rb app/helpers/layout_helper.rb app/models/block.rb app/models/communities_block.rb app/models/theme.rb app/views/box_organizer/index.html.erb app/views/box_organizer/show_block_type_info.html.erb test/functional/environment_design_controller_test.rb test/functional/profile_design_controller_test.rb