haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-03 10:17:19 +00:00
Code Issues Releases Wiki Activity
8,103 Commits 133 Branches 451 Tags 2.1 GiB
c3ede4e834
Commit Graph

414 Commits

Author SHA1 Message Date
lian
0fb958d9bd Update dir api (#2869) 
* update dir api

return dict format response

* [listDir] modified listDir after api updated
 2019-01-22 18:27:51 +08:00
zhengxie
d772dba34b Merge branch '6.3' 2019-01-19 15:38:33 +08:00
zhengxie
d25216b0f2 [test] Update org api 2019-01-18 15:59:07 +08:00
zhengxie
0b0f382d2e wip: Add org role permissions 2019-01-16 15:45:03 +08:00
lian
105afaa549 update v2.1 dir api (#2798) 
* update api v2.1 dir api

refactor this api
add with_thumbnail parameter and some test

* remove is_img, is_video and is_xmind field

* remove ENABLE_THUMBNAIL check
 2019-01-10 17:03:59 +08:00
lian
7b70adaa6d update dir detail (#2796) 
remove file_count, dir_count and size field
 2019-01-09 15:11:17 +08:00
lian
71228ae651 add update share link permission api (#2761) 2019-01-07 16:50:27 +08:00
zhengxie
f3c175ffcd Merge branch '6.3' 2019-01-02 12:53:36 +08:00
lian
6fcc789f88 add new org user/info api (#2625) 2018-12-22 15:28:09 +08:00
lian
2a45250276 update test of admin delete public repo 2018-12-20 18:31:39 +08:00
zhengxie
74d0fbeec1 Fix email notification interval error 2018-12-11 11:44:06 +08:00
zheng xie
8f1b006e78
Merge pull request #2623 from haiwen/7.0-file_updates_email-rebased 
7.0 file updates email rebased
 2018-12-11 11:15:23 +08:00
zhengxie
b4e2460ff7 [tests] Remove unnecessary test 2018-12-11 10:26:14 +08:00
zhengxie
e9778fccd4 [api & notification] Add send_file_updates_email command and update account_info API 2018-12-10 17:32:05 +08:00
zhengxie
40a09e5835 [tests] Update group libraries 2018-12-07 15:41:07 +08:00
zhengxie
7a6a989e46 [tests] Fix group libraries 2018-12-07 15:01:36 +08:00
zhengxie
7fb69a8282 [test] Update tests 2018-12-06 15:54:36 +08:00
zhengxie
3dcdb7aec2 [tests] Add tests 2018-12-06 13:47:59 +08:00
zhengxie
a4fa2b4a10 Merge branch '6.3' 2018-12-06 11:44:11 +08:00
zhengxie
133542b92b [tests] Update repo tests 2018-12-06 11:39:32 +08:00
zhengxie
f423f62b8e Add webdav secret api 2018-11-24 11:07:54 +08:00
C_Q
ad48e1b039 add delete reviewer api (#2556) 2018-11-23 11:58:44 +08:00
C_Q
4785bd2c74 add draft&review test (#2527) 2018-11-16 14:27:06 +08:00
zhengxie
cac765848d Merge branch '6.3' 
Conflicts:
	seahub/utils/__init__.py
 2018-11-01 10:50:44 +08:00
zhengxie
3cd878bd6a Add preview related share perms 
Squashed commit of the following:

commit 12f52311df704e48c282b2a47f59f7a283cfa5c5
Author: zhengxie <xiez1989@gmail.com>
Date:   Tue Sep 11 15:14:34 2018 +0800

    [API] Update client sync and list dir items apis

commit bc18d19dc0f648732c5933c6918d8e784fc0f910
Author: llj <lingjun.li1@gmail.com>
Date:   Tue Sep 4 12:22:10 2018 +0800

    Add preview related share perms

    Squashed commit of the following:

    commit 658bdbdc7acf262f2c0abb0387cf3142b2d8ee37
    Author: llj <lingjun.li1@gmail.com>
    Date:   Tue Sep 4 12:17:47 2018 +0800

        [library icon title] added title for 'admin' permission

    commit 51a088fd7987e2307e5666facb6627d42a7843ec
    Author: zhengxie <xiez1989@gmail.com>
    Date:   Sat Sep 1 15:33:09 2018 +0800

        Add preview related share perms

        Squashed commit of the following:

        commit 42fe21ef0ba3bad4fb68dc5283194cb34eb7775a
        Author: llj <lingjun.li1@gmail.com>
        Date:   Sat Sep 1 13:33:59 2018 +0800

            [icon tip] modified library/folder icon title

        commit 077fecdce80bce966296a1735896a24bf32c282f
        Author: zhengxie <xiez1989@gmail.com>
        Date:   Mon Aug 27 11:05:34 2018 +0800

            Add preview related share perms

            Squashed commit of the following:

            commit 5783325eb25d7298ea3db7f59595446d122889e5
            Author: llj <lingjun.li1@gmail.com>
            Date:   Fri Aug 24 21:14:59 2018 +0800

                fixup

            commit 5f4f4025221f4026a4e7a9bc1c7bba5d6decf5a9
            Author: zhengxie <xiez1989@gmail.com>
            Date:   Fri Aug 24 20:55:41 2018 +0800

                Fix wopi perm

            commit 632744cd5e56f8812af0efe523cf5751bbf57b66
            Author: zhengxie <xiez1989@gmail.com>
            Date:   Fri Aug 24 17:29:31 2018 +0800

                Add preview related share perms

                Squashed commit of the following:

                commit 683296449601960d76a2d0245dab694ab16f67b2
                Author: llj <lingjun.li1@gmail.com>
                Date:   Fri Aug 24 15:54:59 2018 +0800

                    modification after adding 2 new permissions

                commit 3eff1ec06fc7566942b736261a1d5b613d706117
                Author: llj <lingjun.li1@gmail.com>
                Date:   Thu Aug 23 14:58:33 2018 +0800

                    [permission] added 2 new permissions for 'share' & 'folder permission'

                commit 73a0bfc6560860ac11e96a675fe789a984a194c8
                Author: zhengxie <xiez1989@gmail.com>
                Date:   Fri Aug 24 16:34:47 2018 +0800

                    Add prevew related perms in history file view and text_diff

                commit 533b3ff0ca4aa5564ecc87456772b70eedfa816f
                Author: zhengxie <xiez1989@gmail.com>
                Date:   Fri Aug 24 13:49:28 2018 +0800

                    Add prevew related perms on file views

                commit 03db78a841baddf6c042988358d20417f06be4ae
                Author: zhengxie <xiez1989@gmail.com>
                Date:   Thu Aug 23 10:56:17 2018 +0800

                    [api2] Update repo perms and add is pro version check

                commit c025319fe56658da3a3dc077743ee016ac5acd4d
                Author: ilearnit <helloworld.c@outlook.com>
                Date:   Wed Aug 22 11:09:27 2018 +0800

                    update perm copy/download/share

                commit ea19ab4c695c99c0c2817616f2177bebae0777a2
                Author: zhengxie <xiez1989@gmail.com>
                Date:   Mon Aug 20 16:00:11 2018 +0800

                    wip: add repo preview related perms.

                    Updated APIs:
                    1. [api2] group libraries
                    2. [api2] dir shared items
                    3. [api2] share link zip tasks

                    Updated Views:
                    1. wiki & wopi
                    2. ajax copy/download files/dirs
 2018-10-26 17:07:49 +08:00
zhengxie
b55474b33a [auth & api] Refactor login 2018-10-25 15:18:40 +08:00
zhengxie
63c894c1cd [sys] Add force 2FA option 2018-10-16 15:32:58 +08:00
C_Q
2eef50d05e Draft review (#2416) 2018-10-15 15:51:29 +08:00
zhengxie
547a7558a9 Merge branch '6.3' 2018-10-15 12:45:33 +08:00
zhengxie
ddcd19a4a6 Upgrade rest_framework to 3.3.3 to fix html render error in web api 
ref: https://forum.seafile.com/t/6-3-6-pro-api-broken-user-feedback-as-i-go/7356/5
 2018-10-08 10:58:50 +08:00
ilearnit
dac30d24c5 Merge branch '6.3' into master 2018-09-28 15:51:34 +08:00
zhengxie
9164b3df36 Fix tests 2018-09-27 17:07:23 +08:00
shanshuirenjia
e793730939 Drafts module (#2375) 2018-09-15 16:14:17 +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
37875256de Squashed commit of the following: 
commit 8ac4cd167993b4be4249fa28368b0c869852585b
Author: llj <lingjun.li1@gmail.com>
Date:   Thu Aug 30 16:38:15 2018 +0800

    [share link] fixup & improvement for 'permission & copy'; added 'copy' for upload link

commit f318353797d6479bb8c5bc2c3d20b05ca2ac5b70
Author: lian <imwhatiam123@gmail.com>
Date:   Wed Aug 29 13:44:23 2018 +0800

    update

commit bcadd6c3b708f1c672df3873b22816be1eea195d
Author: lian <imwhatiam123@gmail.com>
Date:   Wed Aug 29 11:49:49 2018 +0800

    add can_edit permission when generate share link
 2018-08-30 16:44:34 +08:00
ilearnit
bb40d2f6e9 fix test 2018-08-27 11:23:35 +08:00
lian
eaff121ef2 add can add public repo user role permission 2018-08-23 19:04:33 +08:00
guopengda
30fbc77ede Add email (#2260) 
Login using contact email
 2018-08-10 11:37:09 +08:00
zheng xie
8d5fcd0557
6.3 fix test (#2264) 
* wip: Fix tests

* [tests] Update
 2018-08-08 10:22:26 +08:00
lian
3418ae31b5 add smart link token api (#2231) 
* add smart link token api

* update view file/folder via smart link

use SITE_ROOT when redirect smart link
 2018-07-31 11:26:28 +08:00
zhengxie
13a04f02d0 [api] Update wiki error msg 2018-07-24 18:09:22 +08:00
lian
8755d87510 add last modifier info to file detail api 2018-07-05 16:51:53 +08:00
ilearnit
172a7b9b7d update test 2018-06-06 14:11:10 +08:00
zMingGit
e387c92b99 can set sub-path permission with admin (#1962) 
* can set sub-path permission with admin

* fixup after rebase
 2018-05-18 13:46:43 +08:00
llj
862192514c list all wikis (#2095) 
* [wiki] Update list wikis

* [wikis] show wiki owner
 2018-05-04 16:20:01 +08:00
lian
55014a2527 udpate group transfer test 2018-04-27 15:33:49 +08:00
zhengxie
8d10466ce9 Merge branch '6.2' 
Conflicts:
	media/css/seahub.css
	seahub/notifications/management/commands/send_notices.py
	seahub/notifications/models.py
	seahub/templates/js/templates.html
	seahub/views/__init__.py
	seahub/views/file.py
	tests/seahub/notifications/management/commands/test_send_notices.py
	tests/seahub/notifications/test_models.py
 2018-04-27 11:00:43 +08:00
llj
0ed1dd4c58
Merge pull request #1973 from haiwen/address-book 
Address book
 2018-04-25 16:26:12 +08:00
lian
89e25fa965 update dir view 
return file info when get dir info recursively
 2018-04-19 11:45:17 +08:00