6150 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiez	0de932bec9	Merge pull request #1703 from haiwen/two-factor-auth ... Two factor auth	2017-07-15 13:48:33 +08:00
zming	c0f512aca6	update test	2017-07-15 12:24:52 +08:00
Daniel Pan	ae207a7f85	Merge pull request #1702 from haiwen/file-view-btns-fix ... [file view] op btns: fixed UI	2017-07-15 11:45:00 +08:00
llj	dc27044a63	[file view] op btns: fixed UI	2017-07-15 11:35:02 +08:00
llj	49121c900c	Merge pull request #1701 from haiwen/notification-interval ... update notification interval	2017-07-15 11:12:43 +08:00
lian	3dc584ea97	update notification interval ... set 3 * 60 as the default interval for the js value.	2017-07-15 11:05:58 +08:00
Daniel Pan	49b1c43be5	Merge pull request #1700 from haiwen/image-rotate-expand ... update thumbnail	2017-07-14 18:05:27 +08:00
lian	89d569af27	update thumbnail ... add `expand` parameter when rotate a image 90 degrees	2017-07-14 17:53:16 +08:00
llj	9efb26eca8	[system admin] user info: added 'disable two-factor auth' & bug fix	2017-07-14 16:57:01 +08:00
zhengxie	1bcef1e7fb	[role perm] Use default role if not set in settings	2017-07-14 16:52:35 +08:00
Daniel Pan	c316f0e144	Merge pull request #1697 from haiwen/for-ie ... [base.html] modification for IE	2017-07-13 17:30:36 +08:00
llj	6cfd0e2933	[base.html] modification for IE	2017-07-13 17:25:57 +08:00
zming	f51d8122e9	rm expire invitations	2017-07-13 15:41:30 +08:00
zming	c2873b9112	two-factor-auth	2017-07-13 10:55:10 +08:00
Daniel Pan	14448f06f8	Merge pull request #1694 from haiwen/user-traffic-tip ... [system admin] traffic: modified the tip	2017-07-13 10:41:02 +08:00
llj	f22ba4cee5	[system admin] traffic: modified the tip	2017-07-13 10:30:45 +08:00
llj	a070329833	Don't use 'big' thumbnail for gif files	2017-07-12 16:35:09 +08:00
Daniel Pan	4b29e30730	Merge pull request #1692 from haiwen/user-traffic-tip ... [system admin] traffic: add tip	2017-07-12 11:38:28 +08:00
llj	a243baae58	[system admin] traffic: add tip	2017-07-12 11:29:20 +08:00
unknown	5b55a532d0	see all roles on adduser dialog	2017-07-10 23:49:22 +02:00
TMHBOFH	b8d4fdda88	Merge pull request #1 from haiwen/6.1 ... 6.1	2017-07-10 16:29:10 +02:00
xiez	717cda7793	Merge pull request #1684 from haiwen/admin-share-link ... add `size` when admin get file share link info	2017-07-10 14:35:57 +08:00
xiez	13e70f9eea	Merge pull request #1679 from haiwen/user-notifications ... User notifications	2017-07-10 14:33:12 +08:00
lian	bf5af10952	use normalize_cache_key	2017-07-10 11:33:04 +08:00
lian	a77ab79e91	add size when admin get file share link info	2017-07-10 11:22:39 +08:00
Daniel Pan	66f8451011	Merge pull request #1680 from haiwen/onlyoffice ... use user language as lang setting for onlyoffice	2017-07-07 11:30:43 +08:00
lian	8e52d06cb7	use user language as lang setting for onlyoffice	2017-07-07 11:23:36 +08:00
lian	96e2340a81	update user notifications ... 1. use cache to store user unseen notifications count 1. add UNREAD_NOTIFICATIONS_REQUEST_INTERVAL	2017-07-07 11:05:53 +08:00
zhengxie	94b7d8f9d5	[locale] Update source files	2017-07-05 15:35:44 +08:00
xiez	60be1ae43b	Merge pull request #1678 from haiwen/deleted-repos ... [deleted libs] modification	2017-07-05 15:34:22 +08:00
llj	bf5e7660e5	[deleted libs] modification	2017-07-05 15:28:20 +08:00
zhengxie	d029fe13bc	[profile] Update cache timeout	2017-07-05 15:18:42 +08:00
zhengxie	18a4083ee8	[locale] Update po files	2017-07-05 14:37:43 +08:00
zhengxie	8b106031e4	[locale] Update source files	2017-07-05 14:19:14 +08:00
lian	75eb8eb7d4	Merge pull request #1592 from haiwen/dirent-details ... [dir view] added 'details' for dirent	2017-07-05 13:41:59 +08:00
llj	3905f7b3ef	[dirent details] improvement	2017-07-05 12:17:11 +08:00
llj	5d48dac96c	[dirent details] improvement; show more info for folders	2017-07-04 17:49:36 +08:00
xiez	6eaca1b7e3	Merge pull request #1677 from haiwen/file-dir-count ... add dir detail api	2017-07-04 16:38:29 +08:00
llj	76d58cb025	[dir view] added 'details' for dirent	2017-07-04 14:28:40 +08:00
lian	3e81a5b8a8	add dir detail api	2017-07-04 14:07:26 +08:00
llj	0015a9a6c8	[system admin] enable user to upload a license file	2017-07-04 10:39:11 +08:00
xiez	4c5ca6292d	Merge pull request #1669 from haiwen/fix ... fixed UI bugs for mv/del selected dirents; modified 'avatar'	2017-07-03 15:00:18 +08:00
xiez	1c08c67d24	Merge pull request #1672 from haiwen/system-lib ... add admin system library upload api	2017-07-03 14:55:45 +08:00
lian	46a5473326	add amdin system library upload api	2017-07-03 14:42:12 +08:00
xiez	0100d6da8b	Merge pull request #1675 from haiwen/multi-copy-move ... update multi copy/move dirents api	2017-07-03 13:12:51 +08:00
lian	0f32bf26fe	update multi copy/move dirents api	2017-07-03 12:24:07 +08:00
lian	101a2015ba	rm system lib check when get user folder permission	2017-07-03 11:32:51 +08:00
zhengxie	da4918d7a9	[tests] Update phantomjs installation	2017-07-03 11:22:59 +08:00
zhengxie	d36be41630	Update travis	2017-07-03 10:52:56 +08:00
Daniel Pan	696a2e667d	Merge pull request #1655 from haiwen/deleted-repos ... Deleted repos	2017-07-01 12:04:11 +08:00