haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-30 13:23:14 +00:00
Code Issues Releases Wiki Activity
8,927 Commits 142 Branches 460 Tags 2.8 GiB
a115c4990e
Commit Graph

690 Commits

Author SHA1 Message Date
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
xiez
a03f3066c0
Merge pull request #1971 from haiwen/upload_invalid_type 
upload with invalid type
 2018-01-08 16:05:29 +08:00
zming
295b567b84 upload with invalid type 2018-01-08 16:00:55 +08:00
zhengxie
ed8a549458 Notify admins after register 2018-01-06 16:53:48 +08:00
zhengxie
2d4c3e2ce2 [sudo] Update tests 2018-01-05 11:56:47 +08:00
zhengxie
4b326ad404 [auth] Refactor login attempts 2018-01-04 17:32:30 +08:00
zhengxie
f0a60418e4 [address book] Add admin api 2018-01-04 17:25:19 +08:00
zhengxie
f4734b161a [notification] Notify inviter on guest accept invitation. 2017-12-29 14:15:20 +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
xiez
baeb8ccacf
Merge pull request #1952 from haiwen/invite-multi 
[invite people] enable to invite multiple guests at one time
 2017-12-25 13:32:42 +08:00
zming
9adadb6e7d tests 2017-12-22 12:13:42 +08:00
lian
d4cf67e324 multi storage backend 
1. add multi storage backend support
2. add 'storage_ids' user role
 2017-12-19 15:41:36 +08:00
xiez
78cd00bd13
Merge pull request #1938 from haiwen/search-link 
search link
 2017-12-13 17:56:57 +08:00
zming
cd260c0718 review 2017-12-13 17:26:50 +08:00
zming
b82c141afe review again 2017-12-13 14:33:13 +08:00
zming
3ec7684d46 search link 2017-12-11 16:29:38 +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
zming
c1d7b588e3 update notification 2017-10-26 10:04:16 +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
c09c3d0c6b fixed test 2017-10-13 13:10:05 +08:00
zming
0f97c18558 client create enc library with disable enable_enc_library test 2017-09-27 16:58:51 +08:00
zMingGit
2feb8ae575 [api] Add users in bulk from excel, export batch add user help file, add (#1792) 
* [api] Add users in bulk from excel, export batch add user help file, add
test

* remove csv feature

* review

* column width, del tip, add head

* del write_xls_sample, modify head

* review

* download text

* option->optional, trans
 2017-09-26 10:33:36 +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
zhengxie
f364946310 Merge branch '6.1' 
Conflicts:
	seahub/api2/endpoints/admin/two_factor_auth.py
	seahub/profile/views.py
	seahub/views/sysadmin.py
 2017-09-12 14:14:15 +08:00
lian
222ffc8121 update test of user permission 2017-09-11 14:48:14 +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
zMingGit
f9c16e95e1 performance, funciton name (#1795) 
* performance, funciton name

* middle

* depend with_repos, modify test
 2017-09-09 11:10:34 +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
zming
dd7f5d5417 [API] share to groups, add test 2017-09-06 16:02:12 +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
160e0b3027 [API] share to admin permission 2017-08-26 10:38:12 +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
xiez
2eb27af57f Merge pull request #1734 from haiwen/modify-tag-model 
modify tag model
 2017-08-03 17:38:06 +08:00
zming
0b3977a02e add unit test 2017-08-03 16:24:09 +08:00
xiez
622931dec4 Merge pull request #1739 from haiwen/shib_role_map 
[shibboleth] Add joker * in affiliation role map
 2017-08-02 18:32:22 +08:00
zhengxie
9a5aae50ab [shibboleth] Add joker * in affiliation role map 2017-08-02 18:31:15 +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
d597623b14 update test_get_enabled_role_permissions_by_role 2017-07-28 11:17:24 +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