9f82ae1db7
unspec to mvc 4.0.0.1
2015-05-11 10:52:38 +10:00
3be1cd8b0d
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Core/packages.config
src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/packages.config
2015-05-07 16:24:29 +10:00
2e6c643dde
Bump version
2015-05-06 11:08:25 +02:00
d84b8aa675
Fix duplication of the mysql DbProviderFactory when using NuGet
2015-05-06 11:04:09 +02:00
d01e963365
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
...
Conflicts:
src/Umbraco.Web.UI/packages.config
2015-05-06 17:28:05 +10:00
821daa82c4
Fixes: U4-6474 Update to latest examine v0.1.63
2015-05-06 17:14:10 +10:00
a51dd93ffe
Expressed version range was wrong
2015-05-06 08:58:45 +02:00
4144590189
Upgrade to latest MySql.Data and loosen up NuGet dependency
2015-05-05 12:15:28 +02:00
6849274b98
reverts umb version
2015-05-05 13:03:05 +10:00
2f9753cc12
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/Editors/BackOfficeController.cs
src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
src/Umbraco.Web/umbraco.presentation/content.cs
src/umbraco.macroRenderings/app.config
2015-05-05 12:27:01 +10:00
be065b2fa3
Generate symbols nupkg (apparently you can create it from an existing NuSpec file, very cool)
...
Making sure that all pdbs ARE actually generated in Release mode (the AllBinaries file was missing loads of files)
Generate all and include all xml doc files too
Corrects WebPI zip, also shouldn't include dotLess.Core.dll
2015-05-01 14:27:26 +02:00
624975b4c9
Updates to WebApi2, fixes nuspec to include the correct dependencies (and simplifies them)
2015-05-01 14:03:59 +10:00
7ffb73e467
Updates Examine dependency
2015-04-23 16:45:24 +02:00
57c3665d0f
Show different ReadMe for fresh install vs. upgrade installs
2015-04-23 16:01:23 +02:00
5106ffab97
Mark as Release Candidate
2015-04-23 15:00:12 +02:00
9f569171c3
Suppress error (it's useless information)
2015-04-23 14:59:13 +02:00
800b8b5f7e
updates nuspec, creates new UmbracoApiControllerBase which is not auto-routed but contains the base services
2015-04-13 15:06:40 +10:00
f019900619
oops, not sure how the LICENSE got deleted, removed AD identity nuspec since that is in a diff repo now. Removes commented out code in umb module for auth - this is done by cookie middleware now.
2015-04-01 13:55:33 +11:00
ad92006f54
Removes the extensibility files and build for identity stuff - that now exists in a separate github repo.
2015-04-01 13:42:43 +11:00
439935430a
Simple update adding nuspec for Identity AD
2015-04-01 13:42:40 +11:00
1de9dbf18c
Updates build process to include building a nuget Identity package to provide extensibility points in Umbraco.
2015-04-01 13:42:36 +11:00
74f4b60a21
Merge branch 'dev-v7' into 7.3.0
2015-03-31 14:04:49 +11:00
1b87fd074c
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2015-03-31 13:49:39 +11:00
33f21e0528
Updates build and solution to exclude UmbracoExamine.PDF, removes files for UmbracoExamine.PDF, updates links to license in nuspec files
2015-03-31 13:49:28 +11:00
0b5a2452c2
U4-6476 Examine Issue: The CancellationTokenSource has been disposed.
...
#U4-6476 Fixed Due in version 7.2.5
2015-03-30 14:38:59 +02:00
e0effec3b4
fixes pdf build to only have it's required files in the zip
2015-03-30 19:13:13 +11:00
76a2f433d9
simplifies build since we don't have the examine azure stuff
2015-03-30 18:42:47 +11:00
2c918a2015
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2015-03-24 15:10:45 +11:00
907e5e7ca4
Bump version
2015-03-20 11:25:59 +01:00
8c4eba7837
"It's simple until you make it complicated"
...
- So now this logic has been un-complicated: look for the web.config file, if it exists and has a umbracoConfigurationStatus appSetting then don't overwrite the web.config, the user is upgrading umbraco and config transforms can do their thing. Otherwise, copy in a fresh web.config with all the required Umbraco bits.
2015-03-20 10:16:53 +01:00
182d671e31
Merge branch 'dev-v7' into 7.3.0
2015-03-20 16:42:34 +11:00
fff0151b62
Updates build process to: Ensure the AssemblyFileVersion is set to the real umbraco version, AssemblyInformationalVersion is set to the real umbraco version including the pre-release name if there is one, AssemblyCopyright has the correct year.
2015-03-20 09:31:14 +11:00
f15301a7a0
Merge remote-tracking branch 'origin/dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2015-03-20 08:26:16 +11:00
90fdbb007e
Bump version
2015-03-19 14:45:00 +01:00
311d503d8b
Updates CDF dependency to latest version
2015-03-19 12:54: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
4e9667a067
Don't forcibly remove System.Web.Helpers.dll during upgrades in case people have it already and packages rely on it
2015-03-18 09:49:18 +01:00
97a085d12b
Bump version
2015-03-03 20:19:41 +01:00
74d0ec949d
Delete bower_components folder before build else missing packages will sometimes not be downloaded
2015-03-03 19:43:19 +01:00
6f2fa2ed4d
Makes sure that the version comment gets cleared when there is no comment.
2015-02-26 12:38:03 +01:00
0ae1453fb1
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/umbraco.cms/businesslogic/Dictionary.cs
2015-02-23 13:18:01 +01:00
b724a185b7
Pushes the ascii art down one line as it looked a bit weird because the cursor is on the first line by default after installing
2015-02-19 09:37:56 +01:00
f94d280e27
Removes unnecessary dummy files. Some directories are old and not needed, plus they all get created on app startup anyway.
2015-02-19 09:23:07 +01:00
428df7ae4a
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/Umbraco.Web.csproj
2015-02-17 15:11:10 +01:00
25cfceadc0
Merge branch 'dev-v7-upgradablemvc5webapi2' of https://github.com/Shazwazza/Umbraco-CMS into Shazwazza-dev-v7-upgradablemvc5webapi2
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
2015-02-17 10:46:36 +01:00
7788452fb7
U4-6219 Visual Studio 2013 Crashes When Opening umbraco.sln
...
#U4-6219 Fixed
2015-02-13 10:04:35 +01:00
c7778467e3
Updates to latest examine version which internally supports tokenized paths in config so we don't need to do this in the umbraco core.
2015-02-13 15:34:54 +11:00
58b8aacff1
Fixes U4-6052 Umbraco 7.2.1 web app installed with Nuget fails at start with error :"Cannot create an MVC Area path without the umbracoPath specified"
...
#U4-6052 Fixed Due in version 7.2.2
2015-02-10 17:38:19 +01:00
470ccd1ffc
Merge branch 'dev-v7' into 7.3.0
2015-02-09 08:59:23 +01:00
4790dc59a9
Update CDF dependency
2015-02-05 09:01:42 +01:00
Shannon