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

11723 Commits

Author SHA1 Message Date
Bjarke Berg
ef9dc447cd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/languages.ts
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Tests.AcceptanceTest/package.json
 2021-03-24 15:03:03 +01:00
Mole
f3d1f39302 Merge pull request #10022 from umbraco/netcore/feature/package-dotnet-template 
Netcore: Add package dotnet template and improved the templates
 2021-03-24 09:42:19 +01:00
Kenn Jacobsen
a55a0c9e2d Do not minify bundled CSS at runtime 2021-03-22 08:29:31 +01:00
Bjarke Berg
2a134cf425 Clean up 2021-03-21 12:55:33 +01:00
Bjarke Berg
d55a484c56 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/IO/SystemDirectories.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Scoping/ScopeProvider.cs
#	src/Umbraco.Core/Services/IIconService.cs
#	src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Infrastructure/Scoping/Scope.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
#	src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunner.cs
#	src/Umbraco.Tests/Scoping/ScopeTests.cs
#	src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.BackOffice/Controllers/IconController.cs
#	src/Umbraco.Web.BackOffice/Services/IconService.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Web/Editors/PreviewController.cs
 2021-03-19 16:18:32 +01:00
Bjarke Berg
82c3f92b36 Merge pull request #9980 from kjac/netcore/feature/gulp-comments-and-sourcemap-dependencies 
Add gulp comments and sourcemap dependencies
 2021-03-19 09:13:13 +01:00
Kenn Jacobsen
93b6d31d71 Include sourcemaps for minified dependencies 2021-03-16 08:22:07 +01:00
Kenn Jacobsen
84d71a1237 Add a few comments about why we're renaming JS files during un-minified build 2021-03-16 08:21:09 +01:00
Shannon
670bea81d1 Merge branch 'netcore/dev' into netcore/feature/in-memory-runtime-minifier 
# Conflicts:
#	src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
 2021-03-16 17:49:05 +11:00
Warren Buckley
fa11a812a0 Fix karma.conf JS test for folder names to make UNIX tests pass 2021-03-15 13:41:14 +00:00
Shannon Deminick
ada5599a83 Merge pull request #9839 from kjac/netcore/feature/minify-js-resources 
Do not apply runtime optimization to core scripts and script libraries
 2021-03-15 15:08:35 +11:00
Bjarke Berg
8332b3219b bugfix in snippet 2021-03-12 11:57:56 +01:00
Sebastiaan Janssen
ef60a98fe1 Merge branch 'v8/8.12' into v8/dev 2021-03-12 09:29:44 +01:00
Sebastiaan Janssen
7dc95b55d3 Merge branch 'v8/8.11' into v8/8.12 
# Conflicts:
#	src/Umbraco.Web/Services/IconService.cs
 2021-03-09 14:51:54 +01:00
Sebastiaan Janssen
edab3507ec Merge branch 'v8/8.10' into v8/8.11 2021-03-09 14:49:08 +01:00
Sebastiaan Janssen
1d3d83466c Merge branch 'v8/8.9' into v8/8.10 2021-03-09 14:48:22 +01:00
Sebastiaan Janssen
4481e90f10 Merge branch 'v8/8.8' into v8/8.9 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
 2021-03-09 14:33:01 +01:00
