haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-01 07:10:55 +00:00
Code Issues Releases Wiki Activity
6,245 Commits 138 Branches 455 Tags 2.5 GiB
b912c69c5a
Commit Graph

478 Commits

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