yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,222 Commits 4 Branches 7 Tags
162b90194de27d3353aba0dbe53bc5bc6cc14a8b
Commit Graph

4333 Commits

Author SHA1 Message Date
Kenn Jacobsen
afa3e9b5eb Improve image cropper UX (#3149) 2018-10-09 22:54:51 +02:00
Kenn Jacobsen
4d1b361f8f Style Public access dialog (#3194) 2018-10-09 21:32:54 +02:00
Poornima Nayar
9986c10cec Cleaned up the view by removing inline styles and style tags on the view itself. 
Removed inline styles in the code behind files
Moved all styles into the modals.less stylesheet
 2018-10-09 12:35:32 +02:00
Kenn Jacobsen
62d65f0e3a Style the sort result so it looks like e.g. the copy dialog result 2018-10-09 12:09:12 +02:00
Warren Buckley
31b616f0ae Merge branch 'temp8' into temp8-3087-tree-grouping 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web/Trees/DictionaryTreeController.cs
 2018-10-09 09:25:00 +01:00
Nathan Woulfe
08818c6358 removes ng-show from iframe, make loader background a solid color to hide iframe while it loads 2018-10-09 10:08:51 +02:00
Warren Buckley
f63a9e93b0 Merge remote-tracking branch 'origin/temp8' into temp8-3087-tree-grouping 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web/Trees/DictionaryTreeController.cs
 2018-10-09 08:53:40 +01:00
Mads Rasmussen
4d927e705d fix language file 2018-10-08 19:35:08 +02:00
Stephan
f5c5d9f9d5 Update ModelsBuilder to -alpha.24 2018-10-08 17:15:08 +02:00
Warren Buckley
b2bc259bd5 Adds in lang keys 2018-10-08 14:19:52 +01:00
Kenn Jacobsen
2e135d2006 Register an audit on the parent node when sorting child nodes. 2018-10-08 15:11:51 +02:00
elitsa
b68b962d6f Removed all keys which are not being referenced anywhere in the code base. 2018-10-08 11:58:22 +02:00
elitsa
85309e8ce5 Merge branch 'temp8-I3089' of https://github.com/umbraco/Umbraco-CMS into temp8-I3089 2018-10-08 10:23:53 +02:00
elitsa
4bde59ed66 Translation clean up 2018-10-08 10:13:36 +02:00
elitsa
e2acc8b447 Remove sections icons - not needed anymore 2018-10-08 10:00:52 +02:00
elitsa
8fdee9af85 Update trees.Release.config 2018-10-08 09:58:19 +02:00
Shannon
b48202197f Merge remote-tracking branch 'origin/temp8' into temp8-I3089 
# Conflicts:
#	src/Umbraco.Web/Trees/DataTypeTreeController.cs
 2018-10-08 09:54:12 +02:00
elitsa
99257f2245 Updated the sortOrder also in the respective controllers, as well as updating to the new standards of string interpolation in those controllers. 2018-10-05 11:51:34 +02:00
elitsa
0cc5a01069 packages section is there with translations sections and correct trees 2018-10-05 11:09:33 +02: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
Anders Bjerner
bc081db9e6 Sentences should end with a period (#3144) 2018-10-04 08:16:11 +02:00
Thomas Adams
833137772d Fix typo in twitter settings section of EmbeddedMedia configs 2018-10-03 15:04:33 +01:00
Stephan
2020c680d6 Merge branch temp8 into temp8-11502 2018-10-03 15:08:12 +02:00
Shannon
651b4a348a gets unpublish working 2018-10-03 14:27:48 +02:00
elitsa
83c66730e2 Updating tabs into Settings section. 2018-10-03 14:19:35 +02:00
Shannon
b42cbbc0ff Merge branch 'temp8' into temp8-241-unpublish 2018-10-03 10:07:43 +02:00
elitsa
0e8d4eed63 Move dashboards from the Developer's section into Settings one. 2018-10-02 14:12:53 +02:00
Shannon
edc9744397 manual merge pass #1 2018-10-02 11:14:04 +02:00
Anders Bjerner
3dffb59f72 Should be "JavaScript" instead of "javascript" 2018-10-01 21:55:13 +02:00
Anders Bjerner
38bd53978b Should be "JavaScript" instead of "javascript" 2018-10-01 21:53:53 +02:00
Stephan
8a29745b98 Merge branch temp8 into temp8-11502 2018-10-01 14:45:33 +02:00
Shannon
549d8d83ce reverts changes that shouldn't have been made, will manually merge these ones 2018-10-01 14:39:28 +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
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
093182c56d Allow svg uploads 2018-09-30 13:12:11 +02:00
imranhaidercogworks
5f1fb144e0 Uploading SVG's Causes Error (Depending on imageFileTypes Setting) (#3072) 2018-09-30 13:09:44 +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
Mads Rasmussen
be7acb904d Unpublish dialog scaffolding 2018-09-27 15:24:38 +02:00
Sebastiaan Janssen
25aa74b4cd Merge pull request #2937 from umbraco/temp-view-compilation 
Changes compilation batch mode to true uses Roslyn compiler for views
 2018-09-27 12:01:00 +02:00
Marc Goodson
c021cc50ce U4-10669 7.8. Show 301 url redirects on info tab too (#2452) 2018-09-26 23:16:54 +02:00
Robert
230875f3cf Merge pull request #3030 from umbraco/temp8-rollback 
Temp8 rollback
 2018-09-26 12:38:48 +02:00
Robert
8b9f64b2c8 Merge pull request #3021 from umbraco/temp8-send-to-publish 
Temp8 send to publish
 2018-09-26 11:01:27 +02:00
Sebastiaan Janssen
c19bc0b296 Merge pull request #3007 from callumbwhyte/updating-macro-templates 
Updating macro templates for V8
 2018-09-25 22:48:58 +02:00
Sebastiaan Janssen
7c437998ec Merge pull request #2842 from leekelleher/U4-11555 
[v8] U4-11555 - Remove App_Browsers folder
 2018-09-25 16:06:54 +02:00
Sebastiaan Janssen
00fc1b7c26 Merge branch 'dev-v7' into temp-view-compilation 2018-09-25 15:13:22 +02:00
Mads Rasmussen
55324aa736 Merge pull request #3031 from umbraco/temp8-ui-cleanup 
Temp8 ui cleanup
 2018-09-25 13:11:03 +02:00
Mads Rasmussen
5fc7f7bce5 Merge branch 'temp8' into temp8-ui-cleanup 2018-09-25 11:16:49 +02:00