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

18724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
a6f9d14a1b Merge remote-tracking branch 'origin/dev-v7.6' into temp-CON-1267 2017-04-26 14:18:05 +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
Shannon
bfb81f6362 Allows for the umb pckage repo rest api endpoint to be configurable - for testing 2017-04-26 14:04:47 +10:00
Jason Woods
23816665f3 Fixed issue on line 216 
Found that when uploading media from the folder browser caused an issue of invalid JSON object being stored in the database.  Added quotes around the property values.
 2017-04-25 08:21:02 -06:00
Warren Buckley
ca3dc030bc Merge pull request #1893 from umbraco/temp-u4-9764 
U4-9764 - add FirstChild with predicate extension
 2017-04-25 11:37:37 +01:00
mikkelhm
4775aff749 Bump version to RC2 2017-04-25 11:15:51 +02:00
Warren Buckley
9d20ee293b Merge pull request #1889 from umbraco/temp-U4-9758 
U4-9758 New index can't be applied when CmsMember table has very long login names
 2017-04-25 10:01:35 +01:00
Warren Buckley
a9b820de31 Merge branch 'dev-v7.6' into temp-U4-9758 2017-04-25 09:58:20 +01:00
Stephan
3813653852 deploy-293 - only if not already 7.6 2017-04-25 10:46:37 +02:00
Warren Buckley
a4720a2221 Adds null check - So that we still add the index if we don't have any member entries as of yet 2017-04-25 09:13:48 +01:00
Warren Buckley
728b71c4bd Merge pull request #1902 from umbraco/temp-deploy-293 
temp-deploy-293
 2017-04-24 16:08:01 +01:00
Stephan
9d7975d970 deploy-293 - fix 2017-04-24 16:52:31 +02:00
Emil Wangaa
7505401511 Merge pull request #1896 from umbraco/temp-U4-9760 
U4-9760 - Master Templates & Tree Bug
 2017-04-24 16:04:00 +02:00
Warren Buckley
7ee0a278f7 Adss null check 2017-04-24 14:57:57 +01:00
Stephan
1adbe9ddcb deploy-293 - normalize template guids on upgrade to 7.6 2017-04-24 15:52:44 +02: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
Warren Buckley
d6272b0cdb Merge branch 'temp-U4-9760' of https://github.com/umbraco/Umbraco-CMS into temp-U4-9760 2017-04-24 13:19:36 +01:00
Warren Buckley
ce7dd19a8f Updates the template controller save method - to take into account if the master you are updating to is a sub master that has children that there path's need updating too 2017-04-24 13:19:30 +01:00
Shannon
d295174e53 Updates JS to include the current umbraco version when requesting a package's details, updates the c# to use a new endpoint on OUR to ensure that the correct file is downloaded based on the umb version passed in. 2017-04-24 21:31:35 +10:00
Mads Rasmussen
55022e2aaf fix removeNode check to only be for the root node 2017-04-24 12:46:45 +02:00
Warren Buckley
4ffca2e4bf Merge pull request #1900 from umbraco/temp-deploy-103 
deploy-103 - fix PublicAccessRepository
 2017-04-24 09:53:52 +01:00
Stephan
4a38b8acd1 Fix broken refs to some libs 2017-04-24 10:50:25 +02:00
Stephan
d93b8b869e deploy-103 - fix PublicAccessRepository 2017-04-21 16:02:29 +02:00
Shannon
bec4e442fb bumps to RC1 2017-04-21 17:45:27 +10: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
72cc5ce88b Moves binding redirects to pre app startup 2017-04-21 12:15:36 +10:00
Shannon Deminick
63763d025e Merge pull request #1897 from umbraco/temp-u4-9798 
u4-9798 - Moves LockTable and LockObject Migrations to 7.6
 2017-04-21 11:28:37 +10:00
mikkelhm
f76fa6bde6 Moves LockTable and LockObject Migrations to 7.6 2017-04-20 23:42:15 +02:00
Warren Buckley
c34a1060f7 When we create a brand new template & set a master template we were removing the entire tree for templates - this adds in a check to not do the remove of the old node if its a brand new template we are creating 2017-04-20 15:49:49 +01:00
Warren Buckley
a231cedd8e Merge pull request #1895 from umbraco/temp-U4-9795 
fixes: U4-9795 Update alert in public access dialog to follow same conventions as other alerts
 2017-04-20 15:12:12 +01:00
Mads Rasmussen
20526b40bf fixes: U4-9789 Email input type is not same height as text input type 2017-04-20 12:03:29 +02:00
Mads Rasmussen
5008a2be7f update class on notification 2017-04-20 11:29:16 +02:00
Mads Rasmussen
03a395d1f9 remove unnecessary break from language file 2017-04-20 11:02:49 +02:00
Mads Rasmussen
734df8685d update notification to use alert class instead of custom error class 2017-04-20 10:57:57 +02:00
Claus
92dad1af1c Merge branch 'AndyButland-u4-9652' into dev-v7.6 2017-04-20 10:25:36 +02:00
Claus
d897e78b27 Merge branch 'u4-9652' of git://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9652 
# Conflicts:
#	src/Umbraco.Core/Services/EntityService.cs
 2017-04-20 10:23:54 +02:00
Shannon Deminick
d79115fcdf Merge pull request #1892 from umbraco/temp-deploy-103 
deploy-103 - support member groups in entity service
 2017-04-20 11:35:13 +10:00
Shannon Deminick
992073ab4e Merge pull request #1888 from umbraco/temp-U4-9717 
fixes: U4-9717 7.6 "Do something else"-button
 2017-04-20 11:00:49 +10:00
Shannon
3c9b144927 updates log4net binding redirect to disregard the signing token so it can be null or can be any token and it will redirect 2017-04-20 10:50:16 +10:00
AndyButland
b7e4f58503 Ensured EntityService GetKeyById and GetIdByKey respect passed object type 2017-04-19 18:38:24 +01:00
Stephan
5880df3859 U4-9764 - add FirstChild with predicate extension 2017-04-19 18:56:12 +02:00
Stephan
c11dce7b6e deploy-103 - support member groups in entity service 2017-04-19 17:20:44 +02:00
Mads Rasmussen
004a3e2808 Merge pull request #1882 from umbraco/temp-U4-9769 
U4-9769 - BG Color change for installer to purple hue
 2017-04-19 14:42:43 +02:00
Mads Rasmussen
d05bfc8983 use same purple as the login screen 2017-04-19 14:39:38 +02:00
Shannon Deminick
5bb7223a79 Merge pull request #1890 from umbraco/temp-u4-9782 
u4-9782 - Adds assemblyRedirect for log4net in the nuget upgrade transform
 2017-04-19 20:29:22 +10:00
mikkelhm
c9a816f25e Adds assemblyRedirect for log4net in the nuget upgrade transform 2017-04-19 12:21:49 +02:00
Shannon
13cfb42287 Resizes LoginName column so that it can be indexed but only if the data in the column doesn't exceed a max size 2017-04-19 20:16:43 +10:00
Mads Rasmussen
334fcf38ec fixes: U4-9780 Use email input type for password reset 2017-04-19 11:25:14 +02:00
Mads Rasmussen
8873d0f79d fixes: U4-9717 7.6 "Do something else"-button 2017-04-19 10:04:55 +02:00