yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,213 Commits 4 Branches 7 Tags
15d25ebb3daaa14a2ceb44d323028fbd795be49a
Commit Graph

7213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shannon
6f6c33a721 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Relators/PropertyDataRelator.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Tests/BusinessLogic/BaseTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/TestHelper.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-10-01 13:38:17 +10:00
Shannon
7451e83c73 Integrates authentication within the routes and prevents controllers from being loaded when the user isn't authorized. Ensures we also have a /login route and allows routes to redirect when auth fails. 2013-10-01 13:23:13 +10:00
Shannon
79e35d5c06 Ensures that if a user session times out and another user logs in that we redirect to root 2013-10-01 10:08:55 +10:00
Shannon
59196020bb Fixes up content controller move/copy actions 2013-10-01 10:04:07 +10:00
perploug
fc1e4f959e adds container doctype lookup 
TODO: find a better/faster way to do this
 2013-10-01 00:54:46 +02:00
perploug
146aca31a0 Updating legacy domain, publsh and sort dialogs 2013-10-01 00:47:18 +02:00
perploug
c928769911 adds container UI to doctype editor 2013-09-30 23:34:43 +02:00
perploug
cdbc02354d umbracoField dialog tweaks 2013-09-30 23:34:20 +02:00
perploug
bd3cdd83f6 WIP: adds move and copy methos to content contoller 2013-09-30 23:34:07 +02:00
perploug
5a757f129c Implements doctype container 2013-09-30 23:33:27 +02:00
perploug
987c4401a3 U4-2852: Fixes error messages 2013-09-30 23:32:35 +02:00
perploug
dee067d071 cleans up umbfield legacy dialog 2013-09-30 21:37:35 +02:00
perploug
d901f4d4f1 umb-dialog visual tweaks 2013-09-30 21:36:49 +02:00
perploug
081457ddc8 enables classes on inline modals 2013-09-30 21:36:22 +02:00
perploug
4f98a1b0c8 adds move to content.resource 2013-09-30 21:36:08 +02:00
perploug
7668c3bafa adds initial loading back to umb-tree 2013-09-30 21:35:54 +02:00
Sebastiaan Janssen
5238293c09 Merge branch '6.1.6' into 6.2.0 
Conflicts:
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2013-09-30 16:09:25 +02:00
Sebastiaan Janssen
226e35d65a NuSpec update: we can only accept a specific version of MySQL 2013-09-30 14:32:06 +02:00
perploug
85e2c3e5b1 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-30 13:19:10 +02:00
perploug
47d124a41b wraps datepicker valye set in apply 2013-09-30 13:18:56 +02:00
perploug
ca56539c65 Fixes U4-2980 - tabs not in the right order 2013-09-30 13:18:34 +02:00
perploug
8b25210895 adds localdata to timepicer hide event 2013-09-30 13:10:58 +02:00
perploug
9c4dc838a5 Adds number prevalue editor 2013-09-30 13:10:34 +02:00
perploug
57511b9c5a Fixes: U4-2977 legacy tabs reset to one one submit 2013-09-30 13:10:15 +02:00
Sebastiaan Janssen
cdda69c4cd U4-2788 Error installing Umbraco 6.1.5 with SQL CE 4 option 2013-09-30 12:39:28 +02:00
Shannon
472ef6e48c Starts fixing: U4-2947 Fix complex property editors with $watch expressions 2013-09-30 20:33:19 +10:00
Shannon
9ff74b39f8 fixed web.config xform for debugging 2013-09-30 20:24:11 +10:00
Morten Christensen
5aa01e78ab Updating conn.string in test 2013-09-30 12:13:49 +02:00
Morten Christensen
a21bee6683 Fixing MemberType- and MemberRepository so properties, property types and property groups are properly initialized. 2013-09-30 12:12:58 +02:00
Shannon
0cff484113 fixes unit test 2013-09-30 12:12:17 +02:00
Shannon
3e9afcfc41 Finishes: U4-2678 Fix logging out and then logging in as another user, the sections, etc... do not get updated. 2013-09-30 20:08:15 +10:00
Shannon
830fde372e Fixes EditUser.aspx 2013-09-30 11:49:31 +02:00
Shannon
ac2a4a1e0a Fixing: U4-2678 Fix logging out and then logging in as another user, the sections, etc... do not get updated. - all event broadcasting is now centralized. 2013-09-30 19:14:30 +10:00
Shannon
5ffca11c5b Fixing: U4-2678 Fix logging out and then logging in as another user, the sections, etc... do not get updated. 2013-09-30 18:58:24 +10:00