haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-04-27 19:05:16 +00:00
Code Issues Releases Wiki Activity
14,895 Commits 128 Branches 443 Tags 1.4 GiB
master
Commit Graph

886 Commits

Author SHA1 Message Date
sniper-py
dd659908ff move dtable share and file participants api file 2019-07-04 16:16:07 +08:00
LeoSirius
446d074066 add test case 2019-07-04 15:01:06 +08:00
sniper-py
ee4f3460ed dtable share update model name and class name 2019-07-02 13:32:48 +08:00
sniper-py
240ca9528a update share dtable list 2019-07-02 10:52:06 +08:00
sniper-py
d459fec1b3 share dtable update rw permission 2019-07-02 10:52:06 +08:00
sniper-py
4da16f3e0a share dtable API test 2019-07-02 10:52:06 +08:00
plt
4e7ebb4e70 Merge branch '7.0' 2019-07-01 17:13:28 +08:00
sniper-py
65265196b6 department repo history setting update permission 2019-06-28 11:13:51 +08:00
sniper-py
c29d990c67 file participants update python 2019-06-28 09:53:25 +08:00
sniper-py
ae543df9b7 file participants api-v2.1 2019-06-28 09:53:25 +08:00
lian
86e4e2d549 Merge branch '7.0' 2019-06-27 18:39:55 +08:00
lian
03f6d3136c update travis 2019-06-27 13:22:54 +08:00
sniper-py
a4efe57c49 department clear trash test fix (#3742) 2019-06-27 13:22:33 +08:00
plt
767d6fd85c Merge branch '7.0' 2019-06-26 18:29:55 +08:00
sniper-py
ad18e874b1 admin add group with period in name (#3712) 
* admin add group with period in name

* user add group with period in name
 2019-06-26 18:19:00 +08:00
plt
a20926d0c1 Merge branch '7.0' 2019-06-26 18:00:47 +08:00
sniper-py
163b7f1cfd Department clear trash (#3727) 
* department admin clear repo trash

* department admin clear repo trash API test
 2019-06-26 17:06:52 +08:00
王健辉
8de847f20e fix test error (#3732) 2019-06-26 15:59:18 +08:00
Daniel Pan
837dfff28f
Merge pull request #3704 from haiwen/dtable-upgrade 
dtable upgrade
 2019-06-25 16:46:39 +08:00
王健辉
809e6cddcc add dtables 2019-06-25 15:38:42 +08:00
Daniel Pan
5bbf4f90c6
Merge pull request #3707 from haiwen/7.0 
7.0
 2019-06-24 15:24:00 +08:00
lian
a4eba32bd5 update repo batch api 
1, add batch delete item api
2, check sub folder permission when batch delte/move item
 2019-06-20 18:30:59 +08:00
lian
26f70c61d9 Merge branch '7.0' 2019-06-19 12:11:40 +08:00
lian
2e3b68f947 add file lock check when move dirent 2019-06-17 15:04:20 +08:00
sniper-py
875d5b6ded repo commit fix (#3658) 2019-06-14 16:01:33 +08:00
sniper-py
c41e4b04fa repo commit revert API (#3656) 
* repo commit revert API

* repo commit revert API test
 2019-06-14 15:26:13 +08:00
lian
329c726cc0 add sync batch copy/move item api 2019-06-13 11:33:53 +08:00
plt
2ed53456c8 Merge branch '7.0' 2019-06-11 17:34:17 +08:00
lian
c817cacbb3 add sync batch copy/move item api 2019-06-11 15:32:39 +08:00
Daniel Pan
41c1fcafd1
Merge pull request #3615 from haiwen/async-batch-copy 
add async batch copy/move item api
 2019-06-10 15:42:43 +08:00
lian
4a4d5142c2 update test 2019-06-10 15:24:56 +08:00
lian
c06dc0f0a4 add async batch copy/move item api 2019-06-10 15:02:34 +08:00
plt
62f5d6502b Merge branch '7.0' 2019-06-06 08:07:18 +08:00
sniper-py
7dbdae81db update repo commit dir field 2019-06-05 17:21:35 +08:00
王健辉
a43ebeed87 improve dtable 2019-06-05 15:26:25 +08:00
Daniel Pan
cfd488e82c
Merge pull request #3533 from haiwen/dtable-database 
dtable database
 2019-06-05 10:09:56 +08:00
王健辉
41aef04267 add test case 2019-06-04 23:49:14 +08:00
sniper-py
9860fe63d7 repo commit dir 2019-06-04 18:36:49 +08:00
sniper-py
4f78baf41c repo dir trash API test 2019-06-04 13:21:05 +08:00
lian
54501e70a1 update draft test 2019-06-03 13:04:12 +08:00
lian
edb349584c fix repo history test (#3553) 2019-05-28 13:34:03 +08:00
Leo
17b5312fb0 add can generate share link to perm check (#3535) 2019-05-24 18:19:01 +08:00
王健辉
9c3c94993b fix test case 2019-05-24 13:52:33 +08:00
王健辉
75954dbf93 repo status 2019-05-17 14:07:01 +08:00
sniper-py
88b24c609c update permission check wehn unstar item 2019-05-14 10:44:38 +08:00
Leo
0e0cd9f4ab modify_contact_email_logic_in_user_api (#3417) 
* modify_contact_email_logic_in_user_api
 2019-05-07 18:01:50 +08:00
Leo
d9b62c8555 add can publish repo permission (#3402) 
add can_publish_repo user role permission
 2019-05-06 15:50:44 +08:00
Leo
bf6c2e79c2 fix bug in update user profile contact email (#3409) 
* fix bug in update user profile contact email
 2019-05-06 15:48:56 +08:00
sniper-py
80d75e2d74 Library can not be transferred to owner. (#3404) 2019-05-06 13:58:23 +08:00
Leo
b44d1ef870 update api for change user profile and get user profile, add test cases (#3394) 
* update api for change user profile and get user profile, add test cases
 2019-04-30 17:14:49 +08:00
Leo
0420331a9c add avatar url in response (#3381) 
* add avatar url in response
 2019-04-28 17:10:53 +08:00
ilearnit
fdff270e5c fix index.md bug && update url wikis-->published 2019-04-26 04:04:52 +00:00
sniper-py
5dec5ef281 create group can use single quote (#3265) 
* admin create group can use single quote

* user create group can use single quote, update error_msg
 2019-04-17 14:41:23 +08:00
ilearnit
8c6ae8676e fix test 2019-04-17 03:49:21 +00:00
Leo
66b668fd21 add_api_admin_notifications_with_test_cases (#3246) 
* add_api_admin_notifications_with_test_cases
 2019-04-13 18:15:40 +08:00
sniper-py
704778d788 can add public repo permission update (#3241) 
* can add public repo permission update to
both "can_add_public_repo" and "ENABLE_USER_CREATE_ORG_REPO"
 2019-04-13 10:05:52 +08:00
Leo
e23fd72fc7 fix bug of user notification (#3230) 
* fix bug of user notification

add checks, add test cases for notifications
 2019-04-12 10:36:22 +08:00
ilearnit
22f68f4d11 [test] fix 2019-04-11 06:22:47 +00:00
陈钦亮
bd8e18734c
Update test_view_lib_file.py 2019-03-26 12:02:53 +08:00
陈钦亮
5b5a72f6cb
Update test_drafts.py 2019-03-20 13:35:09 +08:00
王健辉
e6a9352532 fix test error 2019-03-13 13:11:23 +08:00
ilearnit
e31a67dea6 fix test 2019-03-11 10:02:39 +00:00
ilearnit
44b3885b09 update test 2019-03-01 09:54:21 +00:00
陈钦亮
6137e720f0 Refactor draft (#3018) 
* refactor draft

* update
 2019-03-01 16:49:35 +08:00
lian
34d4fe1017 refactor is_repo_admin func (#3003) 2019-02-27 13:23:04 +08:00
zhengxie
ac989da25a [tests] Remove encoding in view text file. 2019-02-26 11:20:29 +08:00
zhengxie
731179f2dd [tests] Fix view lib file. 2019-02-26 11:00:02 +08:00
zhengxie
1c7f1512bc [tests] Fix view image file. 2019-02-23 15:12:38 +08:00
lian
5fd5b000e1 star folder (#2955) 2019-02-18 20:26:55 +08:00
C_Q
90324d3d87 Init text shared (#2908) 2019-02-01 18:44:10 +08:00
zheng xie
b6864cf70f
Merge pull request #2914 from haiwen/7.0-wxwork_interal_app 
7.0 wxwork interal app
 2019-01-30 17:53:50 +08:00
zhengxie
9754ec3039 [tests] Add role_permissiongs 2019-01-28 18:39:49 +08:00
zheng xie
81777b5ec5 [role_perm] Calculate user role according to user.role and user.org_role. (#2897) 2019-01-28 17:45:48 +08:00
lian
37a1e9cedb
Merge pull request #2886 from haiwen/fix-test 
fix dir api test
 2019-01-28 17:14:15 +08:00
zhengxie
0efcbb10a3 [social auth & notification] Add wechat work notification 2019-01-28 11:36:00 +08:00
lian
0359f6aeca fix dir api test 2019-01-25 16:25:45 +08:00
zhengxie
684167819f [tests] Fix errors 2019-01-25 16:18:24 +08:00
zhengxie
9ddcf06225 [sysadmin] Fix attribute error in user search. 2019-01-25 15:28:32 +08:00
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
2eb725b7e1 [profile] Raise exception for duplicated contact email 2019-01-22 11:26:12 +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
C_Q
db2d0e01e7 fix notifications url (#2755) 2019-01-08 10:56:00 +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
C_Q
b196b1cf0a Improve code of draft (#2698) 2018-12-28 23:22:49 +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
2ca0b5f34d Merge branch '6.3' 2018-12-20 16:11:59 +08:00
lian
f41596a611 add LOCAL_PRO_DEV_ENV when test generet event type 2018-12-20 14:41:11 +08:00
lian
8497f075db add test for get file audit event type/device 2018-12-17 16:29:34 +08:00
ilearnit
803ebe4dc2 fix bug 2018-12-11 08:29:44 +00: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
C_Q
b828f536f1 update draft&review (#2596) 2018-12-05 13:31:16 +08:00
zheng xie
2c61839da8 [wiki] Redirect old url to new url end with .md (#2578) 2018-11-29 11:14:33 +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
zheng xie
6dd82286d7
Merge pull request #2466 from haiwen/6.3-force_2fa 
force 2fa
 2018-10-24 10:36:52 +08:00
C_Q
a393f0242d fix encode (#2462) 2018-10-23 08:27:10 +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
3273900056 fix test 2018-09-28 16:33:46 +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
zhengxie
c4538e716f [tests] Fix shibboleth middleware 2018-09-15 16:37:20 +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
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
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
lian
90cd24cec5 Revert "[tests] Update view_lib_file" 
This reverts commit 6f51aec1cc.
 2018-09-05 14:33:20 +08:00
zheng xie
6f51aec1cc
[tests] Update view_lib_file 2018-08-31 14:05:17 +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
zhengxie
4b4730cc99 [profile] Handle duplicated contact emails 2018-08-14 17:35:13 +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
c82f040cc7 Refactor view edit file (#2084) 
* remove unused code

remove api_convert_desc_link, prepare_events, view_repo_file

* refactor file view function
 2018-04-27 16:45:44 +08:00
lian
55014a2527 udpate group transfer test 2018-04-27 15:33:49 +08:00
ilearnit
dbccf38f35 [fix] test 2018-04-27 13:42:26 +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
C_Q
7e212c4246 [fix] send notices (#2079) 
* [fix] send notices

* WIP

* update fix-send-notices test

* Refactor
 2018-04-25 10:51:33 +08:00
lian
89e25fa965 update dir view 
return file info when get dir info recursively
 2018-04-19 11:45:17 +08:00
zhengxie
4d2398e4a7 [tests] Remove http://testserver since Site app is not installed 2018-04-18 11:11:24 +08:00
zhengxie
1cc0d09775 [tests] Fix django_constance in tests 
Conflicts:
	tests/seahub/notifications/management/commands/test_notify_admins_on_virus.py
 2018-04-18 11:11:24 +08:00
haiwen
3a82e7694e Merge branch '6.2' 2018-04-14 03:00:03 +00:00
xiez
12963cb7ef
Merge pull request #2068 from haiwen/fix-transfer-share-links 
fix transfer share links
 2018-04-12 16:42:22 +08:00
ilearnit
755f9fbbc6 fix transfer share lonks 2018-04-12 16:38:23 +08:00
ilearnit
7ba56a5abc [test] debug 2018-04-12 13:20:13 +08:00
ilearnit
12a9ef5b27 transfer share links 2018-04-12 10:57:19 +08:00
zhengxie
d0f8e1b2b2 Merge branch '6.2' 
Conflicts:
	seahub/views/__init__.py
	static/scripts/app/views/myhome-repos.js
 2018-04-11 13:25:52 +08:00
lian
d643456d0a return file info when get dir recursively 2018-04-08 12:06:34 +08:00
lian
f4cd577823 use inner file upload url when send post request inside seahub code. (#2055) 2018-03-30 13:29:12 +08:00
zhengxie
f1a32a3e64 [Django 1.11] Use dict in template.render, and update tests 2018-03-26 16:10:30 +08:00
C_Q
a35af2eea8 fix-hash-urls (#2045) 
* fix-hash-urls

* add fix hash urls test
 2018-03-26 15:43:37 +08:00
zhengxie
ea929696d8 [wiki] Sort wiki list and pages, add readonly permission to GET api 2018-03-26 13:31:41 +08:00
zhengxie
222739ace6 Squashed commit of the following and rebase: 
commit 251f1cd451
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Mar 19 14:41:25 2018 +0800

    Update wiki pages

commit 9461b904f4
Author: ilearnit <helloworld.c@outlook.com>
Date:   Mon Feb 26 16:36:58 2018 +0800

    extend wikis page operation

commit 0ad2f5bc49
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Mar 12 11:32:27 2018 +0800

    Fix minor issues

commit 8fb3c1ab47
Author: ilearnit <helloworld.c@outlook.com>
Date:   Fri Feb 9 17:02:36 2018 +0800

    add edit wiki permission

commit 2103d80302
Author: zhengxie <xiez1989@gmail.com>
Date:   Fri Feb 9 11:56:48 2018 +0800

    [wiki] Updates and tests

commit 642198cc80
Author: zhengxie <xiez1989@gmail.com>
Date:   Wed Jan 17 12:04:52 2018 +0800

    Add wiki home page and and tests

commit 999b17d0e9
Author: ilearnit <helloworld.c@foxmail.com>
Date:   Tue Jan 16 12:19:06 2018 +0800

    Delete a Wiki

    Conflicts:
    	seahub/wiki/models.py

commit f5b00647c6
Author: zhengxie <xiez1989@gmail.com>
Date:   Fri Jan 12 17:34:12 2018 +0800

    [wiki] Add wiki model
 2018-03-26 13:31:40 +08:00
zming
3998466c25 [fixed] error when use search_path feature 2018-03-22 13:31:32 +08:00
zhengxie
b7722fc05b [tests] Fix urlpatterns 2018-03-21 17:02:06 +08:00
zhengxie
9b16ba0e8f [Django 1.11] Feature removed in Django 1.9. Update template settings and test 2018-03-19 15:33:25 +08:00
zhengxie
663eebc8ed [Django 1.11] Feature removed in Django 1.9. Use shortcut to get current site 2018-03-16 13:23:53 +08:00
zhengxie
2d56fd73c0 Rewrite 2fa, do not import models in package level 2018-03-16 11:42:13 +08:00
llj
1182a80989 Merge branch '6.2' 2018-03-15 11:26:02 +08:00
lian
ef5c962b44 update demo user feather 
1. remove CLOUD_MODE check when login demo user
2. add ENABLE_DEMO_USER settings
 2018-03-14 17:23:12 +08:00
zhengxie
faf3b84869 Fix 2fa backup token page when 2fa is skipped. 2018-03-06 17:16:38 +08:00
xiez
e10bbde9c3
Merge pull request #2019 from haiwen/share-link-perm 
update permission when user download/upload link
 2018-03-05 10:44:48 +08:00
zming
16af598e16 Reduce redundant operations 2018-03-02 11:45:52 +08:00
lian
91ee8f16cb update permission when user download/upload link 
add repo access permission check for share link creator
 2018-03-01 16:01:20 +08:00
zMingGit
1529155f3e
Merge pull request #2014 from haiwen/refactor-search 
refactor search file api
 2018-02-09 10:41:03 +08:00
lian
fc3d6b8339 refactor search file api 2018-02-08 17:17:14 +08:00
xiez
35b7d76c82
Merge pull request #2003 from haiwen/share-link-upload 
add api for upload file via upload link foken
 2018-02-08 14:37:51 +08:00
lian
35da335de3 add api for upload file via upload link token 2018-02-08 14:06:02 +08:00
xiez
a55e1fee7e
Merge pull request #2006 from haiwen/search-repo-perm 
update search file api
 2018-02-07 15:55:31 +08:00
ilearnit
1d26c71723 [tests] update extend admin notification 2018-02-07 14:28:27 +08:00
lian
9998f89280 update search file 
admin permission check when search file in a repo
 2018-02-07 11:49:31 +08:00
xiez
d807295010
Merge pull request #2004 from haiwen/clean-repo-trash 
add clean library trash api
 2018-02-06 18:21:08 +08:00
xiez
298a5a62a0
Merge pull request #2001 from ilearnit/extend-admin-notification 
extend-admin-notification
 2018-02-05 10:55:52 +08:00
lian
b35c418361 add clean library trash api 2018-02-03 10:58:35 +08:00
ilearnit
0957c4b3ca extend-admin-notification 2018-02-01 18:01:49 +08:00
zming
5f9033b5ff sysadmin can share repo with admin permission 2018-01-30 17:38:30 +08:00
xiez
f797d2d523
Merge pull request #1985 from haiwen/fs-encrepo 
Fix shared link in enc repo and update tests
 2018-01-29 10:43:26 +08:00
lian
148e382425 add admin copy file/folder api 2018-01-24 13:01:19 +08:00
zhengxie
eb952e2041 Fix demo account 2018-01-22 18:30:37 +08:00
lian
c9968d59e6 update get group repo test 2018-01-20 14:38:03 +08:00
zhengxie
4315f29aa2 Fix shared link in enc repo and update tests 2018-01-20 14:13:47 +08:00
xiez
14f143fe47
Merge pull request #1968 from haiwen/groups-for-repo-share 
add api for getting groups that user can share repo to
 2018-01-17 19:04:14 +08:00
lian
ed8200b52a add api for getting groups that user can share repo to 2018-01-17 18:22:48 +08:00
lian
0c173a12ac use new get group repos api 2018-01-17 16:07:30 +08:00
zhengxie
2abfa3fd53 Update tests 2018-01-11 16:35:14 +08:00
zhengxie
efac7b598f Fix tests 2018-01-11 15:50:22 +08:00
zming
0affd2fc1f license file type invalid && update test 2018-01-10 18:49:55 +08:00
ilearnit
4b7ec9de27 Delete user option (#1979) 
* Remove user all options

* delete space

* delete space

* debug sapce
 2018-01-10 17:28:28 +08:00
xiez
f5daddfef3
Merge pull request #1965 from haiwen/guest-login-notify 
[notification] Notify inviter on guest accept invitation.
 2018-01-09 13:23:50 +08:00
xiez
93b131a8ab
Merge pull request #1975 from haiwen/notify_admin_after_register 
Notify admins after register
 2018-01-09 11:43:51 +08:00