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

7312 Commits

Author SHA1 Message Date
Dave Woestenborghs
2af2a9b77f #3419 don't show the back button in the edit screen of dictionary...doesn't make sense to go to settings section when the tree is in the translation section 2018-10-24 15:39:45 +02: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
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
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
Mads Rasmussen
abed9ab331 show duplicate domain validation messages 2018-10-23 11:48:42 +02: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
Shannon
d9a4d1fa97 Manual merging 2018-10-23 16:12:23 +11: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
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
Mads Rasmussen
d3625f9569 first round of styling fixes 2018-10-22 10:31:34 +02:00
Shannon
93a52432cf Manual merging 2018-10-22 17:04:58 +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
Sebastiaan Janssen
2c6fd3af14 Re-fix - U4-11111 - Hide tooltip of slider in document type property preview 2018-10-21 19:46:08 +02:00
Bjarne Fyrstenborg
b86be5b854 Fix color swatches title when using css classes for colors 2018-10-21 19:41:12 +02:00
Kenn Jacobsen
8c8d979eb2 Style confirmations and alerts consistently across all sections (#3251) 2018-10-21 19:36:07 +02:00
Kenn Jacobsen
10526cfc81 Fix #3368 by watching changes and explicitly flagging the form as dirty 2018-10-21 18:28:15 +02:00
Sebastiaan Janssen
96d7a776b7 Removes dangling comma 2018-10-21 18:17:56 +02:00
Anders Bjerner
954893cf2b umbRequestHelper.resourcePromise not supports the error message being a promise 2018-10-21 18:17:56 +02:00
Anders Bjerner
bb3beb406d <pre> elements should at least have white-space: pre-wrap 2018-10-21 18:17:55 +02:00
Anders Bjerner
d6a329925c Border color for .add-on should be @purple-l3 2018-10-21 18:17:54 +02:00
Jan Skovgaard
7eecf230af 3364 - Suggestion: Make use of confirm action directive on repeatable textstring when deleting (#3365) 2018-10-21 18:17:53 +02:00
Kenn Jacobsen
44fbff4410 Hide "reset password" on the login screen if system emails can't be sent. 2018-10-21 18:17:53 +02:00
Chris Houston
c401782d5e Added clean-css to the client side build process (#3371) 2018-10-21 16:27:39 +02:00
Anders Bjerner
827bc19f6a Localized umb-generate-alias placeholder texts 2018-10-21 14:03:22 +02:00
sebastien-sougnez
5efb079f56 Changed font-awesome verison from 4.2 to 4.7 2018-10-21 12:50:02 +02:00
Chris Houston
4ef9c3f086 When typing to configure some of the data types on a small width screen ( mobile or very narrow browser window ) the editing controls for some of the data types did not wrap underneath the titles and in some cases they disappeared completely. 
This adds a 100% width on small screen sizes and then reverts back to the original 60% width after 800px's.
 2018-10-21 11:23:08 +02:00
Kenn Jacobsen
00cf8dcf05 Reload the node when publishing all unpublished children 2018-10-21 11:01:45 +02:00
Rasmus John Pedersen
ef343f04a8 Only hide icons if hideIcons is set to 'true' 2018-10-21 10:51:35 +02:00
Jamie Townsend
0f2381a94d Merge multiple ng-if attributes 2018-10-19 15:19:22 +02:00
Ed Parry
201a2cd7b1 Added the user ID and GUID to the user details view. (#3279) 2018-10-19 15:13:07 +02:00
Bjarne Fyrstenborg
8e1065a2b6 Fix missing semicolons and remove comma at end 2018-10-19 15:08:17 +02:00
Mike Chambers
ecf9c0adb4 Update datepickerController to add onValueChanged function 
adding onValueChanged method to capture serverside Model Changes, clearing flag using c# System.DateTime.MinValue.
 2018-10-19 15:07:03 +02:00
Andy Robinson
6b90d62bd1 update to issue #3292 to fix 4 col grid cards. 2018-10-19 14:51:44 +02:00
Andy Robinson
c5ea0ea3a9 fixing issue in #3292 2018-10-19 14:51:44 +02:00