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

20888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeavon
833c787414 Adding message text with totals 2017-06-26 15:53:15 +01:00
Jeavon
1f2e1e4e93 Warnings are success with Warning so should be counted as success 2017-06-26 15:48:44 +01:00
Jeavon
d7bd711d9a Switch Health Check Slack notification to use Slack Attachments 2017-06-26 15:25:11 +01:00
Claus
2fdf148610 localizing text https://github.com/umbraco/Umbraco-CMS/pull/1250 2017-06-26 15:41:17 +02:00
Claus
9d9e5e8274 Merge branch 'rodyvansambeek-patch-1' into dev-v7 2017-06-26 15:33:27 +02:00
Claus
89895dd592 Merge branch 'patch-1' of git://github.com/rodyvansambeek/Umbraco-CMS into rodyvansambeek-patch-1 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
 2017-06-26 15:32:47 +02:00
Mads Rasmussen
f309e3587b fix user group filter + add UI for user states filter 2017-06-26 15:00:32 +02:00
Lars-Erik Aabech
f9252372ea Adds InternalsVisibleTo("Umbraco.UnitTesting.Adapter") for more imperative exposure to custom unit test adapters. 2017-06-26 12:39:57 +02:00
Claus
02a2178029 Merge branch 'benjaminketron-temp-U4-9464' into dev-v7 2017-06-26 11:33:27 +02:00
Claus
ee775a2fde adding a few more tests. 2017-06-26 11:31:46 +02:00
Claus
22af206626 Merge branch 'temp-U4-9464' of git://github.com/benjaminketron/Umbraco-CMS into benjaminketron-temp-U4-9464 2017-06-26 11:23:24 +02:00
Mads Rasmussen
493873a8d0 permissions dialog: add edit button to selected user group 2017-06-25 22:48:49 +02:00
Mads Rasmussen
7beec02a3f permissions dialog: fix save button text 2017-06-25 21:54:32 +02:00
Mads Rasmussen
86cb750ca1 permissions dialog: filter out selected groups from dropdown 2017-06-25 21:51:17 +02:00
Mads Rasmussen
f92e119060 hardcode group names 2017-06-25 20:27:14 +02:00
Mads Rasmussen
13a0621f89 localize strings 2017-06-25 20:26:44 +02:00
AndyButland
67e109c0e6 Preserved line breaks in property descriptions when rendering in content area 2017-06-23 11:40:43 +02:00
Sebastiaan Janssen
8a4d85771b Merge pull request #2016 from mikecp/U4-10047 
U4 10047
 2017-06-23 11:14:49 +02:00
Shannon
0cd871241f Gets password reset working, gets more server side validation wired up 2017-06-23 16:38:39 +10:00
Shannon
3eba5e5c19 Merge branch 'dev-v7.7' into user-group-permissions 
# Conflicts:
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Tests/Services/UserServiceTests.cs
#	src/Umbraco.Web.UI.Client/src/common/services/util.service.js
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-06-23 16:37:56 +10:00
Sebastiaan Janssen
4688ac104e Merge pull request #1494 from AndyButland/u4-8999 
U4-8999 - health check, debug compilation mode is being reported in error when config missing
 2017-06-23 08:31:29 +02:00
Shannon
754dbc9621 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
 2017-06-23 15:15:55 +10:00
Shannon
d936105cfe Gets the user states set correctly 2017-06-23 15:14:46 +10:00
Shannon
ea2f808c1e fixes tests 2017-06-23 14:58:00 +10:00
Shannon
3ece9175a0 Moves the enable/disable user notifications and localization alerts to server side, adds server side validation so that the current user cannot disable themsevlves. 2017-06-23 14:49:04 +10:00
Shannon
692dc66684 You can now change the user password in the user editor 2017-06-23 14:08:58 +10:00
Shannon
25a79bc2fa fixing tests 2017-06-23 11:43:58 +10:00
Shannon
8cd413ba8f ensures group start nodes are set to null on install 2017-06-23 11:24:06 +10:00
Shannon
1eeae770b4 Fixes issue with calculating all user start nodes, improves perf too 2017-06-23 11:23:40 +10:00
Michael Latouche
032dbe5bf5 Update fr.xml 2017-06-23 00:52:10 +02:00
Michael Latouche
a7695163b9 Update fr.xml 2017-06-23 00:21:33 +02:00
Michael Latouche
cb4569677e Update fr.xml 2017-06-23 00:10:22 +02:00
Michael Latouche
4be704b968 Update fr.xml 2017-06-23 00:09:52 +02:00
Michael Latouche
b7a5cb046a Update fr.xml 2017-06-22 23:56:33 +02:00
Mads Rasmussen
0e2c94c079 fix remove user from user group 2017-06-22 14:59:03 +02:00
Mads Rasmussen
99da2e923d move toggle to the left of the permission text 2017-06-22 13:30:36 +02:00
Mads Rasmussen
c9200d54b5 update umb-toggle to show icons as default instead of labels 2017-06-22 13:28:01 +02:00
Claus
eb52dafb33 U4-9839 Media Picker: If I only upload one photo then select it as a part of the upload process 2017-06-22 13:01:29 +02:00
Sebastiaan Janssen
af382c171b Merge pull request #2009 from umbraco/temp-U4-10034 
U4-10034 Package install may not wait for app domain restart in all cases
 2017-06-22 11:22:18 +02:00
Claus
54fdfdd639 adding grunt watch interval to prevent insane cpu load. 2017-06-22 11:05:42 +02:00
Claus
c4c99ef0b8 Merge pull request #2014 from umbraco/temp-deploy-348 
deploy-348 - add support for languages
 2017-06-22 10:53:31 +02:00
Stephan
0bd233815e deploy-348 - add support for languages 2017-06-22 10:04:48 +02:00
Shannon
8f51f574ae fixing build 2017-06-22 17:02:46 +10:00
Shannon
90d4153e87 updates some of the sub view routing with users/groups so the routing is always there 2017-06-22 16:47:45 +10:00
Shannon
6380d1d538 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-22 16:33:00 +10:00
Shannon
b43ca64ac7 Ensures that the auth cookie data contains all of the user's start nodes, fixes persisting the user group icon 2017-06-22 16:32:44 +10:00
Michael Latouche
4c9fd4029f Merge pull request #3 from umbraco/dev-v7 
Resync
 2017-06-22 00:32:36 +02:00
Mads Rasmussen
7825040e4d sync tree 2017-06-21 15:55:57 +02:00
Mads Rasmussen
f27b456eb4 users overview tlc + cleanup. Changed click to open instead of select 2017-06-21 15:40:52 +02:00
Claus
3d65afabbf Merge branch 'temp-U4-10043' into dev-v7 2017-06-21 14:27:34 +02:00