Shannon
|
86c996efb8
|
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
|
2013-11-14 10:51:52 +11:00 |
|
Shandem
|
c037e2e09f
|
Merge pull request #246 from lars-erik/6.2.0-fix-U4-3508
Fixes Template.ToXml() (U4-3508) and refactored Template.Import to use P...
|
2013-11-13 15:51:29 -08:00 |
|
lars-erik
|
d8debf6789
|
Fixes Template.ToXml() (U4-3508) and refactored Template.Import to use PackagingService.ImportTemplates.
Fixed nullreference bug in ImportTemplates when used with XElement("Template"). (Added test for case with one template only)
|
2013-11-13 14:27:05 +01:00 |
|
perploug
|
b02b45c815
|
datepicker adds current user language
|
2013-11-13 13:46:04 +01:00 |
|
perploug
|
05cbccec5c
|
adds hotkeys to search, dialogs and help
|
2013-11-13 13:45:46 +01:00 |
|
perploug
|
238bc58234
|
Revert to old datepicker
|
2013-11-13 11:33:39 +01:00 |
|
Shannon
|
dd22377b9b
|
Removes the need for activeTree/currentTree on the nav ctrl, fixes the section animation on first load,
|
2013-11-13 20:35:53 +11:00 |
|
Shannon
|
01589f0a35
|
Cleans up some more tree code that is not used or required, moves the ui.treeEventHandler to a local var in the nav service since it doesn't need to be exposed, fixes main controller redirecting due to an undefined check.
|
2013-11-13 20:14:33 +11:00 |
|
Shannon
|
b9d22b2577
|
Fixes: U4-3506 Linkpicker in RTE doesn't expand tree to last selected link - missing GetPath parameter - which lead to lots of other cleanup, removes auth listening on the section and tree directives since that doesn't belong there, now the navigation controller determines what to render depending on authorization. Removes the path parameter on the umbTree and umbTreeItem since this didn't work and syncTree should be used instead. Fixed up some more tree sync logic as well.
|
2013-11-13 19:57:34 +11:00 |
|
Shannon
|
36c21ca322
|
refactors out ui.tablet into private variable - only navigationService needs to know about this, otherwise if everything does it needs to go into appState and the listener needs to go elsewhere (a directive)
|
2013-11-13 18:44:44 +11:00 |
|
Shannon
|
4fe6da9118
|
refactored out the dialogTitle, currentDialog, actions ui object to use appState, updated the context menu directive to not rely on globals, instead it gets passed the values it needs from the navigation controller.
|
2013-11-13 18:40:30 +11:00 |
|
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 |
|
Shandem
|
e9ed1bf17a
|
Merge pull request #244 from leekelleher/U4-3051
Fixes: U4-3051 GetAncestorOrSelfDocuments gets stuck in infinite loop
|
2013-11-12 14:11:05 -08:00 |
|
leekelleher
|
cfcfb75dcc
|
Fixes: U4-3051 GetAncestorOrSelfDocuments gets stuck in infinite loop
|
2013-11-12 21:26:21 +00: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
|
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 |
|