Commit Graph

8208 Commits

Author SHA1 Message Date
perploug
6effcf82ac Fixes legacy dialog .destroy issues 2013-11-16 10:38:02 +01:00
perploug
71a0c45889 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-15 08:35:53 +01:00
Shannon
febe81105b starts fixing custom membership provider problems with the member editor/tree - this now at least loads in the members section. 2013-11-15 18:26:40 +11:00
Shannon
830d6d914f puts the test init code back in that shouldn't need to be there but the server is failing now for some reason. 2013-11-15 18:21:55 +11:00
Shannon
259d8e03db completes: U4-3300 Need to test content service copy API with tags - since there's 'special' code in there to handle it that's not been tested with the new changes - with test 2013-11-15 17:54:01 +11:00
Shannon
2784e2a22d removes ref to missing file 2013-11-15 17:30:26 +11:00
Shannon
94cc49e67e Fixed the model mapping tests 2013-11-15 17:15:59 +11:00
Shannon
2bd91d619d fixes failing unit test due to default value change for keep user logged in 2013-11-15 17:04:45 +11:00
Shannon
d446d84cf5 fixes failing unit test due to default package url change 2013-11-15 17:03:29 +11:00
Shannon
5244f75d0d Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-11-15 17:01:13 +11:00
Shandem
96440c9ee5 Merge pull request #248 from lars-erik/6.2.0-fix-sqlsyntaxprovider-indexclustring
6.2.0 fix sqlsyntaxprovider indexclustring
2013-11-14 22:00:31 -08:00
Shannon
4545af0a21 Boom! container nodes work for both media and content, fixes:
U4-3540 When creating a Container type node - the list view shows all children of the item it's being created underneath
U4-3541 media tree is not catering for container types
2013-11-15 16:56:51 +11:00
Shannon
0878de4a8b Fixes tree service from showing that there is children when there isn't, fixes container node issues:
U4-3540 When creating a Container type node - the list view shows all children of the item it's being created underneath
U4-3541 media tree is not catering for container types
Adds container style
2013-11-15 16:19:46 +11:00
Shannon
9774744991 should knock off a few minutes for running tests. 2013-11-15 16:00:48 +11:00
Shannon
4a6103ba94 Fixes some merge issues, tries to speed up unit tests a little. 2013-11-15 15:10:02 +11:00
Shannon
8bbe6675db Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
2013-11-15 15:00:44 +11:00
Shannon
b4c005c140 Fixes up the EntityRepository to use dynamics for media as well so that *all* fields in the main table are returned so we can store this information in AdditionalData, now that this is working nicely we should make the entity repo lookup the properties for content too just like we're doing for media since these get put into AdditionalData as well and there's really not much overhead to do that.
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
2013-11-15 14:53:26 +11:00
Shannon
34cebe989f Fixes up the EntityRepository to use dynamics for media as well so that *all* fields in the main table are returned so we can store this information in AdditionalData, now that this is working nicely we should make the entity repo lookup the properties for content too just like we're doing for media since these get put into AdditionalData as well and there's really not much overhead to do that. 2013-11-15 14:29:34 +11:00
Shannon
eca823ea90 Fix for U4-3529 Ysod editing Partial View 2013-11-15 13:49:20 +11:00
Shannon
89481405b5 Fixes: U4-3534 Sorting content items 2013-11-15 12:57:28 +11:00
Shannon
f1d837dfd1 fixes: U4-3539 Cannot set a scheduled publish at date/time gives a warning message 2013-11-15 12:46:55 +11:00
Shannon
c61fd1ec27 Fixes datetimepicker once and for all, fixes user model to return the culture not just the language, adds ability to localize the datetimepicker - will default to english but is easy to add other versions, currently the only custom one in there is brazilian (since it was already made).
fixes: U4-2863 Date picker-textbox jumps between 12 and 24 hours clock
U4-3537 Cannot clear date/time value, still have problems with it's null validation not clearing from the server
2013-11-15 12:26:29 +11:00
Shannon
5314afb51a Changed editorContext to use appState instead for content/media/member editors - the appState saved is the basic entity, this means that if property editors resolve this value they do not have access to actually change the real content model which we don't want to allow (or changing other property's values).
Fixed up some inconsistencies between all of these editors and the content editor helper, fixed up tree syncing with the members editor.
2013-11-15 10:38:36 +11:00
Shannon
1c742db414 Cleans up a bit more code - no longer passing in nav controller scope, removes zany args.scope assignment back to the nav ctrl via the nav service, this is not necessary at all and doesn't make any sense. 2013-11-15 09:43:21 +11:00
Shandem
f8b2fcaa2b Merge pull request #249 from rsoeteman/7.0.0
Fix for  U4-3529  Ysod editing Partial View
2013-11-14 14:00:09 -08:00
perploug
684c99b532 removes css that conflicts with firefox selects state 2013-11-14 22:17:18 +01:00
perploug
28ec40e1ae modifies angular-mobile to fix firefox glitch 2013-11-14 22:05:51 +01:00
perploug
cadf1fe9bb removes old bootstrap files 2013-11-14 22:03:51 +01:00
Richard Soeteman
393c365b6e Fix for U4-3529 Ysod editing Partial View 2013-11-14 14:48:04 +01:00
perploug
a657e10545 Consolidates contextmenu action handling
Moves umbOptionsMenu and umbContext menu exection into navigationService
2013-11-14 14:13:39 +01:00
perploug
d6f9d23626 merge 2013-11-14 14:12:49 +01:00
perploug
7e0eefc18a adds editor context value 2013-11-14 13:12:08 +01:00
perploug
9bcd276073 fixes sir trevor manifest 2013-11-14 13:11:58 +01:00
perploug
d0fd7523c2 fixes media move to root 2013-11-14 13:11:45 +01:00
perploug
0a6826c62a adds manifest documentation 2013-11-14 13:11:20 +01:00
perploug
132b1f305a moves context action execute to navigationService 2013-11-14 13:11:03 +01:00
Shannon
7dfd684cd8 Fixes: U4-3504 Sorting media doesn't work, always defaults to sorting the root 2013-11-14 22:25:08 +11:00
Shannon
4ce5e67116 Fixes: U4-3517 Package tree doesnt load 2013-11-14 22:01:26 +11:00
Shannon
6d2caaa723 Fixes: U4-3430 Save Properties not working for usercontrol macro 2013-11-14 21:56:01 +11:00
Lars-Erik Aabech
e3cd85a6a2 Made CreateIndexBuilder set IndexType in Clustered(), NonClustered() and Unique(). 2013-11-14 10:55:35 +01:00
Lars-Erik Aabech
69f805ecca Proof that CreateIndexBuilder.NonClustered() does not affect index creation statement on SQL Server.
CreateIndexBuilder_SqlServer_NonClustered_CreatesNonClusteredIndex() fails expecting NONCLUSTERED but getting CLUSTERED.
CreateIndexBuilder_SqlServer_Unique_CreatesUniqueNonClusteredIndex() fails expecting UNIQUE NONCLUSTERED but getting CLUSTERED.
2013-11-14 10:53:58 +01:00
Shannon
10e65e8027 Adds new Multiple Media picker property editor 2013-11-14 20:36:06 +11:00
Shannon
d79110aee6 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-14 20:32:26 +11:00
Shannon
9eb9b8df92 Fixes: U4-3501 Error when selecting multiple items with the media picker in v7 - ensures the standard media picker cannot multi-select, hides the add button when multi select is disabled and there's a value. 2013-11-14 20:32:11 +11:00
Shandem
fc8496dd95 Merge pull request #247 from rsoeteman/7.0.0
Fixed Dashboard Controller is only looking for one section
2013-11-14 01:30:22 -08:00
Richard Soeteman
21334bd282 Fixed Dashboard Controller is only looking for one section 2013-11-14 10:23:21 +01:00
Shannon
367bbd7eff Fixes: U4-3518 'Start Node in content' property of user does not work. 2013-11-14 19:58:55 +11:00
Shannon
2f62c58055 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-14 19:35:13 +11:00
Shannon
47f7d0d8df no more nav.ui. removes exposing the userDialog, moves enter/leave tree to the navigation controller since it doesn't belong on the service, cleans up more of the nav ctrl and we have no more globals :) now to look at changing the object that is passed to dialogs (i.e. not the navigation controller scope) 2013-11-14 19:34:47 +11:00
perploug
f4861fb344 fixes broken font on icon picker on windows 2013-11-14 09:16:46 +01:00