Qingping Hou 195b52cb63 Merge branch 'master' of github.com:owncloud/core into issue_1776 ... Conflicts: core/templates/layout.user.php		2013-02-25 17:16:03 -05:00
..
admin.js	Add security section to admin menu	2013-01-11 14:18:51 +01:00
apps-custom.php	json_encode the appid	2013-02-09 15:06:35 +01:00
apps.js	fixing javascript errors IE8 in apps management	2013-02-14 15:47:48 +01:00
isadmin.php	Move isadmin to external file	2013-01-21 21:25:38 +01:00
log.js	hide morelog button if there are no more log entries - bugfix for oc-1398	2012-08-04 17:38:31 +02:00
personal.js	Merge branch 'master' of github.com:owncloud/core into issue_1776	2013-02-25 17:16:03 -05:00
users.js	Fetch displayname in userlist ajax requests. Refs #1681	2013-02-22 14:51:21 +01:00