yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,420 Commits 4 Branches 7 Tags
03e642fced5a62e6ba3b0fff06bf68e4e1bc2ca8
Commit Graph

1073 Commits

Author SHA1 Message Date
Mundairson
9cd2db5018 U4-11546 [v7] Clean up to remove compiler warnings (#2823) 2018-07-31 10:41:15 +02:00
Richard Thompson
60910efc53 U4-10681 Restore option in media recycle bin (#2342) 2018-07-27 15:56:18 +02:00
Sebastiaan Janssen
bfca8c555e Removes Package repository config setting and related unnecessary code 2018-04-19 19:12:42 +02:00
Shannon
e8fd7e2373 Fixes for U4-10900 Individual member data export functionality 2018-02-26 15:02:47 +11:00
Sebastiaan Jansssen
b9c9a232cd Style updates, and removes unused usings 2018-02-23 10:26:11 +01:00
Robert
f0dd32ea19 Removed export placeholder button and added "Action" button instead. 2018-02-22 16:52:16 +01:00
Shannon
e25f6e82ed Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
 2018-01-23 11:42:14 -07:00
Shannon
d104525a50 Updates core to use latest CDF version 2018-01-23 11:15:37 -07:00
Robert
fb8368267e Merge pull request #2410 from umbraco/temp-U4-10851 
Fixes U4-10851 - Unzip Umbraco packages into a flat structure
 2018-01-23 16:06:41 +01:00
Warren Buckley
d1db38182f Fixes U4-10851 - Unzip Umbraco packages into a flat structure, so it supports packages that have files at the root, along with some packages that have the files nested insider another guid folder 2018-01-23 10:38:41 +00:00
Warren Buckley
5ffdf4dd60 Fixes U4-10852 Where the ZipArchive stream was closed - 'Cannot access a closed Stream' 2018-01-22 14:20:01 +00:00
Sebastiaan Jansssen
cad913b7a1 U4-10857 Update to ClientDependency 1.9.5 2018-01-19 08:26:34 +01:00
Shannon
7e1e83b493 Fixes PackageInstaller event args to make sure the package metadata is passed through 2018-01-16 19:18:08 +11:00
Shannon
244429b972 Fixes PackageInstaller event args to make sure the package metadata is passed through 2018-01-16 19:15:01 +11:00
Shannon
b3cbcebf5b Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
 2018-01-15 16:27:29 +11:00
Shannon Deminick
069594c3ac Merge pull request #2380 from umbraco/U4-10815 
U4-10815 Make DisposableObjectSlim
 2018-01-12 12:43:47 +11:00
Robert
bba58ea0c0 Replaced all usages of DisposableObject with DisposableObjectSlim 2018-01-10 13:48:55 +01:00
Shannon
df553140e8 Updates to latest 1.9.4 of CDF and updates Nuspec 2018-01-10 12:25:24 +11:00
Shannon
bc828fc6f3 U4-10810 Update CDF to support storing TEMP files in environment %temp% location 2018-01-09 13:52:52 +11:00
Shannon
a9713dc6fc Converts the xslt tree to a controller, ensures all config for trees is correct and transforms for upgrades applied 2018-01-05 13:44:57 +11:00
Shannon
8053cea92d Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/UdiEntityType.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/umbraco.cms/umbraco.cms.csproj
 2017-12-14 16:24:25 +11:00
Shannon
131fea3ba4 updates some proj refs 2017-12-06 15:38:00 +01:00
Claus
1c883be16b Merge remote-tracking branch 'origin/temp-u4-8409' into dev-v7.8 2017-10-25 12:27:34 +02:00
pijemcolu
6a980e64eb zipPackage to disk 2017-10-23 09:02:28 +02:00
pijemcolu
3c7e820773 remove the directory check 2017-10-19 19:50:27 +02:00
Shannon
f85532f15e U4-10566 The legacy API Member.PopulateGroups throws an exception 2017-10-20 00:56:34 +11:00
pijemcolu
2c1d85989f Extract the zip in UnPack(), remove check for directory exists as it should not and that's what the method did previously 2017-10-19 13:14:06 +02:00
pijemcolu
bc32ff31d4 remove last 3 dependencies 2017-10-19 12:11:07 +02:00
Stephan
8a114a105e U4-8409 - reduce sharpZipLib dependencies 2017-10-16 19:03:05 +02:00
Sebastiaan Janssen
880ae5cb95 Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7 2017-09-28 20:01:44 +02:00
Shannon
d2d43255aa U4-5222 Rollback Feature fails to update the UI to show the rolled back content - requires refresh 2017-09-28 02:38:53 +10:00
Sebastiaan Janssen
3275f03aff Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	.gitignore
#	build/UmbracoVersion.txt
#	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-11 15:46:54 +02:00
Sebastiaan Janssen
3423d8b2cc Merge branch 'dev-v7' into temp-u4-10006 
# Conflicts:
#	.gitignore
#	build/Build.bat
#	build/Build.proj
#	build/BuildBelle.bat
#	build/UmbracoVersion.txt
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-09 14:54:48 +02:00
Shannon
504f32f25b Merge branch 'dev-v7.7' into temp-U4-10275 2017-09-08 13:53:02 +10:00
Shannon
8ad1d247fa U4-10389 Some webforms editors do not authorize on the user's path access or permissions set for the editing node 2017-09-06 11:49:00 +10:00
Shannon
4b7bd6482e Creates new EmailSender which should take the place throughout the codebase for sending emails in the Core. Have replaced most places where SMTP is used directly (but not the notifications part since that is more complicated right now). Added the internal event and special usage so we can raise an event to send an email if smtp is not configured. 2017-09-05 18:52:03 +10:00
Shannon
98a545bdc6 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-08-09 23:18:51 +10:00
Claus
d625388786 U4-10266 Package installer need to handle files before handling entities 2017-08-08 13:10:33 +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
Shannon
0b6ed42201 Removes a bunch more files 2017-07-20 19:15:45 +10:00
Shannon
1643eec62c Fixes cache refreshing for user groups since user cache need to be cleared for that too. Updates cache refreshers to use json.net for serializing which is way faster. adds better support for querying multiple user groups and entity ids for permissions, updates tests 2017-07-13 18:47:10 +10:00
Shannon
6e89202002 Fixes usages of IUserService.GetPermission since before it was doing a FirstOrDefault() since that's just how the old APIs worked, now we need to get all permissions based on groups. Also updated the usages of ToString for char for the permissions to be culture invariant everywhere. 2017-07-13 14:32:43 +10:00
Shannon
69a6a80ffd Updates logic and test for getting all node permissions for a user that have explicit permissions defined 2017-07-13 14:16:13 +10:00
Shannon
8023a89b10 Returns the default permissions as a model as part of the UserGroupDisplay and wires this up in the user group editor 2017-06-28 23:38:42 +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
Stephan
7d8fdff6c1 U4-10006 - adjust projects to new build 2017-06-15 15:50:50 +02:00
Shannon
121036ebb9 Merge branch 'dev-v7.7' into user-group-permissions 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-06-05 10:35:23 +02:00
Lars-Erik Aabech
09a39c1fe4 Right icon for "blueprint from content" action 2017-06-04 22:57:11 +02:00
Lars-Erik Aabech
9f0639ba24 Create blueprint from content action 
In process of adding blueprints to create content dialog
 2017-06-04 16:07:11 +02:00