5724 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Pan	08c6cc69ce	Merge pull request #1477 from haiwen/dirent-download-api ... rm unused dirent download api	2017-02-10 18:19:28 +08:00
lian	edf0707d5b	add exception check when get user joined groups	2017-02-10 18:15:58 +08:00
lian	f5ac28a38c	rm unused dirent download api	2017-02-10 18:04:56 +08:00
Daniel Pan	4baaa29d17	Merge pull request #1467 from haiwen/ldap ... Update LDAP checking	2017-02-10 14:26:04 +08:00
xiez	6fd822f45f	Merge pull request #1457 from haiwen/admin-group ... udpate admin groups page	2017-02-09 18:11:09 +08:00
xiez	94dc6e3488	Merge pull request #1474 from haiwen/update-import-user ... update admin import user	2017-02-09 18:04:40 +08:00
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
llj	51fae749a5	Merge pull request #1336 from haiwen/rm-ajax ... Rm ajax	2017-02-07 17:01:11 +08:00
lian	7c1c1e2977	update rm ajax	2017-02-07 16:03:46 +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
llj	0d3d7dfd96	Merge pull request #1463 from haiwen/remote-wipe ... add remote wipe option when admin unlink device	2017-01-20 13:54:12 +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
lian	9848514e7d	update test	2017-01-19 14:40:49 +08:00
lian	7a8eb038e2	update get file uploaded bytes	2017-01-19 14:40:49 +08:00
lian	06bc49d17b	rm ajax get file op url	2017-01-19 14:40:49 +08:00
lian	6d577d83e3	rm repo change password	2017-01-19 14:40:49 +08:00
lian	a862fad836	rm set repo user/group perm	2017-01-19 14:40:49 +08:00
lian	18c60fd306	update cp/mv file/dir	2017-01-19 14:40:49 +08:00
lian	cb837d5112	rm ajax toggle_group_modules	2017-01-19 14:40:49 +08:00
lian	734263b76e	update cancel_cp	2017-01-19 14:40:49 +08:00
lian	4a120b5aa5	update cp_progress	2017-01-19 14:40:49 +08:00
lian	23dd6c57de	rm unused code in ajax.py & sysadmin.py	2017-01-19 14:40:49 +08:00
lian	d05f72b7a0	update user personal wiki module	2017-01-19 14:40:49 +08:00
lian	7472c03bec	rm user message related code	2017-01-19 14:40:49 +08:00
lian	312500c55e	rm get_my_unenc_repos	2017-01-19 14:40:49 +08:00
lian	86f948aaa8	update set_notice_seen_by_id	2017-01-19 14:40:49 +08:00
lian	5a700d5f00	update set_notices_seen	2017-01-19 14:40:49 +08:00
lian	996c67fdb7	rm get_user_contacts	2017-01-19 14:40:49 +08:00
lian	8d62d3786e	update get unseen notifications count	2017-01-19 14:40:49 +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
lian	f13b61e497	add remote wipe option when admin unlink device	2017-01-17 13:30:25 +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
Daniel Pan	b4599bf6b0	Merge pull request #1460 from haiwen/device-version ... add device/version info in repo history page	2017-01-16 17:29:32 +08:00
lian	82c5dc21c6	add device/version info in repo history page	2017-01-16 17:28:41 +08:00