zhengxie 1b11350f80 Merge branch '6.0' ...

Conflicts:
	seahub/templates/sysadmin/sysadmin_backbone.html
	seahub/urls.py
	seahub/views/sysadmin.py
	static/scripts/app/views/dir.js

2017-03-27 13:53:35 +08:00

..

app

Merge branch '6.0'

2017-03-27 13:53:35 +08:00

i18n

[locale] Update source

2017-01-09 11:15:44 +08:00

lib

Merge pull request #1361 from haiwen/fileupload

2016-11-18 11:29:52 +08:00

sysadmin-app

add test for admin log api

2017-03-23 15:05:47 +08:00

build.js

new admin devices page;

2016-04-23 18:07:09 +08:00

common.js

[system admin] admin logs: fix

2017-03-22 17:26:42 +08:00

file-tree.js

[jstree] updated jstree to the latest v3.3.2, rewrote/modified related code, & bugfix

2016-10-25 11:39:52 +08:00

main.js

…

pinyin-by-unicode.js

enable sort repo/dirent by Chinese word

2015-04-30 11:59:09 +08:00

sysadmin-main.js

Reimplement sysadmin with backbone

2016-04-23 17:13:32 +08:00