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

20127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
6a95da31b0 U4-10374 EntityService, ContentService and MediaService should use a prefix query for GetDescendants instead of a Contains query 2017-09-01 00:55:30 +10:00
Shannon
57a8df8309 fixes tests 2017-08-31 16:47:52 +10:00
Shannon
342ce7e507 updates user authz logic and adds more tests (and fixes test) 2017-08-31 15:53:15 +10:00
Shannon Deminick
7d227a8cd8 Merge pull request #2161 from umbraco/temp-U4-6929 
U4-6929 User permissions security issue
 2017-08-31 15:11:37 +10:00
Stephan
e83d278b9a deploy-360 - missing file 2017-08-30 13:43:16 +02:00
Mads Rasmussen
ede6664e7f allow admins to edit all groups 2017-08-30 13:27:52 +02:00
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
Mads Rasmussen
06a87bc341 update readme 2017-08-29 14:56:17 +02:00
Mads Rasmussen
b10e646ade remove grunt file 2017-08-29 14:53:44 +02:00
Mads Rasmussen
110a3b2a12 add small interval to file watcher to keep windows calm 2017-08-29 14:35:54 +02:00
Mads Rasmussen
1bda9f32c1 only copy minified version of font-awesome 2017-08-29 14:27:43 +02:00
Mads Rasmussen
ce8390768e Source maps gets cached really hard in the browser so I will remove them for now until we find a solution to clear them 2017-08-29 14:17:41 +02:00
Mads Rasmussen
7ccfc79080 update BuildBelle.bat to use gulp build task 2017-08-29 12:40:57 +02:00
Mads Rasmussen
ed850629da Merge branch 'dev-v7' into temp-gulp-spike 2017-08-29 11:47:17 +02:00
Mads Rasmussen
1307cb1173 add themes for tinymce - they are needed for loading it 2017-08-29 11:39:16 +02: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
Mads Rasmussen
70231fcee2 fix codemirror folder structure 2017-08-29 10:26:11 +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
78e66ce25f ok, hope this fixes tests 2017-08-29 16:34:30 +10:00
Shannon
dcc0374464 trying to fix unit tests 2017-08-29 15:18:16 +10: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
a95afa610f updates unit test config to work with new unit tests 2017-08-29 12:01:32 +10:00
Shannon
13e2112c3c U4-10361 Creating new member when AllowManuallyChangingPassword="false" - can't set a password 2017-08-29 11:56:38 +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
Mads Rasmussen
aa5d7fc9fc only use source maps when developing 2017-08-28 15:42:31 +02: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
Mads Rasmussen
5cbe2b6ce0 Add tasks for karma testing 2017-08-28 14:41:54 +02: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
0089f79bd7 add tasks for ngdocs 2017-08-25 14:22:42 +02:00
Mads Rasmussen
c468e4736e bower name should be lowercase 2017-08-25 14:19:25 +02:00