Kenn Jacobsen
b7553e311a Cache the SVG icons serverside to boost performance (#9200) 
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
(cherry picked from commit 8e01ac30d6)

# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web/Services/IconService.cs
 2021-03-09 14:22:22 +01:00
Bjarke Berg
1aa8d3aa09 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/merge-v8-05032021 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
#	src/Umbraco.Web/Editors/PasswordChanger.cs
#	src/Umbraco.Web/Editors/UserGroupsController.cs
 2021-03-09 10:08:53 +01:00
Bjarke Berg
745014a4c3 User manager related updates (#9935) 
* Only allow not-admins to assign groups they have themselves

* Only admins is allowed to change password of other admins

* Fixed issue with deep clone of UserGroup. The Allowed sections was not cloned. This resulted in the allowed sections of the object stored in cache was updated, everytime we changed the allowed sections on an object cloned from the cache. Even if we did not save it.

* Only Admins are allowed to add sections to a user group, that they don't have access to themselves

* Align backend code with UI. User managers that is are not admin, can only assign the same groups new users, that they have themselves.

* Make existingGroupAliases and empty array when creating a new user

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2021-03-08 13:26:52 +01:00
Sebastiaan Janssen
49435708a5 Merge branch 'v8/8.11' into v8/8.12 2021-03-08 12:28:21 +01:00
Sebastiaan Janssen
8b04c32dff Merge branch 'v8/8.10' into v8/8.11 2021-03-08 12:27:42 +01:00
Lars-Erik Aabech
fc447bb101 Should allow grid editors to use hash based settings (#9837) 
* Should allow grid editors to use hash based settings

* Swap to using vm in grid config controller, as well as showing button when there's map settings

* Included keys for styles in empty state check for grid settings

* converted the code into more AngularJS performant code

* Remove rogue change to grid.editors.config

* use watchCollection instead

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit 008827f785)
 2021-03-08 12:27:06 +01:00
Sebastiaan Janssen
c36a2bced6 Merge branch 'v8/8.11' into v8/8.12 2021-03-08 10:08:01 +01:00
Sebastiaan Janssen
0386a311d7 Merge branch 'v8/8.10' into v8/8.11 2021-03-08 10:07:40 +01:00
Sebastiaan Janssen
5825aa5dee Merge branch 'v8/8.9' into v8/8.10 2021-03-08 10:07:08 +01:00
Sebastiaan Janssen
ac41c5451e Merge branch 'v8/8.8' into v8/8.9 2021-03-08 10:06:37 +01:00
Niels Lyngsø
cef1a73a2e no need to prevent or stop propagation on this. (#9933) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit af65810048)
 2021-03-08 10:05:46 +01:00
Bjarke Berg
37ed84871a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Cache/CacheKeys.cs
#	src/Umbraco.Core/Composing/TypeFinder.cs
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Core/Editors/UserEditorAuthorizationHelper.cs
#	src/Umbraco.Core/Extensions/StringExtensions.cs
#	src/Umbraco.Core/Extensions/UriExtensions.cs
#	src/Umbraco.Core/IO/IOHelper.cs
#	src/Umbraco.Core/IO/PhysicalFileSystem.cs
#	src/Umbraco.Core/Media/Exif/MathEx.cs
#	src/Umbraco.Core/Media/UploadAutoFillProperties.cs
#	src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs
#	src/Umbraco.Core/Models/Membership/User.cs
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs
#	src/Umbraco.Core/PropertyEditors/ListViewConfiguration.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
#	src/Umbraco.Core/Routing/AliasUrlProvider.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Routing/UriUtility.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
#	src/Umbraco.Core/RuntimeOptions.cs
#	src/Umbraco.Core/RuntimeState.cs
#	src/Umbraco.Core/Security/BackOfficeUserStore.cs
#	src/Umbraco.Core/Security/ContentPermissions.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Core/Trees/TreeNode.cs
#	src/Umbraco.Core/Udi.cs
#	src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
#	src/Umbraco.Examine/Umbraco.Examine.csproj
#	src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
#	src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
#	src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
#	src/Umbraco.Infrastructure/Scoping/Scope.cs
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs
#	src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
#	src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
#	src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
#	src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
#	src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
#	src/Umbraco.Tests/Testing/TestDatabase.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs
#	src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs
#	src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
#	src/Umbraco.Web.BackOffice/Controllers/TourController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UserGroupEditorAuthorizationHelper.cs
#	src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttribute.cs
#	src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs
#	src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web.BackOffice/Services/IconService.cs
#	src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
#	src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs
#	src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs
#	src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web/Cache/MemberCacheRefresher.cs
#	src/Umbraco.Web/Composing/ModuleInjector.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
#	src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
#	src/Umbraco.Web/Editors/Filters/UserGroupAuthorizationAttribute.cs
#	src/Umbraco.Web/Editors/TinyMceController.cs
#	src/Umbraco.Web/Editors/UserGroupsController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/ImageCropperTemplateExtensions.cs
#	src/Umbraco.Web/Logging/WebProfiler.cs
#	src/Umbraco.Web/Logging/WebProfilerProvider.cs
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
#	src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
#	src/Umbraco.Web/Mvc/JsonNetResult.cs
#	src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
#	src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
#	src/Umbraco.Web/RoutableDocumentFilter.cs
#	src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
#	src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
#	src/Umbraco.Web/Routing/PublishedRouter.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Scheduling/KeepAlive.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs
#	src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
#	src/Umbraco.Web/Trees/DictionaryTreeController.cs
#	src/Umbraco.Web/Trees/LanguageTreeController.cs
#	src/Umbraco.Web/Trees/LogViewerTreeController.cs
#	src/Umbraco.Web/Trees/PackagesTreeController.cs
#	src/Umbraco.Web/UmbracoApplication.cs
#	src/Umbraco.Web/UmbracoApplicationBase.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
#	src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
#	src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
#	src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
#	src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
#	src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
 2021-03-05 15:36:27 +01:00
Sebastiaan Janssen
e848e396af Don't auto focus on the third menu item 2021-03-01 13:20:58 +01:00
Mole
70b04e8a8a Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/packages-with-actions 2021-02-25 13:48:16 +01:00
Mole
f4787f9ae5 Add undo actions to the root node instead of appending them 
also fix minor UI bug
 2021-02-25 12:36:28 +01:00
Mole
2fcae1cc28 Fix installing packages. 2021-02-24 12:54:30 +01:00
Sebastiaan Janssen
980acafbeb Merge branch 'v8/contrib' into v8/dev 2021-02-20 17:17:27 +01:00
Nathan Woulfe
b9b75b3794 Fix 'Do something else' button position in create dialog (#9846) 
* fixes do something else button position in create dialog for doc types and media types

* adds type attribute to buttons
 2021-02-20 02:30:20 +01:00
Kenn Jacobsen
2ccd4a61f4 Minify client JS as part of the build conditionally (not for dev) and reference only minified JS libraries 2021-02-18 08:23:14 +01:00
Bjarne Fyrstenborg
97ad14c895 Update to noUiSlider v14.6.3 2021-02-16 08:50:35 +10:00
Jim Löfgren
fc8dc76d80 Changed grid view labels and values to display: inline instead of display: inline-block to fix weird line break. 2021-02-16 08:07:11 +10:00
Mads Rasmussen
e6462eded6 V8/feature/10273 variant sorting (#9797) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
 2021-02-15 11:15:45 +01:00
Marc Goodson
230bf1052c V8/feature/super doctype create menu (#9174) 
* WIP - added options from superdoctypecreate package

resolve merge conflict in create html file

* fiddling with the wording but it will never be perfect

* looks like ng-if should be ng-show

* Update data-elements for uniqueness (I'm not sure what these are used for!)

* pass 'iscomposition' on the querystring when choosing the 'composition' option from the menu

Why? - in the future we could hide the 'Compositions...' button when choosing to create a composition

* Remove PostCreateCollection implementation now the Create Collection is removed in this PR from the DocType Create menu

resolve merge conflict in Remove PostCreateCollection implementation now the Create Collection is removed in this PR from the DocType Create menu

* Add translations

* Put back PostSave method. It's useful.

Co-authored-by: Kenn Jacobsen <post@kennjacobsen.dk>
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-02-11 09:25:38 +10:00
Jakob Bagterp
e9429cfe44 Separate remove button and label for settings and styles in Grid Layout 
It's inconvenient that the click area for the remove button laps over the label of settings and styles in the Grid Layout property editor. Simply as the editor may remove the style/setting by accident – and especially since there isn't an undo option.

Known issue: Linebreak of long text labels doesn't appear pretty, but this is cosmetic and can be fixed.
 2021-02-10 03:34:30 +01:00
Nathan Woulfe
f8de0fca8f 5596 allow editing alt text in grid (#9681) 
* languages

* add service method for media crop details, might be useful elsewhere

* update UI to add buttons for changing image / editing existing

* update mediapicker controller to use named editor service method

* Update media.controller.js

undefined should be null, consistent use of arrow func

* move buttons to the top right - close to the grid toolbar, so more obvious
 2021-02-09 02:43:59 +01:00
Daniël Knippers
fcd802ba47 V8/bugfix/9074 current urls segments (#9075) 2021-02-08 15:16:25 +01:00
Bjarne Fyrstenborg
044573d9f1 Use umb-icon component in tree item 2021-02-08 16:47:21 +10:00
mcl-sz
5fc37dfeb4 Prevent overflow of searchresults with long urls (#9739) 
* Prevent overflow of searchresults with long urls

Small css change to prevent overflow of searchresults with long url's

* fixes wrapping in node-picker search, stop icon shrinking

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-02-08 16:32:54 +10:00
Bjarne Fyrstenborg
eb9c4e4d82 Document onChange in umbPagination 2021-02-08 10:13:03 +10:00
Niels Lyngsø
a76924f196 Stop using .length !== 0 when its not jQuery (#9715) 
* stop using .length !== 0 as its causing errors.

* revert to only change native find()

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
 2021-02-08 10:10:46 +10:00
Niels Lyngsø
2d4984d434 check for ´err´ 2021-02-08 10:01:11 +10:00
Chad
06e5d07650 Fix eventService memory leaks (#9752) 
* fix leak by unbinding event from $rootscope

* destroy more events

* $scope unavailable

* no need to destroy in services as they are singletons

Co-authored-by: nzdev <nzdev@github.com>
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-02-08 09:56:56 +10:00
Bjarne Fyrstenborg
55124fff81 Update icons in umb-tree-search-results component (#9757) 
* Avoid use of ng-if

* Green class is not necessary

* Ensure button element use full width

* Left align text inside button element
 2021-02-07 02:50:20 +01:00