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

4104 Commits

Author SHA1 Message Date
Stephan
c743ac760d Update ModelsBuilder to -alpha.22 2018-08-28 20:02:25 +02:00
Shannon Deminick
a151829b26 Merge pull request #2845 from umbraco/temp8-serilog 
Bye bye Log4Net, Hello Serilog
 2018-08-28 20:31:12 +10:00
Warren
91ab3b4894 Comments out a lot of the serilog.user.config to give some guidance and examples on what can be setup & configured 2018-08-28 10:11:08 +01:00
Shannon
04db0caa63 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Core/Migrations/Upgrade/V_7_12_0/AddRelationTypeForMediaFolderOnDelete.cs
#	src/Umbraco.Core/Migrations/Upgrade/V_7_12_0/IncreaseLanguageIsoCodeColumnLength.cs
#	src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ConstraintDefinition.cs
#	src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DbIndexDefinition.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroPropertyTable.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AssignMissingKeysAndIndexes.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenEightZero/AddIndexToPropertyTypeAliasColumn.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddForeignKeysForLanguageAndDictionaryTables.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/UpdateUniqueIdToHaveCorrectIndexType.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AddMissingForeignKeyForContentType.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderExtensions.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
#	src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs
#	src/Umbraco.Web/Scheduling/KeepAlive.cs
#	src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
 2018-08-20 15:16:58 +10:00
Shannon
f8370a04a2 Fixes tracking the state of variants in the header drop down when the state changes but validation fails 2018-08-17 00:00:29 +10:00
Sebastiaan Janssen
39e8a9fa67 Bump version to 7.12.1 2018-08-15 15:47:21 +02:00
Shannon
30d29d9fcf initial commit for save dialog 2018-08-13 16:45:05 +10: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
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
Shannon
9d7519d591 manually merges noscript update 2018-08-09 15:10:27 +10:00
Warren
00487c87fc Merge branch 'temp8' into kows-hackathon-import-doc-type-to-angular 2018-08-08 13:23:41 +01: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
Shannon
f921e891a3 Fixes issue with IsEdited and state to make things consistent and easy 2018-08-08 16:29:07 +10:00
Warren
6372d393ee Merge branch 'dev-v7' into temp8 == Shan or Stephan please review this ! 
* Contains a change to work with V8 - content.notify.controller sends a string array
* C# ContentController methods reworked to newer services available & API POST is model bound to string array

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/dialogs/notifications.aspx
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs
 2018-08-07 15:48:21 +01:00
Mads Rasmussen
a4155ad6d8 Update save and publish button text 2018-08-07 14:22:17 +02:00
Warren Buckley
1f1a4ac15c Remove 64Bit IISExpress config in CSProj 2018-08-07 09:16:36 +01:00
Mike
2b6c6b3022 http://issues.umbraco.org/issue/U4-10801 
Fixes label ui issue on template editor ui.

Updated notification settings ui to use angular instead of web forms.
 2018-08-06 19:52:29 +01:00
Warren
a242d13bb9 Fix up missing .aspx tag control reference for ProtectPage dialog 2018-08-06 12:24:43 +01:00
Warren
4730ee317b Removes some unused .aspx files for dictionary editing - no longer needed as we now have this in Angular 2018-08-06 11:52:12 +01:00
elitsa
fc7db11c6c Changed the Danish language file - added the Dictionary title 2018-08-06 10:45:51 +02:00
Shannon
7aaf024397 more work on validation, saving and publishing 2018-08-06 16:50:40 +10:00
Warren
237fcbead6 Last of the umbraco_client files removed 2018-08-03 09:25:33 +01:00
Warren
01a2988737 Tablesorting 3rd party lib is removed 2018-08-02 20:33:38 +01:00
Mads Rasmussen
1e5db34679 add empty state and error handling for save 2018-08-02 19:22:17 +02:00
Warren
b0ca59b0ab OLD sort dialog.aspx & its JS assets from umbraco_client have vanished into thin air 2018-08-02 15:05:18 +01:00
Warren
fee48e9dee To get the build to work - need to push these commented out classes for now that reference MenuButton (I think EditMacro, EditPackage & EditDictionaryItem) are no longer loaded this way AFAIK but I need to check 2018-08-02 14:06:05 +01:00
Andy Hawken (SP4)
afa27ce872 Tour Step 7 Wording 
Change wording of tour step 7 to "Now click on" to indicate that clicking on the avatar is a step in the tour, rather than a description of what it does at runtime
 2018-08-02 13:34:30 +01:00
Warren
08991dc98c Removes old modal js lib & references 2018-08-02 11:58:10 +01:00
Warren
c0ccc79604 Remove another AssignDomain dialog & Punycode lib which was only used in AssignDomain2 dialog 2018-08-02 11:36:13 +01:00
Warren
b59c7d8af6 Remove AssignDomain JS & CSS assets from umbraco_client 2018-08-02 11:33:14 +01:00
Shannon
1f25847cd7 Gets contextual culture server validation working 2018-08-02 20:00:35 +10:00
Warren
3fadfaf632 Kaboom - now the View Audit Trial Context menu item & its dialog is gone. As you can see this on the content node under info 2018-08-02 09:55:48 +01:00
Warren
e33498fb56 Remove old location of jQuery Validate & Unobtrusive libs 2018-08-01 22:37:25 +01:00
Warren
eb220b6db0 Add in jQuery VUpalidate & Unobtrusive into bower 
Update ref's to new path
 2018-08-01 22:35:03 +01:00
Warren
6e08a7d8ce jQuery.metadata.js is on garden leave 2018-08-01 15:57:21 +01:00
Warren
0e6465ee14 See ya later alligator jQuery.hotkeys.js - CTRL+S still wortks in DocType editor so all good 2018-08-01 15:48:19 +01:00
Warren
3bc6bf6da5 jQuery.cookie lib has ran off into the woods 2018-08-01 15:34:32 +01:00
Warren
2fec8b6b02 Remove jQuer fieldselection lib - its not being used 2018-08-01 15:32:43 +01:00
Warren
a2839876c6 Extnesions.js removed from umbraco_client as it has a new home in umbraco/lib/umbraco 2018-08-01 15:30:16 +01:00
Warren
5b4c897892 Yet again I forgot to save the CSProj - you would have thought I would have learnt 2018-08-01 15:07:11 +01:00
Warren
a884a9c56c UmbracoClientManager is next for the chopping block but a legacy copy is in the umbraco/lib/ folder for safe keeping for the time being :) 2018-08-01 15:06:01 +01:00
Warren
fb4dfb62f6 Removes UmbracoField JS & its .aspx dialog - this got rewritten in a nicer UI for template editor 2018-08-01 14:39:42 +01:00
Warren
dcfe0c8bda Forgot csproj update again when removing files 2018-08-01 14:38:27 +01:00
Warren
6c7ecaed5b More vintage menuicon stuff removed from when Umbraco backoffice had drop shadows & buttons like office 2018-08-01 14:08:44 +01:00
Warren
37444a500d ScrollingMenu - now that is vintage V3 & V4 UI days ! 2018-08-01 13:53:24 +01:00
Warren
f645e6ffa9 Macro Split Button has been taken around the back along with its C# Control 2018-08-01 13:46:20 +01:00
Warren
956d1d53a6 base2.js has been moved to that nice farm upstate 2018-08-01 13:35:00 +01:00
Warren
90267338a4 Some old CSS styling is now gone 2018-08-01 13:33:04 +01:00