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

5842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Per Ploug Krogslund
a16855dac2 Fixes the dialog I broke yesterday 
Adds some defaults to the dialogs, so we can open the inline without
animation as well
 2013-07-10 13:12:07 +02:00
Shannon
e7b816a958 All resources now converted to using resourcePromise. 2013-07-10 18:48:14 +10:00
Shannon
0060aa816b Converts media resource to use correct structure, fixes up the media editor and controller so at least stuff renderes now. 2013-07-10 18:18:48 +10:00
Shannon
6652016faa Makes the 'active' property on a tab a server side thing, updates more resources to use the resourcePromise. 2013-07-10 17:28:15 +10:00
Shannon
0f207b01f2 Integrated auth into the UI project and unit tests (you need to log in each time with arbitrary username/password). Fixes authorization, the auth check SHOULD return a 401 so that the MainController re-fires the auth check in order to re-set the 'authenticated' scope flag. Fixed err caused by trying to launch login dialog too many times when too many http calls fail. Converted over authResource to use correct resourcePromise structure. The mock auth is done with angular cookies, so integrated that too. Removes main.js since we don't use it anymore. Fixes media mocks. Removes call to get sections in navigationService since it is irrelevant and causing more issues when not authenticated. 2013-07-10 13:24:28 +10:00
Shannon
5a18c0b0e2 Fixes up resourcePromise 2013-07-10 11:33:36 +10:00
Shannon
74ca129697 Changed auth.resource to use the new resource promise and also enhanced the resource promise + docs. 2013-07-10 11:08:58 +10:00
Shannon
08f6f92e8c Fixed JS Build issues - Mixed spaces/tab issues, missing semi-colon. Fixed grunt build to ensure that a self executing function wraps the JS build output. 2013-07-10 10:38:16 +10:00
Per Ploug Krogslund
58500bd5b8 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 
Conflicts:

src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
 2013-07-09 22:22:29 +02:00
Per Ploug Krogslund
245c764bf1 docs on navigationService 
working ngDocs setup, started adding docs to navigation and dialog
service
 2013-07-09 22:17:23 +02:00
Shannon
5af57d9667 Fixed up the 401 issue with checking authentication which led to other issues of lazy loading in the legacy js tree JS block. 2013-07-09 21:01:29 +10:00
Shannon
76c6d952f3 Fixed up the 401 issue with checking authentication, but now have other auth issues... but better than before :) 2013-07-09 20:13:26 +10:00
Shannon
9af23fdaf7 Converted compat.js to use namespaces 2013-07-09 19:21:44 +10:00
Shannon
7e0066f405 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
 2013-07-09 18:52:54 +10:00
Shannon
a6acb4c558 Got tree menu items loading async so the menu is not part of the treenode json. Created docs for using Umbraco resources and how to use promises properly. Created a helper: angularHelper.resourcePromise for use with all of our resources (still need to convert the rest). Got the legacy tree data working with seperate requests for menu items (not too easy!) 2013-07-09 18:51:45 +10:00
Per Ploug
df98ad4edf Sets the installer redirect to umbraco/default 2013-07-08 15:54:07 +02:00
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
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
Per Ploug
d9e79666ca css-template editor tweaks, more compat polish 2013-07-04 13:33:06 +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
Per Ploug
01d55625d5 merge 2013-07-03 14:04:00 +02:00
Per Ploug
693c0cb2a5 working modals 2013-07-03 13:55:33 +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
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
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