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

27813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
169221a5da Merge pull request #4188 from umbraco/v8/bugfix/temp8-fe-infinityediting-fixing-contentapps-after-edit-doctype 
V8/bugfix/temp8 fe infinityediting fixing contentapps after edit doctype
 2019-01-31 09:52:23 +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 Deminick
7f9ca716e7 Merge pull request #4210 from umbraco/temp8-fixme-get-all-entities-with-postfilter 
Fixme - Handle not implemented exception on pick of macro
 2019-01-31 14:51:55 +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
74a1bb9123 Update .net version, don't insert examine nor defaultuilanguage 2019-01-30 18:02:48 +01:00
Sebastiaan Janssen
781f63b805 There is no log4net.config 2019-01-30 18:01:16 +01:00
Sebastiaan Janssen
b7a788e219 There is no trees.config 2019-01-30 18:01:01 +01:00
Sebastiaan Janssen
396fa73283 There is no UI.xml 2019-01-30 18:00:40 +01:00
Sebastiaan Janssen
1a298be9fa Removes obsoleted settings that prevent v8 startup 2019-01-30 17:47:54 +01:00
Sebastiaan Janssen
2353863092 Fix merge error 2019-01-30 17:35:06 +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
Shannon
f8fd255239 Last cleanup of unused umbraco settings 2019-01-31 01:37:38 +11:00
Shannon
6b2831c606 kill more useless umbraco settings 2019-01-31 01:30:17 +11:00
Shannon
2a54b2931c Removes providers section from umbraco settings 2019-01-31 01:20:19 +11:00
Shannon
f28c60ced3 Removes all irrelevant logging settings from umbraco settings 2019-01-31 01:11:15 +11:00
Shannon
a20c75d3c7 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-31 00:57:39 +11:00
Shannon
1c8b4412e3 Removes scheduled tasks 2019-01-31 00:57:10 +11: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
Shannon
7a50856d32 Removes AutoLegacy routing and the legacy UseDomainPrefixes from umbraco settings 2019-01-31 00:33:02 +11:00
Shannon
d1d9779a71 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-31 00:30:44 +11:00
Shannon
9571f48bd3 Removes AutoLegacy routing and the legacy UseDomainPrefixes from umbraco settings 2019-01-31 00:30:28 +11:00
Bjarne Fyrstenborg
0016962bc2 v8: Edit macro parameters (#4317) 2019-01-30 14:27:58 +01:00
Shannon
82ba360435 removes defaultDocumentTypeProperty from umbraco settings 2019-01-31 00:16:15 +11:00
Shannon
36d7c26120 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-31 00:09:46 +11:00
Shannon
d852422328 removes CloneXmlContent from umbraco settings 2019-01-31 00:09:30 +11:00
Kenn Jacobsen
14a216778e V8: Align delete dialogs with the other dialogs (take two) (#4288) 2019-01-30 14:08:50 +01:00
Shannon
06cf8abfee Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-31 00:03:20 +11:00
Shannon
357da8ac6e removes PropertyContextHelpOption from umbraco settings 2019-01-31 00:03:03 +11:00
Stephan
c8d9e59436 Fix SqlServer version detection 2019-01-30 14:02:45 +01:00
Bjarne Fyrstenborg
69af591b78 v8: Fix general localization (#4274) 2019-01-30 14:01:22 +01:00
Shannon
f1b168fc46 removes ForceSafeAliases from umbraco settings, etc... 2019-01-30 23:58:54 +11:00
Shannon
3dce2c870e removes XmlCacheEnabled, ContinouslyUpdateXmlDiskCache, XmlContentCheckForDiskChanges from umb settings 2019-01-30 23:52:35 +11:00
Shannon
a123bc7084 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-30 23:42:39 +11:00
Shannon
fccfa4f412 Removes umbraco settings: ImageTagAllowedAttributes, UploadAllowDirectories, ensureUniqueNaming, ImageTagAllowedAttributes, ScriptEditorDisable, ScriptFolderPath, UploadAllowDirectories 2019-01-30 23:42:25 +11:00