zhengxie 00f64782ad Merge branch 'dir-share-popup' ...

Conflicts:
	seahub/api2/views.py
	static/scripts/app/views/share.js
	static/scripts/common.js
	tests/api/test_shares.py

2015-07-15 15:06:56 +08:00

..

app

Merge branch 'dir-share-popup'

2015-07-15 15:06:56 +08:00

i18n

[dist] Update locales and dist

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

lib

[dir view] use magnificPopup for img view

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

build.js

[static] Update build.js

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

common.js

Merge branch 'dir-share-popup'

2015-07-15 15:06:56 +08:00

file-tree.js

…

group.js

…

main.js

[backbone] Merge into one library app

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

myhome.js

…

organization.js

…

pinyin-by-unicode.js

enable sort repo/dirent by Chinese word

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