6088 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
llj	c6e8b64492	[system admin] libraries: added 'history setting'	2017-08-11 17:51:11 +08:00
zming	466ef48116	[api] admin library history limit	2017-08-01 10:17:38 +08:00
xiez	534a56ce15	Merge pull request #1733 from haiwen/master-revision-tag ... update revision tag	2017-07-31 11:10:45 +08:00
zming	2164b717f6	[API2] RevisionTag	2017-07-31 10:54:46 +08:00
phillym	7486513f95	Minor language changes in web interface (#1706) ... * Made English sound better to a native speaker. * Made English sound better to a native speaker. Another minor grammatical change.	2017-07-26 15:09:47 +08:00
Daniel Pan	82adc738c5	Merge pull request #1676 from haiwen/revision-tag ... Revision tag	2017-07-21 18:14:11 +08:00
zming	d28e597921	[API2] ReversionTag	2017-07-21 12:30:55 +08:00
Daniel Pan	8a853b3061	Merge pull request #1670 from haiwen/file-tag ... file tag	2017-07-16 16:16:49 +08:00
Daniel Pan	80e483c5c0	Merge pull request #1666 from haiwen/new-login ... [UI] new login	2017-07-16 16:13:35 +08:00
llj	0cd68a9a64	[login] modified UI	2017-07-15 14:16:21 +08:00
xiez	d6b76037d2	Merge pull request #1696 from haiwen/thirdpart ... [captcha] fixed size	2017-07-13 14:32:54 +08:00
zming	6cb50b9c0c	[captcha] fixed size	2017-07-13 14:31:46 +08:00
llj	8be017e917	[dirent details] add 'tags'	2017-07-12 10:47:52 +08:00
zming	b8a4a12880	file tag	2017-07-11 17:45:39 +08:00
zhengxie	f55d23b095	Merge branch '6.1'	2017-07-06 10:47:39 +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
zhengxie	bb8f04993d	Merge branch '6.1' ... Conflicts: seahub/api2/views.py	2017-06-30 14:27:07 +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
llj	60ce1a6bd8	[UI] new login	2017-06-29 17:24:46 +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