5674 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiez	e04005770e	Merge pull request #1458 from haiwen/folder-perm ... update remove folder permission	2017-01-16 15:09:53 +08:00
lian	2ecae4162b	update remove folder permission ... not check path existence when delete user/group folder permission	2017-01-13 16:54:38 +08:00
xiez	6d04da2b0d	Merge pull request #1455 from haiwen/adfs ... Add ADFS auth	2017-01-12 14:49:50 +08:00
zhengxie	4ec3aaeafb	Add ADFS auth	2017-01-12 14:47:21 +08:00
zhengxie	d09fec3eab	[invitation] Fix email subject translation	2017-01-11 16:54:37 +08:00
zhengxie	6bf9609ded	Update time zone to UTC	2017-01-11 13:57:55 +08:00
xiez	de7c5801b7	Merge pull request #1453 from haiwen/transfer-repo ... can not transfer repo to user who can not add library	2017-01-11 13:55:07 +08:00
lian	2620002898	update perm check when transfer repo	2017-01-11 13:52:57 +08:00
xiez	76931c3268	Merge pull request #1454 from haiwen/share-link ... [api2] update perm check when generate share/upload link	2017-01-11 13:18:36 +08:00
lian	9c0e37bf18	[api2] update perm check when generate share/upload link	2017-01-11 11:26:19 +08:00
zhengxie	3461d6773d	[i18n] Update translations	2017-01-10 13:50:38 +08:00
xiez	983bda13a2	Merge pull request #1452 from haiwen/delete-user ... rm shared in repo when delete an user	2017-01-10 11:25:33 +08:00
lian	720bf570cb	rm shared in repo when delete an user	2017-01-09 18:08:39 +08:00
zhengxie	fc680148e5	[locale] Update source	2017-01-09 11:15:44 +08:00
xiez	82f1e96e7c	Merge pull request #1450 from haiwen/update-trans ... update trans	2017-01-09 11:08:26 +08:00
lian	e395fcbfc6	update trans	2017-01-09 10:26:44 +08:00
llj	38226256cd	Merge pull request #1444 from haiwen/download-dir ... update zip download dir	2017-01-07 17:58:38 +08:00
llj	fd4df3792c	[dir view] modification	2017-01-07 17:55:16 +08:00
zhengxie	ca3b957be0	[locale] Update source	2017-01-07 17:12:48 +08:00
xiez	9c4ccd20c0	Merge pull request #1448 from haiwen/note ... update account api	2017-01-07 17:11:38 +08:00
lian	53d09bae5e	update account api ... remove 'note' releated operation	2017-01-07 17:00:16 +08:00
zhengxie	d89f2cdbf4	[locale] Update source	2017-01-07 16:25:50 +08:00
xiez	a359681859	Merge pull request #1447 from haiwen/quota ... update tip/error_msg when admin set user quota	2017-01-07 16:19:46 +08:00
lian	7cea8a8f57	update tip/error_msg when admin set user quota	2017-01-07 16:03:59 +08:00
lian	e274d2c2e1	Merge pull request #1445 from haiwen/mvcp-fix ... [dir view] mv/cp multi: fix	2017-01-07 15:45:52 +08:00
xiez	8dc1fc132f	Merge pull request #1446 from haiwen/check_quota ... update quota check when copy/move file/dir	2017-01-07 15:43:09 +08:00
lian	532a16ad0b	update quota check when copy/move file/dir	2017-01-07 15:34:48 +08:00
llj	6c65d06b3e	[dir view] mv/cp multi: fix	2017-01-07 15:06:49 +08:00
lian	77fa8c0c7a	update zip download dir	2017-01-07 14:18:57 +08:00
xiez	3c3278a644	Merge pull request #1443 from haiwen/trans ... update translate string	2017-01-07 11:03:49 +08:00
lian	17b3e52868	update translate string ... Name should not include '/'.	2017-01-07 11:01:11 +08:00
Daniel Pan	1d21776299	Merge pull request #1442 from haiwen/statistics ... update sysadmin page	2017-01-07 10:28:19 +08:00
lian	38a06be960	update sysinfo page	2017-01-07 10:12:17 +08:00
Daniel Pan	19b79de5ce	Merge pull request #1441 from haiwen/admin-set-quota ... format size when admin set user quota	2017-01-07 10:07:43 +08:00
lian	072defd547	format size when admin set user quota	2017-01-06 18:50:14 +08:00
xiez	9a9b6eb9e1	Merge pull request #1429 from haiwen/useradmin ... Useradmin	2017-01-06 14:01:59 +08:00
lian	9e97a425ab	use "user" object when get account info	2017-01-06 11:25:19 +08:00
llj	7f77d7170c	[sysadmin] userinfo: fix	2017-01-05 16:14:32 +08:00
lian	625db696af	use api to set user quota/profile	2017-01-05 13:33:12 +08:00
xiez	ce2c67bd83	Merge pull request #1439 from haiwen/quota ... check quota when copy/move file/dir	2017-01-04 12:04:52 +08:00
lian	c7e1fc02d8	check quota when copy/move file/dir	2017-01-04 11:05:16 +08:00
llj	49349c265a	[sys useradmin] added 'set quota' for 'LDAP(imported)'; modified UI for 'LDAP'	2016-12-26 14:55:13 +08:00
Daniel Pan	65325da7de	Merge pull request #1434 from haiwen/fix/group_wiki ... Fix group wiki for system admin	2016-12-26 14:38:21 +08:00
zhengxie	b92a370658	Fix group wiki for system admin	2016-12-26 14:18:29 +08:00
Daniel Pan	c28f684c22	Merge pull request #1428 from haiwen/enhancement/invitation ... [invitation] Check duplicated accepter and add blocklist for accepter	2016-12-26 12:02:57 +08:00
zhengxie	11fdfe7299	[invitation] Check duplicated accepter and add blocklist for accepter	2016-12-26 11:49:45 +08:00
Daniel Pan	3b9c5dcb54	Merge pull request #1410 from haiwen/admin-create-group ... admin create group	2016-12-23 15:49:22 +08:00
Daniel Pan	93773f8f2f	Merge pull request #1430 from haiwen/fileupload-fix ... [fileupload] ui fix	2016-12-23 12:11:35 +08:00
llj	eb82d1a5f9	[fileupload] ui fix	2016-12-23 11:58:03 +08:00
llj	1785171a14	[sysadmin] groups: modification	2016-12-22 19:15:21 +08:00