Shannon
|
881fbb7f76
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
# Conflicts:
# build/Modules/Umbraco.Build/Umbraco.Build.psm1
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/DatabaseContext.cs
# src/Umbraco.Core/IO/FileSystemProviderManager.cs
# src/Umbraco.Core/ObjectExtensions.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSevenZero/AddUserGroupTables.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
# src/Umbraco.Core/Services/IdkMap.cs
# src/Umbraco.Core/Services/UserService.cs
# src/Umbraco.Core/packages.config
# src/Umbraco.Tests.Benchmarks/app.config
# src/Umbraco.Tests/UI/LegacyDialogTests.cs
# src/Umbraco.Web/Cache/MediaCacheRefresher.cs
# src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
# src/Umbraco.Web/Features/DisabledFeatures.cs
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
# src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.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/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
# src/Umbraco.Web/PublishedContentQuery.cs
# src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
# src/Umbraco.Web/packages.config
# src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
|
2018-03-29 20:01:14 +11:00 |
|
Shannon
|
fb89f0a795
|
Merge commit '2aa0dfb2c5' into dev-v8
Force merging v7 -> v8, ignoring any conflicts and choosing "our" version (v8)
since we've manually merged it alraedy
|
2018-03-29 18:07:45 +11:00 |
|
Stephan
|
796d931f65
|
Fix tests & apps
|
2018-03-28 18:07:53 +02:00 |
|
Stephan
|
14592a227b
|
Merge origin/dev-v8 into v7 temp merge
|
2018-03-28 12:58:39 +02:00 |
|
Stephan
|
7adc986472
|
Cleanup various migration stuff
|
2018-03-28 12:40:52 +02:00 |
|
Stephan
|
0ecc333a90
|
Fix port, tests
|
2018-03-28 11:28:32 +02:00 |
|
Shannon
|
487e4cbe20
|
Fixes various migration stuff - language migration was broken (public ctor), the custom sql in KeyValueService was incorrect, moved to migration syntax, InsertDataExpression didn't work, fixed with v7 code that does work, changes some Database.Execute to Execute.Sql so logging occurs. Fixes packages.config inclusion
|
2018-03-28 12:50:15 +11:00 |
|
Stephan
|
0d22478186
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-27 17:59:53 +02:00 |
|
Stephan
|
6b1ed89cb0
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-27 16:42:52 +02:00 |
|
Stephan
|
c2e1ba21b2
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-27 16:18:51 +02:00 |
|
Stephan
|
d40a835701
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-27 10:51:41 +02:00 |
|
Stephan
|
0a4878d2a3
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-27 10:04:07 +02:00 |
|
Robert
|
e5c7c5eb2d
|
Merge pull request #2541 from umbraco/temp-U4-11121
U4-11121 New LanguagesController (back office editor controller) for …
|
2018-03-26 13:14:18 +02:00 |
|
Claus
|
19a408fcae
|
U4-11121 New LanguagesController (back office editor controller) for persisting language changes
|
2018-03-26 10:55:49 +02:00 |
|
Claus
|
716020602d
|
adding using statement to preview file to prevent missing htmlhelper error.
|
2018-03-23 11:55:23 +01:00 |
|
Sebastiaan Janssen
|
8c0ec489c2
|
Bump version to 7.11
|
2018-03-23 09:54:11 +01:00 |
|
Stephan
|
59bac5c2a6
|
Fix a few things, the v8 way
|
2018-03-22 17:51:34 +01:00 |
|
Stephan
|
a2a4edb3be
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-22 17:41:13 +01:00 |
|
Claus
|
3a3d6239f0
|
U4-11144 GetManifestFiles fails if there's no App_Plugins folder
|
2018-03-22 15:35:51 +01:00 |
|
Claus
|
a4c9d8f1bf
|
typos
|
2018-03-22 15:34:28 +01:00 |
|
Claus
|
e6010fcd1e
|
Merge pull request #2534 from umbraco/temp-U4-11122
U4-11122 - Update DB and Service/Repo layer to handle language changes: mandatory, default
|
2018-03-22 15:18:15 +01:00 |
|
Sebastiaan Janssen
|
19e5715a84
|
Whoops, that was not supposed to say beta
|
2018-03-22 14:55:02 +01:00 |
|
Claus
|
730c4eaf2d
|
Merge pull request #2529 from umbraco/temp-U4-11123-take2
U4-11123 (Take 2) Updates Language Tree to not show having children or right click menu
|
2018-03-22 13:48:43 +01:00 |
|
Shannon
|
01b48a5aab
|
adds logic for repository and unit tests
|
2018-03-22 23:15:52 +11:00 |
|
Sebastiaan Janssen
|
59f9a64e81
|
Merge branch 'dev-v7' into dev-v7.10
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
|
2018-03-22 11:27:26 +01:00 |
|
Stephan
|
62c5f0f1ef
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-22 11:25:38 +01:00 |
|
Stephan
|
8bfb8e2b72
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-22 11:25:33 +01:00 |
|
Stephan
|
41948607d0
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-22 11:25:25 +01:00 |
|
Stephan
|
a9147f1473
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-22 11:25:22 +01:00 |
|
Stephan
|
8199b7710c
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-22 11:25:18 +01:00 |
|
Stephan
|
0cbfebe21c
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-22 11:25:08 +01:00 |
|
Sebastiaan Janssen
|
4bb75d73dd
|
Bump version to 7.9.3
|
2018-03-22 10:50:12 +01:00 |
|
Shannon Deminick
|
dd8e43d80a
|
Fixes U4-10472 Cannot upgrade to 7.7+ when using MySql (#2493)
* Fixes U4-10472 Cannot upgrade to 7.7+ when using MySql
* Fixes dropping the FK for the AddUserGroupTables migration
|
2018-03-22 10:35:41 +01:00 |
|
Claus
|
c9c9e8352a
|
Merge pull request #2532 from umbraco/temp-U4-11134
redirects preview to login when not authorized
|
2018-03-22 10:22:32 +01:00 |
|
Shannon
|
c4e5ab54d2
|
redirects preview to login when not authorized
|
2018-03-22 19:55:55 +11:00 |
|
Shannon
|
53bfec8a04
|
Merge branch 'dev-v7' into dev-v7.10
|
2018-03-22 19:22:34 +11:00 |
|
Shannon
|
b3fb23a67a
|
Adds language entity changes and tests
|
2018-03-22 17:51:38 +11:00 |
|
Shannon
|
d852c43559
|
oops, didn't mean to commit new lang tests
|
2018-03-22 17:33:16 +11:00 |
|
Shannon
|
0710311e70
|
uncomments an ignore attribute on a test that should definitely be passable
|
2018-03-22 17:27:34 +11:00 |
|
Shannon
|
422fd8e274
|
Fixes many hard coded SQL table names with the proposed new prefix
|
2018-03-22 17:17:01 +11:00 |
|
Shannon
|
448d490eb7
|
Adds TODO note about GlobalSettings
|
2018-03-22 16:35:16 +11:00 |
|
Shannon
|
e2d039d984
|
Changes db prefix to 'umbraco'
|
2018-03-22 15:10:05 +11:00 |
|
Sebastiaan Janssen
|
b4a0dadee9
|
Re-apply the nice C# syntax James provided
|
2018-03-21 19:53:20 +01:00 |
|
Lee Kelleher
|
014ac98d0b
|
U4-11052 - Enabled IntegerValueConverter to handle Int64 source values (#2500)
* Enabled IntegerValueConverter to handle `Int64` source values
|
2018-03-21 19:08:24 +01:00 |
|
Warren
|
d8c1e2fa98
|
Makes sure to set no child nodes & menu url
Removes the child arrow for tree items
Removes the 3 dots for the context menu item that had nothing in it
|
2018-03-21 15:53:09 +00:00 |
|
Stephan
|
10972002d9
|
Fix install issues with super user
|
2018-03-21 16:10:33 +01:00 |
|
Claus
|
37870e906c
|
Merge pull request #2527 from umbraco/temp-U4-11123
Temp U4-11123 - Sets Language Root Tree Node to use custom UI
|
2018-03-21 14:36:11 +01:00 |
|
Claus
|
49a9a249d0
|
removes using statements.
|
2018-03-21 14:35:43 +01:00 |
|
Robert
|
35a79a8598
|
Merge pull request #2525 from umbraco/temp-U4-11020
U4-11020 Deleting a member group that is part of a Public Access feat…
|
2018-03-21 13:47:02 +01:00 |
|
Robert
|
3c4f052a27
|
Moved some code around based on feedback
|
2018-03-21 13:45:44 +01:00 |
|