zhengxie 8fd9bebf45 Merge branch '4.4' ... Conflicts: seahub/auth/views.py seahub/templates/libraries.html seahub/templates/sysadmin/sys_admin_group_info.html seahub/templates/sysadmin/sys_publink_admin.html seahub/templates/sysadmin/userinfo.html seahub/urls.py		2015-10-20 10:27:27 +08:00
..
app	Merge branch '4.4'	2015-10-20 10:27:27 +08:00
i18n	[dist] Update locales and dist	2015-07-07 14:08:43 +08:00
lib	[simplemodal] updated simplemodal.js to fix IE problems	2015-10-08 17:26:33 +08:00
build.js	[static] Update build.js	2015-04-22 15:31:50 +08:00
common.js	use 'POST' instead of 'GET' for some requests, and modified 'share' in repo, file view	2015-10-19 15:04:37 +08:00
file-tree.js	Move scripts from media to static folder	2015-04-22 15:31:46 +08:00
group.js	Move scripts from media to static folder	2015-04-22 15:31:46 +08:00
main.js	[backbone] Merge into one library app	2015-04-22 15:31:49 +08:00
myhome.js	Move scripts from media to static folder	2015-04-22 15:31:46 +08:00
organization.js	Move scripts from media to static folder	2015-04-22 15:31:46 +08:00
pinyin-by-unicode.js	enable sort repo/dirent by Chinese word	2015-04-30 11:59:09 +08:00