19 Mar, 2015
3 commits
-
Conflicts: app/models/profile.rb app/views/profile_editor/edit.html.erb
18 Mar, 2015
3 commits
-
This reverts commit e99db083e4bb10047cc8b543bbc5151abbe36372.
-
Not destroy an user that has a pending ModerateUserRegistration task See merge request !506
-
Main block should not be invisible There used to happen a situation that visitors see an empty profile since the main block was not visible for all users. Now the main block user visibility can not be set for logged, not_logged or followers anymore, only to "All users". See merge request !499
17 Mar, 2015
3 commits
16 Mar, 2015
9 commits
15 Mar, 2015
3 commits
14 Mar, 2015
3 commits
13 Mar, 2015
1 commit
12 Mar, 2015
5 commits
11 Mar, 2015
10 commits
-
Conflicts: test/unit/box_organizer_helper_test.rb
-
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