perploug
ffc1b62b8a
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-10-02 10:56:54 +02:00
perploug
17f2602ca2
icon finder now loads .icon-* from all registered stylesheets
2013-10-02 10:56:40 +02:00
perploug
a71e255468
re-adds tree cache
2013-10-02 10:55:58 +02:00
perploug
f2458b833e
consistent create dialogs
2013-10-02 10:55:48 +02:00
perploug
2b2d986371
Content copy with relation in js layer
2013-10-02 10:55:38 +02:00
perploug
1ed21a3ffb
Better font handling with correct weights
2013-10-02 10:55:20 +02:00
perploug
1f32373bd2
sample manifest with css
2013-10-02 10:54:59 +02:00
perploug
5b1c626714
Reverts meadia sort to legacy dialog
2013-10-02 10:54:37 +02:00
perploug
ce30153830
Enables the manifest to load custom stylesheets outside the js loading
2013-10-02 10:54:25 +02:00
perploug
727f3a804d
Removes osx shadow files
2013-10-02 10:53:12 +02:00
Shannon
be7179b962
Fixed up the TagRelationshipDto to have the correct columns, keys, etc.. as our upgrade, updated the old tags API to support the new changes.
2013-10-02 17:10:12 +10:00
Shannon
7eee954d4d
OOPS! didn't mean to delete this a couple days ago :P
2013-10-02 15:56:53 +10:00
Shannon
36cb078073
Tags db upgrades done, now to look at ensuring the legacy tags stuff works.
2013-10-02 15:51:02 +10:00
Shannon
8b6171bb13
Almost got the tags tables upgraded
2013-10-02 13:50:42 +10:00
Shannon
917d5b39ec
Changes auth controller post login to return an normal validation response instead of 4.3 so the err msg doesn't show up.
2013-10-02 13:42:36 +10:00
Shannon
65f809a0fb
chagnes IsAuthenticated to not return a 403 so the warning msg doesn't display.
2013-10-02 09:53:58 +10:00
Shannon
bad4d0c6e6
fixes merge issues
2013-10-02 09:30:53 +10:00
Shannon
2a1e3dc2f8
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
...
Conflicts:
src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
2013-10-02 09:22:33 +10:00
perploug
5199a5dc99
Move, Copy, protect, notifications dialogs polish
2013-10-02 00:11:10 +02:00
perploug
2e8a8e3623
Working move dialog, needs feedback and validation
2013-10-01 16:14:54 +02:00
perploug
1ec74a5ae8
Fixes: U4-3005 userdialog refuses to close
2013-10-01 15:51:39 +02:00
perploug
6c02eadd88
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-10-01 15:37:19 +02:00
perploug
60c4307f2e
Fixes: u4-3009 missing context menu in search results
2013-10-01 15:37:05 +02:00
perploug
e1c0e70d07
Fixes: U4-3001 missing root node in tree selectors
2013-10-01 15:36:42 +02:00
Shannon
2c88c7c971
Fixed up content tree to check for IsContainer with the new entity AdditionalData, fixes up the AddContainerView to be part of the ContentModelMapper.
2013-10-01 21:12:32 +10:00
Shannon
9e361b7669
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-10-01 21:02:47 +10:00
perploug
e64eb05dcd
adds alt+click to context menu to skip default action
2013-10-01 12:32:43 +02:00
perploug
0898638e33
Fixes: U4-2982 missing translation on contextmenu
2013-10-01 12:32:27 +02:00
perploug
5dd9510d69
Fixes: U4-2973 - View editor save button broken
2013-10-01 11:51:19 +02:00
perploug
229b770447
fixes: U4-2854 Re-adds actions on root tree nodes
2013-10-01 11:40:56 +02:00
Shannon
434e194ba7
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-10-01 19:38:18 +10:00
Shannon
9c96b247be
Completes: U4-2963 Updated EntityService / IUmbracoEntity to have a dictionary to fill additional data
2013-10-01 19:37:51 +10:00
Morten Christensen
74f6a34651
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0
2013-10-01 10:20:29 +02:00
Morten Christensen
7dee2802fe
Fixing Member and MemberType, so the ids are properly assigned through the repositories.
...
Adding test to assert that no Properties, PropertyTypes or PropertyGroups exists without an id when loaded from the db.
NOTE Changes signature of Member class as Email, Username and Password is required.
2013-10-01 10:20:16 +02:00
perploug
15d25ebb3d
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-10-01 10:11:08 +02:00
perploug
fbe388a616
Cleans up rte embed dialog
2013-10-01 10:10:55 +02:00
perploug
891955f164
Fixes: U4-2953 - could not load google fonts file
2013-10-01 10:10:41 +02:00
Shannon
f7103c97cf
Completes: U4-2768 Remove legacy/unused webforms files/classes in folder: /umbraco
2013-10-01 17:03:03 +10:00
Shannon
a90e96d066
Completes: U4-2926 Remove unused/obsoleted 'tasks' for media & content
2013-10-01 16:42:32 +10:00
Shannon
4e56d88eb5
Fixes: U4-2672 Fix how trees are rendered when a start node is applied, the Content/Media titles must always be visible
2013-10-01 16:38:10 +10:00
Shannon
770514919d
Gets member deleting working and adds refresh to each letter node.
2013-10-01 15:54:44 +10:00
Shannon
31a5951626
Updated member tree/editor to use the GUID
2013-10-01 15:36:08 +10:00
Shannon
76b7b131a9
Gets members saving (initially) still needs lots more work though, waiting on some feedback from morten in the meantime.
2013-10-01 15:25:04 +10:00
Shannon
4602a6b989
Fixes an issue with the MemberTypeReadOnlyFactory
2013-10-01 14:46:16 +10:00
Shannon
e27a0e2bd2
updates boolean and check box list to use onValueChanged to detect any server value changes.
2013-10-01 14:16:57 +10:00
Shannon
e5c7a35e8f
updates g-maps editor to use onValueChanged to detect if a server val has changed.
2013-10-01 14:12:15 +10:00
Shannon
6277bc379e
updates mediapicker to use onValueChanged in case the server value changes.
2013-10-01 14:10:11 +10:00
Shannon
2bb279d8f7
Ensures rte controller will re-load itself if server data has changed.
2013-10-01 14:08:14 +10:00
Shannon
a8f87d6dc1
Updates mediapicker to not use jquery each methods since they are not DOM items, use underscore instead.
2013-10-01 14:07:56 +10:00
Shannon
bb350035ef
Fixed merge issues
2013-10-01 13:43:55 +10:00
