11639 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
lian	1623a5cfdc	fix get user institution bug	2021-11-26 11:35:25 +08:00
Daniel Pan	c19bbf4779	Merge pull request #5039 from haiwen/web-setting ... remove ENABLE_USER_CREATE_ORG_REPO	2021-11-26 10:56:21 +08:00
Daniel Pan	08e52178e6	Merge pull request #5042 from haiwen/fix-MichaelAn-search-group-member-bug ... fix group member search init style	2021-11-26 10:35:44 +08:00
Michael An	f68ddd42a3	fix group member search init style	2021-11-26 10:10:06 +08:00
lian	fdd225ffa2	suport set login id when admin import users	2021-11-25 18:11:48 +08:00
lian	fece35af98	update test	2021-11-25 17:32:41 +08:00
Daniel Pan	93023630ae	Merge pull request #5040 from haiwen/folder-perm ... remove ENABLE_FOLDER_PERM	2021-11-25 16:24:57 +08:00
lian	127349b214	remove ENABLE_FOLDER_PERM	2021-11-25 15:20:32 +08:00
lian	8f1c13e68b	remove ENABLE_USER_CREATE_ORG_REPO	2021-11-25 15:08:50 +08:00
Daniel Pan	4a48ea3800	Merge pull request #5038 from haiwen/fix-manage-member-style ... fix manage member style	2021-11-25 12:14:15 +08:00
Michael An	442f91edc1	fix manage member style	2021-11-25 11:32:23 +08:00
Daniel Pan	980b2e8d05	Merge pull request #5037 from haiwen/share-link-password ... show share/upload link password	2021-11-23 13:59:52 +08:00
lian	c21a3e9bd7	hide/show stored password	2021-11-23 12:09:08 +08:00
Daniel Pan	4fe0dc4ddd	Merge pull request #5036 from haiwen/cad ... Cad	2021-11-23 11:56:54 +08:00
Daniel Pan	090adab6d2	Merge pull request #4995 from moschlar/site_description ... Add SITE_DESCRIPTION config variable	2021-11-23 11:49:58 +08:00
lian	ae03124860	update	2021-11-23 09:42:00 +08:00
lian	f3c4ec0f11	view cad file	2021-11-22 18:13:10 +08:00
lian	b95ea9be68	show share/upload link password	2021-11-19 10:53:08 +08:00
Daniel Pan	fa4bdcec3c	Merge pull request #5034 from haiwen/onlyoffice-co-editing-change-name ... can change name when anonymous user edit file	2021-11-17 13:51:59 +08:00
lian	dd01b9ad8d	Merge branch '8.0' into master	2021-11-17 13:41:09 +08:00
lian	82f1c9d2a0	can change name when anonymous user edit file	2021-11-16 14:55:41 +08:00
Daniel Pan	8c3ace469b	Merge pull request #5033 from haiwen/onlyoffice ... update onlyoffice	2021-11-15 17:28:53 +08:00
lian	d0559b50ab	update onlyoffice	2021-11-15 15:06:42 +08:00
Daniel Pan	1b71b21426	Merge pull request #5031 from haiwen/admin-group-lib ... update admin group libs api	2021-11-12 17:21:27 +08:00
Daniel Pan	4bbf5238f1	Merge pull request #5029 from haiwen/onlyoffice-co-editing-lock ... enable co-editing for share link with can_edit permission	2021-11-12 11:18:28 +08:00
lian	9fc84d4e1e	enable co-editing for share link with can_edit permission	2021-11-11 17:16:15 +08:00
王健辉	0f6f55d34e	Merge branch '8.0'	2021-11-09 11:06:56 +08:00
Daniel Pan	0fdd596e73	Merge pull request #5021 from haiwen/onlyoffice-dockey ... update onlyoffice callback view	2021-11-08 16:10:30 +08:00
lian	7001a87fb8	update	2021-11-08 15:41:09 +08:00
lian	6f2350c196	update	2021-11-08 14:50:18 +08:00
王健辉	adc2b4edf8	fix dist (#5024)	2021-11-08 11:15:14 +08:00
王健辉	10c3e63c70	Merge branch '8.0'	2021-11-08 11:04:17 +08:00
Daniel Pan	4a2d3ff3a1	Merge pull request #5023 from haiwen/update-8.0-translation ... update 8.0 translation	2021-11-06 12:24:41 +08:00
Daniel Pan	7804183437	Merge pull request #5022 from haiwen/update-translation ... update translation	2021-11-06 12:24:22 +08:00
王健辉	a2fec36d77	update 8.0 translation	2021-11-06 12:16:00 +08:00
王健辉	ba9ac69c9d	update translation	2021-11-06 11:29:58 +08:00
Daniel Pan	f7c4f83fe2	Merge pull request #5020 from haiwen/random-password ... update utils.js	2021-11-05 17:46:44 +08:00
lian	d40082f675	update onlyoffice callback view ... check doc key first	2021-11-05 16:20:06 +08:00
lian	b6ef872f50	update utils.js ... generate random password	2021-11-03 16:11:56 +08:00
王健辉	2db67a06fa	fix dist error (#5019)	2021-11-03 14:56:11 +08:00
Daniel Pan	167b55c845	Merge pull request #5018 from haiwen/update-8.0-translation ... update translation	2021-11-02 17:39:06 +08:00
王健辉	cb4621b912	update translation	2021-11-02 16:53:50 +08:00
Daniel Pan	ecd26cb0ba	Merge pull request #5017 from haiwen/update-translation ... update translation	2021-11-02 16:20:15 +08:00
王健辉	cc8dcca704	update translation	2021-11-02 16:08:24 +08:00
Daniel Pan	3a3a493198	Merge pull request #5016 from haiwen/fix-docker-license ... fix docker license	2021-11-02 12:20:18 +08:00
llj	9cd52bb245	Merge branch '8.0' ... Conflicts: frontend/package.json frontend/src/components/dialog/manage-members-dialog.js frontend/src/css/manage-members-dialog.css frontend/src/utils/utils.js	2021-11-02 11:41:41 +08:00
skywalker	baa8127967	fix docker license	2021-11-02 11:08:06 +08:00
Daniel Pan	4515b470c3	Merge pull request #5015 from haiwen/jwt-sso ... add jwt sso	2021-11-01 11:54:48 +08:00
Daniel Pan	104008c1b1	Merge pull request #5013 from haiwen/update-seafile-js ... update seafile-js version	2021-10-29 10:58:41 +08:00
shanshuirenjia	ac70e24687	update seafile-js version	2021-10-29 10:53:19 +08:00