zhengxie d37144ef75 Merge branch '6.2' ...

Conflicts:
	seahub/templates/base.html
	static/scripts/app/views/dir.js
	static/scripts/common.js

2017-12-28 15:47:18 +08:00

..

collection

limit ip

2017-09-18 14:21:11 +08:00

models

limit ip

2017-09-18 14:21:11 +08:00

views

[fileupload] improvement: always full show the popup when upload files; close the popup when navigate away from a 'dir view' page

2017-12-14 17:23:01 +08:00

main.js

Reimplement sysadmin with backbone

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

router.js

new design

2017-12-05 17:53:45 +08:00