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

4916 Commits

Author SHA1 Message Date
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
Stephan
31f8213460 Amazingly improve NestedContent non-support of some editors 2017-06-05 11:33:05 +02:00
Lars-Erik Aabech
1abec65f03 Saving blueprints keeps only save button 2017-06-05 10:47:52 +02:00
Shannon
ac0a5bfe5d fixes cancel button 2017-06-05 10:46:37 +02:00
Shannon
121036ebb9 Merge branch 'dev-v7.7' into user-group-permissions 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-06-05 10:35:23 +02:00
Shannon
e2f9c90dc6 Merge branch 'dev-v7.7' into temp-content-blueprints 2017-06-05 10:23:10 +02:00
Shannon
3a990d9cf0 Merge remote-tracking branch 'origin/temp-u4-8604-1' into dev-v7.7 2017-06-05 09:50:17 +02:00
leekelleher
dc3f96a292 Included a pull-request from NestedContent package 
Fixes the prevalue-editor's doctype tabs dropdownlist from reverting to default post-save.

https://github.com/umco/umbraco-nested-content/pull/131
 2017-06-05 09:28:52 +02:00
leekelleher
e136780947 Fixed JSLint warnings 
Renamed "nestedcontent.filters.js" filename to be singular.
 2017-06-05 09:28:52 +02:00
Stephan
942d010264 Retreat Amazing Nested Content Work 2017-06-05 09:28:52 +02:00
Lars-Erik Aabech
b70241e807 Allowing blank documents configurable 2017-06-05 00:49:06 +02:00
Lars-Erik Aabech
10761a2211 Selecting blueprints made configurable 2017-06-05 00:39:16 +02:00
Lars-Erik Aabech
f392c32d63 More localization and validation of blueprints 2017-06-05 00:20:02 +02:00
Lars-Erik Aabech
95cfb6c56b More localization of blueprint actions 2017-06-04 23:44:12 +02:00
Shannon
d59e3d34f9 fix double submit 2017-06-04 23:42:33 +02:00
Shannon
1a03c7f068 Merge remote-tracking branch 'lars/temp-content-blueprints' into temp-content-blueprints 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/createblueprint.html
 2017-06-04 23:40:39 +02:00