yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,713 Commits 4 Branches 7 Tags
150e2b12e84020cf65bf83ee53aa1cdab2db552a
Commit Graph

19713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
150e2b12e8 adding back the functionality to install a machine key during installation 2017-08-02 16:16:59 +10:00
Shannon
e29ac4d17c Fixes issue with the change made to WebSecurity.ValidateBackOfficeCredentials ... not sure what i was thinking 2017-08-02 16:04:37 +10:00
Shannon Deminick
ae30245a9b Merge pull request #2089 from umbraco/temp-77-upgrade-sqlce 
The try catch for getting a user when we are in Upgrading state also …
 2017-08-02 15:31:36 +10:00
Shannon
595e26e41f U4-10221 When creating content that has Content Templates (blueprints) created for it, we should distinguish between "Blank' and Blueprints 2017-08-02 15:30:17 +10:00
Shannon
dda19e292a U4-10217 Blueprints: When clicking "Create Blueprint", add explanation on what it is and what will happen 2017-08-02 13:28:50 +10:00
Shannon
08f07ff3b7 Moves blueprint localization copy into it's own section in the lang files 2017-08-02 12:58:31 +10:00
Shannon Deminick
e9e8d0d4b1 Merge pull request #2090 from umbraco/temp-blueprint-rename 
Implements U4-10219 and U4-10218
 2017-08-02 12:30:12 +10:00
Shannon
9d3a1fe529 updates design so it works and some wording for blueprints intro 2017-08-02 12:26:33 +10:00
Shannon
4f396222dc Merge branch 'dev-v7.7' into temp-blueprint-rename 2017-08-02 12:13:04 +10:00
Shannon
68f5a141c5 ensure when the user upgrades that the admin and editor have blueprint permissions 2017-08-02 12:11:42 +10:00
Shannon Deminick
9c0ca85c41 Merge pull request #2091 from umbraco/temp-U4-10202 
U4-10202 Make it more obvious when no content or media start nodes ar…
 2017-08-02 12:10:09 +10:00
Shannon
5cd314335c formatting 2017-08-02 11:56:11 +10:00
Shannon
241d486e97 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web/Security/Identity/FormsAuthenticationSecureDataFormat.cs
 2017-08-02 11:55:15 +10:00
Mads Rasmussen
b0f1b19385 allow current user to see but not edit its access rights 2017-08-01 20:06:19 +02:00
Mads Rasmussen
b6de92167b remove "lorem ipsum" + fix title on node permissions overlay 2017-08-01 19:40:11 +02:00
Sebastiaan Janssen
136b3db098 Merge pull request #2071 from umbraco/temp-U4-10123 
U4-10123 Make sure the backoffice login is not susceptible to DOS att…
 2017-08-01 17:16:31 +02:00
