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

24542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Warren
ee91e8cec2 Nuget still not happy - as this merge contains the recent removal of the umbraco_client folder 2018-08-10 16:50:38 +01:00
Warren
1f9c5a48a7 Fix up .csproj after merge & update CMS.Core nuspec to include the new Serilog nuget packages we've added 2018-08-10 16:44:36 +01:00
Warren
054308b44e Merge remote-tracking branch 'origin/temp8-directive-cleanup' into temp8-serilog 2018-08-10 15:37:50 +01:00
Mads Rasmussen
ec139ca16c clean up that windows resizer event 2018-08-10 14:17:12 +02:00
Mads Rasmussen
23e81a67fa fix indention 2018-08-10 14:05:15 +02:00
Mads Rasmussen
c7a5786521 remove the deprecaed note 2018-08-10 14:03:39 +02:00
Mads Rasmussen
c0ec2a5314 move the auto-scale directive from obsolete. It is still pretty usefull for the code editors 2018-08-10 14:02:59 +02:00
Warren
212e0a091a Allows Serilog to be configured in a serilog.user.config file that will not effect the main umbraco logger 
Adds in support for filtering expressions - so the user logger configuration can filter by including or excluding on an expression - common use case to include only my namespace from SourceContext thjat starts with xyz
 2018-08-09 22:08:40 +01:00
Mads Rasmussen
cd6585c9b9 remove detect-fold 2018-08-09 21:12:45 +02:00
Mads Rasmussen
a1c4bd6b7a remove umb-content-name 2018-08-09 20:59:10 +02:00
Mads Rasmussen
ca85b0e45c remove umb-header 2018-08-09 20:53:44 +02:00
Warren
9446c2a568 Trying with a nested logger config to see if it works better 2018-08-09 19:51:22 +01:00
Mads Rasmussen
48c5e61d88 remove item sorter 2018-08-09 20:50:52 +02:00
Mads Rasmussen
933bb8ad44 remove drag and drop less import 2018-08-09 20:50:30 +02:00
Mads Rasmussen
ab90690e17 remove umb-login 2018-08-09 20:41:26 +02:00
Mads Rasmussen
67e0b68b7b remove umb-optionsmenu 2018-08-09 20:39:50 +02:00
Mads Rasmussen
c50f7a1284 remove umb-sort 2018-08-09 20:33:48 +02:00
Mads Rasmussen
5ab978ecf5 remove umb-photo-folder 2018-08-09 20:29:17 +02:00
Mads Rasmussen
16ceca1598 remove umb-tab-view 2018-08-09 20:23:20 +02:00
Mads Rasmussen
404055917f remove umb-upload-dropzone 2018-08-09 20:22:11 +02:00
Shannon
6a7b6f7267 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-08-09 19:38:36 +10:00
Shannon
f738e6d7c7 Fixes js tests 2018-08-09 19:38:20 +10:00
Warren
e818197365 Fix comma dangle ESLint errors 2018-08-09 09:00:34 +01:00
Shannon
1ffcc853e1 updates package-lock 2018-08-09 15:23:46 +10:00
Shannon
284e440b7e Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/config/canvasdesigner.config.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/border.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/googlefontpicker.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/margin.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/padding.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/radius.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/lib/spectrum.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umblaunchminieditor.directive.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
 2018-08-09 15:22:20 +10:00
Shannon Deminick
50597b5715 Merge pull request #2843 from umbraco/temp7-eslint 
Temp7 eslint
 2018-08-09 15:19:12 +10:00
Shannon
9d7519d591 manually merges noscript update 2018-08-09 15:10:27 +10:00
Mads Rasmussen
f35110309a fix comma-dangle error 2018-08-08 19:52:31 +02:00
Mads Rasmussen
c73860d144 start eslint from scratch so we slowly can add more rules for easier merging to v8 2018-08-08 19:52:00 +02:00
Warren
1842c78c5d Fix for navigation service for hideDialog(true) which is used to hide the current dialog & show the right click context/more options menu which was failing 2018-08-08 15:26:25 +01:00
Warren Buckley
da39eb3ceb Merge pull request #2808 from kows/hackathon-import-doc-type-to-angular 
Rewrite importDocumenttype.aspx to Angular [v8hackathon]
 2018-08-08 14:36:09 +01:00
Warren
baef12eb2a * Rename import to importdocumentype to match up with the action alias 
* Minor UI changes to match what we had previously & some simple validation if an incorrect file extension is chosen
 2018-08-08 14:35:09 +01:00
Warren
5389a018b3 Sets back the action alias to importDocumentType - It may break more than we expected 2018-08-08 14:32:58 +01:00
Warren
00487c87fc Merge branch 'temp8' into kows-hackathon-import-doc-type-to-angular 2018-08-08 13:23:41 +01:00
Warren
4dbcfc6907 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-08-08 13:22:04 +01:00
Warren
8ba319b9d9 Fix up syntax error in JS from my merge/port upto V8 - oops :( 2018-08-08 12:53:23 +01:00
Robert
2d6ea3c57c Merge pull request #2778 from umbraco/temp-editing-all-variants 
WIP Editing all variants at once
 2018-08-08 13:47:51 +02:00
Robert
c2433a336c Merge branch 'temp8' into temp-editing-all-variants 2018-08-08 13:46:19 +02:00
Warren
44e76adbd1 Merge branch 'hackathon-import-doc-type-to-angular' of https://github.com/kows/Umbraco-CMS into kows-hackathon-import-doc-type-to-angular 
# Conflicts:
#	src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
 2018-08-08 12:01:15 +01:00
copilaurobert
3f348e00cf Merge branch 'temp-editing-all-variants' of https://github.com/umbraco/Umbraco-CMS into temp-editing-all-variants 2018-08-08 11:58:55 +02:00
copilaurobert
bd40428ad9 Variants in NotCreated state are now considered as dirty. 2018-08-08 11:58:35 +02:00
Mads Rasmussen
9dc99d5e35 fix arrow on media boxes 2018-08-08 10:36:17 +02:00
Mads Rasmussen
ea92608f84 prefix new directives with "umb" 2018-08-08 10:25:43 +02:00
Warren
fc7c2523c2 Merge branch 'dev-v7' into temp8 (The small fixes that Shan suggested) 
# Conflicts:
#	src/Umbraco.Web/Editors/ContentController.cs
 2018-08-08 09:21:58 +01:00
Warren
7397541259 Minor fixes to notification dialog after some feedback from Shan when merging this up into V8 2018-08-08 09:04:09 +01:00
Shannon
f921e891a3 Fixes issue with IsEdited and state to make things consistent and easy 2018-08-08 16:29:07 +10:00
Shannon
69acaabec1 Fixes creating doc types, some null checks missing and an issue with how umbgridselector is responsible for syncing the template alias on a new doc type 2018-08-08 15:35:02 +10:00
Shannon
72b1fb1d60 fix sort issue on publish dialog 2018-08-08 13:31:35 +10:00
Shannon
34e7440517 Fixes issues with data re-syncing and underlying js exceptions causing problems 2018-08-08 13:29:25 +10:00
Shannon
0769b634e0 fixes status bar on info tab for content 2018-08-08 12:17:57 +10:00