Commit Graph

52 Commits

Author SHA1 Message Date
Sebastiaan Janssen
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
Sebastiaan Janssen
69c7ecad59 Got bitten by stray files that were left behing in _BuildOutput folder, clean before build 2014-07-24 14:43:40 +02:00
Sebastiaan Janssen
f86902bc89 Microsoft.Bcl 1.1.7 requires NuGet 2.8.1 - also registering MyGet feed from the build.bat file so that it actually works for everybody 2014-07-23 11:39:40 +02:00
Sebastiaan Janssen
52457fea21 Bump version number 2014-06-10 18:47:02 +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
Sebastiaan Janssen
00880fcbfa I was confused, these files exist just fine :) 2014-05-09 13:07:03 +02:00
Sebastiaan Janssen
85012ee82a Renaming files that don't exist led to the NuGet package not being created correctly somehow 2014-05-09 09:16:51 +02:00
Sebastiaan Janssen
421162d809 Bump version + Attempt at U4-4742 Publish debugging symbols for NuGet package 2014-04-23 10:11:36 +02:00
Sebastiaan Janssen
ab7371e146 Bump version number 2014-04-07 14:29:59 +02:00
Sebastiaan Janssen
5efc45a7dd Bump version number 2014-04-03 09:29:52 +02:00
Sebastiaan Janssen
1f03983628 Clean up belle/build folder when building with build.bat to make sure it's pristine 2014-04-01 11:54:25 +02:00
Sebastiaan Janssen
3235678d29 U4-4510 nuget targets file creates an invalid path in the property group
That should fix this one properly now
2014-03-25 20:40:44 +01:00
Sebastiaan Janssen
4ad9ea1537 Bump the version to RC 2014-03-18 15:40:09 +01:00
perploug
fce31a2e02 7.1 beta 2014-03-07 15:26:28 +01:00
Shannon
87f93be6ba updates version 2014-02-17 16:06:46 +11:00
Shannon
68b4a493c6 updates versions and port 2014-01-29 09:46:25 +11:00
Sebastiaan Janssen
171a472966 Split out the Belle build and integrate it in the build of the Web.UI project 2014-01-17 18:56:04 +01:00
Sebastiaan Janssen
65b522a0a0 Automatically build Belle from build.bat without having to install Node.js on local machine 2014-01-17 14:52:42 +01:00
Shannon
63ca9f210b updates version # 2013-12-24 10:48:14 +11:00
Sebastiaan Janssen
208cf8a01d Bump version and try to make the buildserver happy 2013-12-09 17:55:37 +01:00
Sebastiaan Janssen
355137f982 U4-3469 Umbraco 7 + MVC 4 + nuget, web.config error 2013-11-19 15:12:47 +01:00
Sebastiaan Janssen
17db60c34a Fixes U4-3399 - Adds some nuget dependencies and we don't need the dummy in macroscripts
any more nor do we need to preventatively delete json.net any more.
2013-11-18 14:51:12 +01:00
perploug
ea73ecd9cb merge 2013-11-05 11:44:34 +01:00
perploug
725ef52243 version comment in build 2013-11-05 11:17:04 +01:00
Sebastiaan Janssen
2617124ee8 Bump version to RC 2013-11-05 09:05:41 +01:00
Sebastiaan Janssen
a54b2297c7 Changed version to beta 2013-10-11 10:51:12 +02:00
perploug
dcb08250ab Minor search visual tweaks 2013-09-27 11:23:38 +02:00
Sebastiaan Janssen
e71fa681e6 Update build to v7 and include belle files 2013-08-20 14:18:02 +02:00
Sebastiaan Janssen
e41d3c7e84 Increase version to 6.1.4 2013-07-25 11:59:37 +02:00
Sebastiaan Janssen
ffce1a3e6b Open new branch for 6.1.3 2013-06-28 14:44:56 +02:00
Morten Christensen
4368f15097 Updating nuspec files which is a bit different for 6.1.x then 6.0.x 2013-06-27 15:36:25 +02:00
Sebastiaan Janssen
09d9728fb8 Merge branch '6.0.7' into 6.1.2
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2013-06-23 15:16:44 +02:00
Sebastiaan Janssen
c0df3e0202 Match IIS Express port number to Umbraco version so it's easier to use a few copies of the repo locally
(you don't have to re-map your port to the correct folder)
2013-06-23 15:13:27 +02:00
Sebastiaan Janssen
d8a8bf5f74 Bump version number 2013-05-30 10:26:40 -02:00
Sebastiaan Janssen
a8ad8c2a43 Bump version number 2013-05-30 10:23:35 -02:00
Sebastiaan Janssen
ae9d77a765 Bump version number 2013-05-29 05:40:55 -02:00
Sebastiaan Janssen
2f61bc27c8 Bump version number 2013-05-28 15:15:32 -02:00
Sebastiaan Janssen
d10eff04a7 Update version 2013-05-10 07:09:43 -02:00
Sebastiaan Janssen
0ca52fcc60 Fix merge issues, update version number 2013-04-29 12:29:15 -02:00
Morten Christensen
c573459626 Fixing nuget related issue #U4-2067 and updating version 2013-04-22 06:01:31 -02:00
Morten Christensen
03c65c8eec Updating build version to 6.1.0 beta
Updating nuspec with new references.
2013-04-04 12:13:59 -02:00
Morten Christensen
222a5237b0 Version updated to 6.0.3 2013-03-06 12:03:01 -01:00
Morten Christensen
cb03178d99 Updating version 2013-03-01 15:39:24 -01:00
Sebastiaan Janssen
1f7651d0e3 Set version to 6.0.1 2013-02-18 10:16:24 -01:00
Sebastiaan Janssen
ca44094a37 Remove RC from the version number 2013-01-31 08:23:58 -01:00
Morten Christensen
5d0aced9a7 Giving the install/upgrade a bit of TLC.
Fixes U4-1520
2013-01-28 14:01:38 -01:00
Sebastiaan Janssen
801eb2c3d3 Change version to RC 2013-01-21 12:34:56 -01:00
Sebastiaan Janssen
84635631cb Fix U4-1470 UmbracoVersion.Current.ToString(3) - Version string portion was too
short or too long.
2013-01-15 09:13:48 -01:00
Sebastiaan Janssen
fa862e9a33 Improve build so that you can't forget to set the version number, the version in
UmbracoVersion.cs will be updated with the version configured in build.bat
2013-01-14 12:16:55 -01:00