yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,197 Commits 4 Branches 7 Tags
a5cbca348f21ce53e6859fe76e1323bacb0d02ac
Commit Graph

16197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
a5cbca348f re-delete files ... argh thanks gitkraken. 2016-04-29 17:11:51 +02:00
Shannon
bd31dd6caf Fixes issue with ThreadStatic db 
Uses IScopeContext which wraps either HttpContext or CallContext which is created/injected via IOC factory.
 2016-04-29 17:08:34 +02:00
Shannon
5c24a3a734 Fixes AuthorizeUpgrade HtmlHelper reference 2016-04-29 15:22:07 +02:00
Shannon Deminick
e0a5ad5236 Merge pull request #1226 from umbraco/dev-v8-persistclr 
Core.Persistence - post-NPoco cleanup & refactor
 2016-04-29 15:18:33 +02:00
Stephan
b0a33844b1 Fixing tests - database 2016-04-27 19:59:01 +02:00
Stephan
ae7b93609b Fixing tests - application context 2016-04-22 12:03:30 +02:00
Stephan
1f85f51ecd Fixing tests - services test object 2016-04-22 09:58:02 +02:00
Stephan
3daf2bf9a0 Fixing test - MultiValuePropertyEditorTests, FindingMigrationsTest 2016-04-22 09:34:12 +02:00
Shannon
1f2838cb0a fixes merge issues 2016-04-21 14:38:39 +02:00
Shannon
2027cd7b07 Merge branch 'dev-v8' into dev-v8-persistclr 
Conflicts:
	src/Umbraco.Core/Persistence/UmbracoDatabase.cs
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2016-04-21 12:19:14 +02:00
Shannon Deminick
afc78317ca Merge pull request #1236 from umbraco/temp-u4-8354 
U4-8354 - fix v8 tests
 2016-04-21 12:15:55 +02:00
Shannon
081d6ecc07 adds notes 2016-04-21 12:15:39 +02:00
Shannon
55ae0d3af6 Ensure the correct services are injected in to property editors so they are not using singletons 2016-04-21 11:38:43 +02:00
Stephan
23817cdce5 Fixing tests - MigrationStartupHandler is IDisposable 2016-04-20 22:52:48 +02:00
Stephan
07b410459f Fixing tests - file systems 2016-04-20 22:52:48 +02:00
Stephan
4e702c7c79 Fixing tests - kill KegacyShortStringHelper 2016-04-20 22:52:48 +02:00
Stephan
41f6012eb3 Fixing tests - ServiceContext 2016-04-20 22:52:48 +02:00
Stephan
bf51be950f Fixing tests - CoreBootManager 2016-04-20 22:52:48 +02:00
Stephan
7e8b4d13a7 Fixing tests - ValueListPreValueEditor 2016-04-20 22:52:48 +02:00
Stephan
b04e070757 Fixing tests - Plugin and TypeFinder 2016-04-20 22:52:48 +02:00
Shannon
3ef204a46f Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
	src/Umbraco.Core/Persistence/UmbracoDatabase.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
 2016-04-20 15:53:13 +02:00
Shannon
6124126835 Fixes the custom field sorting, no longer has a sub query for order by, now supports both mysql and sqlce, adds a unit test (should add more though) 2016-04-20 15:50:38 +02:00
Shannon
7e71dcd2ae Merge remote-tracking branch 'origin/dev-v7.5' into dev-v7 2016-04-20 12:56:03 +02:00
Shannon
289d5f5741 removes the need for the custom regex for the order by since we no longer have an order by sub-query 2016-04-20 12:51:42 +02:00
Shannon
f149ca9c76 Fixes SqlCe and MySQL sorting on custom properties for list view, this also makes the query work much better and there is no longer a requirement for a sub-query in the order by statement. 2016-04-20 12:50:52 +02:00
Stephan
3b612bf346 Core.Persistence - more cleanup 2016-04-14 18:20:07 +02:00
Per Ploug
fcaa4ad8d6 JsDocs comments on listviewhelper (U4-7185) 2016-04-14 11:36:24 +02:00
Sebastiaan Janssen
bf70e208ad U4-8325 XSLT macro rendering logs too much in Info mode (after upgrade 7.1.4 => 7.4.0) 2016-04-14 09:34:53 +02:00
Stephan
5b935dbd90 Core.Persistence - post-cleanup debugging 2016-04-13 21:21:20 +02:00
Shannon Deminick
26f705b129 Merge pull request #1224 from 0xc0dec/dev-v7 
Fixed logger context class
 2016-04-13 20:18:21 +02:00
