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,597 Commits 142 Branches 460 Tags
0e661f43a38ebb293dd057fb0e1dba6ab8782e03
Commit Graph

484 Commits

Author SHA1 Message Date
Daniel Pan
fa38dd9151 Rewrite wiki page with react (#2258) 2018-08-06 18:29:12 +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
Hu
cf8cbff719 new activity 2018-07-21 14:08:42 +08:00
lian
f03727a82c support smart link 2018-07-11 17:36:21 +08:00
zhengxie
b51477aea5 Merge branch '6.2' into 6.3 
Conflicts:
	seahub/api2/views.py
	seahub/utils/repo.py
 2018-07-09 13:13:59 +08:00
zheng xie
d662c5e3d8 Fix adfs urls in django 1.11 2018-07-05 10:42:41 +08:00
lian
8b0e0ceb51 add admin org api 
1, get org info
2, update name/max user number/quota
3, delete an org
 2018-06-27 18:25:21 +08:00
lian
553aaf68cf add group owned library user/group share api (#2133) 
* add new api for group owned library share

add all groups api
add group owned library user/group share api

* filter library owner group id in get group share item api

* update get address book memebre info api

* return "group_name" field for groups/admin-libs/admin-trash-libs api

* update address book group api

* update admin delete address book api

* [address book] fixed text tips
 2018-06-15 17:14:40 +08:00
llj
435ced05f5 [register] redesigned it 2018-06-14 16:51:13 +08:00
zheng xie
991ea8f206 Merge pull request #2145 from haiwen/batch-copy-move-file-dir 
add batch copy/move item api
 2018-06-13 11:38:22 +08:00
lian
615f7a75b7 add move folder mergea api 2018-06-13 11:24:43 +08:00
lian
bed4bb9bd7 add batch copy/move item api 2018-06-06 16:49:58 +08:00
zhengxie
fd1b30d160 Add cas login/logout 2018-06-04 14:07:19 +08:00
lian
8a95cc5060 update group owned library folder permission (#2096) 
* update group owned library folder permission

get/add/modify/delete user/group folder permission

* add new address book api

1, search member in current and sub groups
2, list current and sub groups

* update is_group_member check

NOT check if is address book sub group member when add a member to group

* add rename group owned library api
 2018-05-18 11:48:03 +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
bffa4ed676 Group owned repo (#2082) 
* admin set group quota

* add/delete group owned repo

* modify group owned sub folder permission

* update address book groups api

1. set quota to "-2" when admin create address book group
2. return quota when get address book groups

* add admin group owned library api

admin modify group owned sub folder permission
admin add/delete group owned repo
 2018-04-25 16:37:35 +08:00
llj
0ed1dd4c58 Merge pull request #1973 from haiwen/address-book 
Address book
 2018-04-25 16:26:12 +08:00
ilearnit
a3e9dd23b4 custom css 2018-04-10 12:39:23 +08:00
xiez
2ade5eb2de Merge pull request #2049 from haiwen/stop-zip-process 
cancel zip task
 2018-03-30 15:19:37 +08:00
ilearnit
d29ab8a9ac if close query zip window then stop zip process 2018-03-30 12:24:40 +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
zhengxie
553d9b3df3 [Django 1.11] Feature removed in Django 1.9. Use shortcut to get current site, and update urls 2018-03-19 13:49:01 +08:00
llj
1182a80989 Merge branch '6.2' 2018-03-15 11:26:02 +08:00
zming
f870a6d556 trash event 2018-03-13 18:31:01 +08:00
lian
9a78a6ceef [sysadmin] use web api to transfer repo 2018-03-05 15:52:47 +08:00
lian
35da335de3 add api for upload file via upload link token 2018-02-08 14:06:02 +08:00
llj
88478dee1d [upgrade jquery] modifications, & cleaned up code & files 2018-02-05 16:47:56 +08:00
lian
ed8200b52a add api for getting groups that user can share repo to 2018-01-17 18:22:48 +08:00
zhengxie
f0a60418e4 [address book] Add admin api 2018-01-04 17:25:19 +08:00
llj
d621e79bba [invite people] enable to invite multiple guests at one time 2017-12-19 12:05:51 +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
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
xiez
ecd6ccfe20 Merge pull request #1892 from haiwen/oauth 
add oauth support
 2017-11-14 13:54:12 +08:00
lian
50ccccfcb4 add oauth support 2017-11-14 11:53:41 +08:00
zMingGit
3661c701f8 admin panel. upload link (#1866) 
* admin panel. upload link

* review
 2017-11-08 18:33:12 +08:00
lian
c88ff295c1 add new group libraries api (#1835) 2017-11-03 12:04:07 +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
zMingGit
12ba328119 limit ip 2017-09-18 14:21:11 +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
f19389b9f7 update Regular Expression of email in admin user url 2017-09-11 14:34:07 +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
lian
bc492b9010 add admin role/log feature 2017-09-09 15:27:04 +08:00
zhengxie
c004100a8a Merge branch '6.1' 
Conflicts:
	seahub/urls.py
 2017-09-04 17:07:02 +08:00
lian
1266e1b237 add admin users api 2017-08-28 14:52:28 +08:00
zming
d23a17424c [API] background image of login page 2017-08-25 11:50:50 +08:00
zhengxie
21701ef3b3 Merge branch 'setLibHistory' 
Conflicts:
	seahub/urls.py
 2017-08-23 15:37:29 +08:00
lian
3e7275ec80 Merge branch '6.1' 2017-08-12 14:34:11 +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