6075 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zming	c0f512aca6	update test	2017-07-15 12:24:52 +08:00
llj	9efb26eca8	[system admin] user info: added 'disable two-factor auth' & bug fix	2017-07-14 16:57:01 +08:00
zming	c2873b9112	two-factor-auth	2017-07-13 10:55:10 +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
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
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
llj	c9292a2e9e	[deleted libs] modification	2017-07-01 12:00:17 +08:00
llj	2df50901f8	modified avatar	2017-06-30 18:30:10 +08:00
llj	735faec773	[deleted libs] list deleted libraries, and enable user to restore a library	2017-06-30 16:31:08 +08:00
zming	734766391a	[api2] get deleted-repos,and restore deleted-repos	2017-06-30 16:22:29 +08:00
xiez	aab90d8ab9	Merge pull request #1671 from haiwen/dirent-op-fix ... [dir view] fix for 'dirent share/del'	2017-06-30 15:50:02 +08:00
xiez	5fa44a771e	Merge pull request #1664 from TMHBOFH/ONLYOFFICE_EDIT_FILE_EXTENSION ... Onlyoffice edit file extension	2017-06-30 15:00:12 +08:00
llj	ce749810e4	[dir view] fix for 'dirent share/del'	2017-06-30 14:33:10 +08:00
llj	a4d5736c68	fixed UI bugs for mv/del selected dirents; modified 'avatar'	2017-06-30 13:39:30 +08:00
Daniel Pan	149a591528	Merge pull request #1668 from haiwen/admin-upload-link ... admin upload links	2017-06-30 13:09:01 +08:00
lian	d4716acf11	admin upload links ... fix bug: use upload token	2017-06-30 11:41:22 +08:00
Daniel Pan	b2cc92da36	Merge pull request #1665 from haiwen/lib-details ... [repo details] improvement	2017-06-28 11:42:13 +08:00
llj	aa6416d30d	[repo details] improvement	2017-06-28 11:37:52 +08:00
TMHBOFH	6184c2631f	Update file.py	2017-06-27 13:43:29 +02:00
TMHBOFH	b6307540c7	Update settings.py	2017-06-27 13:40:38 +02:00
TMHBOFH	e383fbdf33	Merge pull request #2 from haiwen/6.1 ... 6.1	2017-06-27 13:37:33 +02:00
llj	1ce4c18f9c	Merge pull request #1660 from haiwen/lib-details ... [my libraries] added 'repo details'	2017-06-27 19:01:26 +08:00
llj	88c79b4894	[repo details] added 'file count'	2017-06-27 18:58:08 +08:00
llj	067a17b106	[my libraries] added 'repo details'	2017-06-27 18:35:24 +08:00
xiez	1ef77ef036	Merge pull request #1661 from haiwen/normalize_path ... normalize file/dir path	2017-06-27 18:08:10 +08:00
xiez	2269e8ed2c	Merge pull request #1662 from haiwen/repo-info ... add `file_count` info	2017-06-27 18:06:13 +08:00
lian	070f68e3e4	add get repo info api for v2.1	2017-06-27 17:23:10 +08:00
lian	2e5d8bc1ed	update get repo info api ... add `file_count` and rm `desc`	2017-06-27 16:32:19 +08:00
lian	68c5e764d6	normalize file/dir path ... 1. Add '/' at the end of directory path if necessary. 1. And make sure path starts with '/'	2017-06-27 11:34:09 +08:00
zhengxie	25561d7e99	[invitation] Enable sysadmin to remove invitations	2017-06-26 17:11:38 +08:00