Aleksey Fedotov
9e3941e8e1 Fixed logger context class 2016-04-13 22:14:21 +05:00
Stephan
01d46944b7 Core.Persistence - post-cleanup debugging 2016-04-13 18:27:39 +02:00
Stephan
e6f6444034 Core.Persistence - post-cleanup debugging 2016-04-13 17:33:25 +02:00
Stephan
aceaf4b15d Core.Persistence - massive cleanup 2016-04-13 17:33:09 +02:00
Shannon Deminick
a015032442 fixed typo 2016-04-13 16:45:47 +02:00
Shannon Deminick
38f6a7a8b6 fixed typo 2016-04-13 16:45:01 +02:00
Shannon
b8d8c9e59a fixes merge - but the sorting on custom field will not currently work, need to fix that now. 2016-04-13 16:41:45 +02:00
Shannon
df016813ea Merge remote-tracking branch 'origin/dev-v7.5' into dev-v8 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/UmbracoExamine/UmbracoMemberIndexer.cs
	src/umbraco.businesslogic/UmbracoSettings.cs
 2016-04-13 16:18:58 +02:00
Shannon
43f0d77c10 Merge remote-tracking branch 'origin/dev-v7' into dev-v8 2016-04-13 16:09:14 +02:00
Stephan
7886b7814d U4-8312 - models generation false error (#1222) 2016-04-13 15:57:27 +02:00
Shannon
c3b4a9128a ensures all GetPagedDescendant methods are mocked - fixes tests. 2016-04-13 15:47:21 +02:00
Shannon
dbff25bd6d Merge branch 'dev-v7' into dev-v7.5 2016-04-13 15:16:28 +02:00
Shannon
c9c391e477 fixed type, decimal sorting now works 2016-04-13 15:05:23 +02:00
Shannon
10bb16316d Updates sorting code to support decimals - need to test on MySql 2016-04-13 14:49:37 +02:00
Shannon
82b4b4e668 Merge remote-tracking branch 'origin/7.5-ListViewCustomFieldSorting' into dev-v7.5 
Conflicts:
	src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
 2016-04-13 14:44:22 +02:00
Shannon
ce0ecd8114 Ensures that the emails sent our are in the culture of the user, fixes issue of logging in after resetting password and then logging out again 2016-04-13 14:35:40 +02:00
Shannon
e610a5ef54 Changes the password reset link to be a real link (not an angular deep link), this means there is less logging of the reset code in a query string and less visibility of it, this also means that the validation of the code happens instantly. The premise for this is the same as how we deal with external authentication requests and uses ViewData/TempData with redirects. Fixes the models to have the correct attributes to be able to directly json serialize them. 2016-04-13 13:51:12 +02:00
Shannon
f279000d00 removes unecessary methods from user.service.js, ensures correct error msg when resetting password on the server, fixes email copy and allows for non-html emails if the copy is plain text, removes the need for more than one email msg in the lang files and uses the correct way to replace tokens, 2016-04-12 19:54:04 +02:00
Shannon
d424b13ac4 Fixes some styling, wording and validation 2016-04-12 18:59:39 +02:00
Shannon
1361e017a2 Merge branch 'u4-222' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-222 
Conflicts:
	src/Umbraco.Core/Security/BackOfficeUserManager.cs
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/routes.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-04-12 18:07:25 +02:00