zhengxie e6e6e82b82 Merge branch '6.0' ...

Conflicts:
	seahub/api2/endpoints/file.py
	seahub/urls.py
	static/scripts/app/views/share.js

2017-04-17 16:21:22 +08:00

..

collections

Merge pull request #1361 from haiwen/fileupload

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

models

add name check at front end by js

2017-04-14 14:03:25 +08:00

views

Merge branch '6.0'

2017-04-17 16:21:22 +08:00

main.js

[backbone] Merge into one library app

2015-04-22 15:31:49 +08:00

router.js

[UI] top-bar: bugfix & improvement

2017-03-30 12:12:41 +08:00