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

4870 Commits

Author SHA1 Message Date
Alexander Bryukhov
45988d4f0c Localizing hardcoded strings 2017-06-21 02:42:02 +07:00
Alexander Bryukhov
db330b3223 Localizing hardcoded strings 2017-06-21 02:41:54 +07:00
Alexander Bryukhov
03fd06cfa7 Localizing hardcoded strings 2017-06-21 02:41:45 +07:00
Alexander Bryukhov
775148d241 Localizing hardcoded strings 2017-06-21 02:41:37 +07:00
Alexander Bryukhov
8e65ecdc4a Localizing hardcoded strings 2017-06-21 02:41:27 +07:00
Alexander Bryukhov
6a43dd41c6 Localizing hardcoded strings 2017-06-21 02:41:19 +07:00
Alexander Bryukhov
82ae6a1aef Added localizationService 
and localized two hardcoded strings
 2017-06-21 02:41:04 +07:00
Mads Rasmussen
9786ae8428 wip content permissions dialog 2017-06-20 15:35:02 +02:00
Mads Rasmussen
cc41447ff7 prototype default permissions on edit user group 2017-06-20 15:19:06 +02:00
Mads Rasmussen
2e239939fc add umb-toggle component 2017-06-20 14:52:32 +02:00
Stephan
4cdb30fed0 Merge branch dev-v7 into dev-v7.7 2017-06-20 14:27:25 +02:00
Claus
ef32eda874 Merge branch 'temp-U4-8664' into dev-v7 
fixing language selection.
 2017-06-20 14:09:43 +02:00
Claus
01ccf8a6a6 Merge branch 'U4-8664' of https://github.com/DoctaJonez/Umbraco-CMS into temp-U4-8664 2017-06-20 12:59:28 +02:00
Sebastiaan Janssen
c27ca1fb0d U4-9724 Tiny MCE error when adding a link "Cannot read property 'href' of undefined" 2017-06-20 10:16:00 +02:00
Shannon
68e287cf12 fixes $q reference 2017-06-20 18:11:26 +10:00
Shannon
ad6946aa26 fixes error handler reference 2017-06-20 18:07:17 +10:00
Shannon
cec829774e Merge remote-tracking branch 'origin/dev-v7' into user-group-permissions 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
 2017-06-20 17:09:52 +10:00
Shannon
d7e65dd088 User groups can now be created/saved 2017-06-20 15:10:42 +10:00
Shannon
7689ee73d4 Wires up saving the user group 2017-06-20 14:33:24 +10:00
Shannon
e276c7a1bf Wires up getUserGroupScaffold 2017-06-20 12:34:33 +10:00
Shannon
7797ad4130 localizes invite email 2017-06-20 12:25:27 +10:00
Shannon
78bfc087fb Fixes up all of the user sorting to work properly 2017-06-20 11:55:21 +10:00
Shannon
d885265818 Changes restart tracking to use code we used to have in there which is an in memory marker for the app domain, this is a little cleaner 2017-06-19 23:40:51 +10:00
Shannon
7920383904 U4-10034 Package install may not wait for app domain restart in all cases 2017-06-19 23:02:06 +10:00
Shannon Deminick
2654f9189f Merge pull request #1973 from marcemarc/marcemarc-u4-9480 
Revised fix for issue: U4-9489 - Just fix logResource.js parameters
 2017-06-19 20:33:37 +10:00
Mads Rasmussen
79e9394b62 wire up enable users and disable users bulk actions 2017-06-19 11:51:38 +02:00
Mads Rasmussen
a7a7909a25 fix header icon width 2017-06-19 10:21:21 +02:00
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
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
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
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
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
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
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
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
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