1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-19 01:29:05 +00:00
Commit Graph

8262 Commits

Author SHA1 Message Date
lian
b1b91fa59e update get_repo_owner func (#2436)
administrator may get org repo's owner at admin panel
2018-10-11 11:26:15 +08:00
lian
d5c5c5e901
Merge pull request #2438 from haiwen/markdown-comment
comment-detail
2018-10-11 10:37:33 +08:00
wangjianhui
a9200e8fa2 comment-detail 2018-10-10 21:52:22 +08:00
llj
11a0f4fd2a [file view] removed 'share' (#2435) 2018-10-10 13:51:09 +08:00
lian
e37a6a5dd2
Merge pull request #2433 from haiwen/update-file-comment
update-file-comment
2018-10-09 18:13:22 +08:00
wangjianhui
0b911f03d4 update-file-comment 2018-10-09 18:07:49 +08:00
llj
0408c9f82a [system admin] statistic: modification for 'reports' 2018-10-09 14:37:02 +08:00
zheng xie
7beb852811
Merge pull request #2431 from haiwen/oos-cache
add more log when set cache value for OOS
2018-10-09 14:21:58 +08:00
lian
d424848be7 add more log when set cache value for OOS 2018-10-09 14:03:58 +08:00
shanshuirenjia
c0d645962f Optimized code structure (#2430)
* combine utils file

* modify file position
2018-10-09 10:56:59 +08:00
shanshuirenjia
a2cc17778c add toast (#2428) 2018-10-09 10:23:32 +08:00
lian
496ec9b714 export user traffic by month to excel 2018-10-08 18:08:10 +08:00
llj
a0e62bfacb [system admin] statistic: modified text for 'Storage' (#2426) 2018-10-08 17:01:10 +08:00
llj
237455f1a8 [favorites] rewrote it with React (#2417) 2018-10-08 15:33:40 +08:00
lian
2569768471 update shared repos api (#2424)
add 'encrypted' field
2018-10-08 13:49:53 +08:00
zheng xie
0fd0399c36
Merge pull request #2423 from haiwen/6.3-fix_restframework
Upgrade rest_framework to 3.3.3 to fix html render error in web api
2018-10-08 11:17:35 +08:00
zhengxie
ddcd19a4a6 Upgrade rest_framework to 3.3.3 to fix html render error in web api
ref: https://forum.seafile.com/t/6-3-6-pro-api-broken-user-feedback-as-i-go/7356/5
2018-10-08 10:58:50 +08:00
shanshuirenjia
fb0fc6f7ec repair security-hole (#2415)
* repair security-hole

* optimized code
2018-09-30 12:19:30 +08:00
zheng xie
834ee91033
Merge pull request #2404 from haiwen/6.3-traffic_stats
6.3 traffic stats
2018-09-30 11:45:21 +08:00
zhengxie
b6abdd6132 [sys] Update traffic admin and user_traffic_over_limit func 2018-09-30 11:31:22 +08:00
shanshuirenjia
3a67d78016 clean package.json and repair code style (#2411)
* clean package.json and repair code style

* update css style

* repair bug
2018-09-29 18:32:53 +08:00
shanshuirenjia
3ab4cbff4f Wiki optimized third (#2406) 2018-09-29 15:47:53 +08:00
shanshuirenjia
5cffd4cb69 Draft optimized (#2409)
* repair drafts

* repair naming error

* optimized code

* sentence error
2018-09-29 10:24:46 +08:00
ilearnit
3273900056 fix test 2018-09-28 16:33:46 +08:00
ilearnit
dac30d24c5 Merge branch '6.3' into master 2018-09-28 15:51:34 +08:00
llj
0620273992 [system admin] user/org monthly traffic: modification
Conflicts:
	seahub/templates/sysadmin/sys_trafficadmin.html
2018-09-28 14:04:36 +08:00
zhengxie
d9dd62e4b2 [sysadmin] refactor traffic stats 2018-09-28 14:04:36 +08:00
zhengxie
604af74579 Update zh_CN lang 2018-09-28 14:03:49 +08:00
zhengxie
1cdb57e6f9 Remove cache check during init which will cause cache errors after restart 2018-09-28 11:28:44 +08:00
zhengxie
9164b3df36 Fix tests 2018-09-27 17:07:23 +08:00
ilearnit
68a26f7ac7 [dist] frontend 2018-09-27 15:21:08 +08:00
shanshuirenjia
aa9798ef08 Repair draft activities (#2403)
* repair drafts and activities

* repair bug

* repair bug

* repair bug
2018-09-27 15:09:44 +08:00
C_Q
82dcb711a1
Merge pull request #2402 from haiwen/update-api
update FileRevision api
2018-09-27 14:44:52 +08:00
ilearnit
e98dab604f update FileRevision api 2018-09-27 13:50:24 +08:00
zhengxie
7de83202f8 Fix download link empty username in statistic 2018-09-27 12:06:22 +08:00
ilearnit
88353f237c [dist] frontend 2018-09-27 12:02:52 +08:00
ilearnit
8cf2641028 update config 2018-09-27 12:01:56 +08:00
cainiao222
2d490b09cd add file-diff (#2398) 2018-09-26 17:27:14 +08:00
C_Q
7da4642806 change the default view mode of repo (#2399) 2018-09-25 22:41:40 +08:00
shanshuirenjia
6d65771ddd Optimized search module (#2397)
* updating fileRecord api and adding more component

* modify search module

* add translate
2018-09-25 15:10:23 +08:00
llj
4d97d37a6c [file view] office file: added 'open via client' (#2376) 2018-09-25 13:33:43 +08:00
lian
daad7c33e1 update lock file (#2396)
user has rw permission can unlock file locked by OnlineLock
2018-09-25 13:32:49 +08:00
shanshuirenjia
5ce1b15fb2 Style bug repair (#2394)
* optimized css code

* repair search module

* repair response bug

* repair notificition bug

* repair file-history bug

* repair search info bug

* optimized code
2018-09-25 09:13:06 +08:00
llj
28cc3762b0 Shared with me (#2393)
* update api of shared with me

return 'group_name' field if current library is a group owned library

* add api for delete shared in group owned repo

* [shared with me] modification for 'group owned repo'
2018-09-21 15:43:16 +08:00
lian
c51da1c832 update api of shared with me (#2383)
* update api of shared with me

return 'group_name' field if current library is a group owned library

* add api for delete shared in group owned repo
2018-09-21 15:42:59 +08:00
lian
577e814ae7 fix bug of folder share link 2018-09-21 15:21:15 +08:00
shanshuirenjia
490a15deed Code optimized (#2388) 2018-09-21 14:16:15 +08:00
C_Q
6b62d3e653 update file history time (#2392) 2018-09-21 11:05:51 +08:00
C_Q
f6c50235a2 Fix deleting the Drafts repo (#2381) 2018-09-20 17:23:34 +08:00
lian
07d243d927 update view shared file/folder (#2391)
use SHARE_LINK_LOGIN_REQUIRED to control both preview and edit share link
2018-09-20 16:44:49 +08:00