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

486 Commits

Author SHA1 Message Date
Sebastiaan Janssen
ed8cc2ad0d Also fixes U4-5592 and U4-5746 for 7.1.9 2014-11-12 12:40:24 +01:00
Sebastiaan Janssen
5501c9531b Bump version 2014-10-07 11:22:51 +02:00
Shannon
1e04735826 updates iis port 2014-09-29 16:47:00 +02:00
Sebastiaan Janssen
101e116baf Bump version number 2014-08-25 15:14:21 +02:00
Sebastiaan Janssen
873eac7f24 Updating json.net dependency to 6.0.4 2014-08-20 10:44:05 +02:00
Jeavon Leopold
b2ca814fdb Update ImageProcessor to v1.9.0 and ImageProcessor.Web to v3.3.0 2014-08-12 16:59:31 +01:00
Shannon
84fad1300b All nuget refs are now up to date and installed correctly with copy local set correctly for all non gac 4.5 assemblies as well as the specific version attribute. 2014-07-23 12:19:40 -07:00
Shannon
6319b10881 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
	src/SQLCE4Umbraco/app.config
	src/Umbraco.Core/app.config
	src/Umbraco.Tests/App.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/app.config
	src/umbraco.MacroEngines/App.Config
	src/umbraco.businesslogic/app.config
	src/umbraco.datalayer/app.config
	src/umbraco.editorControls/app.config
 2014-07-23 10:08:01 -07:00
Shannon
c24775adb0 re-installs mvc, webapi and ensures running the latest 2.0.x versions of webpages and razor, now all proj's are consistent with correct versions referenced and copy local set correctly. 2014-07-23 10:03:26 -07:00
Shannon
b207521f4b Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-07-22 16:15:02 -07:00
Shannon
a2aaa9a1ea updates proj references to have SpecificVersion set to false 2014-07-22 16:14:13 -07:00
Shannon
217f591db0 updates proj references to have SpecificVersion set to false for libs 2014-07-22 16:13:26 -07:00
Shannon
b835cfb76d Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
 2014-07-22 15:55:06 -07:00
Shannon
d453aedd0d Microsoft.Net.Http required a reinstall command for the UI project as noted by it's persisted 'requiresReinstall' attribute in the packages.config - also ensures that ALL of the WebApi DLLs are copied local 2014-07-22 15:51:13 -07:00
Shannon
851181f861 Microsoft.Net.Http required a reinstall command for the UI project as noted by it's persisted 'requiresReinstall' attribute in the packages.config - and then the project wouldn't actually build anymore. 2014-07-22 15:39:07 -07:00
Shannon
582bafdefd Updates version 2014-06-26 10:02:09 +10:00
Shannon
3ecc974325 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
 2014-06-25 14:33:32 +10:00
Shannon
a4bf4b0977 Fixes: U4-5118 Examine not storing XML fragments - updates to latest examine 2014-06-25 14:19:31 +10:00
Shannon
1c23940b0b Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
 2014-06-17 16:09:29 +10:00
Shannon
d3bb750f98 Updated to latest Examine with lock fixes 2014-06-17 16:07:08 +10:00
Shannon
0da4879400 downgrades mini profiler to what it used to be 2014-06-09 15:32:44 +02:00
Sebastiaan Janssen
68860b6c54 Update Umbraco version everywhere 2014-06-09 10:32:09 +02:00
Shannon
df3bc873df Upgrades mini profiler and enables it in the back offfice. 2014-05-30 15:26:22 +10:00
Sebastiaan Janssen
ea32776174 Bump version 2014-05-28 17:07:51 +02:00
Sebastiaan Janssen
b42d0bc17e Bump version and fix dashboard 2014-05-28 16:04:11 +02:00
Sebastiaan Janssen
a99a33477a Centralized the current Umbraco version number in UmbracoVersion.txt that will be read by 
buildbelle.bat, build.bat and the umbraco.web.ui.csproj so it works in VS, command line and
also in TeamCity.
 2014-05-16 12:27:54 +02:00
