haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 13:24:52 +00:00
Code Issues Releases Wiki Activity
7,246 Commits 145 Branches 460 Tags
06c9fb65cc239a36f3efd67fc13daa435ea3693e
Commit Graph

7246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangjianhui
06c9fb65cc admin-rename-lib 2018-09-15 13:21:40 +08:00
lian
8d196077bf update can_preview_file func 
use PREVIEW_FILEEXT.keys() instead of FILEEXT_TYPE_MAP
 2018-09-14 18:38:50 +08:00
lian
c1d8b9024b Preview edit file (#2369) 
* Revert "update share link permission (#2328)"

This reverts commit 6313e54dd7.

* update share link related UI

Download link(s) to Share link(s)

* update file api

add 'can_preview' and 'can_edit' fields

* update view file page

'invalid extension' to 'File preview unsupported'

* update share popup

1. send file detail request to check if can preview/edit file
2. show or hide share link permission according to api response
3. add tests for can_preview/edit_file func

* use FILEEXT_TYPE_MAP to check if can preview file
 2018-09-14 18:13:25 +08:00
lian
122254905d Share link auth (#2358) 
* rm view_raw_shared_file

* add SHARE_LINK_LOGIN_REQUIRE setting

to force user login when view preview file/folder share link
 2018-09-14 12:05:46 +08:00
zheng xie
f1e98549e5 Merge pull request #2365 from haiwen/6.3-fix_tests 
[tests] Fix tests
 2018-09-13 11:26:05 +08:00
zhengxie
1548fb1ee5 [tests] Fix tests 2018-09-12 18:26:49 +08:00
llj
b14ddfeb31 Traffic fe (#2363) 
* Refactor seafevents msg and add traffic stats API

Squashed commit of the following:

commit 85fe5369f711e1514762d93008f9ebb3c5d49041
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Aug 6 15:48:55 2018 +0800

    Add '-link' to access_token op type when generate download/upload link

commit 1817833fc3374f54030e16f3a1283ff6f34ddbf5
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Aug 6 15:28:38 2018 +0800

    Refactor file/dir events

    1. Remove traffic related msg
    2. Rename seahub.stats to seahub.audit for audit related msg

* Fix share link zip task traffic owner

* [admin api] Add org traffic

* [system admin] statistic: added 'traffic', fixed 'storage'

* [system admin] statistic: added 3 more charts for 'traffic', and modified the top nav

* [system admin] statistic: added 'traffic' for org; added a traffic nav, improved chart dot title
 2018-09-12 17:41:59 +08:00
llj
e19a147154 [dir view] getMore: fixup for some cases 2018-09-12 17:05:58 +08:00
zheng xie
e14c5a93ff Merge pull request #2355 from haiwen/get-related-users 
update get releated users by repo
 2018-09-12 16:56:57 +08:00
shanshuirenjia
e0e5d4fec9 wiki optimized (#2348) 2018-09-12 11:50:41 +08:00
llj
76489d2ca4 [system/org admin] rm 'email' for group member; modified 'Info' icon for org admin side nav 2018-09-11 15:16:02 +08:00
lian
2006447849 update get releated users by repo 2018-09-10 15:22:47 +08:00
zhengxie
bbd10c13da Fix duplicated file_share_id error when create file share link in org mode 2018-09-10 14:32:04 +08:00
guopengda
394e25ed4a new clean (#2230) 
* new clean

* Refactor code
 2018-09-10 13:56:10 +08:00
C_Q
6e873ef029 [wiki] redirect dir page (#2352) 2018-09-07 22:25:13 +08:00
zheng xie
75932af704 Merge pull request #2350 from haiwen/edit-share-link-redirect 
update view shared file
 2018-09-07 15:41:42 +08:00
llj
d6506dc2fa Merge pull request #2351 from haiwen/ie9-fileupload 
[dir view] fileupload: added support for IE9
 2018-09-07 15:28:17 +08:00
llj
94368c5af9 [dir view] fileupload: added support for IE9 2018-09-07 15:17:46 +08:00
lian
989a6c199d update view shared file 
if an unauthenticated user view a shared file with can edit permission redirect
this user to login page.
 2018-09-07 14:55:38 +08:00
ilearnit
a71102fe84 fix wiki trans 2018-09-07 14:25:29 +08:00
ilearnit
c6de6766db [locales] Update po files 2018-09-07 10:54:39 +08:00
Daniel Pan
4ed6f83c5c [api] Add replace file arg to upload link (#2347) 2018-09-07 10:53:26 +08:00
ilearnit
3d04ad8c7f add trans string 2018-09-07 10:36:15 +08:00
ilearnit
79eebfcaef [dist] frontend 2018-09-07 10:31:46 +08:00
shanshuirenjia
ed65284bda Wiki search modify (#2346) 
* modify search privilege

* modify params

* modify search module
 2018-09-06 17:34:33 +08:00
zhengxie
83f6485bea [locales] Update po files 2018-09-06 16:51:03 +08:00
zhengxie
c8b5e5d717 [locales] Update two factor auth strings 2018-09-06 16:45:54 +08:00
lian
fd4486310d [locale] Update .po files 2018-09-06 16:03:19 +08:00
ilearnit
d2a56bba7b remove group wiki 2018-09-06 14:31:18 +08:00
ilearnit
57f1dd580f [dist] frontend 2018-09-06 14:30:54 +08:00
lian
9c54b85193 modify internal-link explaination (#2293) (#2345) 2018-09-06 13:45:44 +08:00
shanshuirenjia
eab6c6fe61 repair wiki bug (#2344) 
* repair wiki bug

* optimized code

* optimized code
 2018-09-05 17:44:14 +08:00
zheng xie
508f5c705f Merge pull request #2343 from haiwen/revert-file-view-test 
Revert "[tests] Update view_lib_file"
 2018-09-05 15:01:05 +08:00
lian
90cd24cec5 Revert "[tests] Update view_lib_file" 
This reverts commit 6f51aec1cc.
 2018-09-05 14:33:20 +08:00
lian
f20707163b View file error (#2341) 
* Revert "update file view page"

This reverts commit 6cac4e1fe4.

* update file view page

show msg when file can not be previewed
 2018-09-05 14:14:14 +08:00
llj
f4ac204594 Merge pull request #2342 from haiwen/timestamp 
added timestamp for base.js
 2018-09-05 14:12:39 +08:00
llj
cbbd7a7a4d added timestamp for base.js 2018-09-05 14:10:12 +08:00
lian
9f38ceb4e1 update water mark (#2340) 
add site name before user name when show water mark
 2018-09-05 12:09:14 +08:00
lian
f6a12786d1 update onlyoffice edit file (#2338) 
add ONLYOFFICE_FORCE_SAVE setting
if True, file will be saved when user click save btn on file editing page
 2018-09-05 11:22:27 +08:00
shanshuirenjia
cece038dec Wiki show dir bug (#2337) 2018-09-05 10:44:58 +08:00
zheng xie
7015929a33 [ADFS] Fix client login issue. 
Redirect to default url `/saml2/complete/`, otherwise user will not finish login in client app.
 2018-09-04 17:52:29 +08:00
shanshuirenjia
681a4235a4 [Wiki] Support show folder (#2334) 2018-09-04 17:16:50 +08:00
shanshuirenjia
b8662376a1 repair menu bug for floder bug (#2335) 2018-09-04 16:19:56 +08:00
zhengxie
d5017f7901 [locale] Update .po files 2018-09-04 15:31:37 +08:00
zhengxie
eda79048df [i18n] Update source strings 2018-09-04 14:41:10 +08:00
llj
0ce5286fa2 [trans] added new js string 2018-09-04 14:35:31 +08:00
llj
1d3d28d2d5 Merge pull request #2333 from haiwen/share-link-ui 
[share popup] share link: new design
 2018-09-04 13:54:28 +08:00
llj
094871b45f [share popup] share link: new design 2018-09-03 18:51:54 +08:00
lian
fbddd5f48d add new custom trans string 2018-09-03 16:39:57 +08:00
zheng xie
d84bd79d1a Merge pull request #2331 from haiwen/share-link-trans 
update trans bug of checking share link expire days
 2018-09-03 11:00:30 +08:00