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
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
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
lian
9998f89280
update search file
...
admin permission check when search file in a repo
2018-02-07 11:49:31 +08:00
lian
b35c418361
add clean library trash api
2018-02-03 10:58:35 +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
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
zming
0affd2fc1f
license file type invalid && update test
2018-01-10 18:49:55 +08:00
zming
295b567b84
upload with invalid type
2018-01-08 16:00:55 +08:00
zhengxie
f0a60418e4
[address book] Add admin api
2018-01-04 17:25:19 +08:00
zhengxie
d37144ef75
Merge branch '6.2'
...
Conflicts:
seahub/templates/base.html
static/scripts/app/views/dir.js
static/scripts/common.js
2017-12-28 15:47:18 +08:00
zming
9adadb6e7d
tests
2017-12-22 12:13:42 +08:00
lian
0500f441a8
update file history page/api
...
1. user with `r` and `rw` permission can view file history
2. add new file history api
2017-12-11 11:18:19 +08:00
zhengxie
0acf8254aa
Merge branch '6.2'
2017-12-05 15:04:56 +08:00
xiez
43e125bbd6
Merge pull request #1915 from haiwen/sysinfo-test-update
...
update sysinfo test
2017-11-20 23:34:37 -06:00
zming
c9e32ce94f
update sysinfo test
2017-11-21 13:14:15 +08:00
zming
b3b61667a3
fixed when get all revision tag
2017-11-21 12:22:23 +08:00
zMingGit
b91f394a43
fixed test ( #1911 )
2017-11-20 21:18:19 -06:00
zMingGit
b5b55b1640
revision delete by name(user) ( #1903 )
...
* revision delete by name(user)
* review
2017-11-20 16:37:09 +08:00
zming
2be35db8df
del statistics by hour(user activity, total storage)
2017-11-17 17:06:29 +08:00
lian
2a680b83c6
update tests of shared repos
2017-11-14 16:01:31 +08:00
zMingGit
05caf621f1
Userinfo contactemail ( #1894 )
...
* Show contact_email on user profile
I think it would be good to have the edit functionality for that
attribute, too, but I did not implement that right now.
It's marked with TODO though.
* update api and tests
* review
2017-11-14 14:12:27 +08:00
lian
cf480de31b
Merge branch '6.2'
2017-11-09 15:27:50 +08:00
zming
f2168d9602
add fileuuidmap to filecomment & del seahub signal
2017-11-06 15:58:41 +08:00
lian
c88ff295c1
add new group libraries api ( #1835 )
2017-11-03 12:04:07 +08:00
zMingGit
f5d1be1f59
share permission refactor ( #1843 )
...
* rebuild
* share admin
* use seafile_api
* rebase 6.2
* complete test
* api changed
* some error
* break up to two method
* review
* js review
2017-11-01 18:13:51 +08:00
lian
36cdff75aa
add admin api for get info of a single repo
2017-10-21 04:33:48 -07:00
zMingGit
58ca1084ac
comment paging ( #1867 )
...
* comment paging
* test
2017-10-19 15:24:59 +08:00
zming
0f97c18558
client create enc library with disable enable_enc_library test
2017-09-27 16:58:51 +08:00
zhengxie
3bd12e7ad2
Merge branch '6.1'
...
Conflicts:
tests/api/test_repo.py
2017-09-19 13:58:36 +08:00
zming
cd516a889c
update test,del share_to_all_group config,del modify name
2017-09-19 11:02:37 +08:00
zming
15d5f354f7
serach-repo
2017-09-19 10:47:49 +08:00
xiez
45950be55c
Merge pull request #1824 from haiwen/search-repo
...
serach-repo
2017-09-19 10:39:40 +08:00
zming
a141f2beac
serach-repo
2017-09-18 17:31:47 +08:00
zMingGit
12ba328119
limit ip
2017-09-18 14:21:11 +08:00
zming
07fe7a1d23
update profile test
2017-09-12 16:07:08 +08:00
lian
9bdbb1671a
Add ENABLE_ADDRESSBOOK_OPT_IN setting
...
Enable user to choose if show himself in global address book
2017-09-11 11:13:59 +08:00
zming
74673d92b1
add unique reference and test
2017-09-09 18:00:22 +08:00
llj
45fb407368
Merge pull request #1784 from haiwen/admin-role-log
...
add admin role/login feature
2017-09-09 16:19:38 +08:00
lian
bc492b9010
add admin role/log feature
2017-09-09 15:27:04 +08:00
xiez
0b973d854d
Merge pull request #1789 from haiwen/ReferenceID
...
[API] add user reference id
2017-09-07 17:49:43 +08:00
zming
669beb936e
add unique reference and test
2017-09-07 17:38:41 +08:00
zming
1044f11aea
[API] add user reference id
2017-09-07 15:22:15 +08:00
zMingGit
24232c85f7
Profile default ( #1793 )
...
* profile -> institution test
* fix
2017-09-06 15:35:23 +08:00
zhengxie
c004100a8a
Merge branch '6.1'
...
Conflicts:
seahub/urls.py
2017-09-04 17:07:02 +08:00
lian
6ebbce5b76
use custom logo when send email
2017-08-31 14:43:25 +08:00
lian
1266e1b237
add admin users api
2017-08-28 14:52:28 +08:00
zming
b460d89f5a
[test] pro -> master
2017-08-23 16:28:51 +08:00
zhengxie
21701ef3b3
Merge branch 'setLibHistory'
...
Conflicts:
seahub/urls.py
2017-08-23 15:37:29 +08:00
zhengxie
60da1ed10a
Merge branch '6.1'
2017-08-23 14:51:56 +08:00
zming
d0975c7836
migrate two-factor
2017-08-21 14:02:57 +08:00
zming
4133d33854
[api] fix setting don't work
2017-08-16 18:48:37 +08:00
zming
9dc68b75d0
[api] fix share to all groups test
2017-08-16 17:55:52 +08:00
zming
897eced17f
restore-library test
2017-08-15 11:43:05 +08:00
Daniel Pan
d99e7b6270
Merge pull request #1738 from haiwen/restore-repo
...
permission check, check whether repo is exists
2017-08-14 15:09:25 +08:00
lian
3e7275ec80
Merge branch '6.1'
2017-08-12 14:34:11 +08:00
lian
057b6960be
check if is group member when share repo to group
2017-08-11 16:11:35 +08:00
zming
71976f998d
[share-group] add judege of global config
2017-08-11 15:51:03 +08:00
xiez
49605e79ff
Merge pull request #1743 from haiwen/master-sharing-groups
...
[ share-repo ] can share repo to any groups
2017-08-11 13:32:12 +08:00
zming
5d04ce0de2
[ share-repo ] can share repo to any groups
2017-08-10 17:35:39 +08:00
zming
9766983ae0
check permission
2017-08-10 15:47:43 +08:00
zMingGit
60c78adc44
[api2] stat_file ( #1690 )
...
* [api2] stat_file
* [send message] update last login info
* datetime->data, return number to int
* fill data
* modify func args
* modify algorithm
2017-08-09 18:14:00 +08:00
lian
630bc43136
batch mkdir
2017-08-08 16:39:53 +08:00
lian
45f0d9cd9a
update parameter and tests
2017-08-04 15:01:55 +08:00
lian
e15f6c6737
batch copy folders
2017-08-04 10:55:33 +08:00
lian
44e2889abf
update account test
2017-08-03 18:06:08 +08:00
zming
5298d25b46
update response
2017-08-02 11:48:15 +08:00
zming
3ab3593fe9
permission check&check whether repo is exists
2017-08-01 15:37:09 +08:00
zming
466ef48116
[api] admin library history limit
2017-08-01 10:17:38 +08:00
zming
2164b717f6
[API2] RevisionTag
2017-07-31 10:54:46 +08:00
lian
259655b6bd
update clear token
...
clear token when inactive user, delete user, change user password
2017-07-28 16:37:11 +08:00
zming
d28e597921
[API2] ReversionTag
2017-07-21 12:30:55 +08:00
Daniel Pan
4c776b0f17
Merge pull request #1705 from haiwen/org-user-info
...
update admin org user api
2017-07-20 14:07:48 +08:00
zming
423a3f0e25
Merge branch 'clear-invitations' into 6.1
2017-07-15 17:52:08 +08:00
zming
9e1fb76166
update invalid args
2017-07-15 17:46:46 +08:00
lian
f62a206ed8
update admin org user api
2017-07-15 16:00:30 +08:00
xiez
64832adc03
Merge pull request #1674 from haiwen/license
...
license
2017-07-15 15:37:06 +08:00
zhengxie
b1e9f5beb3
reload license when updated and update tests
2017-07-15 15:28:41 +08:00
xiez
0de932bec9
Merge pull request #1703 from haiwen/two-factor-auth
...
Two factor auth
2017-07-15 13:48:33 +08:00
zming
c0f512aca6
update test
2017-07-15 12:24:52 +08:00
zming
f51d8122e9
rm expire invitations
2017-07-13 15:41:30 +08:00
zming
c2873b9112
two-factor-auth
2017-07-13 10:55:10 +08:00
zming
b8a4a12880
file tag
2017-07-11 17:45:39 +08:00
lian
a77ab79e91
add size
when admin get file share link info
2017-07-10 11:22:39 +08:00
zhengxie
f55d23b095
Merge branch '6.1'
2017-07-06 10:47:39 +08:00
lian
3e81a5b8a8
add dir detail api
2017-07-04 14:07:26 +08:00
xiez
1c08c67d24
Merge pull request #1672 from haiwen/system-lib
...
add admin system library upload api
2017-07-03 14:55:45 +08:00
lian
46a5473326
add amdin system library upload api
2017-07-03 14:42:12 +08:00
lian
0f32bf26fe
update multi copy/move dirents api
2017-07-03 12:24:07 +08:00
zming
734766391a
[api2] get deleted-repos,and restore deleted-repos
2017-06-30 16:22:29 +08:00
fanghao
3149a4d49d
license
2017-06-30 15:35:31 +08:00
zhengxie
bb8f04993d
Merge branch '6.1'
...
Conflicts:
seahub/api2/views.py
2017-06-30 14:27:07 +08:00
lian
070f68e3e4
add get repo info api for v2.1
2017-06-27 17:23:10 +08:00
lian
2e5d8bc1ed
update get repo info api
...
add `file_count` and rm `desc`
2017-06-27 16:32:19 +08:00
zhengxie
eb2719fc59
[api] Add repo last modifier and add cache for memcache ops
2017-06-23 11:30:01 +08:00
zhengxie
966e0bcb9c
[api] Improve dir list performance
2017-06-22 15:38:59 +08:00
lian
9750e8baaf
add admin share/upload links api
...
1. get share/upload link info by token
1. get dirents of shared dir
1. get download/upload fileserver url of shared file/dir
1. check share/upload link password
2017-06-21 15:15:24 +08:00
lian
74b8272047
rm unused info when get repo list via api
2017-06-20 11:08:26 +08:00
lian
179e2ebc72
update mkdir api
2017-06-20 10:51:45 +08:00
xiez
b487ca463b
Merge pull request #1636 from haiwen/file-modifier
...
[api] file modifier
2017-06-19 15:38:39 +08:00
zming
3edfe92f60
[api] file modifier
2017-06-19 14:52:16 +08:00
zhengxie
12940b3219
Merge branch '6.1'
2017-06-17 11:07:43 +08:00
xiez
5f666ad754
Merge pull request #1601 from haiwen/share-link
...
Share link
2017-06-17 11:07:02 +08:00
zhengxie
7dbb428c6e
Merge branch '6.0' into 6.1
2017-06-09 10:16:34 +08:00
xiez
f2fc7a451d
Merge pull request #1626 from haiwen/api_whitelist
...
Api whitelist
2017-06-07 16:44:44 +08:00
xiez
4c02004220
Merge pull request #1622 from haiwen/delete-files
...
update delete multi file api
2017-06-07 16:41:55 +08:00
zhengxie
c99d3b4035
[tests] Fix tests
2017-06-06 12:11:05 +08:00
lian
1bd70c2f53
update delete multi file api
2017-06-05 17:17:28 +08:00
zming
e26d5b6aa8
[throtting] Add whitelist of throtting
2017-06-05 15:54:08 +08:00
lian
7c9ff51a65
update test of file history api
2017-06-05 11:41:03 +08:00
zhengxie
e9de086db3
Merge branch '6.1'
2017-06-03 11:21:08 +08:00
llj
f7ed342e2d
Merge pull request #1593 from haiwen/custom
...
admin update logo/favicon
2017-05-27 16:50:54 +08:00
lian
e1d0169e64
update admin log
...
1. add log when admin create repo
1. add log when admin batch delete user
1. update test
2017-05-23 16:05:51 +08:00
zhengxie
f79159f9d6
Merge branch '6.0' into 6.1
2017-05-23 11:01:55 +08:00
xiez
df2de123ab
Merge pull request #1590 from haiwen/encode-utf-8
...
not encode utf-8 when do some file/dir operation
2017-05-23 11:01:15 +08:00
zhengxie
ecb26403ac
Merge branch '6.1'
2017-05-23 10:44:06 +08:00
zhengxie
1f7880ebc1
Merge branch '6.0' into 6.1
...
Conflicts:
seahub/urls.py
2017-05-23 10:38:49 +08:00
zming
1ed03f96e1
[API2] add login_id field, and test case
...
[api] update account and test
[template] increase the function of modifying logind
[review] trans
[review] trans again
2017-05-22 15:33:50 +08:00
zhengxie
133522487a
[api2] Add permissions to share link creation api
2017-05-18 17:32:28 +08:00
lian
0ca018fcf4
add admin create repo api
2017-05-18 10:43:31 +08:00
lian
2b1ae5b921
admin update logo/favicon
2017-05-17 16:59:38 +08:00
lian
0d4bdedb37
update user avatar
2017-05-13 16:16:34 +08:00
lian
610d607846
Revert "add create user avatar api"
...
This reverts commit 3483783a28
.
2017-05-13 15:51:48 +08:00
Daniel Pan
2461f86211
Merge pull request #1588 from haiwen/repos-api
...
add v2.1 repos api
2017-05-13 11:04:34 +08:00
lian
f062ed4be4
add v2.1 repos api
...
batch share repos to user/group
2017-05-13 09:43:24 +08:00
lian
52f9a6a82f
not encode utf-8 when do some file/dir operation
2017-05-13 07:38:55 +08:00
lian
3483783a28
add create user avatar api
2017-05-12 18:16:59 +08:00
zhengxie
0c732638eb
Merge branch '6.0'
2017-05-04 10:31:49 +08:00
xiez
d4fc5275e6
Merge pull request #1563 from haiwen/share-test
...
update dir share item api test
2017-04-28 15:16:40 +08:00
zhengxie
5c998cdb03
Merge branch '6.0'
2017-04-28 13:35:49 +08:00
lian
28c7fb5703
update dir share item api test
...
test share failed when share the same item to the same user/group
2017-04-25 16:12:56 +08:00
lian
bd0bbf3121
add test for file ops api
2017-04-25 15:54:42 +08:00
lian
c93d7a8736
update return value when copy/move file via web api
2017-04-24 18:17:58 +08:00
zhengxie
e6e6e82b82
Merge branch '6.0'
...
Conflicts:
seahub/api2/endpoints/file.py
seahub/urls.py
static/scripts/app/views/share.js
2017-04-17 16:21:22 +08:00
lian
fef1d50ecd
add name check
...
1. create/rename repo
1. create/rename folder
1. create/rename file
2017-04-14 13:21:16 +08:00