haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-04-28 03:10:45 +00:00
Code Issues Releases Wiki Activity
7,563 Commits 129 Branches 443 Tags 1.4 GiB
f9c46485d6
Commit Graph

730 Commits

Author SHA1 Message Date
zhengxie
a4fa2b4a10 Merge branch '6.3' 2018-12-06 11:44:11 +08:00
C_Q
5f206a1b95 Load css at the bottom of the head (#2597) 2018-12-05 13:36:19 +08:00
lian
c547218c50 update share_link_expire_days_default 
show default days after delete share link
 2018-11-30 15:25:18 +08:00
llj
9ee2c2bcb2 [share link] improvement for 'delete confirm' & 'show expiration date' 2018-11-29 14:02:44 +08:00
lian
37ed51bd4a show expire date info when render share link 2018-11-29 14:02:44 +08:00
lian
5ff7743df6 add confirm logic when delete share link 2018-11-29 14:02:44 +08:00
lian
5e7e4fd070 use post request when download multy file/folder (#2529) 2018-11-15 17:16:11 +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
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
lian
a43389a126 enable admin change repo history when enable_repo_history_setting (#2469) 2018-10-25 17:18:08 +08:00
lian
fc5e37587d preview xmind file 2018-10-18 10:16:03 +08:00
shanshuirenjia
f0fe76f4da repair share bug 2018-10-17 11:28:01 +08:00
山水人家
55f8277d43 repair share bug (#2449) 2018-10-15 16:11:37 +08:00
C_Q
2eef50d05e Draft review (#2416) 2018-10-15 15:51:29 +08:00
shanshuirenjia
5cffd4cb69 Draft optimized (#2409) 
* repair drafts

* repair naming error

* optimized code

* sentence error
 2018-09-29 10:24:46 +08:00
ilearnit
dac30d24c5 Merge branch '6.3' into master 2018-09-28 15:51:34 +08:00
C_Q
7da4642806 change the default view mode of repo (#2399) 2018-09-25 22:41:40 +08:00
llj
28cc3762b0 Shared with me (#2393) 
* 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

* [shared with me] modification for 'group owned repo'
 2018-09-21 15:43:16 +08:00
lian
577e814ae7 fix bug of folder share link 2018-09-21 15:21:15 +08:00
llj
3fa4a88a96 [invitation] delete: modification (#2379) 2018-09-19 10:08:51 +08:00
shanshuirenjia
db47fb34a7 Wiki coding style improve (#2380) 2018-09-19 09:57:17 +08:00
shanshuirenjia
e793730939 Drafts module (#2375) 2018-09-15 16:14:17 +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
llj
e19a147154 [dir view] getMore: fixup for some cases 2018-09-12 17:05:58 +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
llj
94368c5af9 [dir view] fileupload: added support for IE9 2018-09-07 15:17:46 +08:00
shanshuirenjia
b8662376a1 repair menu bug for floder bug (#2335) 2018-09-04 16:19:56 +08:00
llj
094871b45f [share popup] share link: new design 2018-09-03 18:51:54 +08:00
lian
6313e54dd7 update share link permission (#2328) 
1, download Link -> Share link
2, add can_preview field for file when ajax list lib dir
3, hide preview-only permission if a file can not preview
 2018-09-01 16:07:01 +08:00
zheng xie
e68193c965
Merge pull request #2317 from haiwen/6.3-csrf_cookie 
Use custom csrf cookie name to avoid name conflict
 2018-08-30 18:52:24 +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
zhengxie
0f59f84804 Use custom csrf cookie name to avoid name conflict 2018-08-30 13:37:03 +08:00
lian
c8b51b7bfc update logic of show folder share icon 
if current user has 'is_admin' library permssion, show folder share icon
 2018-08-24 17:54:42 +08:00
lian
f2e32f3073
Merge pull request #2282 from haiwen/copy-file 
update copy dirent api
 2018-08-23 17:57:38 +08:00
llj
ffca232d4d 6.3 perm error (#2294) 
* Add login url to context

* [backbone] turn to login page when 403
 2018-08-23 13:41:17 +08:00
llj
1b0e3e1264 [dir view] enable 'copy file/dir to current folder' 2018-08-21 16:58:49 +08:00
llj
3414cfe10d [org address book] fixup 2018-08-20 19:04:24 +08:00
zheng xie
775d6871f7
Merge pull request #2281 from haiwen/6.3-org_address_book-fe 
[org admin] added 'address-book'
 2018-08-20 13:21:59 +08:00
llj
5b8dc61e6f [misc] fixup 2018-08-18 11:05:08 +08:00
llj
ff90c7cfb4 [org admin] added 'address-book' 2018-08-17 14:01:48 +08:00
llj
c24d527a03 [fileupload] show 'Network error' instead of 'Unknown error' (#2266) 2018-08-16 16:46:07 +08:00
llj
3dad80d722 [group] fixup for adding a group owned repo 2018-08-16 10:56:10 +08:00
llj
3fcfeab7f4 [dir view] fixup for 'group owned repo' 2018-08-15 12:35:49 +08:00
lian
0d4d277361
Merge pull request #2272 from haiwen/share-and-folderPerm 
Share and folder perm
 2018-08-14 14:01:28 +08:00
lian
2ab9b5b900
Merge pull request #2273 from haiwen/new-group-owned-repo-fix 
[group] fixup for adding the first owned repo when there are no repos …
 2018-08-14 13:15:07 +08:00
llj
21c723ecf5 [group] fixup for adding the first owned repo when there is no repos in the group. 2018-08-13 17:30:55 +08:00
llj
cfb9c9b319 [folder perm] modification for group owned repo 2018-08-13 16:28:05 +08:00
llj
76183310e0 [share] share to group: modified group list 2018-08-10 17:32:09 +08:00
llj
d7510c0773 [group repo list, dir view] modification after 'enable users to share personal libraries to departments' 2018-08-10 16:45:20 +08:00