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

27853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
bfc2d53fa4 Merge remote-tracking branch 'origin/temp8' into feature/IContentType-removale-from-IContent 
# Conflicts:
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
 2019-02-01 12:52:20 +01:00
Niels Lyngsø
0c34de4524 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-02-01 12:38:59 +01:00
Niels Lyngsø
f5d904c88c V8: add spacing around tabs 2019-02-01 12:38:12 +01:00
Warren Buckley
a6d0449671 Merge pull request #4335 from umbraco/temp8-3648-retain-cculture-in-urls 
#3648 - Besides mculture also retain cculture in querystring on navig…
 2019-02-01 10:40:17 +00:00
Warren Buckley
d1edc45d4d Merge pull request #4304 from umbraco/temp8-3645-change-culture-in-preview 
Allow changing culture in the preview bar
 2019-02-01 10:27:37 +00:00
Warren Buckley
fde9e9b654 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-02-01 10:14:39 +00:00
Warren Buckley
d38dba1660 Update nuspec to include new hosted image/icon for Nuget packages from .com site 2019-02-01 10:14:29 +00:00
Niels Lyngsø
0bb69aeeee V8: preview colors changed for brandcolors 2019 2019-02-01 11:10:20 +01:00
Warren Buckley
3fac16eda8 Fix count bug - so it works with two languages 2019-02-01 09:58:10 +00:00
Niels Lyngsø
4ab42e0dc7 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-02-01 10:49:22 +01:00
Niels Lyngsø
fc6e17f3f9 V8: UI — umb-content-grid color change 2019-02-01 10:49:09 +01:00
Shannon Deminick
ed734d0f80 Merge pull request #4232 from umbraco/temp8-member-search-and-tags 
Fixes for search of members + Removed fixme in member that apparently…
 2019-02-01 17:11:10 +11:00
Shannon
c0ab9d9e59 Merge branch 'temp8' into temp8-member-search-and-tags 
# Conflicts:
#	src/Umbraco.Web/Editors/MemberController.cs
 2019-02-01 16:43:03 +11:00
Shannon
c846d69507 Merge branch 'kjac-v8-fix-copy-media-types' into temp8 2019-02-01 14:52:06 +11:00
Shannon
e540902ee1 Merge branch 'v8-fix-copy-media-types' of https://github.com/kjac/Umbraco-CMS into kjac-v8-fix-copy-media-types 2019-02-01 14:51:42 +11:00
Shannon
7614ba42df Fixes the tag editor and tag suggestions 2019-02-01 13:32:17 +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
Niels Lyngsø
d59bddfe9a Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-31 12:58:21 +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
Bjarke Berg
92d53eb527 #3648 - Besides mculture also retain cculture in querystring on navigation 2019-01-31 11:10:27 +01:00
Stephan
a6f9598a23 Introduce IPublishedRouter 2019-01-31 11:07:45 +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
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