Shannon
|
e27b873a5a
|
Merge branch 'temp8-remove-package-ascx-3996' into temp8-packages-ui
# Conflicts:
# src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
# src/Umbraco.Web/Trees/PackagesTreeController.cs
|
2019-01-09 20:57:02 +11:00 |
|
Shannon
|
b3414166a6
|
webforms and legacy file cleanup
|
2019-01-09 20:43:46 +11:00 |
|
Shannon
|
4b58e34220
|
Align namespaces with _Legacy folder
# Conflicts:
# src/Umbraco.Web/_Legacy/Packager/PackageInstance/InstalledPackage.cs
|
2019-01-09 19:08:09 +11:00 |
|
Stephan
|
436fa261f5
|
Merge remote-tracking branch 'origin/temp8' into temp8
|
2019-01-07 19:42:33 +01:00 |
|
Stephan
|
19ae9f5dee
|
Refactor configuration for DI
|
2019-01-07 19:40:07 +01:00 |
|
Claus
|
003d54cacd
|
cleanup usings
|
2019-01-07 12:59:38 +01:00 |
|
Stephan
|
ceab758100
|
Merge branch 'temp8' into temp8-di2690
|
2019-01-02 16:44:35 +01:00 |
|
Claus
|
fb9d5a3c5d
|
Merge branch 'v8-feature-angular-public-access' of https://github.com/kjac/Umbraco-CMS into kjac-v8-feature-angular-public-access
|
2019-01-02 11:58:24 +01:00 |
|
Stephan
|
a60fd1b7be
|
Merge branch origin/temp8 into temp8-di2690
|
2018-12-21 15:47:08 +01:00 |
|
Stephan
|
bb9846a6ca
|
Merge branch origin/temp8 into temp8-di2690
|
2018-12-21 10:58:38 +01:00 |
|
Shannon
|
d1befc876f
|
manual merges
|
2018-12-21 13:48:59 +11:00 |
|
Shannon
|
7e20e81cc8
|
Fixes EntityRepository and EntityService to perform order by operations correctly
|
2018-12-21 13:15:46 +11:00 |
|
Shannon
|
2fcb30e54e
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# .editorconfig
# .gitignore
# src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
# src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
# src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-era-button.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html
# src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
# src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
# src/Umbraco.Web.UI.Client/src/views/content/restore.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html
# src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
# src/Umbraco.Web.UI.Client/src/views/media/move.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Controllers/UmbLoginController.cs
# src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
# src/Umbraco.Web/Controllers/UmbProfileController.cs
# src/Umbraco.Web/Controllers/UmbRegisterController.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
# src/Umbraco.Web/HtmlHelperRenderExtensions.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Trees/MediaTreeController.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs
|
2018-12-20 16:58:01 +11:00 |
|
Kenn Jacobsen
|
97f9151473
|
Add "Move" option for deleted items in the content tree (#3772)
|
2018-12-19 18:19:51 +01:00 |
|
Kenn Jacobsen
|
7e144eeacf
|
V8: Fix listviews in pickers (#3894)
|
2018-12-19 18:01:36 +01:00 |
|
Stephan
|
5593d49719
|
Minor fixes as per PR#3852 discussion
|
2018-12-19 16:00:29 +01:00 |
|
Kenn Jacobsen
|
4d48254a93
|
Don't show "Create" and "Sort" for deleted items in the media tree
|
2018-12-19 15:33:53 +01:00 |
|
Stephan
|
115b0cd2aa
|
Merge branch temp8 into temp8-di2690
|
2018-12-18 15:42:45 +01:00 |
|
Stephan
|
adced099be
|
Move UmbracoConfig singleton to Current
|
2018-12-12 23:31:16 +01:00 |
|
Kenn Jacobsen
|
082d65b78f
|
Merge branch 'v8-feature-angular-public-access' of https://github.com/kjac/Umbraco-CMS into v8-feature-angular-public-access
|
2018-12-12 23:07:53 +01:00 |
|
Kenn Jacobsen
|
41624c8c16
|
Remove the old aspx page
|
2018-12-12 23:07:41 +01:00 |
|
Shannon
|
826a8baff5
|
Merge branch 'temp8' into temp8-backoffice-search-with-variants
|
2018-12-12 13:37:19 +11:00 |
|
Warren Buckley
|
767cd93f08
|
Adds in some logic if we have no child trees for that application/section then we create a SingleTreeRoot
|
2018-12-11 14:09:44 +00:00 |
|
Shannon
|
5148f34b32
|
Fixes ISearchableTree lifetime registration, fixes routing that clears required query strings, fixes lucene search string, gets URls in search results working with default lang/variants
|
2018-12-11 15:42:32 +11:00 |
|
Claus
|
ca0cd8711e
|
minor fixes.
|
2018-12-10 14:11:02 +01:00 |
|
Claus
|
cfd6a08366
|
Merge branch '3436-relations-editor' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-3436-relations-editor
|
2018-12-10 13:27:34 +01:00 |
|
Stephan
|
fb4717d31e
|
Merge branch 'temp8-3527-indexes-via-code' into temp8
|
2018-12-07 09:27:38 +01:00 |
|
Warren Buckley
|
3546de3207
|
Update packages tree so that its a full screen app/section like users
|
2018-12-06 09:32:04 +00:00 |
|
Shannon
|
07f15ec7b3
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/Models/UserExtensions.cs
# src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
# src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs
# src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/package.json
# src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/EditRelationType.aspx
# 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/Editors/ContentController.cs
# src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/XmlDataIntegrityHealthCheck.cs
# src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
# src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs
# src/umbraco.cms/businesslogic/language/Language.cs
|
2018-12-06 17:13:23 +11:00 |
|
Warren Buckley
|
8425c3124d
|
Modify FileSystemTree Controller - that if * is used for file extension then we will return all files :)
|
2018-12-05 15:15:45 +00:00 |
|
Warren Buckley
|
00428ec2de
|
Adds in new hidden aka initialized=false tree (so that it can be displayed only as a dialog/infinite editor) to display files & folders from root of the site for the package creator UI
|
2018-12-05 14:28:07 +00:00 |
|
Shannon
|
d549cb8e3d
|
Merge remote-tracking branch 'origin/temp8' into temp8-3527-indexes-via-code
|
2018-12-05 17:36:50 +11:00 |
|
Shannon
|
56d1a317c0
|
Gets searching working in the dashboard, updates to latest examine
|
2018-12-04 14:25:37 +11:00 |
|
Shannon
|
f8d203abff
|
Updates latest examine + api updates + fixes tests, gets different validation working (valid, failed, filtered)
|
2018-12-03 22:10:56 +11:00 |
|
James Coxhead
|
df961d9199
|
Merge branch 'temp8' into 3436-relations-editor
# Conflicts:
# src/Umbraco.Web/Trees/RelationTypeTreeController.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
|
2018-12-02 23:31:54 +00:00 |
|
James Coxhead
|
4617c0c24f
|
Tidy up - remove obsoleted classes
|
2018-12-02 18:17:20 +00:00 |
|
James Coxhead
|
a6ab471505
|
Added delete endpoint. Updated tree controller to use Angular delete view
|
2018-11-30 14:09:48 +00:00 |
|
Kenn Jacobsen
|
8e423d9c75
|
Sort the dictionary items alphabetically
|
2018-11-27 22:43:19 +01:00 |
|
Kenn Jacobsen
|
269f12edbf
|
Remove the default action from tree menus if it isn't allowed
|
2018-11-27 22:35:38 +01:00 |
|
Kenn Jacobsen
|
fe26239f73
|
Fix the sort order of dictionary items in both the tree and list view
|
2018-11-27 22:20:54 +01:00 |
|
James Coxhead
|
5872b6de22
|
Prototyped create view
|
2018-11-22 14:19:40 +00:00 |
|
Warren Buckley
|
54a2aa00a7
|
Revert "Temp8 tinymce"
|
2018-11-22 14:05:51 +00:00 |
|
Shannon
|
9e7384a330
|
Merge branch 'temp8' into temp8-3096-angular-bulk-publish
# Conflicts:
# src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
|
2018-11-20 19:37:39 +11:00 |
|
Shannon
|
99d9c49c9f
|
Gets sln building and manually merges the entity/media service changes
|
2018-11-19 17:54:36 +11:00 |
|
Shannon
|
c3736ce7ab
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# .github/README.md
# build.bat
# src/Umbraco.Core/Migrations/Expressions/Alter/Table/AlterTableBuilder.cs
# src/Umbraco.Core/Migrations/Expressions/Create/Column/CreateColumnBuilder.cs
# src/Umbraco.Core/Migrations/Expressions/Create/Index/CreateIndexBuilder.cs
# src/Umbraco.Core/Migrations/Expressions/Create/Table/CreateTableBuilder.cs
# src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs
# src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
# src/Umbraco.Core/Persistence/Factories/MediaFactory.cs
# src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs
# src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
# src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
# src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
# src/Umbraco.Core/Services/EntityService.cs
# src/Umbraco.Core/Services/IMediaService.cs
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Core/Services/NotificationService.cs
# src/Umbraco.Web.UI.Client/bower.json
# 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/directives/validation/valtab.directive.js
# src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
# src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
# src/Umbraco.Web.UI.Client/src/less/main.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/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/content/copy.html
# src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
# src/Umbraco.Web.UI.Client/src/views/content/move.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
# src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
# src/Umbraco.Web.UI.Client/src/views/media/move.html
# src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
# src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
# src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
# src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
# src/Umbraco.Web.UI/Umbraco/developer/Macros/editMacro.aspx
# src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx
# 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/dialogs/editMacro.aspx
# src/Umbraco.Web/Controllers/UmbLoginController.cs
# src/Umbraco.Web/Editors/ContentControllerBase.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/Editors/PasswordChanger.cs
# src/Umbraco.Web/HttpRequestExtensions.cs
# src/Umbraco.Web/Models/ContentEditing/Tab.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
# src/Umbraco.Web/Templates/TemplateRenderer.cs
# src/Umbraco.Web/Trees/ApplicationTreeController.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/MediaTreeController.cs
# src/Umbraco.Web/_Legacy/Controls/TabView.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs
# src/umbraco.cms/Actions/Action.cs
# src/umbraco.providers/members/UmbracoMembershipProvider.cs
|
2018-11-19 15:32:26 +11:00 |
|
James Coxhead
|
10f6f8df90
|
Show relations in edit view
|
2018-11-15 22:22:15 +00:00 |
|
Shannon
|
496ecf5c9a
|
Cleans up how the content path permissions are checked, integrates the bulk publishing into the controller, adds security check to ensure the user can publish the whole branch, updates the UI messaging so they are grouped by publish statuses and deals with multiple publish status (i.e. in bulk), fixes some content tree issues
|
2018-11-15 15:24:09 +11:00 |
|
Claus
|
f764b46b8e
|
Merge pull request #3429 from umbraco/temp8-231-send-to-publish-with-variants
v8 - send to publish with variants
|
2018-11-06 14:19:28 +01:00 |
|
Warren Buckley
|
1ef487b7da
|
Removing last of log entries that do string concat or interpolation & updates to use MessageTemplate format instead
|
2018-11-06 10:25:35 +00:00 |
|
elitsa
|
2b33c5cfd7
|
Fix for chekcing the children belonging to MemberType tree.
|
2018-11-05 10:46:50 +01:00 |
|