Commit Graph

822 Commits

Author SHA1 Message Date
Jeavon
8259024e20 Merge branch 'dev-v7.7' into temp-U4-9984
# Conflicts:
#	src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
2017-08-02 10:48:43 +01:00
mikkelhm
6655be5f5e Updates the trees.config.install.xdt to update the tree.config with the new User section 2017-08-01 14:24:04 +02:00
mikkelhm
005bee7650 Updates web.config.install.xdt to have the latest assemblyBindings for the Katana libs(Owin), v 3.1.0.0 2017-08-01 10:29:22 +02:00
Shannon
67a69d2e11 bumps version, fixes install with setting built in group start nodes 2017-08-01 16:21:11 +10:00
Shannon
bcf4a84725 fixes more tests, gotta be close now 2017-07-31 19:47:02 +10:00
Stephan
9754c4511b U4-10006 - temp debug 2017-07-21 09:35:32 +02:00
Stephan
442d359ab0 U4-10006 - temp debug 2017-07-21 09:14:46 +02:00
Stephan
bbed2fa8f6 U4-10006 - temp debug 2017-07-21 09:08:21 +02:00
Stephan
3089a0ab3a U4-10006 - temp debug 2017-07-21 08:48:09 +02:00
Shannon
a0d3c18acc Fixes build script to work with VS 2017 (only) and fixes BuildBelle since it didn't work and is missing tools 2017-07-18 13:10:17 +10:00
Stephan
b3ac3a03f3 U4-10006 - temp debug 2017-07-17 11:30:33 +02:00
Stephan
bd0ca43b83 U4-10006 - use Invoke-WebRequest, misc 2017-07-17 09:46:09 +02:00
Stephan
f39531216c U4-10006 - fix npm/node issues 2017-07-14 20:21:29 +02:00
Stephan
f24effdf0e U4-10006 - misc fixes 2017-07-14 10:17:40 +02:00
mikkelhm
374fdcf29e Bumps version to 7.6.5 2017-07-13 12:14:32 +02:00
Stephan
f7d11bf936 U4-10006 - fix 2017-07-10 17:41:58 +02:00
Stephan
0fc868c9ba U4-10006 - verify NuGet 2017-07-10 15:58:22 +02:00
Stephan
a3f4275b30 U4-10006 - build docs 2017-07-09 18:45:29 +02:00
Stephan
cfd3301965 U4-10006 - fix build.ps1, update build.md doc 2017-07-09 17:29:06 +02:00
Stephan
48041c3163 U4-10006 - add build.ps1 2017-07-07 16:41:21 +02:00
Stephan
872530296f U4-10006 - fix 2017-06-29 19:26:51 +02:00
Stephan
71b5e5223f U4-10006 - fix 2017-06-28 16:26:27 +02:00
Jeavon
3083f185d0 Merge branch 'dev-v7.7' into temp-U4-9984 2017-06-26 18:01:57 +01:00
Stephan
7d8fdff6c1 U4-10006 - adjust projects to new build 2017-06-15 15:50:50 +02:00
Stephan
a813c0bfea U4-10006 - import some documentation 2017-06-15 15:15:53 +02:00
Stephan
4870554f47 U4-10006 - from build.bat to Umbraco.Build PS module 2017-06-15 13:32:00 +02:00
Shannon
51b19bedc8 Merge remote-tracking branch 'origin/dev-v7' into user-group-permissions
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Editors/GravatarController.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
2017-06-14 22:30:36 +02:00
Shannon Deminick
08c4a75af7 Merge pull request #1945 from protherj/U4-9792-fips-support
U4-9792 -- Update Umbraco to be FIPS compliant
2017-06-13 15:05:21 +02:00
Sebastiaan Janssen
2191d33844 Bumps version 2017-06-05 16:33:47 +02:00
Jeavon Leopold
57bb47a78b Add xdt transforms for adding the HealthChecks config to Web.Config 2017-06-05 15:31:21 +02:00
Jeavon Leopold
a102a7c094 Adding Slack.Webhooks to nuspec 2017-06-05 13:30:26 +02:00
Sebastiaan Janssen
7e6f7f8a2b Bumps version 2017-06-01 13:04:31 +02:00
mikkelhm
b0a739b4ac Bump version to 7.6.2 2017-05-29 15:07:37 +02:00
Shannon
fce7adcc8e Merge branch 'dev-v7' into user-group-permissions 2017-05-19 13:21:27 +10:00
Shannon
b78c334589 Merge remote-tracking branch 'origin/master-v7' into dev-v7 2017-05-19 12:04:27 +10:00
Shannon Deminick
b41de9b623 Merge pull request #1944 from umbraco/temp-U4-9848
U4-9848 Make sure NuGet version 3.4.4+ is installed in NuGet to prevent update errors
2017-05-19 12:02:11 +10:00
Shannon
73e47402cb Fixes docs build 2017-05-19 10:20:00 +10:00
Shannon
fcc71958e3 Merge remote-tracking branch 'origin/dev-v7' into user-group-permissions
# Conflicts:
#	.gitignore
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx
2017-05-19 09:59:59 +10:00
Jason Prothero
2334596bf3 Update Unit Tests to check for the correct version of Examine 2017-05-16 11:06:00 -07:00
mikkelhm
3f25d3637a Bump version to 7.5.14 2017-05-16 08:32:33 +02:00
Sebastiaan Janssen
99d4b13bb0 Adds SQLCE assembly redirect on fresh installs and upgrades 2017-05-15 22:54:46 +02:00
Sebastiaan Janssen
e7b007386a U4-9848 Make sure NuGet version 3.4.4+ is installed in NuGet to prevent update errors 2017-05-15 19:00:05 +02:00
Shannon
fc58c4f546 bumps version updates a few methods 2017-05-10 18:06:46 +10:00
mikkelhm
36e60c774f Bump version to 7.6.1 2017-05-08 14:06:03 +02:00
Sebastiaan Janssen
0c520f2b43 Merge branch 'dev-v7' into dev-v7.6
# Conflicts:
#	build/Build.bat
2017-05-05 16:19:54 +02:00
Sebastiaan Janssen
85d10014c2 Make new build work when there's spaces in the current path 2017-05-05 16:14:59 +02:00
Sebastiaan Janssen
c6956b5e98 Merge branch 'dev-v7' into dev-v7.6
# Conflicts:
#	.gitignore
#	build/Build.bat
2017-05-05 14:30:08 +02:00
Sebastiaan Janssen
fcf5ecc166 Uses vswhere to figure out where VS17 is installed (if needed)
Removes targets file that was almost unused, moved the relevant bits to the main csproj
Updates BuildBelle.bat to be completely independent of installed version of node & npm on the machine
2017-05-05 14:14:37 +02:00
Mads Rasmussen
28d7a4a6dc Merge branch 'dev-v7.6' into temp-gulp-spike
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
2017-05-05 13:01:24 +02:00
Shannon
c1853e8c51 bumps version to 7.6.0 rtm 2017-05-02 13:42:20 +10:00