Commit Graph

6000 Commits

Author SHA1 Message Date
Shannon
b4f8e6c93d refactors out the usage of 'ui.stickyNavigation' to use appState 2013-11-13 16:43:40 +11:00
Shannon
886d146595 refactored out the usage of ui.showTray to use appState 2013-11-13 16:35:23 +11:00
Shannon
2aaf3d06fa missing adding touchDevice to the local scope 2013-11-13 16:25:25 +11:00
Shannon
35315e0331 Removes touchDevice from rootScope and navigationService, now we detect this on app startup and add to the globalState which can be retrieved whenever. 2013-11-13 16:22:47 +11:00
Shannon
ba72991929 refactored out the usage of "ui.showContextMenu" with the usage of appState. Added a new init.js instead of having the startup scripts embedded in the routes file (we should make a 'startup' naming convention like we have for 'controllers' to combine into one file) 2013-11-13 16:16:11 +11:00
Shannon
ad7edf0d52 refactors out the usage of 'ui.showNavigation' and replaces with using appState. Adds unit tests for appState. 2013-11-13 15:51:59 +11:00
Shannon
ac15e84324 refactored out the global 'ui.currentSection' to use the appState service. 2013-11-13 15:20:13 +11:00
Shannon
5d49dfbe28 refactors showSearchResults to be part of appState 2013-11-13 14:25:07 +11:00
Shannon
5889140386 Created the new appState service - this will be used to control all of the tracked back office state and used used explicitly by getting/setting values by key - cannot be mutable without defining properties first, then other controllers/services can listen for changes to state and act accordingly. Theoretically the navigationService 'should' be the only thing setting any of the state. Have started refactoring out the easy wins to move away from the dreaded ui object. 2013-11-13 13:50:36 +11:00
Shannon
fd91340e75 Updates DefaultShortStringHelperTests to ensure that umb config is mocked. 2013-11-13 12:41:02 +11:00
Shannon
8dbdd67c98 Reverted CleanStringForSafeFileName to the original name that doesn't strip unnecessary characters. 2013-11-13 12:33:03 +11:00
Shannon
d0c5dd208f Reverted to Newtonsoft.Json 4.5.11 2013-11-13 11:28:14 +11:00
Shannon
d46486d3db Fixes: U4-3493 Cannot delete a template with children 2013-11-13 11:09:11 +11:00
Shannon
c52e0cbb65 Added GetTemplateNode and FindTemplateInTree to the IFileService 2013-11-13 11:05:08 +11:00
Shannon
6224d02989 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-13 11:00:06 +11:00
Shannon
9e8286bda9 Adds ability to query the template tree (hierarchy) with the template repository + unit tests. 2013-11-13 10:59:36 +11:00
perploug
9ad869d367 merge 2013-11-12 19:29:15 +01:00
perploug
acbde943b0 replaces the datepicker with a native angular picker 2013-11-12 19:01:48 +01:00
perploug
c4a0e1e923 changes options to actions 2013-11-12 19:01:24 +01:00
perploug
8465b3465b ensures history is reset on login 2013-11-12 19:00:51 +01:00
perploug
8666ae0540 sections css tweak 2013-11-12 19:00:37 +01:00
perploug
9c8e156768 fixes dublicate help and user dialogs 2013-11-12 19:00:25 +01:00
perploug
9efe68724d Fixes dublicate key bindings for hotkeys 2013-11-12 19:00:08 +01:00
Shannon
2129ac8241 Adds template repository tests, updates template repo business logic to be able to delete the whole template tree, updates some script repo tests too. 2013-11-12 22:28:43 +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
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