yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,024 Commits 4 Branches 7 Tags
54c4e3b422ab90ffae577d5bd709c65ae89498c8
Commit Graph

20024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
54c4e3b422 deploy-360 - add IUniqueIdentifyingServiceConnector 2017-08-30 12:17:04 +02:00
Sebastiaan Janssen
cf951e7055 Merge pull request #2107 from leekelleher/temp-U4-10260 
U4-10260 - Umbraco.7.7 beta - NestedContent with ModelsBuilder disabled throws error
 2017-08-30 10:04:24 +02:00
Shannon
e18c91dedc fixing tests 2017-08-30 12:10:02 +10:00
Shannon Deminick
e34e536dad Merge pull request #2156 from umbraco/temp-U4-10326 
Creating a new content node using Content Templates (Blueprints) always places node at root.
 2017-08-30 11:35:47 +10:00
Shannon
209273ba64 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/src/init.js
#	src/Umbraco.Web.UI/umbraco_client/Application/Extensions.js
 2017-08-30 11:08:36 +10:00
Shannon
8c998fd4e6 Creates a virtual ConfigureUmbracoUserManager in UmbracoDefaultOwinStartup so inheritors can just override that if they want to simplify the startup owin code process 2017-08-30 11:02:58 +10:00
Shannon Deminick
88f332f5c7 Merge pull request #2157 from umbraco/temp-U4-10367 
U4-10367 417 missing token error due to cookie being overwritten
 2017-08-30 10:54:29 +10:00
Sebastiaan Janssen
a1b9842215 Merge pull request #2131 from bjarnef/dev-v7-U4-10281 
U4-10281 - Fix maxchars javascript errors on macro parameter editors
 2017-08-29 11:23:16 +02:00
Sebastiaan Janssen
d300bf8d6d U4-10367 417 missing token error due to cookie being overwritten 
Changes the cookie and header names to be Umbraco specific
 2017-08-29 11:17:52 +02:00
Robert
67489d496a Creating a node using Blueprints now places the node under the parrent that was created 2017-08-29 09:30:22 +02:00
Shannon
7571dab4cc Updates the user auth helper and adds unit tests for it's scenarios 2017-08-29 15:13:07 +10:00
Shannon Deminick
cf10f5f0ee Merge pull request #2154 from umbraco/temp-U4-10363 
U4-10363 417 missing token error due to invalid cookie name
 2017-08-29 11:11:35 +10:00
Shannon
ca00246236 another update to perform a little better again (cookies are read VERY often) 2017-08-29 11:10:28 +10:00
Shannon
d71b8a139f Moves GetCookieValue to an extension method, cleans up code, adds unit tests 2017-08-29 10:50:20 +10:00
Sebastiaan Janssen
6bf0d6e175 U4-10363 417 missing token error due to invalid cookie name 
Manually parse the cookie header instead of using the buggy extension method
 2017-08-28 20:36:56 +02:00
Shannon
f37307d540 fixes path access checks to include root ... but now i need to figure out another problem. 2017-08-29 01:16:37 +10:00
Shannon
6995c184e3 Updates user editor, non-admins can see all user groups but cannot edit them, they can save user that contain groups that they don't have access to if they were already there but cannot add new ones they dont' have access to 2017-08-29 01:00:08 +10:00
Stephan
cf450bebc3 Bugfix CombineStartNodes 2017-08-28 15:26:27 +02:00
Shannon
241fbb2144 combine start node tests 2017-08-28 23:06:31 +10:00
Shannon
513aa0b95d Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-08-28 22:41:14 +10:00
Sebastiaan Janssen
7a0c6ab975 Merge pull request #2135 from umbraco/temp-U4-10301 
U4-10301 Change the PluginManager hash to use more reliable and consi…
 2017-08-28 11:44:40 +02:00
Robert
2ec91a075d Merge pull request #2150 from umbraco/temp-U4-10264 
fixes: U4-10264 Umbraco 7.7 beta - UX - 'Set permission' above 'Close'
 2017-08-28 11:21:16 +02:00
Stephan
49d5005453 Merge pull request #2151 from umbraco/temp-U4-10358 
U4-10358 Upgrade error from 7.1.8 to 7.6.5: The index 'IX_umbracoNode…
 2017-08-26 15:26:41 +02:00
