Commit Graph

18637 Commits

Author SHA1 Message Date
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
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
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