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
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
Sebastiaan Janssen
0dc3920309
Merge pull request #191 from dipeshhirani/U4-2756
...
Fixed the issue below: U4-2756
2013-11-07 08:38:44 -08:00
Sebastiaan Janssen
98d1aafb75
Merge pull request #187 from wpyz/6.2.0
...
Fixes issue with opening VS solution when only Visual Studio 2013 is installed (fixes U4-3445)
2013-11-07 08:36:40 -08:00
Anders Stentebjerg
fa0b3ddab9
Set focus on pageName
2013-11-07 16:30:14 +00:00
Per Ploug Krogslund
7440855c72
merge
2013-11-07 17:16:22 +01:00
perploug
937bda9c16
select on focus directive
2013-11-07 17:11:32 +01:00
Anders Stentebjerg
2b3a9a0b8f
U4-3449 Polish UX so it matches grid
2013-11-07 16:04:07 +00:00
Sebastiaan Janssen
6a0d7ec8d6
Merge pull request #183 from mkariti/U4-1477
...
fix U4-1477
2013-11-07 07:49:27 -08:00
perploug
8b879183ba
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-11-07 16:05:43 +01:00
perploug
0f424d314f
Changes editor header editor to input:text
2013-11-07 16:05:22 +01:00
Morten Christensen
f9a86385b5
Rearranging the create schema extensions methods to provide a bit more flexibility for external usage.
2013-11-07 14:03:34 +01:00
Morten Christensen
b8f7df1a96
Fixing the broken stylesheetrepository test and ignoring the StylesheetRepository in the RepositoryResolverTest for the time being as it takes two different UOWs as opposed to other repositories.
2013-11-07 13:33:49 +01:00
Tim Payne
425fd80e65
Fixes issue U4-3228, where dictionary item names are not trimmed.
2013-11-07 12:28:43 +00:00
Morten Christensen
04bb778dc1
Fix StylesheetRepositoryTest which broke as a result of PR #176
2013-11-07 12:52:25 +01:00
dipeshhirani
3f2be3342a
Fixed the issue below:
...
The "Unpublish" button (under Properties tab) is bad translated to Italian.
The used word is "Non pubblicato". This phrase is mean "It is not published".
A best translation is "Non pubblicare" (unpublish).
Did not do any of the others as they are either already done or the requesters change seems incorrect/irrelevent
2013-11-07 11:42:08 +00:00
Morten Christensen
3ba50e7bae
Merge pull request #176 from pynej/add-stylesheet-ids
...
Fix for missing Id's on FileService.GetStylesheets() call. This is need...
2013-11-07 03:41:33 -08:00
Morten Christensen
7306ddef14
Merge pull request #182 from stocksr/6.2.0-petapoco-refactor
...
6.2.0 petapoco refactor - umbraco.cms.businesslogic.language.Item
2013-11-07 03:37:37 -08:00
Morten Christensen
17bb29eb66
Merge pull request #185 from saciervo/6.2.0
...
Use PetaPoco instead of SqlHelper
2013-11-07 03:35:49 -08:00
Morten Christensen
8bf3de738f
Merge pull request #188 from stocksr/6.2.0-petapoco-refactor-umbraco.cms.businesslogic.language.Language
...
Refactoring umbraco.cms.businesslogic.language.Language class
2013-11-07 03:34:08 -08:00
Robert Stocks
2d37502a44
Refactoring umbraco.cms.businesslogic.language.Language class
2013-11-07 11:28:00 +00:00
Ryan Lewis
d5c485205a
Whitespace
2013-11-07 11:24:40 +00:00
Ryan Lewis
9533198365
Can open VS solution with only Visual Studio 2013 installed (fixes U4-3445)
2013-11-07 11:23:41 +00:00
Morten Christensen
66f20e3800
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0
2013-11-07 12:19:27 +01:00
Sandro Ciervo
9269a98806
Refactored Umbraco.Web.UI.Controls.InsertMacroSplitButton
...
- CreateChildControls()
- DoesMacroHaveParameters (Int32)
2013-11-07 12:15:03 +01:00
mkariti
7c97fddec5
fix U4-1477
2013-11-07 13:08:56 +02:00
Morten Christensen
a567cf2a87
Minor update to the DefaultData so the used PetaPoco db object is consistent
2013-11-07 12:00:45 +01:00
Morten Christensen
1e319d667b
Updating the remaining methods in the Notification class so it no longer uses the legacy SqlHelper.
2013-11-07 11:59:59 +01:00
Sebastiaan Janssen
cc039e365d
Merge pull request #181 from Attackmonkey/Tim-Payne-Hackathon-U4-2708
...
Fixes issue U4-2708
2013-11-07 02:55:03 -08:00
Morten Christensen
f91ff5dc31
Special commit for a special Lars-Erik
2013-11-07 11:48:25 +01:00
Robert Stocks
9347a2edbb
Refactoring umbraco.cms.businesslogic.language.Item class - Fix Update and Delete calls
2013-11-07 10:40:23 +00:00
Robert Stocks
64a73ef528
Refactoring umbraco.cms.businesslogic.language.Item class
2013-11-07 10:20:55 +00:00
Tim Payne
4ea04f5ffe
Fixes issue U4-2708
2013-11-07 10:08:11 +00:00
