21 May, 2015
1 commit
-
Conflicts: app/views/content_viewer/_article_toolbar.html.erb
19 May, 2015
2 commits
12 May, 2015
3 commits
08 May, 2015
1 commit
-
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com> Signed-off-by: Filipe Ribeiro <firibeiro77@live.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
27 Apr, 2015
1 commit
-
Conflicts: test/unit/block_test.rb
22 Apr, 2015
2 commits
-
Mistakenly replaced the correct way of doing modals by the old way. This reverts commit ed63bab09a77c398c9228030a8ace0f11e9a6268.
21 Apr, 2015
1 commit
20 Apr, 2015
1 commit
17 Apr, 2015
1 commit
16 Apr, 2015
1 commit
15 Apr, 2015
1 commit
-
I am pretty sure that those calls to .first() an .last() on Javascript arrays never worked at all.
13 Apr, 2015
2 commits
-
Conflicts: app/helpers/layout_helper.rb app/views/layouts/_javascript.html.erb
10 Apr, 2015
2 commits
26 Mar, 2015
2 commits
-
Conflicts: app/helpers/layout_helper.rb
19 Mar, 2015
3 commits
-
Conflicts: app/models/profile.rb app/views/profile_editor/edit.html.erb
17 Mar, 2015
1 commit
16 Mar, 2015
4 commits
-
See merge request !481
12 Mar, 2015
4 commits
11 Mar, 2015
4 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
10 Mar, 2015
1 commit
-
Signed-off-by: Victor Costa <vfcosta@gmail.com> Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
06 Mar, 2015
2 commits