Commit Graph

20888 Commits

Author SHA1 Message Date
akierczynska
4b966ebe91 Update pl.xml 2017-06-20 17:31:18 +01:00
akierczynska
da9e87d0ab Update pl.xml 2017-06-20 17:18:58 +01:00
akierczynska
84a206ce5e Update pl.xml 2017-06-20 16:12:12 +01:00
akierczynska
3c3c31c36e Update pl.xml 2017-06-20 16:08:17 +01:00
akierczynska
585f8e07f7 Update pl.xml 2017-06-20 16:03:46 +01:00
akierczynska
f7c0e02bfd Update pl.xml 2017-06-20 16:00:47 +01:00
akierczynska
e767eaa08b Update pl.xml
Update pl.xml to match en.xml and complete the translation
2017-06-20 15:57:50 +01:00
Mads Rasmussen
9786ae8428 wip content permissions dialog 2017-06-20 15:35:02 +02:00
Mads Rasmussen
f28c4cdaa5 load new permissions dialog 2017-06-20 15:19:42 +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
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