1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-31 06:40:39 +00:00
Commit Graph

113 Commits

Author SHA1 Message Date
lian
d498f2a1a5 Merge branch '8.0' into master 2021-08-16 14:28:32 +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
llj
6bfd8cce96 [video thumbnail] display the thumbnails for some pages.
- when 'video thumbnail' feature is enabled, display the thumbnails
  for 'dir view', 'starred(favorites)', 'file view', 'shared dir view'
  pages.
2021-07-19 15:13:17 +08:00
lian
4388bca9ce Merge branch '8.0' into master 2021-07-13 12:11:52 +08:00
lian
5472974cc8 Revert "update LOGOUT_URL; (#4785)"
This reverts commit d75beba8bd.
2021-07-08 16:47:09 +08:00
Daniel Pan
a38eab49b8
Merge pull request #4799 from haiwen/use-go-fileserver
use go fileserver
2021-06-07 11:13:55 +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
c29a571826 Merge branch '7.1' into master 2021-02-05 11:55:34 +08:00
lian
55c513bf22 use go fileserver 2021-01-22 18:31:53 +08:00
llj
2db2c08032
[department] added an option to control if libraries can be shared in… (#4778)
* [department] added an option to control if libraries can be shared into a department

* update seahub web api

Co-authored-by: lian <lian@seafile.com>
2021-01-13 14:11:35 +08:00
lian
d75beba8bd
update LOGOUT_URL; (#4785)
Co-authored-by: lian <lian@seafile.com>
2021-01-12 16:19:38 +08:00
lian
42c7f25dfa
ocm, add OCM_REMOTE_SERVERS (#4745)
* ocm, add OCM_REMOTE_SERVERS

* update

Co-authored-by: lian <lian@seafile.com>
2020-12-14 11:47:36 +08:00
lian
ee6cccf806 Merge branch '7.1' into master 2020-12-03 12:03:51 +08:00
lian
06b55feae6
add ABOUT_DIALOG_CUSTOM_HTML (#4734)
Co-authored-by: lian <lian@seafile.com>
2020-12-02 21:31:17 +08:00
lian
c0669d4ad8 Merge branch '7.1' into master 2020-11-25 15:05:57 +08:00
lian
cae1204ab1
support LIBRARY_TEMPLATES (#4723)
Co-authored-by: lian <lian@seafile.com>
2020-11-20 10:08:49 +08:00
Leo
267e9f525c
Ocm (#4640)
* ocm share local and inter-server api, ocm share page (#4335)

* ocm share

* optimize code

* ocm repo (#4341)

* ocm repo

* hide share if not repo owner

* optimize code

* fix All refresh page, hide upload if is r perm

* update permission check

* update return status code

* update code

* add receive user drop share
2020-09-24 10:57:45 +08:00
lian
12b200f3e1
enable show contact email when search user (#4641)
* enable show contact email when search user

* [user-select] added new user option with email shown

Co-authored-by: lian <lian@seafile.com>
Co-authored-by: llj <lingjun.li1@gmail.com>
2020-08-14 14:45:44 +08:00
lian
01c9ddd695 add upload link expire days limit 2020-07-22 16:45:15 +08:00
llj
4bc73a750d
[side nav footer] added 'Terms' link (#4514) 2020-04-04 19:51:16 +08:00
shanshuirenjia
7e50035773 merge 7.0 2020-04-01 18:03:46 +08:00
杨顺强
07e9013c26
repair settings naming bug (#4510) 2020-04-01 17:55:59 +08:00
shanshuirenjia
e9f3f8ed2e conflict fixed 2020-04-01 11:19:09 +08:00
杨顺强
6c417b6fb4
Improve hu requirement (#4502)
* optimize code

* optimize code

* optimize code
2020-03-25 20:20:56 +08:00
杨顺强
011cb33fbb
Add hu berlin requirement (#4500)
* add new requirement

* update demo copyright

* update sf-font

* optimize code

* improve variables naming
2020-03-25 18:03:04 +08:00
lian
2de4d4846e
dingtalk (#4426)
Co-authored-by: lian <lian@seafile.com>
2020-03-19 20:15:26 +08:00
lian
51e9295b46
add SIDE_NAV_FOOTER_CUSTOM_HTML (#4466)
* add SIDE_NAV_FOOTER_CUSTOM_HTML

* update
2020-03-04 11:01:50 +08:00
lian
9500ac647a Merge branch '7.0' 2020-02-28 13:00:23 +08:00
杨顺强
4ec71b5ef7
add uploader files number control (#4451)
* add uploader files number control

* update sentence bug
2020-02-27 11:28:11 +08:00
lian
dcb871c957 Merge branch '7.0' 2020-01-06 16:25:55 +08:00
llj
c485cfc932 improved empty tips (#4391) 2020-01-03 16:50:17 +08:00
Leo
7df1192cbf admin api role check (#4353)
* admin api role check

* add check to new tabs and tests

* fix work-weixin virus scan check
2019-12-16 18:31:29 +08:00
杨顺强
3970035c20 add size control (#4339)
* check file size before upload file

* update file naming
2019-12-13 16:16:02 +08:00
sniper-py
37b743fe3a Illegal report by react (#3415)
* illegal report

1, add illegal report at shared file page
2, list all illegal reports at admin page

* add ENABLE_SHARE_LINK_REPORT_ILLEGAL setting

* UserRateThrottle -> AnonRateThrottle

* use to_python_boolean

* frontend by React

* remove illegal report dialog in shared dir view

* add migrations dir

* add illegal_reports migrations

* rename illegal to abuse in api

* rename illegal to abuse in test

* rename illegal to abuse in share file view

* rename illegal to abuse in react

* rename illegal to abuse in Backbone

* add enableShareLinkReportAbuse in templates

* add ReportAbuse

* update ReportAbuse

* update ReportAbuse urls

* update ReportAbuse api-js

* sysadmin_react_app.html

* sysadmin.py

* fix

* fix

* fix

* can not abuse own file

* Contact Information is required.

* fix review

* remove repo icon
2019-11-05 17:46:06 +08:00
llj
ad5b070c9f [system admin] users: rewrote user pages & 'ldap users' page (#4216) 2019-11-02 17:02:26 +08:00
Leo
852fe1b8ee sysadmin reconstruct user page (#4030)
* sysadmin reconstruct user page

* [system admin] users: refactored it
2019-10-28 10:29:20 +08:00
Leo
6e755e9c46 sysadmin reconstruct admin logs page (#4184)
* sysadmin reconstruct admin logs page

* optimize code
2019-10-25 10:15:30 +08:00
plt
2ced0bda04 Merge branch '7.0' 2019-10-21 16:44:49 +08:00
Leo
07059239d1 sysadmin reconstrcut orgs frontend (#4074)
* sysadmin reconstruct orgs page

* [system admin] orgs: refactored it
2019-10-21 09:45:00 +08:00
Leo
1790940bc8 delete user permission 'can_use_wiki' (#4148) 2019-10-15 10:15:04 +08:00
杨顺强
e94d71316b add dtable_web settings (#4131) 2019-10-08 17:28:15 +08:00
Leo
63bd44acf7 Sysadmin reconstruct settings (#3946)
* sysadmin reconstruct settings page

* [system admin] settings: refactored it

* fixup & improvement
2019-09-29 18:19:25 +08:00
plt
7f49eab2c7 Merge branch '7.0' 2019-09-27 21:04:20 +08:00
Leo
d52949da9c custom nav item (#4071)
* custom nav item

* optimize code

* optimize code
2019-09-11 13:39:49 +08:00
plt
af74f8b30b Merge branch '7.0' 2019-07-22 17:09:10 +08:00
杨顺强
7ed33d9fd2 add-blocksize-settings (#3877) 2019-07-19 11:57:22 +08:00
plt
6cb4d38788 Merge branch '7.0' 2019-07-08 18:27:48 +08:00
sniper-py
97016a2e2b update work weixin setting (#3819) 2019-07-08 15:44:38 +08:00
plt
551a15a083 Merge branch '7.0' 2019-07-01 13:45:59 +08:00
Daniel Pan
0144708d96
Merge pull request #3768 from haiwen/improve-account-component
improve account module
2019-07-01 13:40:01 +08:00