cd3191012f
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
src/Umbraco.Web/Scheduling/LogScrubber.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/content.cs
2015-03-27 15:15:49 +11:00
9dfccd86fd
U4-2499 Remove the possibility for accessing pages with nodeid's or give a redirect option
...
#U4-2499 Fixed Due in version 7.2.5
2015-03-24 20:09:48 +01:00
907e5e7ca4
Bump version
2015-03-20 11:25:59 +01:00
90fdbb007e
Bump version
2015-03-19 14:45:00 +01:00
d3eff734aa
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Core/CoreBootManager.cs
src/Umbraco.Core/Models/Template.cs
src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
src/Umbraco.Core/Services/LocalizedTextService.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/Plugins/TypeFinderTests.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/Editors/BackOfficeController.cs
src/Umbraco.Web/Models/ContentExtensions.cs
src/Umbraco.Web/PublishedContentExtensions.cs
src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
src/Umbraco.Web/Scheduling/Scheduler.cs
src/Umbraco.Web/Umbraco.Web.csproj
2015-03-19 17:37:00 +11:00
d24ef3650e
U4-274 - Adds config option to disable alternative templates
2015-03-17 13:50:33 +01:00
97a085d12b
Bump version
2015-03-03 20:19:41 +01:00
defc9d3bc2
Updated all repo's to have their correct ctor's with their correct dependencies. Updated them all to accept ILogger updated all other dependencies with the same without breaking anything since all is internal, or obsoleted other public methods. Updates lots of the tests with mock instances instead, now more tests have less singleton dependencies, easier to test, much clearer and more IoC driven. Updated unit tests to supply the ILogger for required objects, tests should run faster now since most things are just mocked.
2015-01-09 10:51:15 +11:00
341239648d
bumps version
2015-01-07 09:17:22 +11:00
451be273a5
bump version
2014-12-09 18:55:54 +11:00
d4fd58e038
Completes: U4-5846 Remove cmsTemplate.master column and transfer those values over to umbracoNode.parentId, U4-5847 Ensure the path is set correctly for templates in the db, almost done the other template service tasks too.
2014-12-05 17:29:47 +11:00
c71e00b3dc
Merge branch '7.2.1' into 7.3.0
2014-12-05 13:57:23 +11:00
c563629756
Bump version
2014-12-03 10:25:08 +01:00
2b25815eee
Merge branch '7.2.0' into 7.3.0
...
Conflicts:
src/Umbraco.Web/Umbraco.Web.csproj
2014-12-01 12:22:19 +11:00
0155a094b1
Bump Version
2014-11-27 12:12:31 +01:00
df3d427c0b
WIP - Updates templates service and repo with some extra methods, creates new template tree, updates template model with some more properties, still need to finish the template tree, it's missing some menu actions.
2014-11-20 19:51:42 +11:00
9019c49ee8
Merge branch '7.1.9' into 7.2.0
...
Conflicts:
build/NuSpecs/UmbracoCms.Core.nuspec
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
src/Umbraco.Tests/Plugins/PluginManagerTests.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/Scheduling/KeepAlive.cs
src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs
src/UmbracoExamine/BaseUmbracoIndexer.cs
src/UmbracoExamine/DataServices/UmbracoContentService.cs
src/UmbracoExamine/DataServices/UmbracoMediaService.cs
src/UmbracoExamine/UmbracoContentIndexer.cs
src/UmbracoExamine/UmbracoMemberIndexer.cs
2014-11-13 16:32:50 +11:00
d43b673092
Merge branch '7.1.9' of https://github.com/umbraco/Umbraco-CMS into 7.1.9
2014-11-13 13:06:53 +11:00
4ec37b9d3a
Fixes: U4-5391 Create config to explicitly set the 'base url' for a website that is not running as a load balanced site - used for scheduled tasks/publishing/keepalive
2014-11-13 13:05:27 +11:00
4eb0981552
Bump version
2014-11-12 14:28:13 +01:00
1ee6fc8514
Update build.bat to beta2
2014-11-10 13:33:42 +01:00
ea7d52a353
Update version
2014-10-08 13:56:26 +02:00
5501c9531b
Bump version
2014-10-07 11:22:51 +02:00
b975a02bfa
Updates version to 7.1.7
2014-09-29 16:46:53 +02:00
101e116baf
Bump version number
2014-08-25 15:14:21 +02:00
dba180d809
Merge remote-tracking branch 'origin/7.1.5' into 7.2.0
...
Conflicts:
src/Umbraco.Web.UI.Client/gruntFile.js
src/Umbraco.Web.UI.Client/lib/lazyload/lazyload.min.js
src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/packages.config
2014-08-04 13:32:44 +02:00
5011eee037
fixes merge issue
2014-06-25 11:00:53 +10:00
52457fea21
Bump version number
2014-06-10 18:47:02 +02:00
f834155763
updated version to 7.1.5
2014-06-08 17:26:23 +02:00
b42d0bc17e
Bump version and fix dashboard
2014-05-28 16:04:11 +02:00
b42d3b226d
Bump version
2014-05-16 11:29:35 +02:00
421162d809
Bump version + Attempt at U4-4742 Publish debugging symbols for NuGet package
2014-04-23 10:11:36 +02:00
ab7371e146
Bump version number
2014-04-07 14:29:59 +02:00
5efc45a7dd
Bump version number
2014-04-03 09:29:52 +02:00
6169d13eb5
fixes the config issue with unit tests
2014-03-19 17:56:30 +11:00
a46c088d0c
Ensures correct exceptions are thrown when configurations cannot be loaded, before was just null ref exception which was not good.
2014-03-19 11:00:32 +11:00
4ad9ea1537
Bump the version to RC
2014-03-18 15:40:09 +01:00
4d13925e3b
Fixes merge issues
2014-03-18 19:05:07 +11:00
02481dcfba
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
...
Conflicts:
src/Umbraco.Core/Configuration/UmbracoSettings.cs
2014-03-18 18:53:04 +11:00
caad775399
Removes the User membership provider name constant - it is not a constant, this value is configurable!
2014-03-18 18:52:17 +11:00
3e5128147c
fixes typo
2014-03-14 19:34:09 +11:00
b5329ace3b
Backports fixes for legacy encoding checks and to not do any db lookups for the new membership providers and also ensures the legacy membership provider doesn't do any db lookups on init.
2014-03-14 18:38:57 +11:00
fce31a2e02
7.1 beta
2014-03-07 15:26:28 +01:00
4d3eef1124
Update version
2014-03-07 15:25:10 +01:00
00f2afe454
Creates Install MVC Area, creates new installer api controllers, moves old installer files to the new Area folder so that the /install path can route properly.
2014-02-26 04:15:14 +11:00
3800ffc11c
Fixes new membership providers to ensure no sql is run on init. Fixes the installer useLegacyEncoding setup to not attempt to set this when the legacy provider is enabled.
2014-02-26 02:57:05 +11:00
784f873777
updated to use constant
2014-02-25 02:36:25 +11:00
bb9c968d3a
fixes merge issues
2014-02-25 02:30:05 +11:00
b8fe5df3c9
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
...
Conflicts:
src/Umbraco.Core/Configuration/GlobalSettings.cs
src/Umbraco.Core/Configuration/UmbracoSettings.cs
src/Umbraco.Core/Models/Member.cs
src/Umbraco.Core/Services/ContentService.cs
src/Umbraco.Core/Services/MediaService.cs
src/Umbraco.Core/Services/MemberService.cs
src/Umbraco.Web.UI/config/ClientDependency.config
src/Umbraco.Web.UI/config/Dashboard.Release.config
src/Umbraco.Web.UI/config/feedProxy.config
src/Umbraco.Web.UI/config/tinyMceConfig.config
src/Umbraco.Web.UI/config/trees.config
src/Umbraco.Web.UI/config/umbracoSettings.Release.config
src/Umbraco.Web.UI/config/umbracoSettings.config
src/Umbraco.Web.UI/config/xsltExtensions.config
src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-02-25 02:24:45 +11:00
ac59c5deb0
Fixing some potential upgrade issues and two issues found with the legacy member API
...
- For legacy API we never had and "approved" checkbox, so the assumption is that members are always approved
- The RequiresUniqueEmail check was wrong, previously the assumption was: if there's no e-mail then don't check for uniqueness
2014-02-22 16:44:02 +01:00
Shannon