Sebastiaan Janssen
b42d3b226d Bump version 2014-05-16 11:29:35 +02:00
Shandem
95cd32ad8c Merge pull request #359 from Jeavon/7.1.2-ImageCropper 
Adding support for Image Crop Ratio Dimension Support & UpScale to GetCropUrl & More Tests
 2014-04-23 20:20:09 +10:00
Sebastiaan Janssen
421162d809 Bump version + Attempt at U4-4742 Publish debugging symbols for NuGet package 2014-04-23 10:11:36 +02:00
Jeavon Leopold
e8d41a1b5e Adding Ratio Mode parameter to GetCropUrl helper 2014-04-18 22:04:23 +01:00
Sebastiaan Janssen
b60aa3031c Post.cshtml shouldn't be there 2014-04-08 12:03:55 +02:00
Sebastiaan Janssen
2a0e3d803f Merge branch '7.1.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.1 2014-04-08 11:37:50 +02:00
Sebastiaan Janssen
670a67225a Upgrade to Json.Net 6.0.2 2014-04-08 11:37:40 +02:00
perploug
13891bb033 Merge branch '7.1.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.1 2014-04-07 16:08:45 +02:00
perploug
a2efd7ab53 Fixes: U4-4619 Make sure installer pings stats 2014-04-07 16:08:34 +02:00
Sebastiaan Janssen
ab7371e146 Bump version number 2014-04-07 14:29:59 +02:00
Sebastiaan Janssen
66d61c9d20 One more ImageProcessor update 2014-04-03 11:29:13 +02:00
Sebastiaan Janssen
c3fc27565d Update version of ImageProcessor and refer to NuGet in the csproj instead of the bin (!) 2014-04-03 09:26:51 +02:00
Sebastiaan Janssen
29dbbee173 Imageprocessor config files are no longer required and shouldn't ship with Umbraco 2014-03-23 15:02:54 +01:00
Sebastiaan Janssen
39a3a9dc56 Reference the correct ImageProcessor version to get it included in the build 2014-03-20 09:42:06 +01:00
Shannon
a0541b000e Fixes: U4-4463 Upgrade 6.2.0 > 7.1.0 fails - due to incorrect formatting of foreign keys for sql servers 
Conflicts:
	src/Umbraco.Tests/Migrations/AlterMigrationTests.cs
	src/Umbraco.Tests/Migrations/Stubs/AlterUserTableMigrationStub.cs
 2014-03-19 10:33:37 +11:00
Sebastiaan Janssen
4ad9ea1537 Bump the version to RC 2014-03-18 15:40:09 +01:00
Shannon
66aa3084f9 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/packages.config
	src/umbraco.cms/packages.config
	src/umbraco.cms/umbraco.cms.csproj
	src/umbraco.controls/packages.config
	src/umbraco.editorControls/packages.config
	src/umbraco.macroRenderings/packages.config
	src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
 2014-03-17 14:15:14 +11:00
Shannon
d028ee2c3e Completes: U4-4457 Upgrade to latest CDF 2014-03-17 14:08:07 +11:00
Shannon
19b7a9dfff Completes: U4-4369 Remove the need for an Areas folder for the installer 2014-03-11 18:09:54 +11:00
Sebastiaan Janssen
4d3eef1124 Update version 2014-03-07 15:25:10 +01:00
perploug
d410663a68 Updates ImageProcessor 2014-03-06 22:54:51 +01:00
Shannon
feab2de260 Fixes up the starter kit installer in the back office with it's legacy implementation. Adds some handy methods for webapi routing for areas. 2014-03-05 22:42:51 +11:00
Shannon
24cc417395 Removed all the legacy files that we don't need - need to test the starter kit installation process in the back office though as some old files are still used there. 2014-03-05 19:47:00 +11:00
Shannon
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