1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-01 23:38:37 +00:00
Commit Graph

87 Commits

Author SHA1 Message Date
llj
b14ddfeb31 Traffic fe (#2363)
* Refactor seafevents msg and add traffic stats API

Squashed commit of the following:

commit 85fe5369f711e1514762d93008f9ebb3c5d49041
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Aug 6 15:48:55 2018 +0800

    Add '-link' to access_token op type when generate download/upload link

commit 1817833fc3374f54030e16f3a1283ff6f34ddbf5
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Aug 6 15:28:38 2018 +0800

    Refactor file/dir events

    1. Remove traffic related msg
    2. Rename seahub.stats to seahub.audit for audit related msg

* Fix share link zip task traffic owner

* [admin api] Add org traffic

* [system admin] statistic: added 'traffic', fixed 'storage'

* [system admin] statistic: added 3 more charts for 'traffic', and modified the top nav

* [system admin] statistic: added 'traffic' for org; added a traffic nav, improved chart dot title
2018-09-12 17:41:59 +08:00
lian
55014a2527 udpate group transfer test 2018-04-27 15:33:49 +08:00
llj
0ed1dd4c58
Merge pull request #1973 from haiwen/address-book
Address book
2018-04-25 16:26:12 +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
zhengxie
2d56fd73c0 Rewrite 2fa, do not import models in package level 2018-03-16 11:42:13 +08:00
zming
5f9033b5ff sysadmin can share repo with admin permission 2018-01-30 17:38:30 +08:00
lian
148e382425 add admin copy file/folder api 2018-01-24 13:01:19 +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
xiez
43e125bbd6
Merge pull request #1915 from haiwen/sysinfo-test-update
update sysinfo test
2017-11-20 23:34:37 -06:00
zming
c9e32ce94f update sysinfo test 2017-11-21 13:14:15 +08:00
zming
b3b61667a3 fixed when get all revision tag 2017-11-21 12:22:23 +08:00
zMingGit
b91f394a43 fixed test (#1911) 2017-11-20 21:18:19 -06:00
zming
2be35db8df del statistics by hour(user activity, total storage) 2017-11-17 17:06:29 +08:00
zMingGit
05caf621f1 Userinfo contactemail (#1894)
* Show contact_email on user profile

I think it would be good to have the edit functionality for that
attribute, too, but I did not implement that right now.
It's marked with TODO though.

* update api and tests

* review
2017-11-14 14:12:27 +08:00
lian
36cdff75aa add admin api for get info of a single repo 2017-10-21 04:33:48 -07:00
zMingGit
12ba328119 limit ip 2017-09-18 14:21:11 +08:00
zming
07fe7a1d23 update profile test 2017-09-12 16:07:08 +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
zming
74673d92b1 add unique reference and test 2017-09-09 18:00:22 +08:00
llj
45fb407368 Merge pull request #1784 from haiwen/admin-role-log
add admin role/login feature
2017-09-09 16:19:38 +08:00
lian
bc492b9010 add admin role/log feature 2017-09-09 15:27:04 +08:00
zming
669beb936e add unique reference and test 2017-09-07 17:38:41 +08:00
zming
1044f11aea [API] add user reference id 2017-09-07 15:22:15 +08:00
zhengxie
c004100a8a Merge branch '6.1'
Conflicts:
	seahub/urls.py
2017-09-04 17:07:02 +08:00
lian
6ebbce5b76 use custom logo when send email 2017-08-31 14:43:25 +08:00
lian
1266e1b237 add admin users api 2017-08-28 14:52:28 +08:00
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
zming
d0975c7836 migrate two-factor 2017-08-21 14:02:57 +08:00
lian
3e7275ec80 Merge branch '6.1' 2017-08-12 14:34:11 +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
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
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
lian
a77ab79e91 add size when admin get file share link info 2017-07-10 11:22:39 +08:00