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

5928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Per Ploug
34f64fbb2f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-07-05 16:10:08 +02:00
Per Ploug
f51306b0e2 Removed js redirect from logout.aspx 2013-07-05 16:10:00 +02:00
Per Ploug Krogslund
92c797d837 Adds native events to the umb-tree directive 
Better and isolated callbacks
 2013-07-05 16:08:16 +02:00
Per Ploug Krogslund
0c3d274232 merge 2013-07-05 14:27:26 +02:00
Per Ploug Krogslund
852fe4210a Removes left-col leftover file, adds contentLoaded to contentEdit controller 2013-07-05 14:26:43 +02:00
Per Ploug
1b03dbd9c2 Adds compat.js click registering, adds bg load 2013-07-05 14:22:19 +02:00
Per Ploug
291c5920d8 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-07-05 14:14:31 +02:00
Per Ploug
18a7f3dcc3 html encodes profile link to aspx page 2013-07-05 14:14:20 +02:00
Per Ploug Krogslund
63323c494f Adds body click detection to legacy pages 2013-07-05 14:13:45 +02:00
Per Ploug
699f76282d Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-07-05 12:58:45 +02:00
Per Ploug
cfd299562e rename umb leftcol to umb navigation 2013-07-05 12:58:36 +02:00
Per Ploug Krogslund
d88c817770 User profile link in dialog 2013-07-05 12:57:46 +02:00
Per Ploug Krogslund
2580f13978 Changesection should trigger a $location.path change 2013-07-05 12:46:11 +02:00
Per Ploug
4a83262e1f Routes fallback to content if set to default 2013-07-05 12:45:37 +02:00
Per Ploug Krogslund
fd1e647ca7 Changes dashboard routing to the real dashboard.aspx 2013-07-05 12:26:06 +02:00
Per Ploug Krogslund
00ca7242b9 Adds user modal and history service 
User can now log out, and see recent actions
 2013-07-05 12:25:47 +02:00
Per Ploug Krogslund
63495d05e1 merge 2013-07-05 11:05:43 +02:00
Morten Christensen
42eb82e6ca Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-05 10:55:12 +02:00
Morten Christensen
93def731ef Fixes #U4-2466 2013-07-05 10:51:19 +02:00
Per Ploug Krogslund
0a08dce8f5 Modifies the dialog css class loading and allows for left side modals 2013-07-05 10:48:12 +02:00
Per Ploug
0030488b61 Fixes dialog service instant closing modals 2013-07-05 10:40:28 +02:00
Shannon
60805f91d6 bit of code cleaning. 2013-07-05 16:58:51 +10:00
Shannon
048480d5be Fixes: #U4-2460 - UmbracoHelper.RenderTemplate will now execute the complete MVC cycle when rendering MVC templates whereas before it would only execute the view which means any actionfilters, etc... applied would never have fired (as well as other things) 2013-07-05 14:12:31 +10:00
Per Ploug
d9e79666ca css-template editor tweaks, more compat polish 2013-07-04 13:33:06 +02:00
Morten Christensen
173d388c12 Fixes #U4-2450 2013-07-04 12:31:31 +02:00
Morten Christensen
b1285fa7e3 Add missing id to unique naming overload 2013-07-04 12:31:10 +02:00
Morten Christensen
e34c857f6c A bit of refactoring around unique naming, and implementing it for media as well 2013-07-04 11:22:59 +02:00
Morten Christensen
7ff0e6cd4b Fixes #U4-2458 2013-07-04 10:50:02 +02:00
Per Ploug Krogslund
a984bf0d68 Fixes failing tests 
Adds a seperate unit test app loader, removes e2e backend from tests
adds scope.digest and httpbackend.flush to tests
 2013-07-04 09:28:27 +02:00
Shannon
371a0cc65a Fixes SectionService to properly return the user's allowed sections now that the IUserRepository is working nicely. 2013-07-04 15:33:24 +10:00
Shannon
7e345fda70 puts angular.js source back in repo as it is good for debugging/learning. Fixed editContentController tests, but now there's other test issues which I'm not sure how to fix ? 2013-07-04 15:16:02 +10:00
Shannon
15f0503a99 Added js unit tests for icon helper 2013-07-04 13:11:07 +10:00
Shannon
93844f30ac Re-fixed the section icons, deals with legacy icons, new icons and legacy file based icons 2013-07-04 12:50:25 +10:00
Shannon
0f06308efc removed VS build events, hopefully that can kick start the build server 2013-07-04 12:36:28 +10:00
Shannon
1f30a427b0 Reverted Tea commerce commit 2013-07-04 12:30:52 +10:00
Shannon
0683094f84 oops, overwrote previous changes to CmsNode, now merged them back in properly. 2013-07-04 12:20:25 +10:00
Shannon
983b7a85e1 Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-04 12:13:24 +10:00
Shannon
d015780b9f Fixes: #U4-2447 - non thread safe icon lookup 2013-07-04 12:13:02 +10:00
Per Ploug
01d55625d5 merge 2013-07-03 14:04:00 +02:00
Morten Christensen
aeece499bb Fixing unit test for PublishedMedia cache, which had expected result set incorrect 2013-07-03 14:00:44 +02:00
Per Ploug
693c0cb2a5 working modals 2013-07-03 13:55:33 +02:00
Morten Christensen
8465b4e556 Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 12:34:52 +02:00
Morten Christensen
e280785f48 Adding Msdeploy PropertyGroup to build prop file, so both FileSystem and MsDeploy package will include the umbraco and umbraco_client folders 2013-07-03 12:30:34 +02:00
Shannon
71bff2d1d7 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Core/Models/Membership/UserProfile.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
	src/Umbraco.Core/Services/UserService.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-07-03 20:24:02 +10:00
Shannon
5e0a59e4b3 Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 19:47:25 +10:00
Morten Christensen
30835797ff Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 11:47:09 +02:00
Shannon
4077a01a6b Fixes: #U4-2344 - fixes examine re-indexing for media and a null check for DataType.Data 2013-07-03 19:47:06 +10:00
Morten Christensen
aed70ae40c Updating dependencies in our own nuspec file 2013-07-03 11:46:53 +02:00
Morten Christensen
6d44628352 Merge pull request #45 from jhauge/PublishUmbracoFiles 
Add Umbraco files during publish
 2013-07-03 02:39:12 -07:00
Jesper Hauge
7a398d34b1 Added file-reg to .nuspec 2013-07-03 11:33:05 +02:00