haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-27 11:10:10 +00:00
Code Issues Releases Wiki Activity
6,214 Commits 144 Branches 457 Tags 2.8 GiB
1a581a2d5d
Commit Graph

151 Commits

Author SHA1 Message Date
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
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
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
zming
5298d25b46 update response 2017-08-02 11:48:15 +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
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
lian
46a5473326 add amdin system library upload api 2017-07-03 14:42:12 +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
lian
070f68e3e4 add get repo info api for v2.1 2017-06-27 17:23:10 +08:00
zhengxie
eb2719fc59 [api] Add repo last modifier and add cache for memcache ops 2017-06-23 11:30:01 +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
xiez
5f666ad754 Merge pull request #1601 from haiwen/share-link 
Share link
 2017-06-17 11:07:02 +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
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
f062ed4be4 add v2.1 repos api 
batch share repos to user/group
 2017-05-13 09:43:24 +08:00