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

20888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mikkelhm
895faf41b1 Update version to 7.6.7 2017-09-04 12:28:16 +02:00
Shannon
a0306f9d55 Fixes ability to reset your own password in the user section 2017-09-04 20:15:46 +10:00
Stephan
9a06c3a5ff Implement ILocalizationService.GetDictionaryItemKeyMap 2017-09-04 11:31:20 +02:00
Sebastiaan Janssen
44102df36f Merge pull request #2167 from umbraco/temp-U4-10370 
U4-10370 Culture and hostnames with "æøå" after /
 2017-09-04 11:25:55 +02:00
Ronald Barendse
207d6b53b5 Fixed .umb-panel-header-content-wrapper height 
The .umb-panel-header-content-wrapper was 1 pixel higher than the parent .umb-panel-header, now both heights are 99px.
 2017-09-04 11:22:56 +02:00
Shannon
0e0ab81155 Changes AllowManuallyChangingPassword by default to be false 2017-09-04 17:26:45 +10:00
Shannon
a608577a4f Merge branch 'dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Constants-Security.cs
#	src/Umbraco.Core/Security/BackOfficeUserStore.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2017-09-04 16:51:20 +10:00
Robert
972d5f8296 Reverted back to last commit, invalid html check added 2017-09-03 21:17:53 +02:00
Sebastiaan Janssen
617a91c57e Merge pull request #2119 from umbraco/temp-U4-10274 
U4-10274 Umbraco.MemberHasAccess isn't cached
 2017-09-01 15:45:55 +02:00
Sebastiaan Janssen
cb0e5414b9 Merge pull request #2155 from umbraco/temp-U4-10361 
U4-10361 Creating new member when `AllowManuallyChangingPassword="fal…
 2017-09-01 14:46:58 +02:00
Claus
22cef52261 removing using. 2017-09-01 13:50:51 +02:00
Claus
41e419a49e U4-10370 Culture and hostnames with "æøå" after / 2017-09-01 13:48:39 +02:00
Robert
ccfcabc707 Event added to trigger deploy/courier 2017-09-01 11:07:09 +02:00
Stephan
efbe97a01d Merge pull request #2149 from umbraco/temp-deploy-358 
Updates the underlying event args base class's AdditionalData diction…
 2017-08-31 18:25:07 +02:00
Stephan
0babb7f28a deploy-358 - reduce allocations in CancellableEventArgs 2017-08-31 18:03:34 +02:00
Stephan
5ba801386c Merge branch 'dev-v7' into temp-deploy-358 2017-08-31 18:03:19 +02:00
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
66da774bf7 Revert "Change EntityService GetDescendents to lookup the item path to use in the LIKE query to be a 'prefix' query not a 'contains' query which will be much better for SQL" 
This reverts commit ecc761a232.
 2017-09-01 00:46:01 +10:00
Shannon
1cec38c679 Gets site nodes showing for users with multiple root nodes and updates UI to support showing them what they have and don't have access to, also updates the content/media tree controllers performance for when looking up entities and if the user has access to the path. 2017-09-01 00:32:01 +10:00
Shannon
51e9b98857 Updates Content and Media services GetAncestors to use a prefix query intead of contains, fixes tests 2017-08-31 22:54:30 +10:00
Shannon
ecc761a232 Change EntityService GetDescendents to lookup the item path to use in the LIKE query to be a 'prefix' query not a 'contains' query which will be much better for SQL 2017-08-31 22:19:01 +10:00
Robert
73937172dc Added check for invalid HTML and sanitization on said HTML 
Added HtmlSanitization package
Added check for invalid HTML and sanitization on WordsToLength and Truncate methods
Addes some extra comments
 2017-08-31 11:43:06 +02:00
Robert
8c1996a7a1 Changed from the String object qualifier to type qualifier 2017-08-31 09:15:02 +02: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
Bitmapped
65db5396cf Spelling fix 2017-08-30 20:06:20 -04:00
Bitmapped
32d5a0a57c Add method for configuring external logins so things can be granularly overriden. 2017-08-30 20:04:30 -04:00
Robert
742c3236c7 Merge branch 'U4-7580-rename-containers' of git://github.com/lars-erik/Umbraco-CMS into lars-erik-U4-7580-rename-containers 2017-08-30 15:13:19 +02: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
Robert
039ab8f1d2 Null check for firstTrim added and fixed typo 2017-08-30 09:18:45 +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