1454 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
Mads Rasmussen	6658ecf6e3	add success state for "invite user"	2017-08-07 15:24:19 +02:00
Shannon	efbfef74c2	localizes email, fixes issues with smtp and async	2017-08-02 23:39:31 +10: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	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
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
Mads Rasmussen	43bb9ab69b	set default title on user picker overlay and section picker overlay	2017-07-28 10:37:30 +02:00
Mads Rasmussen	0b77e604f6	add button to remove avatar	2017-07-27 10:55:38 +02:00
Stephan	9972f95a10	Merge branch user-group-permissions into temp-U4-10084	2017-07-26 13:22:43 +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
Shannon	525254efd4	Merge branch 'dev-v7.7' into temp-isearchabletree ... # Conflicts: # src/Umbraco.Web.UI/umbraco/config/lang/en.xml # src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml # src/Umbraco.Web/Trees/ContentTreeController.cs	2017-07-20 22:21:59 +10:00
Shannon	c309e5edaf	Removes even more	2017-07-20 19:23:46 +10:00
Shannon	0b6ed42201	Removes a bunch more files	2017-07-20 19:15:45 +10:00
Shannon	a875ede3da	Removes a ton of old unused legacy files	2017-07-20 18:55:38 +10:00
Shannon	0008afb455	Merge branch 'dev-v7.7' into user-group-permissions ... # Conflicts: # src/Umbraco.Core/Umbraco.Core.csproj # src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs	2017-07-18 13:31:04 +10:00
Shannon	6f74fcf24a	Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 ... # Conflicts: # build/UmbracoVersion.txt # src/SolutionInfo.cs # src/Umbraco.Core/Configuration/UmbracoVersion.cs # src/Umbraco.Web.UI/Umbraco.Web.UI.csproj # src/Umbraco.Web/Umbraco.Web.csproj	2017-07-18 13:27:03 +10:00
Sebastiaan Janssen	895f0a9dfe	Merge pull request #1982 from AndyButland/u4-9987 ... Extended HttpsCheck healthcheck to check for expiring SSL certificate	2017-07-17 21:26:03 +02:00
Shannon	8347d8f23b	Merge remote-tracking branch 'origin/user-group-permissions' into temp-U4-10106 ... # Conflicts: # src/Umbraco.Web.UI/umbraco/config/lang/en.xml # src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml	2017-07-14 10:53:07 +10:00
Warren Buckley	17969e4537	Merge branch 'U4-4413_-_maxlength' of https://github.com/madjor5/Umbraco-CMS into madjor5-U4-4413_-_maxlength ... # Conflicts: # src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html # src/Umbraco.Web.UI/umbraco/config/lang/da.xml # src/Umbraco.Web.UI/umbraco/config/lang/en.xml # src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml	2017-07-13 13:09:06 +01:00
Claus	7bc52b3948	localization fixes.	2017-07-12 15:06:29 +02:00
Claus	2e28ff3ccf	U4-10106 Cannot delete user groups	2017-07-12 13:43:00 +02:00
Claus	06f68b1417	U4-10096 Ability to bulk assign users to groups in the user list	2017-07-12 11:31:34 +02:00
Alexander Bryukhov	c87e880b64	Minor localization issues U4-10139	2017-07-11 14:15:07 +07:00
Shannon	f355b27d1f	Merge branch 'dev-v7.7' into user-group-permissions	2017-07-06 12:56:17 +10:00
Shannon	a050a73c31	Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7	2017-07-06 12:28:51 +10:00
Shannon Deminick	9482104ec5	Merge pull request #2028 from umbraco/temp-U4-4905 ... Removed "remove paragraph tags" field	2017-07-04 12:33:25 +10:00
Robert	7053c175f8	Removed "remove paragraph tags" field	2017-07-03 13:44:37 +02:00
Claus	b2116480fc	fix formatting.	2017-07-03 11:17:05 +02:00
Shannon	224d1bcf6e	U4-10053 Review anywhere else in the codebase that may reference User Type ... and removes all old editors, trees, etc...	2017-06-30 18:38:02 +10:00