zhengxie 72d30b2495 Merge branch '5.0' ...

Conflicts:
	seahub/api2/endpoints/dir_shared_items.py
	seahub/api2/urls.py
	seahub/templates/repo.html
	seahub/utils/http.py
	seahub/views/__init__.py
	seahub/views/ajax.py
	seahub/views/repo.py
	tests/seahub/views/test_libraries.py

2016-03-07 16:04:36 +08:00

..

collections

[lib setting] add 'folder perm'

2016-02-19 17:38:32 +08:00

models

[dir view] grid view: show 'name' tip, added magnificPopup preview for images, & etc.

2016-03-05 11:19:19 +08:00

views

Merge branch '5.0'

2016-03-07 16:04:36 +08:00

main.js

[backbone] Merge into one library app

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

router.js

[group setting, group wiki] bugfix, modification

2016-02-19 17:01:31 +08:00