Sebastiaan Janssen
f2db0fe80e U4-10358 Upgrade error from 7.1.8 to 7.6.5: The index 'IX_umbracoNodeUniqueID' is dependent on column 'uniqueID' 
Removes migration that would add wrongly named index to a table, only to immediately be removed again in 7.3.0
 2017-08-25 22:00:41 +02:00
Sebastiaan Janssen
7197c9cbb4 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Models/UserExtensions.cs
 2017-08-25 16:39:06 +02:00
Sebastiaan Janssen
b9614f9393 Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7 2017-08-25 16:22:26 +02:00
Sebastiaan Janssen
9917fb20ca U4-10356 Update default Config/Lang after each update 
Also makes sure UserExtensions returns the correct language
 2017-08-25 16:13:04 +02:00
Mads Rasmussen
ea3f0d6157 fixing edge case model change 2017-08-25 09:31:13 +02:00
Shannon
9b327dd27e Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-08-25 09:54:36 +10:00
Shannon Deminick
21ed9989f3 Merge pull request #2139 from umbraco/temp-U4-2449 
U4-2449 Feature request: Change the default admin users lang to en-us
 2017-08-25 09:40:05 +10:00
Sebastiaan Janssen
780776072d Update umbracoDefaultUILanguage to en-US 2017-08-24 21:03:31 +02:00
Sebastiaan Janssen
49bf7e43a4 Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7 2017-08-24 20:58:56 +02:00
Sebastiaan Janssen
db63e70a99 Merge pull request #2141 from umbraco/temp-U4-10258 
U4-10258 Add documentation for umbUserGroupPreview component
 2017-08-24 20:10:56 +02:00
Sebastiaan Janssen
5ed4d9ccae Merge pull request #2117 from umbraco/temp-U4-10201 
U4-10201 Exception when deleting a user's start node - adds FKs, fixe…
 2017-08-24 20:04:44 +02:00
Shannon
e71e9d7efb U4-10249 FolderAndFilePermissions HealthCheck causes the application to restart 
(cherry picked from commit bdb991f6dc)
 2017-08-24 18:51:53 +02:00
Sebastiaan Janssen
6eb4c066c6 Merge pull request #2136 from umbraco/temp-U4-10249 
U4-10249 FolderAndFilePermissions HealthCheck causes the application …
 2017-08-24 18:49:29 +02:00
Mads Rasmussen
ba8fe93693 localize discard changes notification 2017-08-24 15:10:42 +02:00
Mads Rasmussen
cb4de2a6a1 Add discard changes notification to rights/permissions dialog 2017-08-24 15:00:11 +02:00
Mads Rasmussen
e0b014afad fix styling on dialog footer so it looks like the editor footer and the right side overlay footer 2017-08-24 14:59:02 +02:00
Mads Rasmussen
fcc0198910 make heading on alert form bold 2017-08-24 14:52:12 +02:00
Shannon Deminick
3c17e30133 Merge pull request #2144 from umbraco/temp-U4-10348 
U4-10348 Show readonly user profile information on user editor
 2017-08-24 20:03:01 +10:00
Shannon
ee6dbcef17 minor copy updates, removes test json 2017-08-24 20:02:41 +10:00
Shannon
1b369b5ba9 Adds back a backwards compatibility API 2017-08-24 19:45:48 +10:00
Shannon
7636f54ffd Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Tests/Umbraco.Tests.csproj
 2017-08-24 19:07:21 +10:00
Mads Rasmussen
ff45f1f9cc show calculated start nodes on the user profile 2017-08-23 15:21:19 +02:00
Mads Rasmussen
f50898ee6d add description to umb-box component 2017-08-23 15:20:23 +02:00
Mads Rasmussen
6796f4d4f5 U4-10348 Show readonly user profile information on user editor 2017-08-23 13:08:25 +02:00
Shannon
a0785f2e0d backports U4-10349 Optimize EnsureUniqueNodeName 2017-08-23 16:22:01 +10:00
Shannon Deminick
1abbc31348 Merge pull request #2145 from umbraco/temp-deploy-367 
Improve EnsureUniqueNodeName perfs?
 2017-08-23 16:18:47 +10:00
Shannon
f48ffd28c0 reverts files that shouldn't have been committed 2017-08-23 15:59:47 +10:00