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

4039 Commits

Author SHA1 Message Date
Per Ploug
410b664f7f Got legacy create dialogs working 
Its not pretty, but it works, and over time these hacks should slowly
fade away
 2013-07-10 15:35:38 +02:00
Per Ploug Krogslund
8ff4d9c24c harcoded create dialog hacks 2013-07-10 13:58:21 +02:00
Per Ploug
beef52e555 adds nodetype to tree converter 2013-07-10 13:57:58 +02:00
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
Sebastiaan Janssen
aa327696fe Fixes U4-2354 MiniProfiler - Show SQL parameter values and more stacktrace info 
Refactored duplicate code
 2013-07-10 12:35:21 +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
Lars-Erik Aabech
1272a7c74b Prettifying norwegian translation 
Removed obsolete, translated new, removed incorrect spacing and
hyphenation, misc. improvements in term usage. Ref.
http://i18n.skulelinux.no/nb/Fellesordl.eng-no.html.
 2013-07-09 12:56:13 +02: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
esn303
dcbe6726b0 Updated DE to 6.1.2 
Markup encoded instead of CDATA blocks
 2013-07-09 10:30:20 +02:00
Shannon
ba68da5736 Makes Domain.GetDomains public (#U4-2483) 2013-07-09 11:55:29 +10:00
Shannon
fdabd945dc Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-09 11:48:03 +10:00
Shannon
868edee5e6 Fixes: #U4-2161 - permissions inheritance. Fixes up how user permissions cache is invalidated and looked up (it is now lazy and not forced). User permissions are also cached as a low priority for now and only for 20 mins based on #U4-2474. 2013-07-09 11:47:46 +10:00
Shannon
b91d0bb117 Updates ContentRepository to bulk insert all parent permissions at once (overload to the AssignEntityPermissions method) 2013-07-09 10:08:31 +10:00
Murray Roke
cc91977e94 Fix notification-email link to unpublished page 
http://issues.umbraco.org/issue/U4-2482
I've added links to language files which did not contain it.
I used the %5% syntax in the sv.xml file which seems to otherwise use
{5} syntax
 2013-07-09 11:19:51 +12:00
Per Ploug
df98ad4edf Sets the installer redirect to umbraco/default 2013-07-08 15:54:07 +02:00
Shannon
90b94f6ffb Fixes: #U4-2476 2013-07-08 18:58:38 +10:00
Shannon
3c4cf56309 Fixes: #U4-2475 2013-07-08 18:47:53 +10:00
Shannon
b7f6195791 Started adding base PermissionsRepository for sub classes to use for assigning permissions, created a BulkImport extension methods for PetaPoco with tests since we'll be needing that for assigning permissions in a nice way. Wrote unit tests for all sql gen for permissions and assigning permissions. This all starts fixing #U4-2161 but there's still a bit more work to do. 2013-07-08 17:29:26 +10: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
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