Shannon
65ece33ca9
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# src/Umbraco.Core/Models/UmbracoObjectTypes.cs
# src/Umbraco.Web.UI.Client/bower.json
# src/Umbraco.Web.UI.Client/gruntFile.js
# src/Umbraco.Web.UI.Client/src/installer/_module.js
# src/Umbraco.Web.UI.Client/test/config/karma.conf.js
2017-09-07 22:43:03 +10:00
Shannon
1f7a5ff90a
bumping version
2017-09-05 19:28:18 +10:00
Shannon
2590ee51ec
cleans up event args and makes internal
2017-09-05 19:20:33 +10:00
Sebastiaan Janssen
a9cda9d651
Merge branch 'dev-v7' into temp-gulp-spike
2017-09-04 21:37:49 +02:00
Sebastiaan Janssen
ad19eb8dff
Update node version and remove unused npm reference
2017-09-04 20:14:31 +02:00
Sebastiaan Janssen
2121b7c8a0
Node version
2017-09-04 14:07:06 +02:00
mikkelhm
895faf41b1
Update version to 7.6.7
2017-09-04 12:28:16 +02:00
Mads Rasmussen
7ccfc79080
update BuildBelle.bat to use gulp build task
2017-08-29 12:40:57 +02:00
Mads Rasmussen
ed850629da
Merge branch 'dev-v7' into temp-gulp-spike
2017-08-29 11:47:17 +02:00
Sebastiaan Janssen
780776072d
Update umbracoDefaultUILanguage to en-US
2017-08-24 21:03:31 +02:00
Shannon
254d4e2067
updates to latest examine
2017-08-18 11:54:39 +10:00
mikkelhm
0db4993900
Bump version to beta003
2017-08-10 13:53:26 +02:00
Claus
5f0765a39a
Merge branch 'temp-U4-10263' into dev-v7.7
2017-08-10 11:27:38 +02:00
mikkelhm
ca80a0cddc
Bump version to 7.6.6
2017-08-10 08:41:06 +02:00
Claus
fa1663ed51
Fixes build script to work with VS 2017 (only) and fixes BuildBelle since it didn't work and is missing tools
2017-08-08 13:08:29 +02:00
Per Ploug
ba82885b6d
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into temp-gulp-spike
...
# Conflicts:
# build/BuildBelle.bat
2017-08-07 14:05:53 +02:00
Sebastiaan Janssen
c89f44bb3d
Let's aim for only 1 beta ;)
2017-08-02 16:52:08 +02:00
Jeavon
b915f723f5
Removing Slack Health Check notification
2017-08-02 11:20:00 +01:00
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
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
mikkelhm
374fdcf29e
Bumps version to 7.6.5
2017-07-13 12:14:32 +02:00
Jeavon
3083f185d0
Merge branch 'dev-v7.7' into temp-U4-9984
2017-06-26 18:01:57 +01: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
