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 |
|
Shannon
|
9dc34f0c98
|
Updating a bunch of start node checking logic to ensure that it takes the user and user group start nodes into account
|
2017-06-20 18:38:31 +10: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
|
94e958bd7a
|
Ensures the user's combined start nodes are used when checking path access
|
2017-06-20 17:04:00 +10:00 |
|
Shannon Deminick
|
42d7c83a6d
|
Merge pull request #2004 from umbraco/temp-u4-10026
U4-10026 - use id-key map for getting by guid
|
2017-06-20 17:01:35 +10:00 |
|
Stephan
|
1a435148d8
|
U4-10026 - inject idkmap
|
2017-06-20 08:55:08 +02:00 |
|
Shannon
|
957c8e917f
|
fixes tests
|
2017-06-20 16:49:24 +10:00 |
|
Stephan
|
de348a9946
|
Merge remote-tracking branch 'origin/dev-v7' into temp-u4-10026
|
2017-06-20 08:41:04 +02:00 |
|
Shannon
|
d7e65dd088
|
User groups can now be created/saved
|
2017-06-20 15:10:42 +10:00 |
|
Shannon
|
4e1e2c5332
|
fix unit tests
|
2017-06-20 14:37:49 +10:00 |
|
Shannon
|
7689ee73d4
|
Wires up saving the user group
|
2017-06-20 14:33:24 +10:00 |
|
Shannon
|
af7a5187f2
|
Adds the user count to IUserGroup
|
2017-06-20 13:19:14 +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
|
146a865882
|
fixes UserState values to be what they were before
|
2017-06-20 11:21:31 +10:00 |
|
akierczynska
|
791e6a5f92
|
Update pl.xml
|
2017-06-19 18:19:35 +01:00 |
|
Shannon
|
1f6f8df5b5
|
Turns out when we empty the recycle bin we weren't removing associated cmsTask info. This also adds a null check since a SingleOrDefault call can return null. I've only seen this cause a problem when there is corrupt data but it should still be checked.
|
2017-06-19 23:48:18 +10:00 |
|
Niels Hartvig
|
7f5eff6e53
|
Fixes build, removes more unused client files
|
2017-06-19 15:43:53 +02: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 |
|
Niels Hartvig
|
be6140a38b
|
Revert "More client files clean-up (including a duplicate tinymce)"
This reverts commit 8ee05063a2.
|
2017-06-19 15:27:36 +02:00 |
|
Niels Hartvig
|
8ee05063a2
|
More client files clean-up (including a duplicate tinymce)
|
2017-06-19 15:05:02 +02: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 |
|
Niels Hartvig
|
1a3d9e27f4
|
Removing unused v6 images
|
2017-06-19 14:46:21 +02:00 |
|
Jeavon
|
b0827b75b2
|
Rename Results to GetResultsForStatus and only calculate the result set required
|
2017-06-19 13:03:29 +01:00 |
|
Jeavon
|
824eee80b3
|
Adding a Results method to the HealthCheckResults so that Notification Methods can construct specific messages with different result sets
|
2017-06-19 12:18:47 +01:00 |
|
Jeavon
|
0638786075
|
A Resultype of info only isn't considered a failure
|
2017-06-19 12:16:01 +01: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 |
|
Jeavon
|
ebef6b5d42
|
A few tweaks to the HealthChecks.Release.config to show different options
|
2017-06-19 10:11:57 +01:00 |
|
Shannon
|
054fd46555
|
Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions
|
2017-06-19 18:45:53 +10:00 |
|
Shannon
|
9ab9007821
|
SQL fix for SQLCE for user states
|
2017-06-19 18:45:38 +10:00 |
|
Mads Rasmussen
|
a7a7909a25
|
fix header icon width
|
2017-06-19 10:21:21 +02:00 |
|
Jeavon
|
ac1aa719b6
|
Updating HealthChecks.Release.config to new format
|
2017-06-19 09:18:00 +01: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 |
|
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 |
|