Niels Hartvig
7e49cc0f25 Implements U4-10219 and U4-10218 2017-08-01 16:19:32 +02:00
Mads Rasmussen
1c5bcbc5bb U4-10202 Make it more obvious when no content or media start nodes are selected the user has access to the root node. 2017-08-01 16:18:57 +02:00
Stephan
5fab5102d9 Fix UmbracoObjectTypes enum bkwd compatibility issue 2017-08-01 15:51:23 +02:00
mikkelhm
6655be5f5e Updates the trees.config.install.xdt to update the tree.config with the new User section 2017-08-01 14:24:04 +02:00
Mads Rasmussen
60cd82884f add localizationService as dependency to userGroupPicker controller 2017-08-01 14:13:02 +02:00
mikkelhm
eb93c0de11 Removes c#6 exception filter syntax 2017-08-01 12:33:57 +02:00
mikkelhm
8cb29182f4 The try catch for getting a user when we are in Upgrading state also needs to work for SqlCe 2017-08-01 12:19:26 +02:00
Mads Rasmussen
0786d0849c fix js errors in user controller after merge 2017-08-01 10:34:19 +02:00
mikkelhm
005bee7650 Updates web.config.install.xdt to have the latest assemblyBindings for the Katana libs(Owin), v 3.1.0.0 2017-08-01 10:29:22 +02:00
mikkelhm
39ce2067ef Removes references to deleted uninstall files, uninstall.core.ps1, uninstall.ps1 and web.config.uninstall.xdt 2017-08-01 10:22:17 +02:00
Sebastiaan Janssen
21f46d0a3c Adds debug level logging for failed attempts to get filestream 2017-08-01 09:16:39 +02:00
Shannon
59db5b0081 Obsoletes more dynamic published content extension methods and models 2017-08-01 17:04:16 +10:00
Shannon
44b90e2ce6 removes old template editor webforms files 2017-08-01 17:03:33 +10:00
Shannon
6829660720 removes old scripting templates 2017-08-01 17:02:45 +10:00
Shannon
67a69d2e11 bumps version, fixes install with setting built in group start nodes 2017-08-01 16:21:11 +10:00
Shannon
80364fc4d2 Fixes last unit test ( i think ) 2017-08-01 12:58:18 +10:00
Shannon Deminick
e02c6591d9 Merge pull request #2080 from umbraco/temp-U4-10202 
fixes: U4-10202 Make it more obvious when no content or media start n…
 2017-08-01 12:42:26 +10:00
Shannon
2e6fb8e3e5 Fixes merge issues, ensures "Content root" and "Media root" are localized 2017-08-01 12:41:22 +10:00
Shannon
cee3f456d1 Merge branch 'dev-v7.7' into temp-U4-10202 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-08-01 12:40:47 +10:00
Shannon Deminick
46bb0cca2d Merge pull request #2084 from umbraco/temp-U4-10059 
U4-10059 Localize users and user groups
 2017-08-01 12:09:32 +10:00
Shannon
2beba8067e updates the wording of a few items and updates the en.xml lang file too 2017-08-01 12:02:35 +10:00
Shannon
175da06d60 Merge branch 'dev-v7.7' into temp-U4-10059 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/users/group.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-08-01 11:31:52 +10:00
Shannon
7769a0ba42 Updates logic to show if the user or group has not start nodes defined (which does not anymore indicate root access) 2017-08-01 11:19:31 +10:00
Shannon
fd65380367 Merge branch 'dev-v7.7' into temp-U4-10202 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
 2017-08-01 10:35:37 +10:00
Shannon Deminick
9880e9b6a5 Merge pull request #2086 from umbraco/temp-U4-10212 
fixes: U4-10212 Clean up test css classes
 2017-08-01 10:32:53 +10:00
Shannon Deminick
134033bc3d Merge pull request #2085 from umbraco/temp-U4-10210 
fixes: U4-10210 Add title and filter to user groups overview
 2017-08-01 10:31:05 +10:00
Shannon Deminick
8bf3835212 Merge pull request #2070 from umbraco/temp-U4-10155 
fixes: U4-10155 Prompt the user before deleting user groups in the us…
 2017-08-01 10:16:02 +10:00
Shannon
6782e71841 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-08-01 09:41:21 +10:00
Shannon Deminick
7b449b4bad Merge pull request #2079 from umbraco/temp-U4-10095 
U4-10095 Need to be able to remove a user's avatar
 2017-08-01 09:40:47 +10:00
Sebastiaan Janssen
7fafea2370 Merge pull request #2087 from umbraco/temp-u4-10213 
PluginManager - implement retries on list file
 2017-07-31 17:03:55 +02:00
Stephan
86c37c7f6d PluginManager - fix 2017-07-31 16:38:39 +02:00
Stephan
7dd9f3e766 PluginManager - implement retries on list file 2017-07-31 16:24:22 +02:00
Mads Rasmussen
c539db39ec fixes: U4-10212 Clean up test css classes 2017-07-31 14:58:17 +02:00
Mads Rasmussen
2cc881883b fixes: U4-10210 Add title and filter to user groups overview 2017-07-31 13:20:33 +02:00