1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-09 19:01:42 +00:00
Commit Graph

626 Commits

Author SHA1 Message Date
Leo
7b7055bd19 add office file editOnCloud and download (#3716)
* add office file editOnCloud and download

* modify some details
2019-06-26 17:21:29 +08:00
lian
8d2ae47e8a update repo download info api (#3691)
return permission field
2019-06-21 15:41:07 +08:00
王健辉
75954dbf93 repo status 2019-05-17 14:07:01 +08:00
lian
d19b07d277 update parameter call of seafile api
create_org_repo(self, name, desc, username, org_id, passwd=None, enc_version=2)
create_org_enc_repo(self, repo_id, name, desc, username, magic, random_key, salt, enc_version, org_id)
add_group_owned_repo (self, group_id, name, permission, passwd=None, enc_version=2, storage_id = None)
org_add_group_owned_repo (self, org_id, group_id, name, permission, passwd=None, enc_version=2)
2019-05-17 10:45:40 +08:00
lian
8af98dc2cd support encrypted library v3 (#3455) 2019-05-16 14:09:31 +08:00
王健辉
2d552a9351 repair code 2019-05-10 12:10:10 +08:00
王健辉
d0fab86256 remove print 2019-05-10 09:58:17 +08:00
王健辉
60034a0dae add get all departments api 2019-05-09 21:26:20 +08:00
sniper-py
80d75e2d74 Library can not be transferred to owner. (#3404) 2019-05-06 13:58:23 +08:00
ilearnit
7e541a7bba fix edit file perm 2019-04-19 06:19:47 +00:00
ilearnit
210a3e15ee add repo encryption check in old create share link api 2019-04-17 07:15:12 +00:00
ilearnit
bdf92c3cbb Merge branch '6.3'
Conflicts:
	seahub/notifications/management/commands/send_notices.py
2019-04-02 06:19:41 +00:00
陈钦亮
7e587c8b93 update draft ui (#3049) 2019-03-05 15:37:51 +08:00
陈钦亮
6137e720f0 Refactor draft (#3018)
* refactor draft

* update
2019-03-01 16:49:35 +08:00
lian
815f513a38 update admin create org api (#3005)
return org info instead of 'success'
2019-02-28 10:12:28 +08:00
lian
18634fb04a Transfer repo notice (#2920)
*  add repo transfer notice

* update
2019-02-01 21:01:15 +08:00
zhengxie
d772dba34b Merge branch '6.3' 2019-01-19 15:38:33 +08:00
zhengxie
485b9c8e6f [api2] Fix search per_page argument 2019-01-11 11:01:42 +08:00
lian
b65547c3af remove unused filed (#2763)
root, desc, magic, enc_version, repaired and random_key
2019-01-05 11:59:36 +08:00
C_Q
f20f418f29 Delete redundant code (#2724) 2018-12-27 11:57:36 +08:00
wangjianhui
c0651fbf5f get dir_id from headers 2018-12-20 17:44:11 +08:00
wangjianhui
d6aa80c72e dirent list view update info 2018-12-20 17:44:11 +08:00
zhengxie
701ca86ee0 wip: add file update event in text preview page 2018-12-20 17:42:31 +08:00
ilearnit
a2aa805b20 refactot utils 2018-12-20 05:56:48 +00:00
ilearnit
7a46213c86 add org admin 2018-12-17 08:06:44 +00:00
ilearnit
4cf9532e0a refactor 2018-12-17 04:15:31 +00:00
ilearnit
a83be7af3e refactor code 2018-12-17 04:15:31 +00:00
ilearnit
1fc0882b10 update wiki mode 2018-12-17 04:15:31 +00:00
zhengxie
74d0fbeec1 Fix email notification interval error 2018-12-11 11:44:06 +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
133542b92b [tests] Update repo tests 2018-12-06 11:39:32 +08:00
WangJianhui666
f50fe8a2bd Show file tags (#2509) 2018-11-13 16:39:13 +08:00
zhengxie
cac765848d Merge branch '6.3'
Conflicts:
	seahub/utils/__init__.py
2018-11-01 10:50:44 +08:00
lian
dbde875981 use name instead of email
at group/device/admin-log page
2018-10-27 13:19:22 +08:00
zhengxie
18fe766866 [api2] Fix download repo perm 2018-10-26 17:07:49 +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
C_Q
67e19792aa New draft file (#2465) 2018-10-24 14:37:41 +08:00
zhengxie
26854bca9d [api] Update repos api, add org_id in send_msg 2018-10-18 10:17:51 +08:00
山水人家
6831d9e519 Wiki mode optimized (#2442) 2018-10-13 17:07:54 +08:00
wangjianhui
0b911f03d4 update-file-comment 2018-10-09 18:07:49 +08:00
ilearnit
dac30d24c5 Merge branch '6.3' into master 2018-09-28 15:51:34 +08:00
ilearnit
e98dab604f update FileRevision api 2018-09-27 13:50:24 +08:00
lian
c51da1c832 update api of shared with me (#2383)
* update api of shared with me

return 'group_name' field if current library is a group owned library

* add api for delete shared in group owned repo
2018-09-21 15:42:59 +08:00
ilearnit
15b5be489d Merge branch '6.3'
Conflicts:
	frontend/build/frontend/js/main.js
	frontend/build/frontend/js/main.js.map
	frontend/build/frontend/js/wiki.js
	frontend/build/frontend/js/wiki.js.map
	frontend/src/components/constance.js
	frontend/src/pages/wiki/main-panel.js
	frontend/src/pages/wiki/side-panel.js
	frontend/src/wiki.js
2018-09-12 12:03:07 +08:00
Daniel Pan
4ed6f83c5c [api] Add replace file arg to upload link (#2347) 2018-09-07 10:53:26 +08:00
zhengxie
5ec002c98a Merge branch '6.3' 2018-09-01 15:34:31 +08:00
ilearnit
2909b78ae9 add mtime_relative 2018-09-01 12:20:41 +08:00
zhengxie
a3bdae76b2 Merge branch '6.3'
Conflicts:
	frontend/src/pages/wiki/side-panel.js
2018-08-31 11:59:19 +08:00
zhengxie
9227e743f5 Add FILESERVER_TOKEN_ONCE_ONLY setting 2018-08-31 11:41:33 +08:00
lian
06a81c64c1 update view/edit office file
use OOS/OnlyOffice to view/edit file at
1, file download share link page
2, file in folder download share link page
3, file-history/repo(folder)-trash/repo-snapshot page
2018-08-31 11:23:56 +08:00