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
Sebastiaan Janssen
d7453b5a6e Updating the CG link so we can modify it without releasing a new version 
Updated links to our/tv to be https
 2017-06-19 09:49:15 +02:00
Sebastiaan Janssen
5ed8ceb85e Merge pull request #2000 from umbraco/updates-installer-764 
Update installer photo + tlc on starter kit install screen
 2017-06-19 09:34:40 +02:00
Mikkel Holck Madsen
b7ea0840a9 Merge pull request #2007 from abryukhov/patch-6 
Update ru.xml UI resources
 2017-06-19 09:29:45 +02:00
Shannon Deminick
6b65f1c197 Merge pull request #1970 from Sam7/dev-v7 
U4-9973 Remove sealed modifier from ExternalSignInAutoLinkOptions class
 2017-06-19 17:27:24 +10:00
AndyButland
9f68bd4e52 Amended registration of health check scheduled notifiers (email and Slack) to use a resolver method and allow others to be added without modifying core 2017-06-18 16:41:46 +02:00
Alexander Bryukhov
bc7dc8629e Update ru.xml UI resources 
Couple of translation corrections
 2017-06-18 18:35:48 +07:00
Michael Latouche
d3c2b0a247 Merge pull request #2 from umbraco/dev-v7 
Merge dev-v7 into my fork
 2017-06-17 01:16:26 +02:00
Mads Rasmussen
41ee187637 increase font small for small buttons 2017-06-16 14:14:05 +02:00
Mads Rasmussen
3ec9c9a348 fix animation on block buttons 2017-06-16 14:13:44 +02:00
Stephan
464711d3c8 U4-10026 - use id-key map for getting by guid 2017-06-16 14:09:20 +02:00
Mads Rasmussen
efaa24fb51 add UI feedback when enabling/disabling user 2017-06-16 14:03:06 +02:00
Mads Rasmussen
00659711d9 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-15 20:28:39 +02:00
Shannon
021e083b75 Fixes issue with email confirmation date, adds invite date, adds user state counts 2017-06-15 16:47:51 +02:00
Stephan
a3af1d478d U4-10006 - revert unrelated changes 2017-06-15 16:08:51 +02:00
Shannon
0f89b1dea7 Fixes up how formctrl are required for various directives, adds validation to invite/create user, fixes up back end and is all now working 2017-06-15 15:59:29 +02:00
Stephan
7d8fdff6c1 U4-10006 - adjust projects to new build 2017-06-15 15:50:50 +02:00
Mikkel Holck Madsen
b15fd4496a Merge pull request #1699 from richarth/patch-2 
Spelling and Grammar changes
 2017-06-15 15:24:56 +02:00
Stephan
a813c0bfea U4-10006 - import some documentation 2017-06-15 15:15:53 +02:00
Mikkel Holck Madsen
b3ea0c83f9 Merge pull request #1832 from leekelleher/issue/U4-8098 
Fixes U4-8900 - XPath: "$current" on Multinodetreepicker gives error in Document Type editor
 2017-06-15 15:02:14 +02:00
Shannon Deminick
c1aefe0686 Merge pull request #2002 from rmorrin/obsolete-namespace-errors 
Fix incorrect namespace in deprecated class messages
 2017-06-15 14:16:30 +02:00
Ryan Morrin
907dd8092a Fix incorrect namespace in deprecated class messages 2017-06-15 13:04:30 +01:00
Stephan
4870554f47 U4-10006 - from build.bat to Umbraco.Build PS module 2017-06-15 13:32:00 +02:00
Shannon
5b8d314a29 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-15 12:47:40 +02:00
Shannon
f33d21b8f6 Gets all the localization for the invite setup and error checking based on the password provider information 2017-06-15 12:45:53 +02:00
Sebastiaan Janssen
7b5568ecb4 Merge pull request #1993 from AndersBrohus/U4-10008 
U4-10008 - New danish translation for "Preview" - button
 2017-06-15 12:43:25 +02:00
Mads Rasmussen
2361d7878e add word-wrap to user-card name 2017-06-15 11:27:01 +02:00
Mads Rasmussen
613a9de858 show user state after save 2017-06-15 11:20:19 +02:00
Mads Rasmussen
9f234f1669 start on create user group 2017-06-15 11:07:57 +02:00
Mads Rasmussen
7353591f4c in sections panel: show avatar initials if no avatar 2017-06-15 11:06:10 +02:00
Shannon
439c30e2fd changes name from versionHash to cacheBuster 2017-06-15 09:20:46 +02:00
Shannon
0858e04345 tidy up how a user is created when invited, ensure the special empty password is used. 2017-06-15 00:46:23 +02:00
Shannon
6d22f7f86f Getting the invite password setting done with validation, almost there 2017-06-15 00:05:12 +02:00
Shannon
c13b2fae4b Fixes issue of rendering the umb version in the html markup 2017-06-15 00:04:42 +02:00
Shannon Deminick
2fd383960d Merge pull request #1997 from umbraco/temp-U4-10014 
U4-10014 Making package install events public
 2017-06-14 22:41:11 +02:00
Shannon
51b19bedc8 Merge remote-tracking branch 'origin/dev-v7' into user-group-permissions 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Editors/GravatarController.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
 2017-06-14 22:30:36 +02:00
Shannon
582e36c517 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-14 21:30:08 +02:00
Shannon
a62426a763 Gets email sending ensures user is logged in with verifying but is only partially logged in and cannot access the back office, they can only access the verification screen 2017-06-14 16:21:56 +02:00
Stephan
33f76d25f7 U4-9993 - fix upgrade issues 2017-06-14 15:04:56 +02:00
Mads Rasmussen
898f00cbf1 fix avatar sizes 2017-06-14 14:07:07 +02:00
Mads Rasmussen
12de575dfb update user picker to match new data model 2017-06-14 13:12:49 +02:00
Mads Rasmussen
cd8418a8c0 remove fake loading of user groups 2017-06-14 12:52:12 +02:00
Mads Rasmussen
89dcb6a0e2 fix start node pickers 2017-06-14 12:51:41 +02:00
Niels Hartvig
a2c5c35394 Update installer photo + tlc on starter kit install screen 2017-06-14 11:45:03 +02:00
Shannon
cd1e88d151 Gets email sending using razor view 2017-06-14 11:29:15 +02:00
Mikkel Holck Madsen
c0616a37bf Merge pull request #1999 from umbraco/temp-tryAscii 
Enable trying to convert urls to ascii
 2017-06-14 10:12:58 +02:00
Mikkel Holck Madsen
da4be3be65 Merge pull request #1995 from umbraco/temp-backofficeguids 
Adds hoverstates for metadata(documenttypes, datatypes etc), making it possible to see their guids in the backoffice
 2017-06-14 08:27:41 +02:00
Shannon
e757868d09 Moves logic back to user service for inviting a user since its much simpler. 2017-06-13 18:47:20 +02:00
Shannon
f09f17e496 getting email invite working and with identity apis 2017-06-13 18:38:16 +02:00
Shannon
3fac1b05ae Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-13 15:48:04 +02:00
Shannon
716629235e issue with mapping ysod 2017-06-13 15:47:39 +02:00