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

18647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Hartvig
d1e6c0e835 Change username to email in login dialog 2017-04-28 13:37:19 +02:00
Shannon
d24b0aa9eb oops undeletes a couple files that are still needed for the custom package ascx page 2017-04-28 10:30:47 +10:00
Shannon
9f505a7976 bumps to rc3 version 2017-04-28 08:27:31 +10:00
Shannon
1b27114014 Merge branch 'temp-CON-1267' into dev-v7.6 2017-04-28 07:53:16 +10:00
Shannon Deminick
d8b235ad62 Merge pull request #1906 from umbraco/temp-CON-1267 
CON-1267 Update Our to not offer v6 to people on < 7.6.0
 2017-04-28 07:52:19 +10:00
Shannon
56581478c8 Merge remote-tracking branch 'origin/dev-v7' into temp-CON-1267 2017-04-28 07:48:04 +10: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
Stephan
d1094eea7a Merge pull request #1905 from umbraco/temp-tasks 
Publicize more IBackgroundTask plumbing
 2017-04-27 14:46:33 +02:00
Shannon
c629a50f39 Fixes entity service and figuring out which GUID to go with which object type 2017-04-27 13:29:31 +10:00
Shannon
430f906ae6 Merge remote-tracking branch 'origin/dev-v7.6' into temp-CON-1267 2017-04-27 13:28:34 +10:00
Shannon
736798c769 Merge remote-tracking branch 'origin/dev-v7' into temp-CON-1267 
# Conflicts:
#	src/Umbraco.Core/Exceptions/ConnectionException.cs
#	src/Umbraco.Core/Services/PackagingService.cs
#	src/Umbraco.Web/Editors/PackageInstallController.cs
 2017-04-27 13:27:23 +10:00
Shannon
e913034d93 Changes PackagingService to not have a different base class since it was not needed 2017-04-27 13:21:56 +10: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
Stephan
0291ab615d Fix shadow wrapper cleanup 2017-04-26 17:38:06 +02:00
Stephan
ceeea7827e Fix shadow wrapper cleanup 2017-04-26 14:44:48 +02:00
Shannon
756b4d24c0 Updates endpoint to include hidden package files 2017-04-26 22:10:34 +10:00
Stephan
ffe3fc9257 deploy-293 - fix normalization 2017-04-26 13:25:54 +02:00
Shannon
26bd3c7c0b removes unneeded closing of stream since it's disposed 2017-04-26 19:42:58 +10:00
Shannon
944b3dcaac New method for IPackagingService to fetch a package from the repo, removes usages of the old repo endpoint, removes ability to push a package from the back office to Our since that would require a different endpoint. 2017-04-26 19:02:36 +10:00
Stephan
ba489afe9a Publicize more IBackgroundTask plumbing 2017-04-26 09:07:48 +02:00
Shannon
968d52e490 Removes old packager files that should absolutely never be used 2017-04-26 15:46:07 +10:00
Shannon
ebbe9f6ed0 Removes old packager files that should absolutely never be used 2017-04-26 15:45:37 +10:00
Shannon
ba32636fe7 Merge remote-tracking branch 'origin/dev-v7' into temp-CON-1267 2017-04-26 14:18:27 +10:00
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
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