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

..

app

Merge branch '5.0'

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

i18n

[dist] Update locales and dist

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

lib

Remember view mode in cookie

2016-02-28 19:35:32 +08:00

build.js

[static] Update build.js

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

common.js

Show 24px file icon for low DPI screen

2016-03-04 18:29:12 +08:00

file-tree.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

pinyin-by-unicode.js

enable sort repo/dirent by Chinese word

2015-04-30 11:59:09 +08:00