yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,738 Commits 4 Branches 7 Tags
01dd28fc61546fca9de21968a0c8b3e0dcc31073
Commit Graph

15887 Commits

Author SHA1 Message Date
AndyButland
01dd28fc61 Retains original media creator when media is updated 2017-05-09 16:01:06 +02:00
mikkelhm
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
mikkelhm
36e60c774f Bump version to 7.6.1 2017-05-08 14:06:03 +02:00
mikkelhm
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
Mikkel Holck Madsen
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
Shannon Deminick
d012d8e8b6 Merge pull request #1925 from SaDa1337/dev-v7 
fixed console error on media picker
 2017-05-08 17:11:28 +10:00
Mikkel Holck Madsen
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
Shannon Deminick
a08849f60a Merge pull request #1935 from jamescoxhead/U4-9869 
Fix typo error in upgrade installer
 2017-05-08 13:40:36 +10:00
Shannon Deminick
9792d8df25 Merge pull request #1930 from TomSteer/U4-9852 
Change Context to be public on MigrationBase
 2017-05-08 13:39:06 +10:00
Shannon Deminick
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
James Coxhead
9ccf7bdbab Fix typo error in upgrade installer 
Changed "your" to "you're"
 2017-05-07 16:22:54 +01:00
Claus
3c4b3f44c7 U4-9864 Missing import and xss check in other PermissionEditor.aspx 2017-05-05 14:52:01 +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
Dave Woestenborghs
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
Stephan
eb949e2cbc Fix UdiString to escape paths 2017-05-05 12:46:20 +02:00
Claus
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
Claus
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
Claus
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
Tom Steer
3e294e290b Change Context to be public on MigrationBase 2017-05-04 09:10:35 +01:00
Shannon Deminick
751dc8df23 Merge pull request #1926 from avatart0ph/dev-v7.6 
fix Add basic xss prevention logic
 2017-05-04 11:05:49 +10:00
Claus
1030fd5294 U4-9704 Sorting UDI media picker items, makes it store Int's 2017-05-03 10:21:00 +02:00
Denise Michelle del Bando
be2eb3f555 fix Add basic xss prevention logic 
missing import on CleanForXss
 2017-05-02 23:16:32 -04:00
Maciej Sadowski
0eafa14246 fixed console error on media picker 2017-05-02 15:36:39 +02:00
Shannon
c1853e8c51 bumps version to 7.6.0 rtm 2017-05-02 13:42:20 +10:00
Shannon
31c965ae42 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2017-05-02 13:41:03 +10:00
Shannon Deminick
d91fc6ce60 Merge pull request #1887 from umbraco/temp-U4-9775 
U4-9775 AlreadyClosedException is thrown when retrieving media if the…
 2017-05-02 13:40:28 +10:00
Shannon
d5124e9739 Ensures that an UmbracoContext exist before emitting the cache handler events 2017-05-01 21:10:22 +10:00
Shannon
d9b507c947 bumps version to RC4 so we can build new dependencies against forms/deploy 2017-04-30 23:26:04 +10:00
Shannon
2479c5a272 updates other nuget refs that shouldnt be there 2017-04-30 23:21:19 +10:00
Shannon
fee071db22 Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6 2017-04-30 23:20:16 +10:00
Shannon
004e00599d Fixing nuget package issues , semver 2 is only for 452+ which we dont have, we shouldnt be using it and it adds more dependencies that we don't need right now 2017-04-30 23:19:45 +10:00
Morten Christensen
2e2e8b43b0 Merge pull request #1917 from Frozire/patch-1 
Edit DA with minor spelling and compound word changes
 2017-04-30 14:05:14 +02:00
Morten Christensen
e77c5f8667 Keep the Concierge Product name 2017-04-30 14:04:00 +02:00
Shannon Deminick
3509a2c40f Merge pull request #1908 from umbraco/temp-scope-events-stale-entities 
POC to normalize all event entities when we track events so that all …
 2017-04-30 19:28:19 +10:00
Shannon
378d0f7939 chagnes test params to be slightly less hacky 2017-04-30 19:21:13 +10:00
Shannon
d64fa7f92d Fixes tests, ensures we null check when generating hashes for items in a collection 2017-04-30 19:14:36 +10:00
Stephan
ea14170272 minor cleanup 2017-04-30 10:14:48 +02:00
Shannon
73209d7e2c Merge branch 'dev-v7' into dev-v7.6 2017-04-30 17:13:14 +10:00
Shannon Deminick
cf8ead62ac Merge pull request #1904 from jwoods1/patch-2 
Fixed issue on line 216
 2017-04-30 17:11:44 +10:00
Shannon Deminick
8461aea7d8 Merge pull request #1907 from wanddy/dev-v7 
Improve Chinese translation.
 2017-04-30 17:10:58 +10:00
Shannon Deminick
034de1651b Merge pull request #1910 from abryukhov/patch-9 
ru.xml - Missing newest area & key from en.xml
 2017-04-30 17:09:30 +10:00
Shannon Deminick
dcb8aa7e56 Merge pull request #1909 from abryukhov/patch-8 
en_us.xml - Missing newest area & key from en.xml
 2017-04-30 17:09:15 +10:00
Shannon Deminick
e8a52a95da Merge pull request #1914 from dawoe/patch-1 
Added dutch translation for usernameHint
 2017-04-30 17:08:42 +10:00
Shannon Deminick
42c99e0f07 Merge pull request #1916 from stelim/patch-1 
Adding login hint to German language file
 2017-04-30 17:08:29 +10:00
Shannon Deminick
a31b368b60 Merge pull request #1919 from NathalieLarsson/patch-1 
Adding login hint to Swedish language file
 2017-04-30 17:05:29 +10:00
Shannon Deminick
77f6d28a74 Merge pull request #1920 from camaya/patch-1 
Add Spanish translation for usernameHint
 2017-04-30 17:04:56 +10:00
Shannon Deminick
0b8d3ef214 Merge pull request #1921 from mikecp/patch-1 
Adding login hint to French language file
 2017-04-30 17:04:44 +10:00
Shannon Deminick
a4f83f9c00 Merge pull request #1922 from abryukhov/patch-10 
Adding 'usernameHint' key to ru.xml lang file
 2017-04-30 17:04:30 +10:00
Shannon Deminick
85467976ad Merge pull request #1913 from umbraco/temp-U4-9824-v76 
Change username to email in login dialog
 2017-04-30 17:04:16 +10:00