Commit Graph

309 Commits

Author SHA1 Message Date
Gdpao
49fe886234 gdpao 2020-09-19 20:02:43 +08:00
gyh
a732778481 Merge pull request 'gdpao' (#106) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/106
2020-09-18 14:23:48 +08:00
Gdpao
2d7922ff96 gdpao 2020-09-18 14:22:31 +08:00
5b3dbd1dc2 Merge pull request '更改了字体 修复了10秒消失' (#105) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/105
2020-09-18 09:52:24 +08:00
880ce7487b
更改了字体 修复了10秒消失 2020-09-18 09:51:48 +08:00
a6a65153ea Merge pull request 'xbx' (#104) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/104
2020-09-17 19:44:21 +08:00
c77a7a4d5b
删除了断流提示 2020-09-17 19:18:42 +08:00
32bcfb92e1
消除了退出之后的探矿 2020-09-17 19:11:27 +08:00
100d4d67b9
一分钟之后文字消失 2020-09-17 19:04:55 +08:00
a1d9339948 Merge pull request 'xbx' (#103) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/103
2020-09-16 19:06:03 +08:00
a4fee4682f
删除了清楚定时器 2020-09-16 19:05:13 +08:00
f74c8a8776
十秒提交一次 2020-09-16 19:01:33 +08:00
gyh
2f62fde4f6 Merge pull request 'gdpas' (#102) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/102
2020-09-16 17:08:29 +08:00
Gdpao
905ae3b9da gdpas 2020-09-16 11:33:14 +08:00
gyh
341d733a16 Merge pull request 'gdpao' (#101) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/101
2020-09-15 17:41:25 +08:00
Gdpao
c02acd7259 gdpao 2020-09-15 16:46:40 +08:00
aa0d7a4a06 Merge pull request '修复了清楚图片' (#100) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/100
2020-09-11 20:43:37 +08:00
45b6086398
修复了清楚图片 2020-09-11 20:43:21 +08:00
f81ce05547 Merge pull request 'xbx' (#99) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/99
2020-09-11 20:23:56 +08:00
fb81800253
涉黄提示 2020-09-11 20:23:34 +08:00
1f6d2b4ab3
删除了派送方式 2020-09-11 20:03:26 +08:00
52277be0c9
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-09-11 19:46:31 +08:00
391fda5abc
修改了选择 2020-09-11 19:46:19 +08:00
f770b05dcd Merge pull request '修改了热度 => 观看人数' (#98) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/98
2020-09-11 16:46:32 +08:00
6d3d176cd8
修改了热度 => 观看人数 2020-09-11 16:43:54 +08:00
gyh
909082f7ca Merge pull request 'gdpao' (#97) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/97
2020-09-11 15:37:57 +08:00
Gdpao
dadb891236 gdpao 2020-09-11 15:25:57 +08:00
42e3c7d6a7 Merge pull request 'xbx' (#96) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/96
2020-09-10 17:21:57 +08:00
8434b1e611
不变型 2020-09-10 17:21:26 +08:00
a0ccf26c99
member_id 2020-09-10 17:13:40 +08:00
gyh
541d8f9f6e Merge pull request 'gdzb' (#95) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/95
2020-09-10 16:14:22 +08:00
5f56b7a27c Merge pull request 'xbx' (#94) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/94
2020-09-10 16:01:29 +08:00
0c41f85630
修复 2020-09-10 16:01:16 +08:00
0087c0c3cd
修复了层次 2020-09-10 15:58:54 +08:00
Gdpao
c270f238bd gdzb 2020-09-10 14:48:17 +08:00
5add00c60a Merge pull request 'xbx' (#93) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/93
2020-09-10 11:38:51 +08:00
c236af5986
删除 2020-09-10 11:38:33 +08:00
d86dc49da2
修改了标题提示 2020-09-10 11:37:37 +08:00
4c8309ca66
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-09-10 10:05:18 +08:00
e173f3c2a8
Merge branch 'xbx' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-09-10 10:05:14 +08:00
d0107c5729
临时修复了提示 2020-09-10 10:05:04 +08:00
gyh
1309fec9c3 Merge pull request 'gyh' (#92) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/92
2020-09-10 09:58:33 +08:00
b2d7ae4ec5
临时修复了提示 2020-09-10 09:27:12 +08:00
Gdpao
75e02e0228 gdpao 2020-09-10 09:20:30 +08:00
Gdpao
3e8caffe19 gdpaoup 2020-09-07 17:10:24 +08:00
gyh
571489743a Merge pull request 'gdpao' (#91) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/91
2020-09-07 16:22:45 +08:00
Gdpao
f7f3fee4ad gdpao 2020-09-07 16:22:11 +08:00
gyh
1f70d8dfcb Merge pull request 'gdpaoup' (#90) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/90
2020-09-05 20:05:02 +08:00
Gdpao
8c89864beb gdpaoup 2020-09-05 17:22:53 +08:00
gyh
af908a3dda Merge pull request 'gdpao' (#89) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/89
2020-09-05 15:32:35 +08:00