Shannon
904cbbb906
missing proj file update
2013-12-19 11:41:26 +11:00
Shannon
8656d3e4b9
adds some null checks, removes old unused webforms files for tree control
2013-12-19 11:35:53 +11:00
Shannon
40988b4655
Merge branch 'select-parent-on-movecopy' of https://github.com/pynej/Umbraco-CMS into pynej-select-parent-on-movecopy
...
Completes: U4-3920 Move/Copy/Content-Picker time saver - pre-selects current node
2013-12-19 11:25:54 +11:00
Shannon
06dbea84d8
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0
2013-12-19 11:06:11 +11:00
Shannon
f54cf32057
Converted spell checker deserialization to json.net and changed the deserialized object to internal with correct naming conventions.
2013-12-19 11:06:00 +11:00
Shannon
64dbf0207b
Merge branch 'DougMac-6.1.4' into 6.2.0
2013-12-19 10:38:56 +11:00
Stephan
206c88105e
Left some Console.WriteLine statements uncommented
2013-12-18 17:50:47 +01:00
Shannon
4ab32dd270
moves classes into sep files
2013-12-18 18:09:54 +11:00
Shannon
fec55e9d1c
Updates IMemberService with methods to search on string properties with an option to define how to match the string property, adds all supporting unit tests.
2013-12-18 17:37:46 +11:00
Shannon
a21aa079ff
Adds ability to use the query builder with string matches based on an NText column
2013-12-18 17:22:00 +11:00
Shannon
ef4246478d
Fixes: U4-2294 6.1.0: umbracoServer table can't be created on MySQL <5.6.5
2013-12-18 15:30:40 +11:00
Shannon
137d859532
backports missing logic and tests from 7 that I overlooked.
2013-12-17 16:13:38 +11:00
Shannon
82b2821e27
Gets the members services ensuring members xml is being handled correctly, fixes issue with the static variable holding the default member type properties (this was then persisted in mem and then reused across all member types). Added more unit tests to verify all.
2013-12-17 15:40:47 +11:00
Shannon
b270cefacc
Upgrading member repositories and services with tests
2013-12-17 14:53:21 +11:00
Shannon
b4e984fe6a
adds/updates unit tests for member and member type repository
2013-12-17 12:38:11 +11:00
Shannon
f62e4fa973
adds/updates member type repo tests
2013-12-17 11:42:03 +11:00
Shannon
ee8050f38f
Fixes ContentTypeBase event assignment issue - an event handler was added for every property type added - that was not correct.
2013-12-17 11:35:56 +11:00
Stephan
b506b5c8e9
U4-3710 - bugfix
2013-12-16 17:01:35 +01:00
Shannon
66dd0d073c
backports the member type service updates
2013-12-16 19:05:03 +11:00
Shannon
29c22cc4b5
exposes repository service
2013-12-16 19:02:53 +11:00
Shannon
e29031a2c4
Back ported relationship repo/service updates
2013-12-16 18:44:11 +11:00
Shannon
3ff0cca033
back ports entity service updates
2013-12-16 18:23:40 +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
d1e071b9cb
adds additional unit tests for the data type service to include pre-value handling.
2013-12-16 17:47:40 +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
6a9b8d5540
Fixes a unit test issue with the mntp editor initialization.
2013-12-16 16:27:59 +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
Stephan
5aec753859
U4-3710, -3732 - Fix default ShortStringHelper
2013-12-13 12:20:57 +01:00
james-melville
eeaa9166ac
Fixes: U4-3814 - 6.1.6 XSS vulnerability in backoffice
2013-12-13 10:25:32 +00: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
Anders Bjerner
e17b5e6a7b
Update PublishedContentExtensions.cs
...
Added overloaded extension methods for Next() and Previous() to take a delegate (eg. lambda expression) as a second parameter. The methods are based on this thread by Jeavon Leopold: http://our.umbraco.org/forum/developers/razor/46832-Filtered-Next()-and-Previous()-v7-UmbracoHelperMVC
The code is tested in 7.0.0, but since it only relies on the existing Next() and Previous() methods, it should work in 6.1.x and 7.1.1 as well.
2013-12-12 15:32:52 +01:00
Shannon
a1c65f0518
Gets that naggy unit test passing
2013-12-12 17:52:03 +11:00
Shannon
c5047148b3
Fixes legacy media business logic to return null when calling ToXml if the media item is trashed - this makes it consistent with how content works and also prevents being able to show the media on the front-end when it is trashed. Fixes up how the MediaService rebuilds the XML to make sure it's transactional based. Fixes: U4-3820 cached media xml is not cleared from the cmsContentXml table when recycled
...
Conflicts:
src/Umbraco.Web/umbraco.presentation/library.cs
2013-12-10 12:56:31 +11:00
Shannon
ed2126eef9
ensures media xml cache is rebuilt on upgrade
2013-12-10 11:54:18 +11:00
Shannon
ce4b56895e
fixes installer login check
2013-12-10 11:51:41 +11:00
Shannon
94db371234
Ensures macro and urls are not parsed in the ItemRenderer when a content item is assigned since that parsing will occur with the value converters
2013-12-10 09:59:13 +11:00
Sebastiaan Janssen
103e226b51
Merge pull request #215 from dipeshhirani/U4-752
...
U4-752 Add culture invariant languages to create language dialog
2013-12-09 13:40:21 -08:00