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

5854 Commits

Author SHA1 Message Date
Stephan
3f4306a05f Consolidate and update dependencies 2016-11-04 12:05:51 +01:00
Stephan
b29bc66026 Post-merge fixing & refactoring (tests ok) 2016-11-04 11:36:58 +01:00
Stephan
74e0a4d999 7.6 merge review fixes 2016-11-03 19:20:42 +01:00
Sebastiaan Janssen
0eeb481d85 Merge pull request #1586 from LottePitcher/U4-9068 
Truncate should not finish halfway through a two word unicode character
 2016-11-03 17:53:49 +01:00
Andy Felton
66bce71a8b "it's" replaced with "its" on "Checks to see if your site is revealing information in it's headers that gives away unnecessary details about the technology used to build and host it." 2016-11-03 16:51:33 +00:00
Sebastiaan Janssen
ecbe058d00 Merge pull request #1591 from RachBreeze/U4-7239 
U4-7239 Now trims the parameters
 2016-11-03 17:16:22 +01:00
Lotte Pitcher
c8b23195f6 When truncating if the last characters was the first half of a two word unicode character, also include the second half to avoid YSOD 2016-11-03 14:30:38 +00:00
CORP\Rachel.Breeze
ae659e3c84 U4-7239 Now trims the parameters so that if a default is set in a comma and space seperated list, the parameter is now populated. 2016-11-03 13:40:46 +00:00
Claus
a06b920785 Merge pull request #1563 from umbraco/temp-u4-9137 
U4-9137 - Fix PublishedMediaCache getting trashed media
 2016-11-03 11:25:21 +01:00
Claus
0441827578 using the provided media type when uploading images, instead of using default Image media type. 2016-11-03 10:41:06 +01:00
Stephan
b26b415096 Merge origin/dev-v7-deploy into dev-v8-zbwip (builds) 2016-11-03 10:31:44 +01:00
Thomas Nielsen
ea67e21796 Link to mediatype from media properties 2016-11-02 21:20:03 +01:00
Rasmus Fjord
0624d224a9 Translated set permissions windows 2016-11-02 20:30:05 +01:00
Anders Bjerner
a5b0fbb83d Headline in the "Republish entire site" dialog is now translated 2016-11-02 19:51:54 +01:00
Stephan
07f4da9b00 Cleanup WebProfiler from 8.x 2016-11-02 14:26:04 +01:00
Stephan
c2d3d057a5 U4-9137 - Fix PublishedMediaCache getting trashed media 2016-11-02 13:59:04 +01:00
Claus
7fe5f0c099 Merge branch 'Flaeng-Email-validation-on-user-form' into merge-U4-8782 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2016-11-01 14:28:38 +01:00
Claus
5f615d30b2 Merge branch 'Email-validation-on-user-form' of git://github.com/Flaeng/Umbraco-CMS into Flaeng-Email-validation-on-user-form 2016-11-01 13:35:04 +01:00
Claus
4c408eb1b7 Merge branch 'temp-U4-8782' of git://github.com/mikecp/Umbraco-CMS into mikecp-temp-U4-8782 2016-11-01 13:32:09 +01:00
Sebastiaan Janssen
82a2f50d03 Merge pull request #1554 from umbraco/temp-u4-9121 
U4-9121 - improve url perfs
 2016-11-01 09:56:11 +01:00
Tom Pipe
0a49d54a85 Fixed issue with member properties sort order 2016-10-29 18:23:25 +01:00
Stephan
c500f98ad8 U4-9121 - improve url perfs 2016-10-28 14:33:44 +02:00
Sebastiaan Janssen
3e79b65539 Merge pull request #1549 from umbraco/temp-u4-8995 
U4-8995 - fix health check for trySkipIisError
 2016-10-27 21:30:55 +02:00
Shannon
ba0ef3676d U4-9109 changes all usage of automapper ResolveUsing<T> to instantiate the resolver explicitly - this prevents IoC frameworks registered against automapper to not explode if these resolvers have not been added to the container. 2016-10-27 18:32:16 +02:00
Shannon
7e81768abc adds exception checking to ExamineExtensions 2016-10-26 14:25:32 +02:00
Stephan
6d0bca471e U4-8995 - fix health check for trySkipIisError 2016-10-26 14:24:31 +02:00
Shannon
68e871d175 Ensures that any given JSON blob written to the instructions can only contain the maximum number of instructions to process 2016-10-25 16:01:55 +02:00
Claus
f753dfa2a7 minor updates and a little reformatting. 2016-10-20 13:56:52 +02:00
Claus
8fa02913be Merge branch 'U4-205' of git://github.com/sniffdk/Umbraco-CMS into sniffdk-U4-205 2016-10-20 12:53:44 +02:00
Stephan
e8538cc035 Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy 2016-10-20 12:23:22 +02:00
Stephan
ec68993448 Cleanup hybrid accessors 2016-10-20 10:52:11 +02:00
Sebastiaan Janssen
21426610ad Need to take the current schema into account for the ExcessiveHeadersCheck 2016-10-19 17:01:15 +02:00
Stephan
b7ef002da5 Cleanup SignalR 2016-10-19 15:35:25 +02:00
Stephan
20fc78419e Refactor / fix SignalR integration, add nuspec dependency 2016-10-19 15:07:48 +02:00
Sebastiaan Janssen
40b0a62cc3 Use int.MaxValue instead of 0 2016-10-19 14:58:56 +02:00
Shannon Deminick
3949b78c61 Merge pull request #1533 from callumbwhyte/U4-9042 
U4-9042: Fixes backoffice members list view for custom membership providers
 2016-10-19 14:48:44 +02:00
Stephan
42adb46f2a Move Examine entirely to its own component 2016-10-19 13:56:57 +02:00
Claus
55179d7400 adding missing multiple content picker macro parameter. 2016-10-19 13:56:26 +02:00
Mads Rasmussen
517147346e Merge pull request #1534 from umbraco/temp-u4-9048 
temp-U4-9048 - security when uploading files
 2016-10-19 11:01:19 +02:00
Sebastiaan Janssen
097f5355e2 U4-9050 Update to latest Examine 0.1.70.0 2016-10-18 18:03:43 +02:00
Stephan
33a773a0b9 Cleanup UmbracoContext 2016-10-18 17:28:36 +02:00
Stephan
88593b0bf3 Deal with fixme in FacadeRouter 2016-10-18 16:16:46 +02:00
Sebastiaan Janssen
9da95ce28f Moved UmbracoAuthorize to the class level 
Unfortunately can't consolidate GetCacheItem and InsertCacheItem because of different timespan
Can't directly cache the `content` variable due to problems with modified closures
 2016-10-18 14:16:37 +02:00
Stephan
dda988f0ea Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy 2016-10-18 12:25:31 +02:00
Sebastiaan Janssen
33e05625ed Fixes based on review 2016-10-18 10:10:50 +02:00
Stephan
b64b67ce81 U4-9048 - return proper Forbidden status code when uploading to invalid folder 2016-10-18 08:47:03 +02:00
Callum Whyte
a1a90d5bff Fixes backoffice members list view for custom membership providers by using key instead of id in edit URL 2016-10-17 16:26:20 +01:00
Sebastiaan Janssen
5d0d65c624 Merge branch 'dev-v7' into temp-U4-8829-dashboards-from-remote-feed 2016-10-17 15:00:40 +02:00
Stephan
92c55e302f Oops, U4-8626 colateral WIP 2016-10-17 11:00:19 +02:00
Stephan
341e817fd5 Get tests to run, troubleshoot 2016-10-17 11:00:18 +02:00