haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-16 08:16:55 +00:00
Code Issues Releases Wiki Activity
13,486 Commits 135 Branches 453 Tags 2.3 GiB
c06d51a596
Commit Graph

862 Commits

Author SHA1 Message Date
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
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
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
xiez
0100d6da8b Merge pull request #1675 from haiwen/multi-copy-move 
update multi copy/move dirents api
 2017-07-03 13:12:51 +08:00
lian
0f32bf26fe update multi copy/move dirents api 2017-07-03 12:24:07 +08:00
zhengxie
da4918d7a9 [tests] Update phantomjs installation 2017-07-03 11:22:59 +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
xiez
1ef77ef036 Merge pull request #1661 from haiwen/normalize_path 
normalize file/dir path
 2017-06-27 18:08:10 +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
lian
68c5e764d6 normalize file/dir path 
1. Add '/' at the end of directory path if necessary.
1. And make sure path starts with '/'
 2017-06-27 11:34:09 +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
zhengxie
e939f942e3 Fix travis test 2017-06-19 15:30:22 +08:00
zming
3edfe92f60 [api] file modifier 2017-06-19 14:52:16 +08:00
zhengxie
e5747a1e67 Fix permission in shared file 2017-06-17 16:19:46 +08:00
zhengxie
5e20cd58fa Update share file permissions 2017-06-17 15:50:17 +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
zming
11f45979a5 [seahub] Added the ability to modify the format of the text preview suffix 2017-06-12 11:31:51 +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
zhengxie
2c2a84159d [role_permission] Add quota for a certain role 2017-06-05 17:52:04 +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
b2b9495a35 [share] Add permission field to FileShare model 2017-05-05 15:35:56 +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
zhengxie
764a63e705 Update sso login 2017-04-26 10:28:33 +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
0c61a22100 Fix tests 2017-04-17 16:37:23 +08:00
zhengxie
e72cde9d0a Update Django to 1.8.18 2017-04-17 16:37:11 +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
lian
132d181c3a update repo history api 
add 'name' and 'contact_email' to result
 2017-04-11 17:44:17 +08:00
lian
756ccf1303 add api 
1. add repo history api.
1. add repo trash api.
1. udpate search file api, add 'content_highlight' to search result
 2017-04-10 17:23:34 +08:00
lian
af4b430572 Revert "Fix tests" 
This reverts commit 375b270b53.
 2017-04-07 10:10:17 +08:00
lian
7de34634a0 Revert "Update Django to 1.8.18" 
This reverts commit 928cf4a09c.
 2017-04-07 10:09:59 +08:00
zhengxie
375b270b53 Fix tests 2017-04-06 17:01:58 +08:00
zhengxie
928cf4a09c Update Django to 1.8.18 2017-04-06 14:13:32 +08:00
zhengxie
2cb2bca2cd Add logout redirect url 2017-03-29 18:31:03 +08:00
lian
1f3b597336 add test for admin libraires api 2017-03-27 15:05:40 +08:00
zhengxie
f40aa6341b Update code styles 2017-03-27 13:58:12 +08:00
zhengxie
1b11350f80 Merge branch '6.0' 
Conflicts:
	seahub/templates/sysadmin/sysadmin_backbone.html
	seahub/urls.py
	seahub/views/sysadmin.py
	static/scripts/app/views/dir.js
 2017-03-27 13:53:35 +08:00
lian
b7d3a62b52 mock has permission 2017-03-24 18:12:27 +08:00
lian
54ec4bba63 add test for admin log api 2017-03-23 15:05:47 +08:00
lian
5427563233 add test for admin libraires api 2017-03-22 17:26:42 +08:00
lian
8286f73331 add api of amdin manage org user 2017-03-09 16:42:09 +08:00
lian
5e70dd8608 Merge pull request #1501 from haiwen/enhancement/share_link 
[share link] Enlarge token length
 2017-02-25 17:28:21 +08:00
zhengxie
ca399d38f8 [share link] Enlarge token length 2017-02-20 15:59:57 +08:00
zhengxie
d82df5fb52 Merge branch '6.0' 
Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py
 2017-02-17 17:11:33 +08:00
lian
b7cad9a707 add api of admin create default repo for common user 2017-02-17 11:46:37 +08:00
lian
fefb450b76 update api of out shared repos/folders 
return contact email when get info of out shared repos/folders
 2017-02-15 13:56:41 +08:00
lian
8f2df766a9 update search user when not use global address book 2017-02-14 18:38:39 +08:00
lian
2b43226d08 Merge pull request #1475 from haiwen/odf-view 
[ODF] modified file view for ODF; fix bugs
 2017-02-13 16:49:12 +08:00
