haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 06:33:48 +00:00
Code Issues Releases Wiki Activity
7,433 Commits 145 Branches 464 Tags
4cc735cf1f57943b91cf29acec152151ad39a24c
Commit Graph

7433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
山水人家
fdbb39a6d3 Repair eslint wraning (#2453) 2018-10-16 18:19:51 +08:00
plt
80b7e562a0 Remove picture height limit in Markdown editor 2018-10-16 15:47:28 +08:00
zhengxie
63c894c1cd [sys] Add force 2FA option 2018-10-16 15:32:58 +08:00
山水人家
d49e2f38f7 New file/folder menu on toolbar (#2452) 2018-10-16 14:27:21 +08:00
Daniel Pan
2a6548b1de Draw file support (#2451) 2018-10-16 12:07:11 +08:00
山水人家
55f8277d43 repair share bug (#2449) 2018-10-15 16:11:37 +08:00
C_Q
2eef50d05e Draft review (#2416) 2018-10-15 15:51:29 +08:00
zhengxie
70aa4a0257 Update travis pipeline 2018-10-15 13:29:02 +08:00
zhengxie
62f0cfbbcd Update travis pipeline 2018-10-15 13:28:29 +08:00
zhengxie
547a7558a9 Merge branch '6.3' 2018-10-15 12:45:33 +08:00
zhengxie
1de3e35b77 [locale] Update .po files 2018-10-15 11:39:17 +08:00
zheng xie
a9b4f9e66f Merge pull request #2446 from haiwen/online-office-update 
update OOS/OnlineOffice update file
 2018-10-15 11:02:55 +08:00
lian
60caf9e345 update OOS/OnlineOffice update file 
transfer online_office_update to seafile api when get fileserver access token
 2018-10-15 10:38:43 +08:00
山水人家
6831d9e519 Wiki mode optimized (#2442) 2018-10-13 17:07:54 +08:00
zheng xie
1be37ab3c9 Merge pull request #2444 from haiwen/6.3-fix_postoffice 
Fix post office connection and handle invitation error
 2018-10-13 15:16:22 +08:00
zhengxie
a306737700 Fix post office connection and handle invitation error 2018-10-13 15:08:35 +08:00
lian
eb2d38c8f8 Revert "update onlyoffice edit file (#2338)" (#2443) 
This reverts commit f6a12786d1.
 2018-10-13 11:40:51 +08:00
lian
0e8c39e2ca update get file size unit 2018-10-11 14:54:23 +08:00
lian
9805a33ef0 Merge pull request #2441 from haiwen/markdown-comment 
modify-comment-model
 2018-10-11 14:35:41 +08:00
wangjianhui
d80550a729 modify-comment-model 2018-10-11 14:33:01 +08:00
C_Q
db3e2ead71 fix wiki bug (#2440) 2018-10-11 12:08:32 +08:00
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