6210 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zhengxie	a0cded89ee	Activate inactive user on first login	2017-10-12 14:04:48 +08:00
Daniel Pan	a2907b5fca	Merge pull request #1827 from haiwen/new-office-file ... update create file api	2017-09-26 04:33:13 -05:00
Daniel Pan	2e971707a3	Merge pull request #1845 from haiwen/wopi ... update format string	2017-09-26 04:22:41 -05:00
lian	089eeaaf5a	update format string	2017-09-26 17:17:19 +08:00
lian	41685724f8	update create file api ... use `new_file_path` when create office file from offie template	2017-09-19 16:27:40 +08:00
zming	cd516a889c	update test,del share_to_all_group config,del modify name	2017-09-19 11:02:37 +08:00
zming	15d5f354f7	serach-repo	2017-09-19 10:47:49 +08:00
Daniel Pan	af74f4d132	Merge pull request #1816 from haiwen/search-file ... add `with_permission` parameter when search file	2017-09-13 16:48:29 +08:00
lian	c5f493f8b9	add with_permission parameter when search file	2017-09-13 16:46:01 +08:00
Daniel Pan	cd447abaa4	Merge pull request #1810 from haiwen/search-file ... add `permission` to file search result	2017-09-13 16:03:12 +08:00
Daniel Pan	1c7b4a642a	Merge pull request #1814 from haiwen/upload-bytes ... add `Accept-Ranges: bytes` to response header if ENABLE_RESUMABLE_FIL…	2017-09-13 16:01:45 +08:00
lian	c171ed9374	add Accept-Ranges: bytes to response header if ENABLE_RESUMABLE_FILEUPLOAD	2017-09-13 14:34:29 +08:00
lian	b8a3a12a81	add permission to file search result	2017-09-12 16:15:37 +08:00
zhengxie	ba714ea1f5	Remove force server crypto	2017-09-12 13:58:24 +08:00
xiez	3968201731	Merge pull request #1806 from haiwen/email-regex ... update Regular Expression of email in admin user url	2017-09-12 10:39:19 +08:00
lian	222ffc8121	update test of user permission	2017-09-11 14:48:14 +08:00
lian	f19389b9f7	update Regular Expression of email in admin user url	2017-09-11 14:34:07 +08:00
zhengxie	6d48dee854	[settings] Update logging rotating	2017-09-05 16:21:20 +08:00
zming	4a9b657680	[two-factor-auth]modify variable name	2017-09-04 18:17:13 +08:00
xiez	e851d031af	Merge pull request #1785 from haiwen/custom-logo ... use custom logo when send email	2017-09-01 18:11:16 +08:00
Daniel Pan	ecc79fb9c2	Merge pull request #1786 from haiwen/history-setting-trans ... update trans string of libary history settings	2017-09-01 06:19:07 +08:00
lian	cbf0b09ce0	update trans string of libary history settings	2017-08-31 14:58:20 +08:00
lian	6ebbce5b76	use custom logo when send email	2017-08-31 14:43:25 +08:00
xiez	c1a5998f40	Merge pull request #1783 from haiwen/client_platform ... update auth token platform field check	2017-08-29 17:29:26 +08:00
lian	93d7b6e77c	update auth token platform field check	2017-08-29 17:24:29 +08:00
xiez	bc609e89f7	Merge pull request #1765 from haiwen/admin-user-api ... add admin user api	2017-08-28 16:09:30 +08:00
lian	2f3c7736f6	use 400 http code when user exists	2017-08-28 16:07:08 +08:00
lian	1266e1b237	add admin users api	2017-08-28 14:52:28 +08:00
Daniel Pan	4110908f6a	Merge pull request #1782 from haiwen/org-search-user ... use ccnet_api.get_org_users_by_url_prefix()	2017-08-28 14:33:13 +08:00
lian	1b243cf4e7	use ccnet_api.get_org_users_by_url_prefix()	2017-08-28 14:17:20 +08:00
Daniel Pan	252fbc3261	Merge pull request #1780 from haiwen/search-user ... update search user in org mode	2017-08-26 10:46:02 +08:00
lian	1bb1ef8033	update search user in org mode	2017-08-25 15:32:35 +08:00
Daniel Pan	63c2944390	Merge pull request #1776 from haiwen/api_return_lock_owner_name ... api: include lock_owner_name if a file is locked	2017-08-19 01:12:26 +08:00
Shuai Lin	705e010be4	api: include lock_owner_name if a file is locked	2017-08-18 19:13:33 +08:00
xiez	5cf93f2b5a	Merge pull request #1772 from haiwen/travis-to-slack ... [notification] send travis message to slack	2017-08-17 12:09:57 +08:00
zming	23ad613ed8	[notification] send travis message to slack	2017-08-17 12:02:26 +08:00
Daniel Pan	46e206be74	Merge pull request #1764 from haiwen/check-name ... check if name is valid when create folder/file	2017-08-16 16:22:01 +08:00
Daniel Pan	1bac6302cd	Merge pull request #1760 from haiwen/check-quota ... return 443 http code when above quota	2017-08-16 15:37:35 +08:00
lian	9d9beb3f1e	check if name is valid when create folder/file	2017-08-15 17:26:44 +08:00
lian	b46b0f33cf	return 443 http code when above quota	2017-08-15 16:22:56 +08:00
xiez	30e0375e63	Merge pull request #1761 from haiwen/resotre-test ... restore-library test	2017-08-15 16:01:34 +08:00
zming	897eced17f	restore-library test	2017-08-15 11:43:05 +08:00
lian	fa2141e81c	[locale] Update source files	2017-08-14 16:35:14 +08:00
Daniel Pan	d99e7b6270	Merge pull request #1738 from haiwen/restore-repo ... permission check, check whether repo is exists	2017-08-14 15:09:25 +08:00
zming	1be9c34071	error msg: repo -> library	2017-08-14 14:44:05 +08:00
zming	f2b2ec3c43	delete redundant code	2017-08-14 14:36:12 +08:00
Daniel Pan	c23b6de1a9	Merge pull request #1747 from haiwen/export-users ... python manage.py export_users	2017-08-14 10:00:12 +08:00
zming	9766983ae0	check permission	2017-08-10 15:47:43 +08:00
lian	a494c7b8a2	python manage.py export_users ... export users to '../users.xlsx' via `./export-users.sh`	2017-08-10 15:03:51 +08:00
lian	0e94eafe85	update trans string of institution	2017-08-09 15:13:34 +08:00