Robert
|
b2d1a48c7a
|
Added null check for EmailValidator value, fixed js error.
|
2018-10-09 08:19:36 +02:00 |
|
Warren Buckley
|
d1835d8ea0
|
Merge pull request #3151 from umbraco/temp8-219-IsolatedContentAppForms
#219 Isolated content app forms
|
2018-10-04 12:53:38 +01:00 |
|
Warren Buckley
|
17cb3604e0
|
After peer review with Shan & Mads - forgot to remove commented out code but both are happy with this implemtation for first iteration
|
2018-10-04 12:49:43 +01:00 |
|
Warren Buckley
|
5bc2954650
|
Merge pull request #3109 from umbraco/update-dashboards
Merge dashboards from Developer to Settings section
|
2018-10-04 11:56:14 +01:00 |
|
Warren Buckley
|
8270888780
|
Merge remote-tracking branch 'origin/temp8' into temp8-219-IsolatedContentAppForms
# Conflicts:
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
|
2018-10-04 10:38:37 +01:00 |
|
Warren Buckley
|
e98cd3fe8f
|
WIP - Get the custom content app icon as invalid if my form in my content app contains errors in the form
|
2018-10-03 16:42:58 +01:00 |
|
Warren Buckley
|
a3217a73d3
|
we need to NOT have umb-isolate-form or val-form-manager on the umb-editor-sub-view when its core's own content apps
|
2018-10-03 15:15:43 +01:00 |
|
Stephan
|
1ff92d819d
|
Fix languages list
|
2018-10-03 16:08:25 +02:00 |
|
Warren Buckley
|
6d604a37b6
|
WIP with Shan - Removes nested content app form validation error messages & then puts them back
|
2018-10-03 14:55:15 +01:00 |
|
Warren Buckley
|
b2ec2ac592
|
Update bower to angular 1.7.4
|
2018-10-03 14:51:04 +01:00 |
|
Stephan
|
2020c680d6
|
Merge branch temp8 into temp8-11502
|
2018-10-03 15:08:12 +02:00 |
|
Stephan
|
61a926e7e6
|
Cleanup npm package[-log].json files
|
2018-10-03 14:44:08 +02:00 |
|
Shannon
|
651b4a348a
|
gets unpublish working
|
2018-10-03 14:27:48 +02:00 |
|
elitsa
|
f3d1cc29bb
|
Remove file related to old Developer's dashboard.
|
2018-10-03 14:21:41 +02:00 |
|
elitsa
|
2fca4579e7
|
Relocate "Redirect URLs" markup and controller into a newly created 'content' folder.
|
2018-10-03 14:16:06 +02:00 |
|
Shannon
|
b42cbbc0ff
|
Merge branch 'temp8' into temp8-241-unpublish
|
2018-10-03 10:07:43 +02:00 |
|
Shannon
|
6dba59585c
|
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
|
2018-10-02 15:30:53 +02:00 |
|
Claus
|
9cbb7f1d4a
|
Merge pull request #3108 from umbraco/temp8-3094-save-button
Temp8 3094 save button
|
2018-10-02 15:14:58 +02:00 |
|
elitsa
|
cda24b4fba
|
Updating the right path to the Packages dashboard subviews. Adding new properties and attribute to meet the new implementation standards of a section.
|
2018-10-02 14:19:00 +02:00 |
|
elitsa
|
e2eaa1b9dd
|
Change the location of the Developer section's dashboards markups and controllers into the respective Settings folder .
|
2018-10-02 14:08:45 +02:00 |
|
Mads Rasmussen
|
facaba2ed2
|
Remove save from comment
|
2018-10-02 13:07:57 +02:00 |
|
Warren Buckley
|
59c0e3f988
|
Uses underscorejs omit to remove the 'apps' from the object we copy to avoid a never ending nested tree of apps in the JSON
|
2018-10-02 11:45:06 +01:00 |
|
Shannon
|
edc9744397
|
manual merge pass #1
|
2018-10-02 11:14:04 +02:00 |
|
Mads Rasmussen
|
1c0cf42f86
|
fixing dashboard paddings
|
2018-10-02 10:43:28 +02:00 |
|
Mads Rasmussen
|
92314a14f6
|
show load spinners in dialogs when those are used. Show load spinner on button when dialogs are not used.
|
2018-10-02 10:42:57 +02:00 |
|
Mads Rasmussen
|
41f4953013
|
add outlined button style
|
2018-10-02 10:40:44 +02:00 |
|
Stephan
|
8a29745b98
|
Merge branch temp8 into temp8-11502
|
2018-10-01 14:45:33 +02:00 |
|
Shannon
|
b96ba05d22
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1
# build/NuSpecs/UmbracoCms.Core.nuspec
# build/NuSpecs/UmbracoCms.nuspec
# build/NuSpecs/tools/Readme.txt
# src/Umbraco.Core/Configuration/UmbracoConfig.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
# src/Umbraco.Core/Constants-Conventions.cs
# src/Umbraco.Core/Constants-System.cs
# src/Umbraco.Core/IO/MediaFileSystem.cs
# src/Umbraco.Core/Media/Exif/ImageFile.cs
# src/Umbraco.Core/Models/Property.cs
# src/Umbraco.Core/Models/PropertyTagBehavior.cs
# src/Umbraco.Core/Models/PropertyTags.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/SetDefaultTagsStorageType.cs
# src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
# src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
# src/Umbraco.Core/Security/AuthenticationExtensions.cs
# src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
# src/Umbraco.Core/Services/Implement/PackagingService.cs
# src/Umbraco.Core/Services/ServerRegistrationService.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Core/packages.config
# src/Umbraco.Tests/ApplicationUrlHelperTests.cs
# src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
# src/Umbraco.Tests/packages.config
# src/Umbraco.Web.UI.Client/package.json
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
# src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/user.service.js
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/components/card.less
# src/Umbraco.Web.UI.Client/src/less/navs.less
# src/Umbraco.Web.UI.Client/src/less/panel.less
# src/Umbraco.Web.UI.Client/src/less/property-editors.less
# src/Umbraco.Web.UI.Client/src/less/tree.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
# src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
# src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/packages.config
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/CanvasDesignerController.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/DashboardController.cs
# src/Umbraco.Web/Editors/LogController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/Install/InstallHelper.cs
# src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
# src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
# src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs
# src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
# src/Umbraco.Web/Mvc/MasterControllerFactory.cs
# src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
# src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs
# src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
# src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
# src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
# src/Umbraco.Web/Scheduling/KeepAlive.cs
# src/Umbraco.Web/Scheduling/LogScrubber.cs
# src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
# src/Umbraco.Web/Scheduling/ScheduledTasks.cs
# src/Umbraco.Web/Scheduling/Scheduler.cs
# src/Umbraco.Web/Templates/TemplateUtilities.cs
# src/Umbraco.Web/Trees/DataTypeTreeController.cs
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/_Legacy/Packager/Installer.cs
# src/Umbraco.Web/packages.config
# src/Umbraco.Web/umbraco.presentation/keepAliveService.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
# src/umbraco.businesslogic/IO/IOHelper.cs
# src/umbraco.cms/packages.config
# src/umbraco.cms/umbraco.cms.csproj
# src/umbraco.controls/packages.config
# src/umbraco.controls/umbraco.controls.csproj
# src/umbraco.editorControls/packages.config
# src/umbraco.editorControls/umbraco.editorControls.csproj
|
2018-10-01 14:32:46 +02:00 |
|
Warren Buckley
|
47bafdfc19
|
Removes ng-swipe-left-directive on the umb-navigation component/directive - aka make Mads happy :)
|
2018-10-01 13:07:12 +01:00 |
|
Mads Rasmussen
|
6b08af666a
|
add ellipsis to save button when it opens the variant overlay
|
2018-10-01 13:39:14 +02:00 |
|
Mads Rasmussen
|
22ad787c95
|
fix border radius on button group
|
2018-10-01 13:06:13 +02:00 |
|
Mads Rasmussen
|
f8bf94c4c9
|
remove save button from publish combo button + add new save button
|
2018-10-01 12:54:41 +02:00 |
|
Warren Buckley
|
7304c140a7
|
Update to make domain dropdown binding on load (if selected lang in top half is not selected)
|
2018-10-01 10:30:56 +01:00 |
|
Anders Bjerner
|
fabab44342
|
Removed "debugger" statement from linkpicker overlay
|
2018-09-30 19:31:40 +02:00 |
|
Stephan
|
053e0e17a3
|
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
|
2018-09-30 18:49:50 +02:00 |
|
Matthew-Wise
|
a33ccd15c6
|
Convertion of assigndomain2.aspx to angular (#2897)
|
2018-09-30 16:02:09 +02:00 |
|
agrath
|
63a2a155d1
|
User invite flow review (#3000)
|
2018-09-30 15:03:52 +02:00 |
|
KimHolzmann
|
8fad718347
|
#2916 Media picker searches entire media archive (#3061)
|
2018-09-30 14:08:01 +02:00 |
|
Sebastiaan Janssen
|
3879b81ed3
|
Merge pull request #3062 from markadrake/temp-3058
If TinyMCE has not loaded yet, return the initialized value.
|
2018-09-30 13:44:11 +02:00 |
|
Mark Drake
|
c5de33dcae
|
Added an active css class for Umbraco Tree items (#3056)
|
2018-09-30 13:38:19 +02:00 |
|
Sebastiaan Janssen
|
f36139619a
|
Merge pull request #3060 from markadrake/temp-3051
Minimal changes to class `nav-tabs` styling
|
2018-09-30 13:29:01 +02:00 |
|
imranhaidercogworks
|
5f1fb144e0
|
Uploading SVG's Causes Error (Depending on imageFileTypes Setting) (#3072)
|
2018-09-30 13:09:44 +02:00 |
|
Sebastiaan Janssen
|
3c73f6a764
|
Rename name property so title gets set for the doctype icon picker - relates to PR #2864
|
2018-09-30 10:59:20 +02:00 |
|
Bjarne Fyrstenborg
|
865cdc09c6
|
U4-11588 - Adjustments of color picker (#2864)
|
2018-09-30 10:50:05 +02:00 |
|
Stephan
|
3382a4efdb
|
Fix nested content breaking issue
|
2018-09-28 16:59:00 +02:00 |
|
Mads Rasmussen
|
a418322ee5
|
find languages for unpublishing
|
2018-09-28 13:52:36 +02:00 |
|
Mads Rasmussen
|
36520b0777
|
add support for invariant content
|
2018-09-28 13:01:27 +02:00 |
|
Mads Rasmussen
|
39ffb60a9d
|
show mandatory language as text
|
2018-09-28 12:30:05 +02:00 |
|
Mads Rasmussen
|
90150fdc46
|
fine tuning selection
|
2018-09-28 11:19:29 +02:00 |
|
Mark Drake
|
12a9466cd7
|
if tinymce has not loaded yet, return the initialized value only
|
2018-09-27 17:03:24 -04:00 |
|