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

8280 Commits

Author SHA1 Message Date
Shannon
3eb6cd9e21 Macros are now working inline in the rte with both the Classic and Distraction free modes 2019-02-01 13:50:39 +11:00
Shannon
e79e07af77 Merge branch 'temp8' into temp8-macros-dont-render-and-other-macro-bugs 2019-02-01 13:50:10 +11:00
Shannon
7614ba42df Fixes the tag editor and tag suggestions 2019-02-01 13:32:17 +11:00
Shannon
0c4712de56 Merge branch 'temp8' into temp8-macros-dont-render-and-other-macro-bugs 
# Conflicts:
#	src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
#	src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
#	src/Umbraco.Web/Templates/TemplateRenderer.cs
 2019-02-01 11:33:13 +11:00
Shannon
d8fbbeccfe Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-02-01 11:27:53 +11:00
Shannon
452badab41 Fixes tag editor for proper dirty tracking and model updating, the models weren't being updated correctly 2019-02-01 11:27:40 +11:00
Shannon
f74a49f5a3 Gets the macros being able to be updated, now to fix the Classic mode, since this now only works in distraction free mode 2019-02-01 10:18:53 +11:00
Bjarke Berg
4a480ab391 #4068 - Added interceptor to remove $ variables from post data 2019-01-31 15:10:19 +01:00
Bjarke Berg
6bf3b19d86 #4068 - Fix for ordering of grid 2019-01-31 15:09:57 +01:00
Niels Lyngsø
d45d0a816e V8: UI — changed colors for selection state for rows in list-view 2019-01-31 12:58:17 +01:00
Kenn Jacobsen
1a64c0a803 Fix disappearing media thumbnails 2019-01-31 11:45:08 +01:00
Warren Buckley
14b97b6abe Fix up JS as the API model had changed 2019-01-31 10:24:15 +00:00
Bjarke Berg
92d53eb527 #3648 - Besides mculture also retain cculture in querystring on navigation 2019-01-31 11:10:27 +01:00
Kenn Jacobsen
26e0c6cb79 Don't break for root relations + minimize number of XHR 2019-01-31 10:43:34 +01:00
Niels Lyngsø
b65e042b4c Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-31 10:13:11 +01:00
Niels Lyngsø
b558023f9e V8: UI interact vs. select 2019-01-31 10:13:07 +01:00
Bjarke Berg
228480a2ef Merge remote-tracking branch 'origin/temp8' into v8/bugfix/temp8-fe-infinityediting-fixing-contentapps-after-edit-doctype 2019-01-31 09:50:30 +01:00
Bjarke Berg
9d9597dbc3 Merge remote-tracking branch 'origin/temp8' into v8/bugfix/temp8-fe-infinityediting-fixing-contentapps-after-edit-doctype 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
 2019-01-31 09:39:43 +01:00
Niels Lyngsø
01ecd49256 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-31 09:37:14 +01:00
Niels Lyngsø
2ab391eb69 V8: UI select colors 2019-01-31 09:37:04 +01:00
Sebastiaan Janssen
a1f72826c7 Remove duplicate css class 2019-01-31 08:39:59 +01:00
Bjarne Fyrstenborg
3ba32dafa5 Localize edit link, remove duplicate class attributes and only make remove link red 2019-01-31 08:34:54 +01:00
Bjarne Fyrstenborg
d55262b322 Revert "Localize edit link, remove duplicate class attributes and only make remove link red" 
This reverts commit 63cc250c0f929b1f7e6f9f05fae2fd302682d418.
 2019-01-31 08:34:54 +01:00
Bjarne Fyrstenborg
7b3623a9d9 Localize edit link, remove duplicate class attributes and only make remove link red 2019-01-31 08:34:54 +01:00
Shannon
9abd72f623 gets macro content loading on rte load 2019-01-31 17:12:44 +11:00
Shannon
f9e673ca4c Updates tinymce, adds back the styles for the rendered macro in the rte, properly uses tinymce's noneditable plugin and removes a ton of code relating to the old work arounds we had, now just need to get the macro re-rendering 2019-01-31 16:54:17 +11:00
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