yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,483 Commits 4 Branches 7 Tags
5dc3e0a3fcbf2fd4d2cd62fbbd37743571d01057
Commit Graph

17483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claus
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
Claus
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
Mikkel Holck Madsen
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
wanddy
c6bc5ae6aa Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-05-10 22:37:47 +08:00
Shannon Deminick
f84d3b435b Merge pull request #1898 from DaveLong/U4-9799 
Fixed Serialization issue in ValidatePasswordResetCodeModel
 2017-05-10 14:59:04 +10:00
Shannon Deminick
99855bce11 Adds AppVeyor build badge 2017-05-10 14:51:40 +10:00
Shannon
d0b2f10a8c U4-9836 CreatorId on a media is overwritten on save 2017-05-10 14:32:09 +10:00
Shannon Deminick
bbfd570b8a Merge pull request #1938 from suedeapple/U4-9886 
U4 9886 - automaticly - > automatically (typo fix up)
 2017-05-10 14:24:36 +10:00
suedeapple
7b4912b1e7 automaticly - > automatically 2017-05-09 16:47:36 +01:00
suedeapple
8c6362d947 automaticly - > automatically 2017-05-09 16:40:59 +01: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
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
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
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
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
Tom Steer
3e294e290b Change Context to be public on MigrationBase 2017-05-04 09:10:35 +01:00
Maciej Sadowski
0eafa14246 fixed console error on media picker 2017-05-02 15:36:39 +02:00
wanddy
b807b84466 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-05-02 14:23:36 +08:00
wanddy
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
wanddy
1520fa77d5 Add missing translation item for en.xml and zh.xml 
Signed-off-by: wanddy <wanddy@163.com>
 2017-05-02 14:12:58 +08: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 Deminick
8461aea7d8 Merge pull request #1907 from wanddy/dev-v7 
Improve Chinese translation.
 2017-04-30 17:10:58 +10:00
Sebastiaan Janssen
9fa76a0133 Merge pull request #1911 from umbraco/temp-U4-9812 
U4-9812 FailedLoginAttempts should be reset to 0 after a successfull …
 2017-04-29 10:19:26 +02:00
Sebastiaan Janssen
3242b31a8a U4-9812 FailedLoginAttempts should be reset to 0 after a successfull login attempt 2017-04-28 12:46:58 +02:00
Shannon
2be330d237 adds notes, changes to protected 2017-04-28 07:45:01 +10:00
Shannon
4381a700ba Updates UmbracoVirtualNodeRouteHandler to have a new protected GetUmbracoContext method used to get the umb context used in the rest of the code 2017-04-28 07:38:03 +10:00
Shannon
99821954f1 adds notes 2017-04-28 07:31:44 +10:00
Shannon Deminick
10a15be8ad Merge pull request #1901 from tompipe/U4-9384-StaleVariableFix 
Quick/simple fix for the stale variable
 2017-04-28 07:28:00 +10:00
wanddy
0a2830aece Improve Chinese translation. 
Signed-off-by: wanddy <wanddy@163.com>
 2017-04-27 22:59:17 +08:00
Shannon
bed5f8a03b backports updates from 7.6 so that the packages.umbraco.org endpoint is not used for fetching package files any longer 2017-04-27 13:21:07 +10:00
Shannon
7cd385dd6b disables ssl by default 2017-04-26 14:17:24 +10:00
Shannon
5d4a97591a Cherry picks changes for package fetching for Our to use the new endpoint and passes in the current version 2017-04-26 14:08:37 +10:00
Harvey Williams
81354cea3c U4-9806 Media Picker media hover should show full title 
Added title to all media items in the media picker rather than just SVG and normal images.

Solving an issue where whole titles could not be visible if the title was too long.
 2017-04-24 16:29:35 +01:00
Tom Pipe
67e3ec2ae0 Quick/simple fix for the stale variable 
The umbracoContext variable can hold a null reference to UmbracoContext.Current. 

If a request containing a file extension is passed through an UmbracoVirtualNodeRouteHandler, the UmbracoContext will be null, because a context is never created for urls containing extensions due to 5397f2c53a/src/Umbraco.Core/UriExtensions.cs (L143)

A call can be made to EnsureContext in the overridden FindContent method, but the fresh context would never get picked up, instead the variable always contains a null reference, and an exception is then thrown on line 23
 2017-04-24 13:23:12 +01:00
Dave Long
b88e714050 Fixed Serialization issue in Password Reset Validate Model 2017-04-21 08:33:21 +02:00
Shannon Deminick
da8c46e426 Merge pull request #1859 from alexxn/dev-v7 
Add basic xss prevention logic
 2017-04-21 13:05:40 +10:00
Shannon Deminick
62af834176 Merge pull request #1876 from jwoods1/patch-1 
The form closing tag
 2017-04-18 13:17:12 +10:00
Shannon
2dac1b3cf5 Merge branch 'normalize-stream-seek' of https://github.com/JimBobSquarePants/Umbraco-CMS into JimBobSquarePants-normalize-stream-seek 
# Conflicts:
#	src/Umbraco.Core/Media/ImageHelper.cs
 2017-04-18 13:11:44 +10:00
Shannon Deminick
68fb951283 Merge pull request #1885 from JimBobSquarePants/fix-image-memoryleak 
EncodingParameters implements IDisposable
 2017-04-18 13:08:04 +10:00
Shannon Deminick
1ca825de62 Merge pull request #1886 from JimBobSquarePants/filesystem-docs 
Document the IFileSystem interface
 2017-04-18 13:05:35 +10:00
Shannon
13ccd86192 Adds another check for not being able to read the index 2017-04-18 12:35:21 +10:00
Shannon
336266c0eb U4-9775 AlreadyClosedException is thrown when retrieving media if the app domain is currently in a shutdown state and the site is under heavy load 2017-04-18 12:32:44 +10:00
James Jackson-South
54b57f7d51 Document the IFileSystem interface 2017-04-15 17:21:48 +10:00
James Jackson-South
2f6e161120 EncodingParameters implements IDisposable 2017-04-15 16:41:24 +10:00
Marc Goodson
58f9ff4b79 Add some debug logging when there is a distributed calls configuration issue 2017-04-11 20:37:59 +01:00
Shannon
f2c7c1e2c6 bumps version 2017-04-10 16:42:31 +10:00
Shannon
9f2c428a7c updates to latest Models Builder 2017-04-10 16:12:23 +10:00
Shannon
a958f946ef bumps version (beta) so i can post the patch release 2017-04-08 13:57:43 +10:00
Shannon
688652fb91 U4-9752 Very slow indexing after 7.5.12 update 2017-04-08 13:53:10 +10:00
Jason Woods
4ef1eeb8bc The form closing tag 
The form was closing tag was </div> should be </form>
 2017-04-07 11:09:21 -06:00