yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,453 Commits 4 Branches 7 Tags
56f4904fc0deb33901dc7bdf6cfabaa054149dfd
Commit Graph

1148 Commits

Author SHA1 Message Date
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
Stephan
363c8fab2c Cleanup 2018-01-21 10:03:17 +01:00
Stephan
8d4fd9d1cf Merge branch 'perf-tryconvertto' of https://github.com/JimBobSquarePants/Umbraco-CMS into perf-tryconvertto 2018-01-21 10:01:12 +01:00
James Jackson-South
24071eb3b1 Faster TryConvertTo 2018-01-20 14:54:52 +11:00
Sebastiaan Jansssen
cad913b7a1 U4-10857 Update to ClientDependency 1.9.5 2018-01-19 08:26:34 +01: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
Stephan
774f333c70 U4-10789 - cleanup + beta003 2018-01-10 15:24:58 +01: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
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
mikkelhm
b9cbdbd9a7 Add rename of Appender to csproj 2017-11-17 12:01:32 +01:00
Robert
5982a868ea Added custom RollingFileAppender and changed rollingStyle to "size" 
OpenFile method has been overiden, this means that everytime a log will be opened, it will check the last access time of all existing logs, and delete the ones that haven't been accessed in more than 1 month.

Changing the rollingStyle to "size" will make sure that logs will roll once the maximumFileSize reaches its set limit.
 2017-11-14 12:01:11 +01:00
Shannon
b9b1fc3a70 Adds a global config switch to enable/disable tours entirely 2017-11-09 00:57:05 +11:00
Shannon
0f3a76809b Merge branch 'dev-v7.8' into temp-U4-10305 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
 2017-11-08 14:52:21 +11:00
Robert
9b7a9fc988 Merge remote-tracking branch 'origin/temp-U4-5896-2' into dev-v7.8 2017-11-03 15:38:08 +01:00
Claus
49356b31a1 Merge branch 'dev-v7.8' into temp-U4-10286 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
 2017-11-03 14:08:46 +01:00
Shannon
782d6100f0 Gets user session management tracking via the database including detecting stale sessions, generating and removing them along with cleaning them up. This takes into account legacy code too. The session is revalidated on a one minute threshold per user so that it's not hammering the databse on every request. 2017-11-03 17:27:23 +11:00
Shannon
5b19d5e0d8 WIP on login ids 2017-11-02 15:04:54 +11:00
Shannon
408ec17201 Merge branch 'temp-U4-10305' into temp-U4-10601 2017-11-01 15:25:50 +11:00
Shannon
8208f8de51 Updates codebase to store tour data for a user in the user table, adds new column to store json and adds migration to create the column 2017-11-01 15:11:13 +11:00
Shannon
6462329494 U4-9120 Add instruction count column on the db instructions table 2017-10-31 11:54:08 +11:00
Shannon
f71577f86e Adds data migrations for media path table 2017-10-31 11:20:01 +11:00
Shannon
5dc993890d New cmsMedia database table to track media by media paths for fast lookups 2017-10-31 11:20:01 +11:00
Shannon
a2025c14b1 Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
 2017-10-31 11:18:52 +11:00
Claus
1c883be16b Merge remote-tracking branch 'origin/temp-u4-8409' into dev-v7.8 2017-10-25 12:27:34 +02:00
Claus
73d681d674 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
 2017-10-25 11:52:30 +02:00
Sebastiaan Janssen
18e377f159 U4-10564 - Update ImageProcessor dependencies 2017-10-24 13:20:33 +02:00
Stephan
8a114a105e U4-8409 - reduce sharpZipLib dependencies 2017-10-16 19:03:05 +02:00
Shannon
7b3f7f4ad4 U4-10503 Umbraco plugins cache files should be stored in the same local temp location as the umbraco xml cache file 2017-10-06 11:47:25 +11:00
Mads Rasmussen
0da8644e77 Merge branch 'dev-v7' into temp-U4-10309 2017-09-29 09:55:32 +02:00
Sebastiaan Janssen
bb88eb155f Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Security/BackOfficeSignInManager.cs
#	src/Umbraco.Core/Security/BackOfficeUserManager.cs
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Security/MembershipHelper.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2017-09-15 16:34:51 +02:00
Sebastiaan Janssen
b6dbc245e2 Merge branch 'dev-v7' into temp-U4-8634 2017-09-15 13:57:46 +02:00
Mads Rasmussen
5330830362 Merge branch 'dev-v7.7' into temp-U4-10309 
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/gruntFile.js
 2017-09-14 15:28:21 +02:00
Sebastiaan Janssen
6cd2a15964 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/UdiEntityType.cs
 2017-09-13 17:34:35 +02:00
Stephan
ef91e152b4 U4-10409 - udi parsing and assembly scanning 2017-09-13 12:00:56 +02:00
Stephan
e8faf54edf Merge pull request #2187 from umbraco/temp-U4-10118 
temp u4 10118
 2017-09-12 16:05:55 +02:00
Shannon
59afcd8be7 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-12 13:38:34 +10:00
Shannon Deminick
ba072aec7c Merge pull request #2183 from umbraco/temp-U4-10400 
U4-10400 Clear CDF temp files during upgrades
 2017-09-12 13:26:41 +10:00
Shannon
68f1120b4f U4-10118 Umbraco.Core.IO.FileSystemProviderManager is simply not testable and cannot be properly used or setup in tests 2017-09-12 13:18:34 +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
23950c0cac U4-10400 Clear CDF temp files during upgrades 2017-09-11 12:22:38 +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
ab3407a1aa Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
#	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-09-08 11:31:04 +10:00
Sebastiaan Janssen
7003ef8d26 Remove circular dependency 2017-09-07 20:42:26 +02:00
Shannon
bc148d08fa maps avatars in log 2017-09-07 22:24:18 +10:00
Shannon
c7b9a57795 U4-10382 Add end point to get a paginated audit trail 2017-09-07 17:27:37 +10:00