Stephan
|
2f1687cd4f
|
Merge branch 'v8/dev' into temp8-4682-ui-selection-of-users-and-user-groups
|
2019-04-23 10:54:07 +02:00 |
|
Stephan
|
9443599382
|
Merge pull request #5307 from kjac/v8-fix-search-result-mapping
V8: Fix mapping for search results
|
2019-04-23 10:43:12 +02:00 |
|
Sebastiaan Janssen
|
160d140167
|
Merge branch 'v7/dev' into v8/dev
# Conflicts:
# src/Umbraco.Web/Strategies/NotificationsHandler.cs
|
2019-04-22 13:22:15 +02:00 |
|
Sebastiaan Janssen
|
db7ae9a7e2
|
V7: Send notifications for changes in permissions (#5306)
V7: Send notifications for changes in permissions
|
2019-04-22 13:21:03 +02:00 |
|
Sebastiaan Janssen
|
2e6f032222
|
Merge branch 'v7/dev' into pr_5306
# Conflicts:
# src/Umbraco.Web/Strategies/NotificationsHandler.cs
|
2019-04-22 13:20:15 +02:00 |
|
Sebastiaan Janssen
|
9fc33d71e4
|
V7: Send notifications when an item is copied (#5302)
V7: Send notifications when an item is copied
|
2019-04-22 13:15:44 +02:00 |
|
Sebastiaan Janssen
|
916cd999d5
|
Merge branch 'v7/dev' into pr_5302
# Conflicts:
# src/Umbraco.Web/Strategies/NotificationsHandler.cs
|
2019-04-22 13:14:32 +02:00 |
|
Sebastiaan Janssen
|
a75506d60b
|
V7: Send notifications when an item is moved or restored (#5303)
|
2019-04-22 13:04:14 +02:00 |
|
Sebastiaan Janssen
|
6631a50a44
|
Merge branch 'v7/dev' into pr_5303
# Conflicts:
# src/Umbraco.Web/Strategies/NotificationsHandler.cs
|
2019-04-22 13:03:00 +02:00 |
|
Sebastiaan Janssen
|
9611791f31
|
Merge branch 'v7/dev' into v8/dev
# Conflicts:
# src/Umbraco.Web/Strategies/NotificationsHandler.cs
|
2019-04-22 12:52:25 +02:00 |
|
Kenn Jacobsen
|
c35a3fa702
|
Send notifications for rollbacks
|
2019-04-22 12:51:37 +02:00 |
|
Kenn Jacobsen
|
153ac58d2a
|
Send notifications for rollbacks
|
2019-04-22 12:50:44 +02:00 |
|
Kenn Jacobsen
|
a969ff6e10
|
Make sure Nested Content scaffolds are listed in defined sort order
|
2019-04-22 12:34:19 +02:00 |
|
Kenn Jacobsen
|
c7b4d1b206
|
Always show file names for media/files without thumbnail
|
2019-04-22 12:31:01 +02:00 |
|
Sebastiaan Janssen
|
aaf8ba0211
|
Merge branch 'v7/dev' into v8/dev
# Conflicts:
# src/Umbraco.Core/IO/MediaFileSystem.cs
|
2019-04-22 12:28:33 +02:00 |
|
Kenn Jacobsen
|
072c014055
|
Read image dimensions via GDI if EXIF fails with an exception
|
2019-04-22 12:21:55 +02:00 |
|
Kenn Jacobsen
|
655befde42
|
Read image dimensions via GDI if EXIF fails with an exception
|
2019-04-22 12:19:36 +02:00 |
|
Sebastiaan Janssen
|
344b7731ce
|
Fix JS unit tests
|
2019-04-22 12:10:53 +02:00 |
|
Sebastiaan Janssen
|
687cc4630f
|
Fix missing semicolon
|
2019-04-22 10:47:00 +02:00 |
|
Kenn Jacobsen
|
e180bb6722
|
V8: Fix broken listview pagination when using the back link (#5149)
|
2019-04-22 10:44:29 +02:00 |
|
Kenn Jacobsen
|
32104fff41
|
V8: Add back button to listviews for members (#5158)
* Add back button to edit member
* Don't set illegal location (with querystring params)
|
2019-04-22 10:21:38 +02:00 |
|
Kenn Jacobsen
|
8b6fbee47e
|
V8: Add back button to listviews in media (#5116)
|
2019-04-22 10:00:51 +02:00 |
|
Kenn Jacobsen
|
59df7f1399
|
Ensure consistency in the way panels are spaced
|
2019-04-22 09:57:44 +02:00 |
|
Kenn Jacobsen
|
f55e05da79
|
Don't explode when passing bad parameters to log resource
|
2019-04-22 09:55:38 +02:00 |
|
Kenn Jacobsen
|
2a43170915
|
V8: Add toggle group (#5096)
V8: Add toggle group
|
2019-04-22 09:16:41 +02:00 |
|
Kenn Jacobsen
|
717f8c9944
|
Fix mapping for search results
|
2019-04-21 21:00:34 +02:00 |
|
Kenn Jacobsen
|
ff4fe2cd79
|
Send notifications for changes in permissions
|
2019-04-21 13:22:49 +02:00 |
|
Kenn Jacobsen
|
d2f727a1ba
|
Send notifications when an item is moved or restored
|
2019-04-20 20:40:52 +02:00 |
|
Kenn Jacobsen
|
38bb98b099
|
Send notifications when an item is copied
|
2019-04-20 20:31:36 +02:00 |
|
Kenn Jacobsen
|
d87464b8e4
|
Fix the style of the public access confirmation button
|
2019-04-18 13:48:54 +02:00 |
|
Sebastiaan Janssen
|
aba9c89ff4
|
Merge pull request #5090 from deMD/temp8-5069-getTreePackageFolder-use-localeCompare
V8 Plugins: Changed treeService.getTreePackageFolder to use localeCompare
|
2019-04-18 12:42:17 +02:00 |
|
Sebastiaan Janssen
|
74f98d51cd
|
Compare to 0 to get the desired result
|
2019-04-18 12:37:52 +02:00 |
|
Sebastiaan Janssen
|
1e475bfc6f
|
Merge branch 'v8/dev' into pr_5090
|
2019-04-18 12:11:24 +02:00 |
|
Kenn Jacobsen
|
e7f3f8da68
|
Remove unused translations from area"editcontenttype"
|
2019-04-18 12:05:17 +02:00 |
|
Kenn Jacobsen
|
a3af3d6d2b
|
Use "group" instead of "tab" on Nested Content config
|
2019-04-18 11:47:36 +02:00 |
|
Kenn Jacobsen
|
29a542a0dd
|
Support stylesheets in subfolders in the RTE
|
2019-04-18 11:38:34 +02:00 |
|
Kenn Jacobsen
|
73e4c6022d
|
Update the title of the macro view picker
|
2019-04-18 09:38:20 +02:00 |
|
Sebastiaan Janssen
|
eb10d71bff
|
Don't just Parse, the value might be null, have to use TryParse
|
2019-04-17 16:47:23 +02:00 |
|
Sebastiaan Janssen
|
9cf69d53c2
|
Merge branch 'v7/dev' into v8/dev
# Conflicts:
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Core/Services/IMediaService.cs
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/MediaController.cs
|
2019-04-17 16:39:10 +02:00 |
|
Kenn Jacobsen
|
2a930e5a66
|
Log the ID of the current user when emptying the media recycle bin
|
2019-04-17 16:01:18 +02:00 |
|
Kenn Jacobsen
|
2d32863fc9
|
Audit current user when moving media + clean up a few audit related things
|
2019-04-17 16:00:21 +02:00 |
|
Sebastiaan Janssen
|
2c32fabd36
|
Merge pull request #5054 from kjac/fix-content-empty-trash-audit-user
V7: Log correct user ID when emptying the content recycle bin
|
2019-04-17 15:58:43 +02:00 |
|
Kenn Jacobsen
|
a48d97e631
|
Create explicit overloads for UrlAbsolute
|
2019-04-17 15:38:47 +02:00 |
|
Kenn Jacobsen
|
4107f47588
|
Add optional culture parameter to UrlAbsolute extension
|
2019-04-17 15:38:47 +02:00 |
|
Kenn Jacobsen
|
bdac2a4a41
|
Use umb-checkbox for user filters
|
2019-04-17 15:35:57 +02:00 |
|
Sebastiaan Janssen
|
1941c0dd1c
|
Merge branch 'v7/dev' into v8/dev
# Conflicts:
# src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Core/UriExtensions.cs
# src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/search.service.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
# src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
# src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
# src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
# src/Umbraco.Web/umbraco.presentation/content.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs
|
2019-04-17 14:52:35 +02:00 |
|
Sebastiaan Janssen
|
650ef39780
|
Merge branch 'v8/dev' into v8/merge/5061-from-v7
|
2019-04-17 14:44:10 +02:00 |
|
Sebastiaan Janssen
|
7db0440b5c
|
Merge branch 'v7/dev' into v8/dev
# Conflicts:
# src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Core/UriExtensions.cs
# src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/search.service.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
# src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
# src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
# src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
# src/Umbraco.Web/umbraco.presentation/content.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs
|
2019-04-17 14:35:59 +02:00 |
|
Shannon Deminick
|
1ad19edfbd
|
Merge pull request #5262 from kjac/v8-fix-listview-annotation-order
V8: Tree node annotation "pending changes" should take precendence over "is listview"
|
2019-04-17 15:25:12 +10:00 |
|
Shannon Deminick
|
637cf6a608
|
Merge pull request #5276 from 0Neji/temp-5273
Make DropDownFlexibleConfiguration class public
|
2019-04-17 15:22:02 +10:00 |
|