haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-08 18:30:53 +00:00
Code Issues Releases Wiki Activity
11,715 Commits 143 Branches 460 Tags
ae52fbe26101f28d9d13a543b62adfebe918e56c
Commit Graph

11715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lian
866e84e692 Merge branch '7.1' into 8.0 2021-04-19 10:55:50 +08:00
Daniel Pan
8b2106e8c2 Merge pull request #4875 from haiwen/repair-share-dir-upload-bug 
repair share dir upload bug
 2021-04-17 12:14:46 +08:00
shanshuirenjia
93e0cc5857 repair share dir upload bug 2021-04-17 12:08:10 +08:00
Daniel Pan
58038e275f Merge pull request #4871 from haiwen/admin-search-user 
remove duplicated email when admin search user
 2021-04-16 10:52:54 +08:00
lian
47fa10d8bc remove duplicated email when admin search user 2021-04-15 13:44:02 +08:00
Daniel Pan
5ef46b500a Merge pull request #4870 from haiwen/repair-notification-xss-bug 
repair notification xss bug
 2021-04-14 21:03:09 +08:00
shanshuirenjia
187d565682 repair notification xss bug 2021-04-14 16:31:48 +08:00
Daniel Pan
e5873b25e2 Merge pull request #4868 from haiwen/default-send-collaborate-email 
Default send collaborate email
 2021-04-12 15:12:57 +08:00
AlexCXC
0c4d3ea5c0 update query users methods 2021-04-12 14:53:08 +08:00
Daniel Pan
2805f05e8a Merge pull request #4863 from haiwen/update-import-deparement 
Update import deparement
 2021-04-12 14:49:18 +08:00
AlexCXC
46baf3bdfb dont unset collaborate when interval is 0 2021-04-12 12:21:01 +08:00
AlexCXC
5bb7821dbe default end collaborate email 2021-04-12 12:17:13 +08:00
Daniel Pan
024af25593 Merge pull request #4866 from haiwen/markdown-content 
return markdown content to web page
 2021-04-10 14:02:30 +08:00
Daniel Pan
16bb3b005a Merge pull request #4865 from haiwen/django-timezone 
fix bug when config USE_TZ and TIME_ZONE
 2021-04-10 13:51:07 +08:00
Markus Richter
30914eff0c Fix for python 3.9 
This replaces a removed method (see https://docs.python.org/3.9/whatsnew/3.9.html#removed-in-python-39 and https://docs.python.org/3.8/library/xml.etree.elementtree.html#xml.etree.ElementTree.Element.getiterator) with its successor which should be a drop-in replacement (judging from the docs)
 2021-04-09 16:02:50 +02:00
lian
c0a756082b return markdown content to web page 2021-04-09 16:21:33 +08:00
lian
7b98838fc1 fix bug when config USE_TZ and TIME_ZONE 2021-04-09 13:42:00 +08:00
skywalker
14ce83c518 rm outer_parent_id 2021-04-08 12:00:15 +08:00
skywalker
04515c829e rename 2021-04-08 10:37:32 +08:00
skywalker
cab973eb2b sync_departments_to_db 2021-04-07 17:07:01 +08:00
skywalker
1ab06f85db BigIntegerField 2021-04-07 16:39:36 +08:00
skywalker
7e3067643c external_department 2021-04-07 11:27:23 +08:00
skywalker
fe4a0838b8 ding ding inport 2021-04-07 11:26:40 +08:00
skywalker
2a1665a6a2 work weixin import 2021-04-07 11:21:25 +08:00
skywalker
100da7240f ExternalDepartment 2021-04-07 10:51:06 +08:00
skywalker
757e6d5777 sorted department_list 2021-04-06 15:50:46 +08:00
Daniel Pan
ad8da25133 Merge pull request #4862 from haiwen/8.0 
8.0
 2021-04-02 21:17:28 +08:00
songjiaqi1
973c9a978f fix seahub button style (#4861) 2021-04-02 18:23:49 +08:00
llj
0f490fd85a [system admin] department: fixed the 'op dropdown menu' for sub-department (#4860) 2021-04-01 20:40:08 +08:00
杨顺强
d4052aa966 repair upgrade bug (#4859) 2021-04-01 17:10:55 +08:00
杨顺强
be3c098e81 Update dependencies (#4857) 
* update dependencies

* update seaile-editor version

* update seafile-js version
 2021-03-31 15:27:24 +08:00
lian
6c1e9d21fe fix bug when get repo history detail (#4855) 
Co-authored-by: lian <lian@seafile.com>
 2021-03-31 10:15:50 +08:00
lian
189387a27d update location of "import" 2021-03-30 18:13:09 +08:00
Alex Happy
c043c1c34c add 'can_update_user' admin permission for subscription system admin (#4843) 2021-03-30 13:19:58 +08:00
王健辉
cb4d88d78f upgrade translation (#4854) 2021-03-30 11:25:11 +08:00
llj
fdc6812839 [seafile-js] updated the version 2021-03-26 10:37:31 +08:00
Alex Happy
eca5a3b933 support collaborate notis interval (#4841) 
* support collaborate notis interval

* fix unit-test

* fix unit-test

* fix unit-test

* fix unit-test

* fix unit-test

* update text

* fix error msg
 2021-03-25 21:44:58 +08:00
lian
855b457e5f admin rename department (#4849) 
* admin rename department

* update Code comment

* update group name validate msg

* [department] fixup: added 'add member' back

* [department] rename: fixup & improvements

* [system admin] departments: added 'rename' & 'op menu' for dept

Co-authored-by: lian <lian@seafile.com>
Co-authored-by: llj <lingjun.li1@gmail.com>
 2021-03-25 21:41:55 +08:00
王健辉
1d108ae828 upgrade translation (#4848) 2021-03-23 14:30:43 +08:00
lian
327aceec52 update group name validate msg (#4847) 
Co-authored-by: lian <lian@seafile.com>
 2021-03-23 13:34:01 +08:00
lian
1a53d8c3cf Merge branch '7.1' into 8.0 2021-03-23 12:45:16 +08:00
lian
be075c2383 update trans (#4846) 
Failed to send email, email service is not properly configured, please contact administrator.

Co-authored-by: lian <lian@seafile.com>
 2021-03-23 12:40:03 +08:00
lian
568c0975f3 Merge branch '7.1' into 8.0 2021-03-23 11:03:01 +08:00
王健辉
717461809f clean_db_records (#4845) 2021-03-22 10:32:41 +08:00
lian
d7c163b8a7 thirdparty editor (#4828) 
Co-authored-by: lian <lian@seafile.com>
 2021-03-20 16:22:43 +08:00
llj
06254447e4 File view op (#4836) 
* [file view] added 'Details' & 'open via client'

* [file view] adjusted places of operations

* [file view] 'open via client': use a new icon

* [file view] 'open via client': updated the icon
 2021-03-18 17:31:21 +08:00
lian
30e4ec65f7 update view lib file 
not lock file when open file, let OOS server send lock request to lock file
 2021-03-18 13:20:37 +08:00
lian
2405ba671e add GROUP_IMPORT_MEMBERS_EXTRA_MSG (#4835) 
Co-authored-by: lian <lian@seafile.com>
 2021-03-17 16:43:10 +08:00
lian
b27d7cd11c check if is pro when get user last access time (#4838) 
Co-authored-by: lian <lian@seafile.com>
 2021-03-17 16:27:01 +08:00
lian
59509d4f61 update test (#4837) 
fix failed test

Co-authored-by: lian <lian@seafile.com>
 2021-03-17 16:13:10 +08:00