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

832 Commits

Author SHA1 Message Date
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
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
0a4878d2a3 Port v7@2aa0dfb2c5 - WIP 2018-03-27 10:04:07 +02:00
Sebastiaan Janssen
8c0ec489c2 Bump version to 7.11 2018-03-23 09:54:11 +01:00
Stephan
a2a4edb3be Port v7@2aa0dfb2c5 - WIP 2018-03-22 17:41:13 +01:00
Stephan
a9147f1473 Port v7@2aa0dfb2c5 - WIP 2018-03-22 11:25:22 +01:00
Shannon
448d490eb7 Adds TODO note about GlobalSettings 2018-03-22 16:35:16 +11:00
Stephan
32e6aa4f6b Version alpha.32 for ModelsBuilder 2018-03-20 16:21:26 +01:00
Shannon
830f460b7e bumps version 2018-03-14 13:58:48 +11:00
Sebastiaan Jansssen
213ea6470f Bump version to 7.9.2 2018-03-01 15:09:04 +01:00
Sebastiaan Jansssen
86bc50c61d Bump version to 7.9.1 2018-02-28 13:27:53 +01:00
Sebastiaan Jansssen
e433daf5ff Bump version to 7.9.0 2018-02-21 16:06:59 +01:00
Sebastiaan Jansssen
56f4904fc0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 2018-02-14 12:15:18 +01:00
Sebastiaan Jansssen
9178e7afcf Whoops, no need to introduce a new method here, old method was still available 2018-02-14 12:13:01 +01:00
Sebastiaan Jansssen
7746c4a014 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs
 2018-02-14 10:28:51 +01:00
Sebastiaan Jansssen
4640cf56d1 Make change non-breaking 2018-02-14 10:23:58 +01:00
Shannon
e900711180 Updates the CDF version changer to to use a hash of the current version and the date time so that it's not constantly updated if it's not changed. 2018-02-14 11:53:49 +11:00
Stephan
af7df0c6b5 Cleanup 2018-02-09 18:22:59 +01:00
Sebastiaan Jansssen
c63156fcd8 Bump version to 7.7.11 
(cherry picked from commit 0c25c36af0)
 2018-02-09 09:53:52 +01:00
Sebastiaan Jansssen
28eb4ff03a Bump version to 7.8.1 2018-02-08 14:08:38 +01:00
Sebastiaan Jansssen
7a4b5fa796 Bump version to 7.7.10 2018-01-24 14:34:03 +01:00
Stephan
c3e6886ac0 DataType refactoring - in progress 2018-01-24 11:44:44 +01:00
Stephan
2f7f22961b Version alpha.31 with ModelsBuilder alpha.14 2018-01-20 10:21:01 +01:00
Stephan
eff2e7a65b Manifest refactoring 2018-01-20 10:19:57 +01:00
Sebastiaan Jansssen
382103d99d Bump version to 7.7.9 2018-01-19 08:26:33 +01:00
Sebastiaan Jansssen
d2f3e162f1 Bump version to 7.7.8 2018-01-04 16:45:00 +01:00
Sebastiaan Jansssen
b6b7b9f433 Bump version to 7.7.7 2017-12-11 13:57:31 +01:00
Sebastiaan Janssen
7eca99e249 Bump version to 7.7.6 2017-11-15 15:21:25 +01:00
Sebastiaan Janssen
dad77fc506 Bump version to 7.7.5 2017-11-14 07:17:19 +01:00
Shannon
b9b1fc3a70 Adds a global config switch to enable/disable tours entirely 2017-11-09 00:57:05 +11:00
Shannon
2fdd1c0bd2 bump version 2017-10-31 11:52:43 +11:00
Stephan
2305426dda Version -alpha.30 with ModelsBuilder -alpha.13 2017-10-26 11:25:01 +02:00
Stephan
edc5b398bd Version 8.0.0-alpha.29 2017-10-25 14:25:52 +02:00
Stephan
cf46a51866 Getting NestedContent and ModelsBuilder happy 2017-10-25 13:23:14 +02:00
Sebastiaan Janssen
7e7f9902f6 Bumps version to 7.7.4 2017-10-23 14:18:00 +02:00
Stephan
0fe96a58c1 Migrate to Umbraco.Build 2017-10-20 17:53:41 +02:00
Sebastiaan Janssen
80f172e3fb Bump version to 7.7.3 2017-10-16 14:56:43 +02:00
Shannon
7b3f7f4ad4 U4-10503 Umbraco plugins cache files should be stored in the same local temp location as the umbraco xml cache file 2017-10-06 11:47:25 +11:00
Stephan
d32f18f9e7 Relax versionning, version 8.0.0-alpha.26 2017-09-29 18:33:33 +02:00
Shannon
efd1ea5b86 bumps version 2017-09-29 13:18:58 +10:00
Shannon
9ad767a285 removes regex configuration bits 2017-09-27 23:13:02 +10:00
Sebastiaan Janssen
147d6aa638 Revert to the previous regex we had, which was actually working great 2017-09-27 12:36:43 +02:00
Stephan
477acb4de3 Fix build, version 8.0.0-alpha024 2017-09-27 11:35:51 +02:00
Sebastiaan Janssen
8a52865d22 U4-10439 Email validation in installer, User and Member editor need to be the same 2017-09-26 15:23:47 +02:00
Stephan
e71c9740cd More SqlTemplates 2017-09-24 18:54:31 +02:00
Stephan
5ba2ffcbf3 CrLfTab 2017-09-23 10:08:18 +02:00
Stephan
9ed6576908 Port 7.7 - WIP 2017-09-19 15:51:47 +02:00
Sebastiaan Janssen
0070d8b913 Bump version 2017-09-19 14:23:58 +02:00
Sebastiaan Janssen
0dfbe4d4eb Bump version 2017-09-18 23:08:32 +02:00