yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,625 Commits 4 Branches 7 Tags
2b7f12253f48c7ec08b8511c4f42bb27cd439742
Commit Graph

8504 Commits

Author SHA1 Message Date
Shannon
d9cb605f22 Fixing getting the macro to render in the rte, incorrect params being set 2019-01-31 14:48:43 +11:00
Shannon
8c813fa40d Merge branch 'temp8' into temp8-fixme-get-all-entities-with-postfilter 2019-01-31 11:10:01 +11:00
Shannon
0e9eae6f73 removes a bunch of console.log that was recently added 2019-01-31 11:05:41 +11:00
Shannon
dcacff0124 Updates user section routing so that it has nice urls 2019-01-31 11:03:25 +11:00
Callum Whyte
2036da5e84 V8: kill usercontrol support, cleanup macros (#4329) 2019-01-30 18:37:07 +01:00
Sebastiaan Janssen
5ebe1b19ee Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-30 17:28:07 +01:00
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
Kenn Jacobsen
f2e1978ddb Support start node IDs for media picker in infinite editing 2019-01-30 16:46:33 +01:00
Kenn Jacobsen
4dd51f645a Make sure the color picker label is stored on first select (#4325) 2019-01-30 16:12:50 +01:00
Bjarke Berg
5561029e07 Merge pull request #4070 from kjac/v8-fix-redirects-search-box-styling 
V8: Fix the styling of the search box on the Redirect URL Management dashboard
 2019-01-30 14:41:19 +01:00
Bjarne Fyrstenborg
0016962bc2 v8: Edit macro parameters (#4317) 2019-01-30 14:27:58 +01:00
Kenn Jacobsen
14a216778e V8: Align delete dialogs with the other dialogs (take two) (#4288) 2019-01-30 14:08:50 +01:00
Bjarne Fyrstenborg
69af591b78 v8: Fix general localization (#4274) 2019-01-30 14:01:22 +01:00
Kenn Jacobsen
31765a7a47 Remove the tooltip position flickering 2019-01-30 13:26:21 +01:00
Shannon
19633b8d70 Merge branch 'temp8' into temp8-fixme-get-all-entities-with-postfilter 2019-01-30 20:41:37 +11:00
Niels Lyngsø
ab77623248 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-30 10:16:36 +01:00
Niels Lyngsø
bf7372c6ba V8: Color corrections for several components 2019-01-30 10:16:32 +01:00
Shannon
273441a2fb Merge branch 'temp8' into temp8-fixme-get-all-entities-with-postfilter 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
 2019-01-30 20:09:07 +11:00
Bjarke Berg
2287c0e402 #3645 - remove badge again in preview mode + added spinner 2019-01-30 08:24:47 +01:00
Shannon
134cc176ff Moves the Xml published cache to the tests project since that is the only place it is used, removes the xml data integrity check since it's not needed, removes the xml published cache benchmark since it's not needed. Now we don't include the old xml published cache at all in the shipped product. 2019-01-30 17:50:13 +11:00
Bjarke Berg
ae9141f9e7 Merge remote-tracking branch 'origin/temp8' into temp8-3645-change-culture-in-preview 
# Conflicts:
#	src/Umbraco.Web/Editors/PreviewController.cs
 2019-01-30 07:34:19 +01:00
Shannon
febc788c20 Merge remote-tracking branch 'origin/temp8' into temp8-remove-legacy-controls 
# Conflicts:
#	src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
 2019-01-30 14:36:40 +11:00
Vigan Shemsiu
cca1393f2b Validate both width and height 
Make sure to validate both width and height before running "setDimensions();". 

The focus point will not work if we have "img { width: 100%; }" in the stylesheet. 

This pull request will fix the bug.
 2019-01-29 22:26:26 +01:00
Kenn Jacobsen
69548aed20 Fix the offset in the crop editor 2019-01-29 22:22:34 +01:00
Kenn Jacobsen
27ce8c8ebc Add a few missing localizations for edit media 2019-01-29 22:21:59 +01:00
Kenn Jacobsen
3f080ab277 Remove the annoying menuDialogTitle tooltip 2019-01-29 22:20:15 +01:00
Kenn Jacobsen
2f146934d3 Show the error message and localize it 2019-01-29 22:11:17 +01:00
Niels Lyngsø
9d37e7ceda Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-29 21:28:29 +01:00
Niels Lyngsø
106c044ba5 V8: Color corrections 2019-01-29 21:28:25 +01:00
Kenn Jacobsen
bda8128e93 Proper handling of the selected color 2019-01-29 21:00:40 +01:00
Kenn Jacobsen
4915efbb8d Re-select selected color on reload 2019-01-29 21:00:40 +01:00
Kenn Jacobsen
c778249fed Fix the approved color styling 2019-01-29 21:00:40 +01:00
Kenn Jacobsen
5637c44f69 Explicitly set the form dirty when toggling a boolean 2019-01-29 17:41:28 +01:00
Bjarke Berg
414f838476 #3645 - Lists available languages in the preview bar (if more than 1) 
Reads the culture from hash instead of query and updates the hash when changing culture.
 2019-01-29 15:30:25 +01:00
Niels Lyngsø
d75cace85d color variable clean up 2019-01-29 15:23:21 +01:00
Niels Lyngsø
2fa2e0109d Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-29 15:14:41 +01:00
Niels Lyngsø
78c3797e5a V8: colors for tags 2019-01-29 15:14:38 +01:00
Stephan
5d65ba3147 Merge branch 'temp8-fixtree' into temp8 2019-01-29 14:59:45 +01:00
Niels Lyngsø
f94e0fd3ec V8: CSS — variable correction 2019-01-29 14:38:33 +01:00
Niels Lyngsø
d39045caef V8: CSS — adding missing unit for umb-loader in umb-tree 2019-01-29 14:31:27 +01:00
Kenn Jacobsen
99f0e6c05a Fix callback 2019-01-29 14:11:04 +01:00
Kenn Jacobsen
2c40e46d56 Set form dirty on color picker value change + update selected item label + clean up unused code 2019-01-29 14:11:04 +01:00
Niels Lyngsø
d2934f6be4 Merge remote-tracking branch 'origin/temp8-ui-update-color-to-2019-brandcolor-pink' into temp8 2019-01-29 14:10:18 +01:00
Niels Lyngsø
b573b9a50a brandcolor 2019 corrections 2019-01-29 14:09:48 +01:00
Niels Lyngsø
f0b4f31a9e Merge remote-tracking branch 'origin/temp8-ui-niels-adjustments' into temp8-ui-update-color-to-2019-brandcolor-pink 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/buttons.less
#	src/Umbraco.Web.UI.Client/src/less/components/editor.less
#	src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
 2019-01-29 13:33:44 +01:00
Niels Lyngsø
34f93331bd brandcolor 2019 corrections 2019-01-29 13:31:54 +01:00
Niels Lyngsø
6bf7db79e3 frontend design update for brandcolors 2019 2019-01-29 12:05:52 +01:00
Shannon
cf1bf123da Merge branch 'temp8' into temp8-remove-legacy-controls 
# Conflicts:
#	src/Umbraco.Web/Editors/DashboardController.cs
 2019-01-29 22:02:37 +11:00
Shannon
1f7a0600c6 Merge remote-tracking branch 'origin/temp8' into temp8-3396-fix-YSOD-for-publishing 2019-01-29 21:48:09 +11:00
Warren Buckley
7d2024d3fd Merge pull request #4295 from umbraco/temp8-macro-picker-fixes 
Fixes UI for macropicker and added submit button
 2019-01-29 09:31:41 +00:00