zhengxie d82df5fb52 Merge branch '6.0' ... Conflicts: media/js/base.js seahub/api2/views.py seahub/views/ajax.py tests/api/test_repo_user_folder_perm.py		2017-02-17 17:11:33 +08:00
..
app	Merge branch '6.0'	2017-02-17 17:11:33 +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	Merge branch '6.0'	2017-02-17 17:11:33 +08:00
build.js	new admin devices page;	2016-04-23 18:07:09 +08:00
common.js	Merge branch '6.0'	2017-02-17 17:11:33 +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	[backbone] Merge into one library app	2015-04-22 15:31:49 +08:00
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