1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-15 07:52:14 +00:00
Commit Graph

11715 Commits

Author SHA1 Message Date
Daniel Pan
ef4677d560
Merge pull request #4977 from haiwen/service-url
add SERVICE_URL in settings.py
2021-08-26 10:00:23 +08:00
lian
ecb5bd1e50 add SERVICE_URL in settings.py 2021-08-26 09:56:49 +08:00
Daniel Pan
0a10575f25
Merge pull request #4955 from haiwen/wopi-utils
use iter instead of getiterator
2021-08-25 16:30:27 +08:00
Daniel Pan
65d3107a0b
Merge pull request #4975 from haiwen/admin-permission-log
check if group existes before get group name
2021-08-22 14:34:38 +08:00
lian
f510b8fe24 check if group existes before get group name 2021-08-19 17:15:48 +08:00
Daniel Pan
3893c93764
Merge pull request #4974 from haiwen/invite-email
use "You are invited to join" as subject
2021-08-19 11:48:45 +08:00
lian
4308d858cf use "You are invited to join" as subject 2021-08-19 11:24:12 +08:00
songjiaqi1
d24fc8f68c
Merge pull request #4972 from haiwen/update-markdown-editor
update markdown editor
2021-08-17 11:40:31 +08:00
cainiao222
fffdb8b801 update markdown editor 2021-08-17 11:38:35 +08:00
lian
d498f2a1a5 Merge branch '8.0' into master 2021-08-16 14:28:32 +08:00
Daniel Pan
81b49a6e72
Merge pull request #4966 from haiwen/admin-import-users
filter out empty cell when admin import users from excel
2021-08-16 09:49:29 +08:00
Daniel Pan
d38a93f04d
Merge pull request #4971 from haiwen/2fa-site-name
use SITE_NAME as issuer for 2fa
2021-08-16 09:47:44 +08:00
Daniel Pan
a6d747a728
Merge pull request #4970 from haiwen/system-notification
update system notification
2021-08-16 09:44:33 +08:00
Daniel Pan
b8f36e6517
Merge pull request #4965 from haiwen/change-password
hide "Forgot password?" when not ENABLE_CHANGE_PASSWORD
2021-08-14 08:47:52 +08:00
Daniel Pan
6cd47ca041
Merge pull request #4964 from haiwen/share-link-password
update create share/upload link
2021-08-14 08:46:09 +08:00
lian
521175b148 filter out empty cell when admin import users from excel 2021-08-12 16:25:53 +08:00
lian
a44c9a3d1e update test 2021-08-12 15:49:10 +08:00
lian
d7c6be0865 hide "Forgot password?" when not ENABLE_CHANGE_PASSWORD 2021-08-12 15:31:34 +08:00
lian
8e78d73b53 update create share/upload link
add SHARE_LINK_FORCE_USE_PASSWORD and SHARE_LINK_PASSWORD_STRENGTH_LEVEL
2021-08-12 15:02:03 +08:00
lian
01f9b4ab85 update system notification 2021-08-06 17:15:53 +08:00
Daniel Pan
88376a91ec
Merge pull request #4962 from haiwen/image-view-fixup
[dir view] fixup for 'image view' in 'column mode'
2021-08-06 15:16:17 +08:00
llj
3462473cdb [dir view] fixup for 'image view' in 'column mode' 2021-08-06 14:52:59 +08:00
lian
32ecda5ee3 Merge branch '8.0' into master 2021-08-06 13:07:36 +08:00
lian
73fd93dd07 Merge branch '7.1' into 8.0 2021-08-06 13:07:17 +08:00
Daniel Pan
3752bc5b84
Merge pull request #4961 from haiwen/cache-key-length
use sha1 encrypted str as cache key
2021-08-06 12:21:10 +08:00
lian
c567a8cab6 use sha1 encrypted str as cache key 2021-08-06 11:53:58 +08:00
lian
03037d27f2 use SITE_NAME as issuer for 2fa 2021-08-05 13:47:06 +08:00
llj
a49bcc3bbe [seafile-js] updated the version 2021-08-05 11:34:37 +08:00
Daniel Pan
2f57db84a2
Merge pull request #4960 from haiwen/force-change-password
force change user password when admin add new user
2021-08-03 12:24:33 +08:00
Daniel Pan
ec4f1a933e
Merge pull request #4959 from haiwen/invitation
update invitation expire time
2021-08-03 12:22:52 +08:00
lian
968e4b5051 force change user password when admin add new user 2021-08-02 17:36:44 +08:00
lian
8bc838b670 update invitation expire time 2021-08-02 17:17:52 +08:00
Daniel Pan
5bfaf0ad0a
Merge pull request #4949 from haiwen/repo-trash
use post request to get repo/folder trash files
2021-07-30 17:01:11 +08:00
Daniel Pan
9b3333972c
Merge pull request #4950 from haiwen/org-admin-search-user
Org admin search user
2021-07-30 16:54:37 +08:00
llj
4fa775255b [seafile-js] updated the version 2021-07-30 13:52:06 +08:00
Daniel Pan
1e479f949c
Merge pull request #4824 from mqus/patch-1
Fix wopi/utils.py for python 3.9
2021-07-29 16:53:48 +08:00
Daniel Pan
a9326ffaa9
Merge pull request #4956 from haiwen/2fa
decode two factor auth StaticToken
2021-07-29 16:49:52 +08:00
Daniel Pan
549daf2a31
Merge pull request #4957 from haiwen/admin-invitation
check if has accept_time before return
2021-07-29 16:48:24 +08:00
Daniel Pan
88f856daeb
Merge pull request #4958 from haiwen/fix-7.1-chardet
FIX: chardet
2021-07-29 15:28:40 +08:00
AlexCXC
0e14dcc716 FIX: chardet 2021-07-29 14:37:01 +08:00
lian
75f0fd5dd4 Merge branch '7.1' into 8.0 2021-07-29 11:14:49 +08:00
lian
666d77b02f update admin invitation
check if has accept_time before return
2021-07-28 11:59:49 +08:00
lian
0c5e110050 use iter instead of getiterator 2021-07-28 11:06:42 +08:00
Daniel Pan
df6f44b8a1
Merge pull request #4954 from haiwen/rm-enable-thumbnail
Rm enable thumbnail
2021-07-27 22:34:55 +08:00
skywalker
a5b32f7a50 fix unittest 2021-07-27 16:30:39 +08:00
skywalker
f8467e0ab0 fix video thumb create 2021-07-27 16:22:43 +08:00
skywalker
75e5eb4814 rm ENABLE_THUMBNAIL 2021-07-27 11:40:32 +08:00
Daniel Pan
debc838898
Merge pull request #4688 from Jonatino/patch-1
Remove moviepy dependency, use ffmpeg for all video thumbnails
2021-07-27 11:28:42 +08:00
Daniel Pan
f75e57d6e8
Merge pull request #4952 from haiwen/share-permission-fixup
[share dialog] fixed 'permission' problem for 'share to user' & 'share to group'
2021-07-27 09:49:37 +08:00
llj
0f0e407048 [share dialog] fixed 'permission' problem for 'share to user' & 'share
to group'

* bugfix for 'select-editor'
2021-07-26 18:06:30 +08:00