Shannon
|
a2025c14b1
|
Merge branch 'dev-v7' into dev-v7.8
# Conflicts:
# src/Umbraco.Core/Umbraco.Core.csproj
|
2017-10-31 11:18:52 +11:00 |
|
Shannon Deminick
|
49d54f8ca5
|
Merge pull request #2266 from ProNotion/issues/U4-9401
Fixes U4-9401 Double slashes in some Umbraco generated urls causes broken links
|
2017-10-27 14:32:04 +11:00 |
|
Simon Dingley
|
731e380445
|
Fixes U4-9401 Double slashes in some Umbraco generated urls causes broken links
|
2017-10-26 14:27:23 +01:00 |
|
Shannon Deminick
|
bd0edb322d
|
Merge pull request #2262 from umbraco/temp-U4-10564
U4-10564 - Update ImageProcessor dependencies
|
2017-10-26 15:06:36 +11:00 |
|
Sebastiaan Janssen
|
f766057e50
|
Merge branch 'dev-v7.6' into dev-v7
# Conflicts:
# src/Umbraco.Core/PluginManager.cs
# src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
|
2017-10-25 14:13:38 +02:00 |
|
Sebastiaan Janssen
|
f0b5c831f1
|
Manually applied all changes for U4-10503 Umbraco plugins cache files should be stored in the same local temp location as the umbraco xml cache file
|
2017-10-25 14:05:56 +02:00 |
|
Shannon
|
d3232a09fb
|
U4-10503 Umbraco plugins cache files should be stored in the same local temp location as the umbraco xml cache file
(cherry picked from commit 7b3f7f4ad4)
|
2017-10-25 13:42:10 +02:00 |
|
Sebastiaan Janssen
|
586c59949a
|
Merge branch 'dev-v7.6' into dev-v7
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
|
2017-10-25 13:05:11 +02:00 |
|
Shannon
|
7cbaecc53a
|
U4-10538 Disable Ping on front-end nodes when load balancing
(cherry picked from commit fd8daa398f)
|
2017-10-25 13:03:31 +02:00 |
|
Claus
|
1c883be16b
|
Merge remote-tracking branch 'origin/temp-u4-8409' into dev-v7.8
|
2017-10-25 12:27:34 +02:00 |
|
Claus
|
73d681d674
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8
# Conflicts:
# src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
|
2017-10-25 11:52:30 +02:00 |
|
Stephan
|
e84a963d66
|
U4-10121 - Scheduled Publishing as background task
(cherry picked from commit 79df75c415)
|
2017-10-25 11:51:42 +02:00 |
|
Sebastiaan Janssen
|
58c180d6cc
|
Merge pull request #2242 from umbraco/temp-U4-10538
U4-10538 Disable Ping on front-end nodes when load balancing
|
2017-10-24 17:21:13 +02:00 |
|
Claus
|
fa68bee762
|
removing left over using statements and references to SharpZipLib.
|
2017-10-24 15:16:12 +02:00 |
|
Sebastiaan Janssen
|
18e377f159
|
U4-10564 - Update ImageProcessor dependencies
|
2017-10-24 13:20:33 +02:00 |
|
Sebastiaan Janssen
|
7e7f9902f6
|
Bumps version to 7.7.4
|
2017-10-23 14:18:00 +02:00 |
|
Sebastiaan Janssen
|
a36184a261
|
Bump version to 7.6.11
|
2017-10-23 14:14:59 +02:00 |
|
Sebastiaan Janssen
|
dcd2630d6b
|
Merge branch 'dev-v7.6' into dev-v7
|
2017-10-23 14:10:04 +02:00 |
|
Sebastiaan Janssen
|
b70f543790
|
Reverts wrongly committed files
|
2017-10-23 14:02:00 +02:00 |
|
Sebastiaan Janssen
|
24c1c15b66
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2017-10-23 13:59:30 +02:00 |
|
Sebastiaan Janssen
|
4a0cd7228b
|
Revert "U4-10554 - warn if closing page with changes"
This reverts commit 24b147e2a6.
|
2017-10-23 13:59:06 +02:00 |
|
pijemcolu
|
6a980e64eb
|
zipPackage to disk
|
2017-10-23 09:02:28 +02:00 |
|
Stephan
|
edfe212227
|
Fix login issue
|
2017-10-20 15:35:30 +02:00 |
|
pijemcolu
|
3c7e820773
|
remove the directory check
|
2017-10-19 19:50:27 +02:00 |
|
Sebastiaan Janssen
|
e3bc98a155
|
Merge pull request #2257 from umbraco/temp-U4-10566
U4-10566 The legacy API Member.PopulateGroups throws an exception
|
2017-10-19 06:59:18 -07:00 |
|
Shannon
|
f85532f15e
|
U4-10566 The legacy API Member.PopulateGroups throws an exception
|
2017-10-20 00:56:34 +11:00 |
|
pijemcolu
|
2c1d85989f
|
Extract the zip in UnPack(), remove check for directory exists as it should not and that's what the method did previously
|
2017-10-19 13:14:06 +02:00 |
|
pijemcolu
|
bc32ff31d4
|
remove last 3 dependencies
|
2017-10-19 12:11:07 +02:00 |
|
Sebastiaan Janssen
|
b04d71ca5f
|
Merge pull request #2256 from richarth/patch-1
Removed duplicate translations
|
2017-10-19 00:41:33 -07:00 |
|
Sebastiaan Janssen
|
ab4de382f3
|
Merge pull request #2252 from umbraco/temp-u4-7317
U4-7317 - select default template
|
2017-10-18 12:38:53 -07:00 |
|
Sebastiaan Janssen
|
a293c633fc
|
Merge pull request #2249 from umbraco/temp-u4-8652
U4-8652 - accept exceptions when loading some assemblies
|
2017-10-18 11:00:45 -07:00 |
|
Richard Thompson
|
507e3ece98
|
Removed duplicate translations
Removed duplicate definition of English translations
|
2017-10-18 15:36:17 +01:00 |
|
Stephan
|
b77826fd3d
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2017-10-18 12:18:59 +02:00 |
|
Stephan
|
4c7358d63b
|
U4-8960 - minor fixes
|
2017-10-18 12:17:58 +02:00 |
|
Stephan
|
4814612102
|
Merge branch 'U4-8960' of https://github.com/lars-erik/Umbraco-CMS into temp-u4-8960
|
2017-10-18 11:56:00 +02:00 |
|
Robert
|
6dae4396bb
|
Merge pull request #2250 from umbraco/temp-u4-10554
U4-10554 - warn if closing page with changes
|
2017-10-18 11:53:54 +02:00 |
|
Stephan
|
dd5560f00b
|
U4-8616 - minor cleanup
|
2017-10-18 10:11:23 +02:00 |
|
Stephan
|
b56575fc50
|
Merge branch 'dev-v7' of https://github.com/jhauge/Umbraco-CMS into temp-u4-8616
|
2017-10-18 09:49:05 +02:00 |
|
Stephan
|
b06d30c0f9
|
U4-10554 - cross-browser
|
2017-10-18 09:29:50 +02:00 |
|
Claus
|
9c50e1c48d
|
fixing bug in U4-10524 Show warning in UI for the media/content picker that is referencing a trashed or deleted item
|
2017-10-17 23:52:34 +02:00 |
|
Claus
|
0688835ac0
|
fixing bug in U4-10524 Show warning in UI for the media/content picker that is referencing a trashed or deleted item
|
2017-10-17 23:44:03 +02:00 |
|
Stephan
|
353b8f21cd
|
U4-7317 - select default template
|
2017-10-17 16:04:31 +02:00 |
|
Stephan
|
30a0d553d5
|
Merge pull request #1230 from bjarnef/dev-v7-U4-8319
U4-8319 - Sort data types array by name A-Z
|
2017-10-17 15:06:54 +02:00 |
|
Stephan
|
d0fbc362b2
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2017-10-17 15:00:13 +02:00 |
|
Stephan
|
39c534ef54
|
Merge branch 'temp-u4-7115' into dev-v7
|
2017-10-17 14:59:56 +02:00 |
|
Stephan
|
7f86166abf
|
Merge branch 'dev-v7' of https://github.com/hfloyd/Umbraco-CMS into temp-u4-7115
|
2017-10-17 14:59:07 +02:00 |
|
Robert
|
838e86469a
|
Merge pull request #2245 from umbraco/temp-u4-5322
U4-5322 - add labels to color picker
|
2017-10-17 14:47:36 +02:00 |
|
Stephan
|
24b147e2a6
|
U4-10554 - warn if closing page with changes
|
2017-10-17 14:39:47 +02:00 |
|
Stephan
|
11342ff1df
|
U4-8652 - accept exceptions when loading some assemblies
|
2017-10-17 14:04:24 +02:00 |
|
Robert
|
bf20af9345
|
Merge pull request #2247 from umbraco/temp-u4-5722b
Temp u4 5722b
|
2017-10-17 13:19:34 +02:00 |
|