swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,583 Commits 73 Branches 219 Tags
a4274ba76727273eb8d7cfb02b97fc5bdcd3e9cc
Commit Graph

5066 Commits

Author SHA1 Message Date
Mads Rasmussen 2c2a9cc916 fixes: U4-10220 Missing the ability to create Content Templates (blueprints) from the blueprints tree directly when none exist 2017-08-09 10:47:41 +02:00
Shannon 2d42a6ca16 Merge branch 'dev-v7.7' into temp-U4-10257 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
 2017-08-08 13:02:57 +10:00
Shannon 1258148e37 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
 2017-08-08 12:36:16 +10:00
mikkelhm ca0de5acd3 Fix more xml format issues in pl.xml 2017-08-07 21:58:45 +02:00
mikkelhm 27168722ab fix xml in pl.xml 2017-08-07 20:33:49 +02:00
Per Ploug babcbd2f7a Updates from dev-v7 2017-08-07 15:29:34 +02:00
Mads Rasmussen 6658ecf6e3 add success state for "invite user" 2017-08-07 15:24:19 +02:00
Mads Rasmussen 19af28dd93 localize content permissions dialog 2017-08-04 11:21:43 +02:00
mikkelhm 1c59c0b164 Dont output the Healthcheck.Release.config file when publishing the webapp, i.e. for nu nuget package 2017-08-02 23:57:37 +02:00
Shannon d459246519 oops 2017-08-02 23:41:31 +10:00
Shannon efbfef74c2 localizes email, fixes issues with smtp and async 2017-08-02 23:39:31 +10:00
Jeavon 51f51c1762 Revert this csproj change, not sure when VS added it 2017-08-02 11:29:31 +01:00
Jeavon b6e377a560 Removing further NuGet packages that were added by the Slack package 2017-08-02 11:25:28 +01:00
Jeavon b915f723f5 Removing Slack Health Check notification 2017-08-02 11:20:00 +01:00
Jeavon 8259024e20 Merge branch 'dev-v7.7' into temp-U4-9984 
# Conflicts:
#	src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
 2017-08-02 10:48:43 +01:00
Shannon dda19e292a U4-10217 Blueprints: When clicking "Create Blueprint", add explanation on what it is and what will happen 2017-08-02 13:28:50 +10:00
Shannon 08f07ff3b7 Moves blueprint localization copy into it's own section in the lang files 2017-08-02 12:58:31 +10:00
Shannon 4f396222dc Merge branch 'dev-v7.7' into temp-blueprint-rename 2017-08-02 12:13:04 +10:00
Mads Rasmussen b0f1b19385 allow current user to see but not edit its access rights 2017-08-01 20:06:19 +02:00
Niels Hartvig 7e49cc0f25 Implements U4-10219 and U4-10218 2017-08-01 16:19:32 +02:00
Shannon 98c1f9820f Updates partial view snippets to not re-iterate all of the time and to remove any non-required iterations, adds required namespace imports 2017-08-01 17:47:33 +10:00
Shannon 44b90e2ce6 removes old template editor webforms files 2017-08-01 17:03:33 +10:00
Shannon 6829660720 removes old scripting templates 2017-08-01 17:02:45 +10:00
Shannon 2e6fb8e3e5 Fixes merge issues, ensures "Content root" and "Media root" are localized 2017-08-01 12:41:22 +10:00
Shannon cee3f456d1 Merge branch 'dev-v7.7' into temp-U4-10202 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-08-01 12:40:47 +10:00
Shannon 2beba8067e updates the wording of a few items and updates the en.xml lang file too 2017-08-01 12:02:35 +10:00
Shannon 175da06d60 Merge branch 'dev-v7.7' into temp-U4-10059 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/users/group.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-08-01 11:31:52 +10:00
Shannon 7769a0ba42 Updates logic to show if the user or group has not start nodes defined (which does not anymore indicate root access) 2017-08-01 11:19:31 +10:00
Shannon Deminick 7b449b4bad Merge pull request #2079 from umbraco/temp-U4-10095 
U4-10095 Need to be able to remove a user's avatar
 2017-08-01 09:40:47 +10:00
Mads Rasmussen 5c0af42d00 add descriptions to permissions 2017-07-31 11:24:11 +02:00
Mads Rasmussen 38ae9d6d52 update lorem ipsum texts 2017-07-31 10:52:45 +02:00
Nik 7367c8ef67 Re-do min max number of items in the grid after rebasing 2017-07-30 02:09:38 +01:00
Mads Rasmussen 7707bfe700 more localisation of users and user groups 2017-07-28 14:12:35 +02:00
Mads Rasmussen 47290cd801 init localise on users and groups 2017-07-28 13:25:29 +02:00
Stephan b10d370b16 Merge branch dev-v7.7 into user-group-permissions 2017-07-28 12:54:13 +02:00
Stephan 9c27a6c69a Merge branch 'dev-v7.7' into temp-isearchabletree 2017-07-28 12:33:13 +02:00
Stephan e52adfdd07 Merge branch user-group-permissions into temp-U4-8643 2017-07-28 10:38:43 +02:00
Mads Rasmussen 43bb9ab69b set default title on user picker overlay and section picker overlay 2017-07-28 10:37:30 +02:00
Stephan a0fe56ee7c Rename UmbracoExamine to Umbraco.Examine 2017-07-27 12:01:38 +02:00
Stephan 42a046b80c Cleanup AssemblyInfo 2017-07-27 11:18:41 +02:00
Mads Rasmussen 0b77e604f6 add button to remove avatar 2017-07-27 10:55:38 +02:00
Stephan 76569d58fe Cleanup DotSettings 2017-07-26 19:26:55 +02:00
Stephan 9972f95a10 Merge branch user-group-permissions into temp-U4-10084 2017-07-26 13:22:43 +02:00
Shannon b8e2e49a44 Updates to latest Katana libs 2017-07-26 17:50:58 +10:00
Alexander Bryukhov 6c91d54372 U4-10200 Listview layouts - empty state not localized 2017-07-26 10:24:03 +07:00
Stephan db9eccc220 Cleanup versions 2017-07-25 18:06:28 +02:00
Stephan Lonntorp d4a2244190 Added missing translations 2017-07-25 13:28:46 +02:00
Shannon fa89bef11a Merge branch 'dev-v7.7' into user-group-permissions 2017-07-25 15:16:37 +10:00
Shannon 39e4bf4579 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web/PublishedContentExtensions.cs
 2017-07-25 15:15:56 +10:00
akierczynska e0c891719f Update pl.xml to match en.xml 
Updating pl.xml with new keys to match en.xml
 2017-07-24 00:04:11 +01:00