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

4879 Commits

Author SHA1 Message Date
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
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
f09f17e496 getting email invite working and with identity apis 2017-06-13 18:38:16 +02:00
Mads Rasmussen
e40a904896 clean up groups overview controller 2017-06-13 15:39:14 +02:00
Mads Rasmussen
5aeb8ed74d get all sections in section picker 2017-06-13 15:27:58 +02:00
Mads Rasmussen
5273644a7e split up groups and status filter + add additional filter options to order by 2017-06-13 15:12:54 +02:00
Mads Rasmussen
56e6722880 fix user group load spinner 2017-06-13 11:47:35 +02:00
Mads Rasmussen
fb3ac86d8c add section picker 2017-06-13 11:30:48 +02:00
Mads Rasmussen
e559a6d485 add key as hover on name 2017-06-12 14:55:12 +02:00
Claus
160518e977 adding guids to backoffice. 2017-06-12 12:12:14 +02:00
Mads Rasmussen
379b8c3719 fix render in users list view 2017-06-06 02:16:21 +02:00
Shannon
9bf61bb487 real data for user group 2017-06-06 02:05:17 +02:00
Shannon
7f03a97a78 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-06 01:21:17 +02:00
Shannon
7533b0e704 ensures icons, ensures saving info for creating users 2017-06-06 01:21:03 +02:00
Mads Rasmussen
d72af87790 rename content picker to media picker 2017-06-06 01:11:40 +02:00
Mads Rasmussen
1eba16579a remove search on user groups 2017-06-06 01:10:55 +02:00
Mads Rasmussen
1c373ca771 fix render in user group picker 2017-06-06 01:10:36 +02:00
Mads Rasmussen
e8ceb2756d wire up start node preview 2017-06-06 00:49:48 +02:00
Mads Rasmussen
a041fc47e0 view for user group preview 2017-06-06 00:49:07 +02:00
Mads Rasmussen
6da5fe6b3a fix sections, content and media start node in umbUserGroupPreview 2017-06-06 00:35:31 +02:00
Mads Rasmussen
c03e1420e0 fix user group name 2017-06-06 00:11:59 +02:00
leekelleher
1293730dd3 Merge remote-tracking branch 'upstream/dev-v7.7' into temp-cgrt17-nc-tweaks-1 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
 2017-06-05 21:35:16 +02:00
Shannon
ca8e25f465 Merge remote-tracking branch 'origin/dev-v7.7' into temp-content-blueprints 2017-06-05 21:17:53 +02:00
Shannon
f55d1328d0 Merge tag 'release-7.6.4' into temp-content-blueprints 2017-06-05 21:17:41 +02:00
leekelleher
685f7bcde8 Correct the Nested Content Editor directive name, 
as it conflicted with the package version - which override the core version (wasn't good).
 2017-06-05 21:08:43 +02:00
Lars-Erik Aabech
8602aab6f7 Merge remote-tracking branch 'origin/temp-content-blueprints' into temp-content-blueprints 2017-06-05 16:47:40 +02:00
Lars-Erik Aabech
88702f7e18 Can create blueprints from the tree 2017-06-05 16:46:30 +02:00
Sebastiaan Janssen
92a507bc87 New CG year 2017-06-05 16:02:04 +02:00
leekelleher
57b037fda0 Switched to a better GUID generation method 
Fixed issue with keys being generated on every publish rather than being remembered
 2017-06-05 15:26:02 +02:00
leekelleher
7aad660ebf Renamed selectedDocTypeTabs to be docTypeTabs, 
as it contains the tab names for all the doctypes. It was a misnomer.
 2017-06-05 15:25:34 +02:00
leekelleher
181a5b847c Removed redundant reference from the Nested Content editor controller 
`ncResources` wasn't being used in the `PropertyEditorController`
 2017-06-05 15:24:37 +02:00
leekelleher
7a7f24ed78 Localized Nested Content's labels 2017-06-05 15:23:27 +02:00
leekelleher
c43dda468c Renamed "nestedcontent.resources.js" to be singular "resource". 
Aligns with the rest of the resource files
 2017-06-05 15:21:21 +02:00
Shannon
e4d96997d5 Merge remote-tracking branch 'lars/temp-content-blueprints' into temp-content-blueprints 2017-06-05 14:35:07 +02:00
Shannon
8bc033efde Merge remote-tracking branch 'lars/temp-content-blueprints' into temp-content-blueprints 2017-06-05 14:02:23 +02:00
Shannon
1e90015253 updates to name ModelState and ensures tokenized localization 2017-06-05 14:02:11 +02:00
Lars-Erik Aabech
7f63919ba6 Merge branch 'temp-content-blueprints' of https://github.com/umbraco/Umbraco-CMS into temp-content-blueprints 2017-06-05 13:52:57 +02:00
Lars-Erik Aabech
0fff051cf6 Tests for the create content controller 2017-06-05 13:52:07 +02:00
Lars-Erik Aabech
346b29b827 Couple of unit tests for the create content dialog 2017-06-05 12:12:25 +02:00
Shannon
1bedc6a444 Wires up server side validation for name 2017-06-05 12:11:20 +02:00