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

8649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
f269b1931d Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 19:03:29 +11:00
Shannon
29c22cc4b5 exposes repository service 2013-12-16 19:02:53 +11:00
Shannon
76695fc7b2 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 18:44:52 +11:00
Shannon
e29031a2c4 Back ported relationship repo/service updates 2013-12-16 18:44:11 +11:00
Shannon
9b2b8e8166 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 18:24:12 +11:00
Shannon
3ff0cca033 back ports entity service updates 2013-12-16 18:23:40 +11:00
Shannon
aa398b4f36 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 18:18:23 +11:00
Shannon
fe16cc91fa back ports packaging service updates 2013-12-16 18:17:30 +11:00
Shannon
7e6fdcb05e back ported template repo and file service updates 2013-12-16 18:10:44 +11:00
Shannon
ae54f34bcf Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 17:48:01 +11:00
Shannon
d1e071b9cb adds additional unit tests for the data type service to include pre-value handling. 2013-12-16 17:47:40 +11:00
Shannon
3e253f9c19 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 17:18:15 +11:00
Shannon
2ce952bdbb backports data type service updates and fixes unit tests with correct seeding value. 2013-12-16 17:17:23 +11:00
Shannon
b8f5d1c42c Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs
 2013-12-16 16:29:28 +11:00
Shannon
6a9b8d5540 Fixes a unit test issue with the mntp editor initialization. 2013-12-16 16:27:59 +11:00
Shannon
fdc9261399 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 16:21:47 +11:00
Shannon
64b247157c Merge commit '0f25029ff6531095782a567bf054d6bc209e2a56' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
 2013-12-16 16:21:38 +11:00
Shannon
fcacc1bd71 Merge commit '060e584503039ac020f79602ae9565d7ee0531bb' into 7.0.2 2013-12-16 16:21:06 +11:00
Shannon
68d581ac82 fixes build (merge issue) 2013-12-16 16:18:44 +11:00
Shannon
af86a5d7b1 backporting imediaservice changes 2013-12-16 16:04:37 +11:00
Shannon
0f25029ff6 Fixed typo 2013-12-16 16:02:34 +11:00
Shannon
060e584503 backported IContentService updates 2013-12-16 15:57:59 +11:00
Shannon
743c0bb31c Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-12-16 14:19:10 +11:00
Shannon
4bac3e19fe Fixes up webbootmanager with new cachehelper updates. 2013-12-16 14:18:58 +11:00
Shannon
b86cddda94 fixes up unit tests 2013-12-16 13:55:46 +11:00
Shannon
11103c0bc5 proj file 2013-12-16 13:23:07 +11:00
Shannon
8210702474 removes the xquery tests - we don't need these and r# keeps wanting to run them 2013-12-16 13:22:52 +11:00
Shannon
a42b660648 Backporting the cachehelper and associated cache classes. 2013-12-16 13:19:10 +11:00
Shannon
f11d4fbedd Worked on the application cache, added request cache, changed some stuff over to be interfaces, added unit tests suite (need mroe) to test all caching providers. 
Conflicts:
	src/Umbraco.Core/Cache/CacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/Cache/NullCacheProvider.cs
	src/Umbraco.Core/Cache/StaticCacheProvider.cs
 2013-12-16 12:51:02 +11:00
Shannon
9105c08a4c getting membership provider to the same state as v7 2013-12-16 12:20:38 +11:00
Shannon
71b3ea2e56 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-16 11:19:57 +11:00
perploug
33b3032b30 Merge pull request #269 from hartvig/7.0.1 
Fixes links in help
 2013-12-14 03:02:28 -08:00
Niels Hartvig
31e5ed7b1b Fixes links in help 2013-12-14 11:48:08 +01:00
Stephan
98c8d637f4 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/DatabaseContext.cs
	src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/install/utills/LegacyClasses.cs
 2013-12-13 13:05:10 +01:00
Stephan
8a3eae9ea6 Merge remote-tracking branch 'origin/7.0.1' into 7.0.2 2013-12-13 12:55:46 +01:00
Stephan
5aec753859 U4-3710, -3732 - Fix default ShortStringHelper 2013-12-13 12:20:57 +01:00
Shannon
751ace1168 Merge branch '6.2.0-membershipprovider' into 6.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2013-12-13 17:17:24 +11:00
Shannon
51da5343ea Fixes installation issue with rebuilding media cache 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/config/trees.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-12-13 17:07:29 +11:00
Shannon
34df5009e0 Upgraded installer to do a two part install - first install then if an upgrade is required do the upgrade in a second call - this way we can have the progress bar update since the media xml installer can take some time. 2013-12-13 16:58:21 +11:00
Shannon
d4db7d9523 Merge branch '7.0.1' into 7.0.2 2013-12-13 16:54:39 +11:00
Shannon
6a5a320a22 doh, didn't mean to commit this config change 2013-12-13 16:54:16 +11:00
Shannon
62cf1cd87d Fixes: U4-3844 U7 - System.OutOfMemoryException: Out of memory - uploading 11Mb image 2013-12-13 16:50:11 +11:00
Shannon
ebf22d155e Updated the migration to just remove the data it needs instead of rebuilding as that would take a very long time for some installs. 2013-12-13 12:53:02 +11:00
Shannon
01644e8f6c Upgraded installer to do a two part install - first install then if an upgrade is required do the upgrade in a second call - this way we can have the progress bar update since the media xml installer can take some time. 2013-12-13 12:34:57 +11:00
Shannon
f2be1669bf Fixes installation issue with rebuilding media cache 2013-12-13 12:02:32 +11:00
perploug
24911bffe2 adds version number to help dialog 2013-12-12 12:28:43 +01:00
perploug
d343340f56 Adds missing language keys 2013-12-12 12:28:25 +01:00
perploug
0c82f78c43 Upgrades tinymce lib to support IE11 2013-12-12 12:27:49 +01:00
perploug
5cf3a619f7 Fixes: U4-3841 sorting picked media items with the multiple media picker clears the selection 2013-12-12 09:16:02 +01:00
Shannon
49550b410a Ensures Integer and Email validators are added on startup as manifest validators. 2013-12-12 18:28:45 +11:00