Shannon
6bab9500c1
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
2013-11-12 20:54:56 +11:00
Shannon
bb4a7ef21f
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
2013-11-12 20:53:06 +11:00
Shannon
abb6b6519f
Fixes gravatar JS issue if user times out
2013-11-12 20:52:55 +11:00
Shannon
e94ca7513b
Fixes: U4-3473 Cannot edit Partial views - getting YSOD data reader error - PetaPoco error will backport to 6.2
2013-11-12 20:50:17 +11:00
perploug
ad9fa736f4
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-11-12 10:05:46 +01:00
perploug
cad0f8bb2a
WIP on photo folderresiizng on IE
2013-11-12 10:05:26 +01:00
perploug
289caa791a
moves touch device prop to rootscope
2013-11-12 10:04:40 +01:00
perploug
bfa325163d
adds fall-back icon to content types
2013-11-12 10:03:59 +01:00
perploug
f03e9ecebe
adds check to dialog swiping
2013-11-12 10:03:34 +01:00
perploug
0ab2b74004
fixes missing legacy icons in IE
2013-11-12 10:03:19 +01:00
perploug
fe40288514
fixes dublicate hotkey in legacy editors
2013-11-12 10:02:59 +01:00
Shannon
df867af900
Fixes: U4-3329 Link to "Edit Profile" errors if you don't have access to Users
2013-11-12 18:13:00 +11:00
Shannon
5f5f535f05
Changes UserController to be CurrentUserController - and removes the other methods in there since that was an overlooked security issue. This controller is responsible solely for dealing with the currently logged in user. Changes over to be currentuser.resource as well.
2013-11-12 18:07:10 +11:00
Shannon
a532b49485
Fixes: U4-3482 keepUserLoggedIn setting ignored? and streamlines some of the auth methods.
2013-11-12 17:38:32 +11:00
Shannon
c28f800fe6
Removes the re-committed app plugins property editor that shouldn't be there
2013-11-12 17:38:09 +11:00
Shannon
e7201b6a69
Fixes: U4-3485 Can't use membership provider functions with a membertype that contains a "Belle" property editor
2013-11-12 16:07:53 +11:00
Shannon
1f538d1bd5
Fixes: U4-3489 Member tree items should not have refresh node as an action
2013-11-12 15:24:08 +11:00
Shannon
a9ffa3f1b7
his reverts commit c2fca795e6 to use the normal tree cache
2013-11-12 15:06:47 +11:00
Shannon
c2fca795e6
This is an attempt to put the tree cache into sessionStorage - I'm creating this revision in case we want to re-visit this but unfortunately it is much more difficult because the cache is serialized/deserialized which means only the first level will be cached automatically since the loadNodeChildren would have to update the cache too but it doesn't know what a cache key is.
...
I've then done it the other way which is that we cache the tree sections when changing sections, this works great but poses other issues due to the serialized nature of the tree nodes. Spending too much time here, will revisit some other day. will revert after this is committed.
2013-11-12 15:02:02 +11:00
Shannon
72b08f4029
Fixes an issue if the upgrade check server is not responding.
2013-11-12 13:28:13 +11:00
Shannon
c4bfeeb321
Changes the CreateTreeNode to ensure that a parentId is always passed in - now all tree node models have a parentId property based on the server side data. Changes the JS tree node model to not have a 'parent' property and instead changes this to a parent() method - this allows us to serialize the tree model because otherwise it has cyclical references.
2013-11-12 13:09:24 +11:00
Shannon
acd52d42f4
Refactoring TreeNode to inherit from EntityBasic = makes much more sense and makes our models more consistent.
2013-11-12 12:30:10 +11:00
Shannon
635ccc444d
Adds another childrenOf option to clearing tree cache to clear a cached branch, this is used to fix U4-3465 Media tree not updating when creating folders and can be used elsewhere where modifying trees outside of it's context.
2013-11-12 12:01:16 +11:00
Shannon
6dcfbaee7f
Adds a new filter arg to remove tree cache - we will use this in order to clear specific items from tree cache (like when we are creating folders for media in the media picker)
2013-11-12 11:09:30 +11:00
Anders Stentebjerg
6fb6aa397f
Styling
...
- Logo size login screen
- H1 in panel
2013-11-11 15:34:49 +01:00
Morten Christensen
181593f5ea
Merge pull request #234 from saciervo/fix/petapoco-fetch
...
SqlHelper Refactoring
2013-11-11 02:59:49 -08:00
Shannon
c0037a40c6
Fixes a unit test - before if the packager could not resolve a legacy data type because the ids were not valid, it would just ignore that properly, now it logs warnings and just converts to a label property.
2013-11-11 18:17:49 +11:00
Shannon
57e98fda97
Fixes setting the 'section' on a tree node, fixes the editors syncTree call to not force reload when routing to the editor - this will still load in the data for the tree if it is missing, just won't force reload the individual tree node loading.
2013-11-11 17:54:42 +11:00
Shannon
3111a2d22f
Missing file
2013-11-11 17:12:35 +11:00
Shannon
f123c58c79
Fixes up some more tree sync, streamlines naming conventions, adds more doc/comments to the code and specifies what is internal (only to be used by legacy code). syncTree method now takes an object to sync and both sets the active tree and the path at the same time and fixes setting the active tree to search the root node and children because content/media trees are single section trees.
2013-11-11 17:12:09 +11:00
Shannon
9f613c04f3
Fixes more tree syncing - setActiveTreeType should *not* perform any tree loading, it should just set the active root tree node. syncTree is always used in conjunction with that call in the legacy API which means we get 2 tree queries loading at once and syncing ends up not working. We'll create a nicer method for our angular views to use to sync the tree, setActiveTreeType will typically only be used by the legacy umbraco wrapper.
2013-11-11 16:15:09 +11:00
Shannon
0be60a5c88
Fixes: U4-3466 Deleting Document Type with children fails
2013-11-11 15:09:26 +11:00
Shannon
8fc82476a6
Fixes some tree syncing with legacy trees - now need to cleanup the delete animation stuff.
2013-11-11 14:36:45 +11:00
Shannon
6fe647146c
Fixes: U4-3431 Macro property not passed to ASCX usercontrol
2013-11-11 12:23:46 +11:00
Shannon
dd80b41735
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
...
Conflicts:
src/Umbraco.Tests/Macros/MacroTests.cs
2013-11-11 12:23:27 +11:00
Shannon
a311a54d3d
Hugely simplifies setting properties from macro parameters on user control macros with tests.
2013-11-11 12:22:29 +11:00
Shannon
330732323f
Hugely simplifies setting properties from macro parameters on user control macros with tests.
2013-11-11 12:16:30 +11:00
Shannon
ad0b7e4259
Changed default (development) macro error handling to throw.
2013-11-11 10:16:25 +11:00
Shannon
0d42f721db
fixed more tree sync
2013-11-08 12:35:42 +11:00
Shannon
7664cec0d3
Fixes: U4-3442 tree sync doesn't work for nodes that are not loaded - tree sync is now working properly and loads in any nodes that are missing. Have removed the dependency on navigationService from umbTree directive since it should not have that dependency. navigationService now sets it's global current node after treeSync based on an event. Moved the treeSync logic to the treeService so it can be unit tested (now to write the unit tests). Added another method to treeService to reload a single node - this is now used by treeSync when the current node is being synced - much nicer than reloading all the children. Updates the treeService to always add the current section to each tree node, this will make it much easier to know the treenode section - and in theory should mean we might be able to remove the ui global currentSection var.
2013-11-08 11:48:04 +11:00
Shannon
ef40c76363
Re-formats the code structure of nav service and umbtree to be easier to read, adds better error checking to treeservice
2013-11-08 09:07:28 +11:00
Shannon
367cdde35e
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
...
Conflicts:
src/umbraco.cms/businesslogic/workflow/Notification.cs
2013-11-08 08:55:22 +11:00
Shannon
590b7f2289
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-11-08 08:49:07 +11:00
Sandro Ciervo
9911f03745
Fixed potential DbReaderException
...
- Use Fetch<T> instead of Query<T> because we create another DbReader inside the loop with DoesMacroHaveParameters().
2013-11-07 20:09:06 +01:00
Anders Stentebjerg
2d09785753
Search form 1px up
2013-11-07 17:15:41 +00:00
perploug
7a31ba0de7
merge
2013-11-07 18:14:53 +01:00
Anders Stentebjerg
1cfb79788a
Align header
2013-11-07 17:11:35 +00:00
Anders Stentebjerg
641d0c737f
Styling
...
- Retina optimized gravatar
- White Umbraco logo
2013-11-07 16:51:25 +00:00
perploug
242b755b1a
Tabs overflow
2013-11-07 17:48:54 +01:00
Sebastiaan Janssen
d76336cd39
Merge pull request #194 from Attackmonkey/Hackathon-U4-3228
...
Fixes issue U4-3228, where dictionary item names are not trimmed.
2013-11-07 08:45:21 -08:00
