yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,127 Commits 4 Branches 7 Tags
6ea92daa70cc834cc8e33409f5f404794de025b9
Commit Graph

20127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
=
7f75802e4e allow DecimalValueConverter to understand signs in the front of the number. wonder if this could be more configurable as there are many other options avaialble." 2017-06-06 22:18:12 -06:00
Jeavon Leopold
f6cc06356c Adding new verbosity attribute to transform for health check config 2017-06-06 12:24:16 +02:00
AndyButland
7929b460c3 Added option for summary or detailed results in health check notifications 2017-06-06 10:32:26 +02:00
Mads Rasmussen
379b8c3719 fix render in users list view 2017-06-06 02:16:21 +02:00
Shannon
174e336512 fixes sections 2017-06-06 02:13:14 +02:00
Shannon
9bf61bb487 real data for user group 2017-06-06 02:05:17 +02:00
Shannon
5a5bdb6328 user doesn't need to be not approved for invite 2017-06-06 01:29:01 +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
Shannon
f907385ac8 fix mapping issue 2017-06-06 01:06:19 +02:00
Shannon
fbda8fe4a3 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-06 00:50:56 +02:00
Mads Rasmussen
e8ceb2756d wire up start node preview 2017-06-06 00:49:48 +02:00
Shannon
cfe90999d3 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-06 00:49:43 +02:00
Shannon
bbda93a06b updates mapping for start nodes 2017-06-06 00:49:36 +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
Shannon
869f75af4a Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-06 00:14:26 +02:00
Shannon
76032cf5f7 maps name and icon for user groups 2017-06-06 00:13:46 +02:00
Mads Rasmussen
c03e1420e0 fix user group name 2017-06-06 00:11:59 +02:00
Shannon
64975166e7 updates user models 2017-06-06 00:02:23 +02:00
Shannon
2ee34d5c48 updates user models 2017-06-05 23:25:33 +02:00
Lee Kelleher
44018b976a Merge pull request #1980 from leekelleher/temp-cgrt17-nc-tweaks-1 
Nested Content amends + localization
 2017-06-05 21:40:51 +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 Deminick
fc30cdee31 Merge pull request #1984 from umbraco/temp-content-blueprints 
Content blueprints
 2017-06-05 21:26:35 +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
Jeavon Leopold
5eb330b7d7 Add GetAbsoluteMediaUrl method to UrlHelper for the Open Graph starter kit lesson 2017-06-05 17:32:05 +02:00
Lars-Erik Aabech
6c78b8b60a Prevents saving blueprint with same name as other existing 2017-06-05 16:56:29 +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
AndyButland
ce618d289b Extended HttpsCheck healthcheck to check for expiring SSL certificate 2017-06-05 16:43:17 +02:00
Sebastiaan Janssen
2191d33844 Bumps version 2017-06-05 16:33:47 +02:00
Sebastiaan Janssen
92a507bc87 New CG year 2017-06-05 16:02:04 +02:00
Jeavon Leopold
57bb47a78b Add xdt transforms for adding the HealthChecks config to Web.Config 2017-06-05 15:31:21 +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
0c8e5a2cc2 Added dictionary keys for Nested Content 2017-06-05 15:21:43 +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
Jeavon Leopold
9edc20b1b1 Merge branch 'dev-v7.7' into temp-U4-9984 2017-06-05 15:00:42 +02:00
AndyButland
28247add3c Created unit tests for health check results 2017-06-05 14:37:50 +02:00
Shannon
e4d96997d5 Merge remote-tracking branch 'lars/temp-content-blueprints' into temp-content-blueprints 2017-06-05 14:35:07 +02:00
Jeavon Leopold
dd84164ac5 Fix email subject to come from config for Health Check Notifier 2017-06-05 14:08:52 +02:00
Shannon
8bc033efde Merge remote-tracking branch 'lars/temp-content-blueprints' into temp-content-blueprints 2017-06-05 14:02:23 +02:00
Jeavon Leopold
a407f9aa19 Merge branch 'feature/health-check-scheduler' of https://github.com/AndyButland/Umbraco-CMS into temp-U4-9984 
# Conflicts:
#	src/Umbraco.Web/HealthCheck/HealthCheckResults.cs
#	src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
 2017-06-05 14:02:12 +02:00