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
c51d29da52
Merge pull request #1947 from umbraco/temp-U4-9896
...
U4-9896 SqlCEconnection Type A originates from Version=4.0.0.0, Type B originates from 4.0.0.1
2017-05-19 11:54:40 +10:00
120cb964a5
Merge pull request #1949 from umbraco/temp-u4-9926
...
U4-9926 - fix partial view macro udis
2017-05-17 13:39:48 +01:00
147a1daf6d
U4-9926 - fix partial view macro udis
2017-05-17 12:09:28 +02:00
9badb35c05
fix merge issue
2017-05-17 20:08:53 +10:00
765decf3b1
Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7
...
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
# src/Umbraco.Web/Trees/PartialViewsTree.cs
2017-05-17 20:00:29 +10:00
69775c369a
Bump version to 7.5.14
2017-05-16 08:33:19 +02:00
3f25d3637a
Bump version to 7.5.14
2017-05-16 08:32:33 +02:00
99d4b13bb0
Adds SQLCE assembly redirect on fresh installs and upgrades
2017-05-15 22:54:46 +02:00
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
5dc3e0a3fc
Merge pull request #1880 from marcemarc/temp-U4-9765
...
debug logging when there is a distributed calls config issue
2017-05-15 10:28:26 +02:00
d146df43e6
Merge pull request #1903 from HarveyWilliams/dev-v7
...
U4-9806 Media Picker media hover should show full title
2017-05-15 10:19:04 +02:00
080150baa3
Merge pull request #1924 from wanddy/dev-v7
...
Fix missing translation for some menu tree item
2017-05-10 21:18:58 +02:00
c6bc5ae6aa
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2017-05-10 22:37:47 +08:00
f84d3b435b
Merge pull request #1898 from DaveLong/U4-9799
...
Fixed Serialization issue in ValidatePasswordResetCodeModel
2017-05-10 14:59:04 +10:00
99855bce11
Adds AppVeyor build badge
2017-05-10 14:51:40 +10:00
d0b2f10a8c
U4-9836 CreatorId on a media is overwritten on save
2017-05-10 14:32:09 +10:00
70507501bd
Merge pull request #1937 from AndyButland/u4-9836
...
U4-9836 - retains original media creator when media is updated
2017-05-10 14:31:34 +10:00
bbfd570b8a
Merge pull request #1938 from suedeapple/U4-9886
...
U4 9886 - automaticly - > automatically (typo fix up)
2017-05-10 14:24:36 +10:00
7b4912b1e7
automaticly - > automatically
2017-05-09 16:47:36 +01:00
8c6362d947
automaticly - > automatically
2017-05-09 16:40:59 +01:00
01dd28fc61
Retains original media creator when media is updated
2017-05-09 16:01:06 +02:00
67e2c911f7
Re adds the umbraco.presentation.targets for Umbraco.Web.UI as it handles default transormations for confg files
2017-05-09 00:26:40 +02:00
36e60c774f
Bump version to 7.6.1
2017-05-08 14:06:03 +02:00
745252341f
Merge branch 'dev-v7' into dev-v7.6
...
# Conflicts:
# src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
2017-05-08 13:58:08 +02:00
a2df4c5232
Merge pull request #1933 from umbraco/temp-U4-9864
...
U4-9864 Missing import and xss check in other PermissionEditor.aspx
2017-05-08 10:29:03 +02:00
d012d8e8b6
Merge pull request #1925 from SaDa1337/dev-v7
...
fixed console error on media picker
2017-05-08 17:11:28 +10:00
9318da2883
Merge pull request #1931 from umbraco/temp-U4-9849-2
...
U4-9849 Query Builder not working in template editor. Always returns …
2017-05-08 09:05:29 +02:00
a08849f60a
Merge pull request #1935 from jamescoxhead/U4-9869
...
Fix typo error in upgrade installer
2017-05-08 13:40:36 +10:00
9792d8df25
Merge pull request #1930 from TomSteer/U4-9852
...
Change Context to be public on MigrationBase
2017-05-08 13:39:06 +10:00
635cfe6b20
Merge pull request #1932 from dawoe/patch-1
...
Return empty string when e-mail is not filled
2017-05-08 13:37:48 +10:00
9ccf7bdbab
Fix typo error in upgrade installer
...
Changed "your" to "you're"
2017-05-07 16:22:54 +01:00
0c520f2b43
Merge branch 'dev-v7' into dev-v7.6
...
# Conflicts:
# build/Build.bat
2017-05-05 16:19:54 +02:00
85d10014c2
Make new build work when there's spaces in the current path
2017-05-05 16:14:59 +02:00
3c4b3f44c7
U4-9864 Missing import and xss check in other PermissionEditor.aspx
2017-05-05 14:52:01 +02:00
c6956b5e98
Merge branch 'dev-v7' into dev-v7.6
...
# Conflicts:
# .gitignore
# build/Build.bat
2017-05-05 14:30:08 +02:00
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
c5c87ff50d
Return empty string when e-mail is not filled
...
Fix for http://issues.umbraco.org/issue/U4-9862
2017-05-05 13:27:32 +02:00
eb949e2cbc
Fix UdiString to escape paths
2017-05-05 12:46:20 +02:00
8a096cd826
Merge pull request #1794 from TheBekker/fix-U4-9038
...
[fix-U4-9038] get and set media start node for mediaPickerOverlay in …
2017-05-05 10:51:31 +02:00
3b236ba724
Merge pull request #1794 from TheBekker/fix-U4-9038
...
[fix-U4-9038] get and set media start node for mediaPickerOverlay in …
2017-05-05 10:47:52 +02:00
e7eaf6959f
U4-9849 Query Builder not working in template editor. Always returns Model.Content.Site().Children()
...
adding missing nullchecks in the endpoint action.
ensuring promise returns before setting init data - the unresolved promise was being used on the query model instead of the actual text string the promise returns - causing the endpoint to fail to bind the model.
2017-05-04 15:08:37 +02:00
3e294e290b
Change Context to be public on MigrationBase
2017-05-04 09:10:35 +01:00
751dc8df23
Merge pull request #1926 from avatart0ph/dev-v7.6
...
fix Add basic xss prevention logic
2017-05-04 11:05:49 +10:00
91047182fa
Merge pull request #1929 from umbraco/temp-U4-9704
...
U4-9704 Sorting UDI media picker items, makes it store Int's
2017-05-03 13:20:25 +02:00
1030fd5294
U4-9704 Sorting UDI media picker items, makes it store Int's
2017-05-03 10:21:00 +02:00
be2eb3f555
fix Add basic xss prevention logic
...
missing import on CleanForXss
2017-05-02 23:16:32 -04:00
0eafa14246
fixed console error on media picker
2017-05-02 15:36:39 +02:00
b807b84466
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2017-05-02 14:23:36 +08:00
ab551b2c96
Fix some menu tree header won't be translated.
...
This may be caused by the explicit definition of tree node name.
Signed-off-by: wanddy <wanddy@163.com >
2017-05-02 14:20:44 +08:00
Shannon Deminick