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

..

assets

[dist] Update locales and dist

2015-07-07 14:08:43 +08:00

avatars

[group list] redesigned it

2014-02-26 17:01:03 +08:00

codemirror

[file_edit] upgraded codemirror to v2.36 to fix md link bug, and fixed css mode bug

2012-12-11 15:14:55 +08:00

cors

fixed 'path' bug for file upload, rewrite file update, rm unused files

2013-08-01 11:55:46 +08:00

css

[loading] use a new one

2015-10-14 11:12:50 +08:00

img

[loading] use a new one

2015-10-14 11:12:50 +08:00

js

use 'POST' instead of 'GET' for some requests, and modified 'share' in repo, file view

2015-10-19 15:04:37 +08:00

rest_framework

Added rest framework

2013-03-01 13:38:05 +08:00