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

28114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
132c3c0c8e Cleanup PR, document and rename things 2019-02-01 17:19:12 +01:00
Stephan
e88443e549 Merge branch 'temp8' into feature/IContentType-removale-from-IContent 2019-02-01 16:25:36 +01:00
Warren Buckley
e17d6df023 It helps if you put in a valid value - it expects Information and not Info as the loglevel 2019-02-01 15:13:41 +00:00
Warren Buckley
0a9bc82551 Merge pull request #4347 from umbraco/temp8-4068-grid-fixes 
Grid fixes
 2019-02-01 14:13:23 +00:00
Claus
7d17b1be16 Merge pull request #4337 from umbraco/temp8-appsetting-conventions-constants 
Web.Config AppSetting key conventions & move to constants class
 2019-02-01 15:11:54 +01:00
Niels Lyngsø
59c43fe8cb Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-02-01 14:54:54 +01:00
Niels Lyngsø
d4b2ac3f1e V8: UI — changed color for focus point on medias 2019-02-01 14:54:49 +01:00
Claus
05a40b32c6 Merge pull request #4361 from kjac/v8-media-items-default-property-descriptions 
V8: Add descriptions to properties on default media items
 2019-02-01 14:35:36 +01:00
Kenn Jacobsen
bf87ecb818 Add descriptions to properties on default media items 2019-02-01 14:32:17 +01:00
Bjarke Berg
9acf913872 #3545 - Added IContentTypeServiceBaseFactory to create a IContentTypeServiceBase (E.g. IContentTypeService or IMediaTypeService) based on the type of the IContentBase 2019-02-01 14:07:31 +01:00
Warren Buckley
fec046347b Merge pull request #4352 from umbraco/temp8-4257-refactoring-of-infinite-editor-layers 
Temp8 4257 refactoring of infinite editor layers
 2019-02-01 12:43:31 +00:00
Niels Lyngsø
7261432461 V8: UI — changed look of media-picker upload button 2019-02-01 13:23:09 +01:00
Niels Lyngsø
b645cc8e54 Merge pull request #4355 from umbraco/temp8-4354-publish-fix 
Fix for javascript's strict equality
 2019-02-01 13:21:40 +01:00
Kenn Jacobsen
712a260159 Fix wrong class name in media picker element selector 2019-02-01 13:01:42 +01:00
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
Bjarke Berg
ab5c33e340 #4354 - Fix for stupid javascript's strict equality 2019-02-01 12:34:56 +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ø
979f7b404c V8: refactoring of layers add and removal methods 2019-02-01 10:51:14 +01: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
Stephan
a6d04aa5bb Merge branch 'temp8' into temp8-3640 2019-02-01 10:47:34 +01:00
Bjarke Berg
045020e739 #4068 - Changed save event triggered when save dialog is opened. save is still broadcasted on the actual save. 
Changed the grid event listener to only execute on `save` events
 2019-02-01 08:37:06 +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
bb64141207 removes obsolete method 2019-02-01 16:35:10 +11:00
Shannon
ad5b166f3f Fixes tests, simplifies constructors 2019-02-01 15:44:32 +11:00
Shannon
036ca7f1e5 fixing tests 2019-02-01 15:30:38 +11:00
Shannon
c2ff32aaab Fixing tests, don't expose UmbracoContext on UmbracoHelper, fixing all of the editor constructors 2019-02-01 15:24:07 +11:00
Shannon
493ee63cb9 Merge branch 'temp8' into temp8-macros-dont-render-and-other-macro-bugs 2019-02-01 14:57:13 +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
d7d82ea98d Allows grid rte to be distraction-free, the parameter was not being passed but it can be configured 2019-02-01 14:02:45 +11:00
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
dae8dfdc59 fix merge 2019-02-01 11:34:28 +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
Kenn Jacobsen
eeaf8d594d Make NC resilient towards culture variance in elements 2019-01-31 19:43:57 +01: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