5646 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
lian	b0f2ddab00	update	2017-02-09 18:01:04 +08:00
lian	5743c3879e	update admin import user from csv file	2017-02-09 17:58:04 +08:00
Daniel Pan	ee4c58955d	Merge pull request #1476 from haiwen/magnificPopup-fix ... [dir view] bugfix for img view with magnificPopup	2017-02-09 16:49:58 +08:00
llj	f85d9e8e67	[dir view] bugfix for img view with magnificPopup	2017-02-09 16:00:36 +08:00
lian	718bdbb59b	update admin manage group page	2017-02-09 14:59:49 +08:00
llj	9fc46aa7d4	[ODF] modified file view for ODF; fix bugs	2017-02-08 17:34:31 +08:00
lian	8a61fbf81a	Merge pull request #1465 from haiwen/admin-del-repo ... [sysadmin] single user page: delete 'owned' library with ajax	2017-02-08 14:52:43 +08:00
xiez	2265dbf08f	Merge pull request #1473 from haiwen/inactive ... show detailed error msg when user login failed	2017-02-08 11:24:18 +08:00
lian	768d93c724	show detailed error msg when inactive user login	2017-02-08 10:49:06 +08:00
xiez	e14d14f52f	Merge pull request #1471 from haiwen/import-user ... force change password after batch add user	2017-02-07 18:15:33 +08:00
lian	287257dd7c	force change password after batch add user	2017-02-07 17:45:36 +08:00
lian	bd054efe7f	Merge pull request #1464 from haiwen/search-group ... admin search group by name	2017-02-06 10:29:59 +08:00
zhengxie	b01034e6bb	Update LDAP checking	2017-01-20 16:07:53 +08:00
lian	2bf6a89b30	Merge pull request #1466 from haiwen/trash-ajax ... [trash] use ajax to fetch the first batch of trash items	2017-01-20 10:08:36 +08:00
lian	d43a2e5eb3	admin search group by name	2017-01-19 18:21:04 +08:00
llj	6346dc5ec0	[trash] use ajax to fetch the first batch of trash item	2017-01-19 18:06:34 +08:00
llj	72af4885f7	[sysadmin] single user page: delete 'owned' library with ajax	2017-01-18 11:17:52 +08:00
zhengxie	622fe2705e	Fix reset email message	2017-01-17 16:08:03 +08:00
xiez	e9067789c9	Merge pull request #1462 from haiwen/shib ... [shib] Add affiliation role map	2017-01-17 13:30:39 +08:00
zhengxie	1832b2b0c0	[shib] Add affiliation role map	2017-01-17 13:24:08 +08:00
zhengxie	19beb9a7c8	[tests] Fix user reset	2017-01-17 12:01:03 +08:00
zhengxie	df70fd1b5e	Use contact email in password resetting	2017-01-16 15:46:00 +08:00
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