Commit Graph

147 Commits

Author SHA1 Message Date
Gdpao
74fcc50696 gdpaoup 2020-08-10 19:06:47 +08:00
Gdpao
2e95172a75 upct 2020-08-09 19:11:12 +08:00
Gdpao
234f11eeef gdpao 2020-08-09 19:08:12 +08:00
9a4e4f5efe Merge pull request 'bug 8.9' (#140) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/140
2020-08-09 18:40:07 +08:00
9b93b6a5a9 bug 8.9 2020-08-09 18:39:35 +08:00
b9b9a8e829
搜索完成 2020-08-09 18:29:36 +08:00
d00b4a75ac Merge pull request 'specil 8.9' (#138) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/138
2020-08-09 14:24:30 +08:00
9631e9f827 specil 8.9 2020-08-09 14:23:59 +08:00
gyh
097f7e3cba Merge pull request 'gdpao' (#137) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/137
2020-08-09 11:33:25 +08:00
Gdpao
fe8af80983 gdpao 2020-08-09 11:31:47 +08:00
817c886d84 Merge branch 'master' into xbx 2020-08-08 17:31:25 +08:00
5abe5620f5
勉强解决 2020-08-08 16:14:25 +08:00
9e96eeb575
成功 2020-08-08 15:40:48 +08:00
Gdpao
0290189205 gdpaomg 2020-08-07 19:59:51 +08:00
Gdpao
502e020000 gdpao 2020-08-07 19:56:47 +08:00
6eeebf25c0
清空消息 2020-08-07 17:37:23 +08:00
93dbdca573
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 17:10:29 +08:00
57fcf69974
聊天完成 2020-08-07 16:54:54 +08:00
a088c895d2 collect 8.7 2020-08-07 11:59:08 +08:00
fc86ad2579
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 11:41:03 +08:00
eb0d648f6a
完成 2020-08-07 11:40:13 +08:00
Gdpao
2afd55f79e gdpaomg 2020-08-06 20:46:40 +08:00
Gdpao
090b7cc753 gdpaoup 2020-08-06 20:42:03 +08:00
e6b7b50a1e
聊天本地缓存 2020-08-06 15:57:56 +08:00
9872770472
Merge branch 'zmr' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-06 10:45:03 +08:00
7a7b126fe3
聊天 2020-08-06 10:40:26 +08:00
Niujiawei
1313a90d5e 修改样式 2020-08-05 22:44:08 +08:00
Niujiawei
361e9a76fd 修改样式等相关文件 2020-08-05 21:39:02 +08:00
Gdpao
1b5bf33166 gdpaomg 2020-08-05 21:11:32 +08:00
Gdpao
c4c11781fb gdpaoup 2020-08-05 21:06:29 +08:00
e1519b8d68 Merge pull request 'store 8.5' (#119) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/119
2020-08-05 17:40:03 +08:00
0057bcd28e store 8.5 2020-08-05 17:38:11 +08:00
b0f224d79b
聊天列表 2020-08-05 17:00:04 +08:00
045f6e6e01
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-05 10:47:18 +08:00
09a7dbdf5c
1 2020-08-05 10:47:08 +08:00
Niujiawei
ef4a4010ff 修改样式2020.0804 2020-08-04 22:34:03 +08:00
Gdpao
7b9bee2f1e gdpaoup2 2020-08-04 22:13:50 +08:00
5343196342 upgrade 8.4 2020-08-04 21:13:47 +08:00
Gdpao
cc934696d1 gdpaoup 2020-08-04 19:46:42 +08:00
Gdpao
afc7731781 gdpao 2020-08-04 19:39:31 +08:00
1f9299602e Merge pull request 'classify 8.4' (#110) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/110
2020-08-04 19:10:00 +08:00
2fd62acb73 classify 8.4 2020-08-04 19:08:04 +08:00
gyh
f69a82ace5 Merge pull request 'gdpaoup' (#109) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/109
2020-08-04 14:38:17 +08:00
Gdpao
1f5af9d92b gdpaoup 2020-08-04 14:36:35 +08:00
e354152beb
人数 2020-08-04 11:43:33 +08:00
20b1c0da43 Merge branch 'master' into xbx 2020-08-04 10:42:38 +08:00
35e0c39d1d
rid 2020-08-04 10:41:54 +08:00
715793414f Merge pull request 'time none8.3' (#105) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/105
2020-08-03 21:00:41 +08:00
0a52842e35 time none8.3 2020-08-03 20:59:24 +08:00
gyh
0ee518854c Merge pull request 'gdpaoup2' (#104) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/104
2020-08-03 19:52:53 +08:00