Sebastiaan Janssen
|
8be93f91ba
|
Merge branch 'dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/Services/Implement/MemberGroupService.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
|
2019-01-30 17:27:34 +01:00 |
|
Chris Houston
|
78319bae9e
|
Temp8 fix typos 2 (#4130)
|
2019-01-23 00:03:39 +01:00 |
|
Stephan
|
4a0b969777
|
Deal with fixme in Umbraco.Core
|
2019-01-21 16:01:37 +01:00 |
|
Kenn Jacobsen
|
bb53c020e9
|
Fix the member group picker
|
2018-12-19 16:20:22 +01:00 |
|
Warren Buckley
|
54a2aa00a7
|
Revert "Temp8 tinymce"
|
2018-11-22 14:05:51 +00:00 |
|
Stephan
|
edf7df043f
|
Reorg code, move services
|
2017-12-28 09:18:09 +01:00 |
|