7294 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zhengxie	fde748909e	[sys admin] User list, email -> ID	2018-06-15 11:52:58 +08:00
zhengxie	194a9555cf	Update translations	2018-06-14 18:30:17 +08:00
zheng xie	c925cb4e0e	Merge pull request #2157 from haiwen/redesign-register ... [register] redesigned it	2018-06-14 17:26:25 +08:00
llj	435ced05f5	[register] redesigned it	2018-06-14 16:51:13 +08:00
llj	f6d24df9c6	[login, settings] added 'capfirst' for current language name	2018-06-13 16:03:50 +08:00
lian	4507beb7e8	add starred field to file detail api	2018-06-13 15:25:06 +08:00
zheng xie	105a22f01a	Merge pull request #2143 from haiwen/batch-unshare-repo ... add batch unshare repo from user/group	2018-06-13 11:52:31 +08:00
lian	fc07a1d885	add batch unshare repo from user/group	2018-06-13 11:51:12 +08:00
zheng xie	991ea8f206	Merge pull request #2145 from haiwen/batch-copy-move-file-dir ... add batch copy/move item api	2018-06-13 11:38:22 +08:00
zheng xie	5b5d26a8ed	Merge pull request #2144 from haiwen/move-dir-merge ... add move folder merge api	2018-06-13 11:28:10 +08:00
lian	615f7a75b7	add move folder mergea api	2018-06-13 11:24:43 +08:00
Daniel Pan	c70b878359	Merge pull request #2155 from haiwen/update-seafile-editor ... update seafile editor	2018-06-11 11:36:34 +08:00
ilearnit	748670b1a2	update seafile editor	2018-06-11 11:28:27 +08:00
zhengxie	6151c80b93	[locale] Update translations	2018-06-09 16:29:18 +08:00
zhengxie	f8f96c3300	[locale] Update source files	2018-06-09 16:06:09 +08:00
zheng xie	a4ad95b5b2	Merge pull request #2154 from haiwen/fix-terms ... fix terms	2018-06-09 16:03:10 +08:00
ilearnit	116f6c45d8	fix terms	2018-06-09 15:58:55 +08:00
llj	7670caf660	[Terms] fixup	2018-06-09 15:48:33 +08:00
zhengxie	a2354fcc02	Update .gitignore	2018-06-09 13:39:30 +08:00
zhengxie	48d3a046a7	[locale] Update translations	2018-06-09 13:31:57 +08:00
zhengxie	fe44f629c9	[locale] Update source files	2018-06-09 11:29:21 +08:00
zhengxie	4680dc3272	Merge branch '6.3'	2018-06-09 11:27:29 +08:00
zheng xie	e98d7d2345	Merge pull request #2137 from haiwen/terms-and-conditions ... Add terms to web settings	2018-06-09 11:25:39 +08:00
ilearnit	3cc68f5b6d	Add terms to web settings	2018-06-09 11:17:04 +08:00
zheng xie	72750f1265	Merge pull request #2150 from haiwen/onlyoffice-save ... update onlyoffice callback func	2018-06-09 11:05:21 +08:00
lian	2b1e5b18e7	update onlyoffice callback func	2018-06-08 18:49:57 +08:00
lian	bed4bb9bd7	add batch copy/move item api	2018-06-06 16:49:58 +08:00
zheng xie	1c66f8823f	Merge pull request #2141 from haiwen/admin-restore-deleted-repo ... update admin restore deleted repo api	2018-06-06 15:06:04 +08:00
zheng xie	db75b1b310	Merge pull request #2132 from haiwen/repo-first-commit ... show repo's first commit's desc	2018-06-06 15:05:00 +08:00
ilearnit	172a7b9b7d	update test	2018-06-06 14:11:10 +08:00
zheng xie	eff13b64fb	Update .travis.yml	2018-06-06 13:43:55 +08:00
Daniel Pan	35f9408316	Merge pull request #2100 from haiwen/master-search ... search by time and size	2018-06-05 17:17:35 +08:00
zming	7b91da8553	search by time and size	2018-06-05 16:14:03 +08:00
zhengxie	de31389fe0	Merge branch '6.2' into 6.3	2018-06-05 13:39:20 +08:00
zhengxie	690866b607	Merge branch '6.3'	2018-06-05 13:36:57 +08:00
llj	25aa891bcd	[user info popup] removed dead 'quota doc' link	2018-06-05 11:08:52 +08:00
lian	4ebdbb8912	update admin restore deleted repo api ... check if repo exists in trash.	2018-06-04 18:01:14 +08:00
xiez	d7693834d3	Merge pull request #2065 from haiwen/cas ... Add cas login/logout	2018-06-04 14:07:49 +08:00
zhengxie	fd1b30d160	Add cas login/logout	2018-06-04 14:07:19 +08:00
Daniel Pan	a7a94ea1b9	Merge pull request #2130 from haiwen/search-virtual-repo ... search virtual repo	2018-06-04 12:08:20 +08:00
lian	35235a25b0	show repo's first commit's desc ... Created library	2018-06-04 11:12:51 +08:00
zming	af0d175c37	search virtual repo	2018-05-29 17:30:47 +08:00
llj	b7eca4de27	[view_file_wopi] improvement	2018-05-28 16:32:53 +08:00
Daniel Pan	65d959108e	Merge pull request #2127 from haiwen/collabora-fullscreen ... update view_file_wopi.html	2018-05-28 13:49:25 +08:00
lian	2f3126af8d	update view_file_wopi.html ... allow fullscreen presentation when view ppt(x) file via CollaboraOffice.	2018-05-26 10:38:38 +08:00
xiez	ce6dd0f797	Merge pull request #2126 from haiwen/seafile-editor-master-dist ... Seafile editor master dist	2018-05-25 16:25:09 +08:00
ilearnit	b01eb64a1f	seafile-editor-master-dist	2018-05-25 13:47:30 +08:00
zhengxie	4060f0cc77	Update CACHE setting	2018-05-24 11:38:15 +08:00
xiez	67ed4258b3	[syadmin] Update exception in listing users	2018-05-23 14:43:59 +08:00
xiez	d11b8a070d	Merge pull request #2125 from haiwen/download-info ... check if repo exist before check folder permission	2018-05-22 17:27:04 +08:00