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
Stephan 17d3548bbb Merge branch dev-v7 into temp-u4-10006 2017-07-21 10:04:25 +02: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
Stephan c76403077f Normalize cr/lf/tab 2017-07-20 11:21:28 +02: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 69fc7c4b7c reverts removing cook computing dll and ensures we still ship with it, removes publish.aspx 2017-07-20 16:44:28 +10:00
Shannon e9e2a86e2e U4-5546 Remove user 'channels', weblog api, and all code / db tables relevant to those 2017-07-20 15:47:26 +10:00
Shannon 85e5b023b7 Gets UserAwareMembershipProviderPasswordHasher there, updates defaults for MembershipProvider, updates default web.config so the new hashing can be used 2017-07-20 13:44:37 +10:00
Stephan 2a9072609d Update AutoMapper to v6 2017-07-19 18:23:23 +02:00
Stephan 6098ba42a2 Update common dependencies 2017-07-19 18:23:14 +02: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
Bjarne Fyrstenborg 50d7114209 Update localization of email 2017-07-18 00:07:22 +02: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
Stephan e9a4321ee8 U4-10006 - revert unwanted changes to tree.config 2017-07-14 10:17:13 +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
mikkelhm 374fdcf29e Bumps version to 7.6.5 2017-07-13 12:14:32 +02: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
Stephan 0fc868c9ba U4-10006 - verify NuGet 2017-07-10 15:58:22 +02:00
Shannon f355b27d1f Merge branch 'dev-v7.7' into user-group-permissions 2017-07-06 12:56:17 +10:00
Shannon 7e9afe7720 bumps version 2017-07-06 12:31:26 +10:00
Shannon a050a73c31 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-07-06 12:28:51 +10:00
Shannon bba7b15125 Fixes installer angular module loading - this would have never worked without errors, not sure how we've missed this. 2017-07-05 18:22:45 +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 ff02b28d26 Fixes tree for single tree sections, fixes creating a user group so you can select default permissions 2017-07-03 16:31:47 +10:00
Stephan 32d4d36847 Upgrade more dependencies 2017-06-30 21:39:26 +02:00
Stephan 534e11ae1e Upgrade ModelsBuilder 2017-06-30 21:29:30 +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
Shannon e4edd8f692 U4-10053 Review anywhere else in the codebase that may reference User Type 
This also removes some totally unused and ancient code
 2017-06-30 18:14:44 +10:00
Shannon 804c60653e Merge branch 'dev-v7.7' into user-group-permissions 
# Conflicts:
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
 2017-06-30 16:57:22 +10:00
Shannon 29c6d547db Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-06-30 16:55:04 +10:00
wanddy 5768992ccc Improve Chinese translation to match the newest version based on en.xml file. 
Signed-off-by: wanddy <wanddy@163.com>
 2017-06-30 12:10:59 +08:00
Stephan b120bb929a Fix dependencies 2017-06-29 19:23:14 +02:00
Claus 1a1adbf647 Merge pull request #2024 from greystate/drobar-partialviews 
Updates to partialviews
 2017-06-29 13:47:54 +02:00
Claus 5dec54badb U4-8988 Adding translations for Chinese (Taiwan) 2017-06-29 13:27:31 +02:00
Shannon 4f28cb1917 Gets content permissions saving per user group 2017-06-29 19:15:04 +10:00
Claus af3665c0f9 Merge branch 'dev-v7-U4-5804' of git://github.com/drbldgtl/Umbraco-CMS into drbldgtl-dev-v7-U4-5804 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-06-29 10:48:04 +02:00
Claus 2fbb9721fa updating language files. 2017-06-29 08:53:22 +02:00
Claus 5b3ff58ad8 Merge pull request #1964 from esn303/patch-2 
Update "Element hinzufügen" (Add grid element)
 2017-06-29 08:14:08 +02:00
Stephan 7126234e80 Fix build 2017-06-28 21:11:02 +02:00
Stephan 6c710dac93 Log4Net fixing 2017-06-28 20:57:23 +02:00
Stephan 8397fc8e1b Build with PS - fix 2017-06-28 20:57:22 +02:00
Shannon 7ca7b6f922 Allows for the mini profiler in the back office (again) 2017-06-29 01:04:20 +10:00