haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 07:01:12 +00:00
Code Issues Releases Wiki Activity
9,020 Commits 142 Branches 460 Tags
31a5e955cc7c1b3547beb267a5041e1b51a100cb
Commit Graph

692 Commits

Author SHA1 Message Date
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