haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-14 23:46:49 +00:00
Code Issues Releases Wiki Activity
7,177 Commits 135 Branches 453 Tags 2.3 GiB
6f51aec1cc
Commit Graph

379 Commits

Author SHA1 Message Date
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
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
55014a2527 udpate group transfer test 2018-04-27 15:33:49 +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
lian
89e25fa965 update dir view 
return file info when get dir info recursively
 2018-04-19 11:45:17 +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
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
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