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

25614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
James Coxhead
dadc3ad7a7 Fixes #3348 - Configure Umbraco.Dropdown.Flexible for new installations 2018-10-21 19:18:43 +02:00
Sebastiaan Janssen
04aa199266 Makes sure the path on the tree is correct 2018-10-21 18:59:25 +02:00
Tim Geyssens
2c14f396fb Update FileSystemTree.cs 
Make sure it can find child items in root folders
 2018-10-21 18:59:25 +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
cd6f489606 Merge pull request #3374 from umbraco/abjerner-umb-generate-alias 
Localized umb-generate-alias placeholder texts
 2018-10-21 18:20:20 +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
Kenn Jacobsen
d16bc7a465 Add a custom content item binder for saving blueprints (fixes #2985) 2018-10-21 18:17:51 +02:00
Anders Bjerner
df2313f7ec umbRequestHelper.resourcePromise not supports the error message being a promise 2018-10-21 18:08:56 +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
1de7b8f10f <pre> elements should at least have white-space: pre-wrap 2018-10-21 16:11:22 +02:00
Anders Bjerner
fe06f095be Border color for .add-on should be @purple-l3 2018-10-21 16:05:04 +02:00
Jan Skovgaard
01d9785097 3364 - Suggestion: Make use of confirm action directive on repeatable textstring when deleting (#3365) 2018-10-21 16:00:11 +02:00
Kenn Jacobsen
5da5df5bf9 Hide "reset password" on the login screen if system emails can't be sent. 2018-10-21 14:58:18 +02:00
Kenn Jacobsen
90416a4d87 Add a custom content item binder for saving blueprints (fixes #2985) 2018-10-21 14:52:05 +02:00
Anders Bjerner
827bc19f6a Localized umb-generate-alias placeholder texts 2018-10-21 14:03:22 +02:00
Anders Bjerner
39edf4c6dd Added keys for "enterAlias" and "generatingAlias" 2018-10-21 13:58:45 +02:00
Anders Bjerner
6f359b3d18 Added keys for "enterAlias" and "generatingAlias" 2018-10-21 13:57:01 +02:00
Anders Bjerner
e1919e0c52 Added keys for "enterAlias" and "generatingAlias" 2018-10-21 13:54:17 +02:00
Pawel Bres
5bd87efb3f Updated URL to the Contributing page of v7 
The old link was not working anymore and was pointing to 404 GitHub page
 2018-10-21 12:51:09 +02:00
Anders Bjerner
f4a9617487 Improved the description for the "Icon" property 2018-10-21 12:50:42 +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
Carole Rennie Logan
7071b21db7 Updating example content app manifest 
Including roles
 2018-10-21 10:41:17 +02:00
Søren Kottal
5dc67deeec adds the right description to UmbracoHelper.Concatenate 2018-10-21 10:39:57 +02:00
Rasmus John Pedersen
6996a06d64 Only add "Move" action once 2018-10-21 10:34:42 +02:00
Warren Buckley
f37f679031 Adds ContentApps to the Composition extension methods 2018-10-19 15:19:37 +01:00
Jamie Townsend
0f2381a94d Merge multiple ng-if attributes 2018-10-19 15:19:22 +02:00
Kenn Jacobsen
f993869482 Remove the default SMTP configuration 2018-10-19 15:16:01 +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
fer22f
d95ec9eb14 Fix documentation of container styling of nodes 2018-10-19 14:56:52 +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
Mads Rasmussen
126a834ad4 fix installer facts 2018-10-19 14:49:27 +02:00
Pritesh Tailor
d9efc2a401 Fixed broken link in detailed contrib doc 
The link to the the issues was broken (Your first code code contribution section). I've updated to the readonly issue tracker and added a reference to new issue tracker.

Removed a line on upvotes, as i don't believe that's relevant anymore.
 2018-10-19 14:46:37 +02:00
Mads Rasmussen
b75f41b3f6 fix user cards grid 2018-10-19 14:25:15 +02:00
Kenn Jacobsen
8036af958f Allow video feeds to load over HTTPS + fix a few feeds (#3256) 2018-10-19 14:19:47 +02:00