Daniel Pan
f0a610cf69 Merge pull request #1480 from haiwen/search-user 
update search user
 2017-02-13 16:48:26 +08:00
lian
c904884526 update search user 
user can search if he/she has no permission of using global address book
 2017-02-13 16:03:31 +08:00
llj
5802a37628 [ODF] update test 2017-02-13 15:54:14 +08:00
xiez
801ec6455e Merge pull request #1479 from haiwen/virus 
Virus
 2017-02-13 13:36:31 +08:00
zhengxie
2cb9d4c753 [notification] Update virus scan notice 2017-02-13 11:37:53 +08:00
lian
f5ac28a38c rm unused dirent download api 2017-02-10 18:04:56 +08:00
xiez
6fd822f45f Merge pull request #1457 from haiwen/admin-group 
udpate admin groups page
 2017-02-09 18:11:09 +08:00
lian
5743c3879e update admin import user from csv file 2017-02-09 17:58:04 +08:00
lian
718bdbb59b update admin manage group page 2017-02-09 14:59:49 +08:00
lian
287257dd7c force change password after batch add user 2017-02-07 17:45:36 +08:00
lian
d43a2e5eb3 admin search group by name 2017-01-19 18:21:04 +08:00
lian
9848514e7d update test 2017-01-19 14:40:49 +08:00
lian
d05f72b7a0 update user personal wiki module 2017-01-19 14:40:49 +08:00
lian
86f948aaa8 update set_notice_seen_by_id 2017-01-19 14:40:49 +08:00
lian
5a700d5f00 update set_notices_seen 2017-01-19 14:40:49 +08:00
lian
8d62d3786e update get unseen notifications count 2017-01-19 14:40:49 +08:00
zhengxie
622fe2705e Fix reset email message 2017-01-17 16:08:03 +08:00
zhengxie
1832b2b0c0 [shib] Add affiliation role map 2017-01-17 13:24:08 +08:00
zhengxie
19beb9a7c8 [tests] Fix user reset 2017-01-17 12:01:03 +08:00
zhengxie
df70fd1b5e Use contact email in password resetting 2017-01-16 15:46:00 +08:00
lian
2ecae4162b update remove folder permission 
not check path existence when delete user/group folder permission
 2017-01-13 16:54:38 +08:00
lian
53d09bae5e update account api 
remove 'note' releated operation
 2017-01-07 17:00:16 +08:00
lian
38a06be960 update sysinfo page 2017-01-07 10:12:17 +08:00
xiez
9a9b6eb9e1 Merge pull request #1429 from haiwen/useradmin 
Useradmin
 2017-01-06 14:01:59 +08:00
lian
625db696af use api to set user quota/profile 2017-01-05 13:33:12 +08:00
Daniel Pan
65325da7de Merge pull request #1434 from haiwen/fix/group_wiki 
Fix group wiki for system admin
 2016-12-26 14:38:21 +08:00
zhengxie
b92a370658 Fix group wiki for system admin 2016-12-26 14:18:29 +08:00
Daniel Pan
c28f684c22 Merge pull request #1428 from haiwen/enhancement/invitation 
[invitation] Check duplicated accepter and add blocklist for accepter
 2016-12-26 12:02:57 +08:00
zhengxie
11fdfe7299 [invitation] Check duplicated accepter and add blocklist for accepter 2016-12-26 11:49:45 +08:00
lian
d6e216dda5 admin add group 2016-12-16 15:02:21 +08:00
xiez
048d6df0ba Merge pull request #1388 from haiwen/new-user 
check if user num exceed limit before add user
 2016-11-05 13:49:23 +08:00
lian
34a350d623 check if user num exceed limit before add user 2016-11-05 12:09:58 +08:00
lian
41dbebaa86 check if repo/folder exist before upload/update file 2016-11-02 18:04:59 +08:00
lian
7a2ad81be2 fix bug when admin searching unexisting user 2016-11-01 11:45:32 +08:00
lian
74b5e840db filter out sub repos 2016-09-22 11:32:21 +08:00
lian
58737d62f7 update revert file/dir 2016-09-13 11:16:12 +08:00
zhengxie
f4253ad806 [role perm] Update settings of role permissions 2016-09-05 15:16:31 +08:00
zhengxie
de9f8a0aea [invitations] Fix mail and role 2016-09-05 10:37:18 +08:00
lian
fd917c0007 update user permission 
1. update user generate share/upload link permission
2. update user connect iso/android/desktop clients permission
 2016-08-22 11:20:48 +08:00