yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,714 Commits 4 Branches 7 Tags
15eaa33e08be55cc43e1cee59b261a7e22b05083
Commit Graph

22200 Commits

Author SHA1 Message Date
Shannon
15eaa33e08 updates migration to invariant string check 2018-10-30 01:15:23 +11:00
Shannon
9347e6205f fixes test 2018-10-24 16:36:13 +11:00
Shannon
b199b7346b Fixes multiple selection with drop down 2018-10-24 16:35:30 +11:00
Shannon
df7623e6a7 Fixes migration, ensure's that if it runs again it won't corrupt data, fixes flexible drop down angular editor to post string vals, not the int ids, removes old angular drop down prop editor 2018-10-24 16:32:13 +11:00
Shannon
f332e9a07e Fix sql and table check 2018-10-24 15:45:24 +11:00
Shannon
74c373de84 Merge branch 'temp8' into temp8-remove-legacy-drop-downs 2018-10-24 15:45:13 +11:00
Shannon
c7cb8b52cc Fixes AuthorizeUpgrade page since it was still referencing the old UmbracoClient folder 2018-10-24 15:23:21 +11:00
Shannon
9704c124ed Removes all old deprecated drop down editors, we only have one drop down editor now and it doesn't store IDs either in the db or in the cache, it just stores what is selected 2018-10-24 15:20:28 +11:00
Shannon
e34728c10c fixes drop down pre value editor 2018-10-23 23:04:53 +11:00
Shannon
ce6b4f4a51 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
 2018-10-23 22:16:48 +11:00
Shannon
001ed50c7d fixes test 2018-10-23 22:13:50 +11:00
Shannon
dfd3e8f4c4 Fixes tests and issue with member list view not passing the GUID along in the route 2018-10-23 22:10:27 +11:00
Shannon
fa64f4a6a8 Fixes member group editing, removes old dialog tasks, removes old references in the old ui.xml file 2018-10-23 21:38:24 +11:00
Warren Buckley
2ec6216932 Merge pull request #3400 from umbraco/temp8-247-hostnames-dialog 
Temp8 247 hostnames dialog
 2018-10-23 11:28:08 +01:00
Warren Buckley
03b363df21 Add some TODO's to consider removing references to MasterPages & UserControls 2018-10-23 10:53:55 +01:00
Warren Buckley
0e51b45e64 Make SystemDirectories.Bin non configurable, as the comment mentioned you cannot configure the bin folder for ASP.NET projects 2018-10-23 10:53:22 +01:00
Warren Buckley
3e4ecac4e3 Remove SystemDirectory.Base - this is a very legacy feature & no longer in use in codebase 2018-10-23 10:52:19 +01:00
Mads Rasmussen
abed9ab331 show duplicate domain validation messages 2018-10-23 11:48:42 +02:00
Warren Buckley
d88aab59a1 Remove all references to SystemDirectories.UmbracoClient - as Umbraco_Client folder no longer exists anymore 2018-10-23 10:41:44 +01:00
Claus
9438581621 Merge pull request #3240 from umbraco/temp8-sendToPublish 
Send to Publish changes
 2018-10-23 10:54:42 +02:00
Mads Rasmussen
1badcd0b29 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-10-23 10:32:33 +02:00
Mads Rasmussen
76eb809b2c Fix list view property editors. Use "display: block" for instead of "inline block" 2018-10-23 10:31:54 +02:00
Warren Buckley
e3c6cfa63c Merge pull request #3312 from umbraco/temp8-3298-move-rollback 
Temp8 3298 move rollback
 2018-10-23 09:28:41 +01:00
Shannon
69450791cf Fixes the new Id/Guid property on members, ensures all tabs are expanded by default and removes that init logic from JS since we don't want it there. 2018-10-23 19:25:48 +11:00
Shannon
1936cc5be9 Merge remote-tracking branch 'origin/temp8' into temp8 2018-10-23 18:39:16 +11:00
Shannon
9dadecdcc1 Fixes boolean conversion logic in ColorPickerConfigurationEditor, Fixes tree grouping logic and moves groups cache to the ApplicationTreeService, fix other merge issues 2018-10-23 18:28:55 +11:00
elitsa
c5755e25c8 Revert commit not belonging to this PR. 2018-10-23 09:04:09 +02:00
Shannon
d9a4d1fa97 Manual merging 2018-10-23 16:12:23 +11:00
Stephan
d2cfe8f3b9 Fix GetVersionsSlim 2018-10-22 18:21:00 +02:00
Stephan
3468351de8 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-10-22 17:20:19 +02:00
Mads Rasmussen
78fb52f788 fix size of publish state in publish dialog 2018-10-22 17:04:56 +02:00
Mads Rasmussen
7265d329ea Alwyas show ellipsis for unpublish. It will always open a dialog 2018-10-22 15:56:08 +02:00
Mads Rasmussen
9d1c12d7df this validation needs to happen server side 2018-10-22 15:13:25 +02:00
Mads Rasmussen
d3163aa00e show validation message when a domain name is missing 2018-10-22 13:34:57 +02:00
Mads Rasmussen
bc379e0b71 set domain and language to be required + add required markers in the table headings 2018-10-22 13:07:54 +02:00
Mads Rasmussen
5391934a76 remove domain validation regex 2018-10-22 12:59:23 +02:00
Mads Rasmussen
88857fa1b5 show load indicator when dialog loads 2018-10-22 12:53:26 +02:00
Mads Rasmussen
126ed536ed update casing to match model updates 2018-10-22 12:34:48 +02:00
Warren Buckley
2062672eda Camel case models for the hostnames dialog 2018-10-22 10:20:02 +01:00
Mads Rasmussen
9560548b46 temp remove domain validation because that is preventing the form from saving + show saving state 2018-10-22 11:03:25 +02:00
Mads Rasmussen
7a2b91c9a7 don't show culture selector for nodes with variants 2018-10-22 10:41:46 +02:00
Stephan
8976a6cce3 Show language ISO code in list 2018-10-22 10:34:14 +02:00
Stephan
d49e06255c Fix upgrade message 2018-10-22 10:34:04 +02:00
Mads Rasmussen
8cc0fae771 Merge branch 'temp8-247-hostnames-dialog' of https://github.com/umbraco/Umbraco-CMS into temp8-247-hostnames-dialog 2018-10-22 10:32:12 +02:00
Mads Rasmussen
d3625f9569 first round of styling fixes 2018-10-22 10:31:34 +02:00
Warren Buckley
6b7dd261ab Add to the tree metadata (So the UI of the tree node can be aware if it allows variants) 2018-10-22 09:30:39 +01:00
Stephan
f46b7ca7b1 Rollback uses GetVersionsSlim 2018-10-22 08:45:30 +02:00
Shannon
93a52432cf Manual merging 2018-10-22 17:04:58 +11:00
Shannon
cd2cf26274 Fixes build errors after merge 2018-10-22 16:13:53 +11:00
Shannon
c6a67f79ac Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/UmbracoConfig.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/Models/IContentTypeBase.cs
#	src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/buttons.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/less/hacks.less
#	src/Umbraco.Web.UI.Client/src/less/modals.less
#	src/Umbraco.Web.UI.Client/src/less/panel.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/dialogs/protectPage.aspx
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
#	src/Umbraco.Web.UI/config/EmbeddedMedia.config
#	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/sort.aspx
#	src/Umbraco.Web.UI/umbraco_client/Dialogs/PublishDialog.js
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs
#	src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
#	src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs
#	src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
#	src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebServices/SaveFileController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
 2018-10-22 16:03:01 +11:00