Daniel Pan ee99d7aad8 Merge branch '5.1' ... Conflicts: seahub/group/templates/group/group_base.html seahub/templates/home_base.html seahub/templates/js/sysadmin-templates.html seahub/templates/js/templates.html seahub/templates/libraries.html seahub/templates/pub_base.html static/scripts/app/views/group-discussions.js		2016-05-21 13:42:04 +08:00
..
app	Merge branch '5.1'	2016-05-21 13:42:04 +08:00
i18n	[dist] Update locales and dist	2015-07-07 14:08:43 +08:00
lib	Add accessiblity support to simplemodal	2016-05-04 11:51:56 +08:00
sysadmin-app	add account view to sysadmin app router	2016-05-17 14:09:24 +08:00
build.js	new admin devices page;	2016-04-23 18:07:09 +08:00
common.js	add download multi dirents api	2016-04-28 15:16:58 +08:00
file-tree.js	[lib setting] folder perm: open the jstree	2016-03-10 15:11:21 +08:00
main.js
pinyin-by-unicode.js	enable sort repo/dirent by Chinese word	2015-04-30 11:59:09 +08:00
sysadmin-main.js	Reimplement sysadmin with backbone	2016-04-23 17:13:32 +08:00