0a5db8f97b
Fixes up macros and file trees
2018-05-01 00:35:49 +10:00
6db5ebf6f9
More xslt removal
2018-05-01 00:15:05 +10:00
9a2797303b
cleaning up files
2018-04-30 23:30:08 +10:00
890b5f30a1
Merge remote-tracking branch 'origin/dev-v7' into temp8
...
# Conflicts:
# src/Umbraco.Core/Configuration/UmbracoSettings/IRepositoriesSection.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IRepository.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoriesCollection.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoriesElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryConfigExtensions.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
# src/Umbraco.Core/Services/PackagingService.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementDefaultTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementTests.cs
# src/Umbraco.Tests/Plugins/PluginManagerTests.cs
# src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs
# src/umbraco.cms/umbraco.cms.csproj
2018-04-30 23:25:07 +10:00
79f303ddcf
wip animation experiments
2018-04-25 10:29:18 +02:00
312b2ff435
Merge branch 'dev-v8' into temp-U4-11218
2018-04-23 09:43:22 +02:00
7d349ef518
Replaces instances of UmbracoTemplatePage with UmbracoViewPage
2018-04-20 17:40:01 +10:00
6c8e39876f
These changes shouldn't have been checked in
2018-04-19 19:36:32 +02:00
bfca8c555e
Removes Package repository config setting and related unnecessary code
2018-04-19 19:12:42 +02:00
c46d4e9e43
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
# src/Umbraco.Core/Persistence/PetaPoco.cs
# src/Umbraco.Core/Scoping/NoScope.cs
# src/Umbraco.Core/Scoping/ScopeProvider.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Tests/Persistence/Migrations/MigrationStartupHandlerTests.cs
# src/Umbraco.Tests/UI/LegacyDialogTests.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI/umbraco/config/create/UI.xml
# src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
# src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/MediaTypeController.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/ClickJackingCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
# src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
# src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
2018-04-19 23:41:35 +10:00
03ac073c02
Merge branch 'dev-v8' into temp-U4-11218
...
# Conflicts:
# src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
2018-04-19 09:59:31 +02:00
2872d0b0a2
Fixes tree init logic when user isn't logged in, moves sequential promise chaining to a helper funciton, updates the route promise chaining to actual chain.
2018-04-17 14:43:17 +10:00
319bd783ff
Merge remote-tracking branch 'origin/dev-v8' into temp-U4-11177
2018-04-17 01:45:32 +10:00
6b3c6eba8d
Fix csproj, nuspec
2018-04-16 17:04:23 +02:00
dc589f9b96
Fix csproj, nuspec
2018-04-16 16:08:26 +02:00
d0f9021bcf
Merge branch 'temp-U4-11218' into temp-v8-UI-infinite-editing
2018-04-16 15:27:29 +02:00
a92361bd00
Tree refactor, cleanup legacy support, remove odd jquery callback object, removes unused files, removes publish dialog
2018-04-16 23:07:00 +10:00
ed3e693308
Umbraco.Compat7.die.die.die
2018-04-13 11:03:35 +02:00
29d9dcffb8
Manually applying PR: Three new healthchecks #1522
2018-04-12 18:38:00 +02:00
30f8885aa9
Merge branch 'u4-9983' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9983
...
# 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/zh.xml
# src/Umbraco.Web/HealthCheck/Checks/Security/ClickJackingCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
2018-04-12 17:59:11 +02:00
28cbb0a517
Bumps version to 7.11.0
2018-04-12 13:41:56 +02:00
d8459bf4b4
Changes to build script & references etc with Stephan
2018-04-11 18:06:33 +02:00
10b777a4e0
Merge remote-tracking branch 'origin/dev-v8' into temp-U4-11174
2018-04-10 10:53:10 +10:00
584209c38d
adds elipses to the publish button when there is more than one variant
2018-04-10 10:52:07 +10:00
59f9af6eb8
Gets publish dialog mostly working with server side validation messages wired up to the dialog
2018-04-10 01:38:35 +10:00
2675669cf8
Merge pull request #2573 from umbraco/temp-U4-11171
...
fixes: U4-11171 Tree panel doesn't vertically scroll
2018-04-09 15:40:03 +02:00
dfcb93abf9
fixes: U4-11171 Tree panel doesn't vertically scroll
2018-04-09 15:00:52 +02:00
354505fde3
U4-11149 fixed error when creating new xslt file ( #2540 )
...
* U4-10659 added create task back for xslt files
* Add fix to UI.Release.xml as well
2018-04-09 14:47:09 +02:00
b98e7f2d3e
Merge pull request #2567 from umbraco/temp-U4-10783
...
fixes:
* The UI for the new bulk publish variants from Mads merged in
2018-04-09 13:27:21 +01:00
e61089f927
Merge remote-tracking branch 'origin/temp-U4-10783' into temp-U4-11174
2018-04-09 17:55:20 +10:00
41d91c225f
Gets validation working for trying to publish a document when there are validation problems with required languages
2018-04-09 16:59:45 +10:00
78121dd0f2
Re-send of invitation from user profile.
...
Allow delete of users that haven't logged in from user profile.
Prevent disable/enable and change password options from user profile for invited users.
2018-04-09 08:52:54 +02:00
95d40049f5
Bumps version to 7.10.2
2018-04-09 08:30:39 +02:00
c90d6be8ab
U4-8861 Extract GlobalSettings to an interface and expose on the standard UmbracoConfig.For settings singleton including a bunch of cleanup, getting the installer and steps to be DI
2018-04-06 13:51:54 +10:00
0f32b653a1
Change "Save and publish" label to "Publish"
2018-04-05 16:01:26 +02:00
d09d50e013
add global overlay component + add simple service for opening and closing
2018-04-05 14:35:47 +02:00
798236dc85
removes unused code, cleans up web.confgi
2018-04-05 18:13:50 +10:00
a62422fac3
ensure that debug is true when developing
2018-04-05 15:09:12 +10:00
f7a14a03f2
Fix build, still some weird csc.exe versionning
2018-04-04 17:41:55 +02:00
612acfac15
Fix solution
2018-04-04 09:59:01 +02:00
683b47bae5
Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8
2018-04-04 08:32:10 +02:00
1b804e07e5
Push web.template.config
2018-04-04 08:28:10 +02:00
d89009bbe7
Changes targetFramework to 4.7, removes the huge assembly list, removes post build scripts since they don't work
2018-04-04 16:17:57 +10:00
d618151e4f
Fixes the csproj, binding redirects and versions
2018-04-04 15:54:39 +10:00
e3c6205d0c
Fix
2018-04-03 15:32:46 +02:00
75966dcfbd
Merge branch origin/dev-v8 into dev-v8
2018-04-03 14:57:55 +02:00
cdd064ba08
Upgrade Dependencies
2018-04-03 14:54:01 +02:00
1719d33a48
Fixes tests, updates examine, fixes how __Path is stored
2018-04-03 12:33:21 +10:00
047a05cfb3
bumps version
2018-04-03 11:38:13 +10:00
e019c94207
changes back to correct version
2018-04-03 10:42:57 +10:00
Shannon