zhengxie cf3d96b46a Merge branch '5.0' ...

Conflicts:
	media/css/sf_font2/seafile-font2.eot
	media/css/sf_font2/seafile-font2.ttf
	media/css/sf_font2/seafile-font2.woff
	requirements.txt
	seahub/api2/endpoints/dir_shared_items.py
	seahub/templates/js/templates.html
	seahub/views/ajax.py
	static/scripts/app/views/group-repo.js

2016-01-13 10:19:56 +08:00

..

app

Merge branch '5.0'

2016-01-13 10:19:56 +08:00

i18n

[dist] Update locales and dist

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

lib

[simplemodal] updated simplemodal.js to fix IE problems

2015-10-08 17:26:33 +08:00

build.js

[static] Update build.js

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

common.js

Clean getUrl() in common.js

2016-01-11 16:12:30 +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