|
|
a318ea9f84
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx
|
2020-08-10 16:47:52 +08:00 |
|
|
|
3eaee9009a
|
聊天
|
2020-08-10 16:47:27 +08:00 |
|
cmxdd
|
2ab2d1c38e
|
fixed bug
|
2020-08-10 15:55:21 +08:00 |
|
|
|
d8840edb30
|
Merge pull request 'gdpao' (#33) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/33
|
2020-08-10 14:48:10 +08:00 |
|
Gdpao
|
1d98624753
|
gdpao
|
2020-08-10 14:47:20 +08:00 |
|
|
|
75a4bbedbe
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx
|
2020-08-10 14:45:35 +08:00 |
|
|
|
d4a9b38f99
|
Merge pull request 'cmx' (#32) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/32
|
2020-08-10 12:08:34 +08:00 |
|
cmxdd
|
3b9e429c80
|
Merge branch 'cmx' of http://git.luyuan.tk/luyuan/demingshangjia into cmx
|
2020-08-10 12:07:30 +08:00 |
|
cmxdd
|
a9d4708d2c
|
fixe bug about image
|
2020-08-10 12:04:09 +08:00 |
|
|
|
7206d00afc
|
Merge pull request 'master' (#31) from master into cmx
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/31
|
2020-08-10 11:32:18 +08:00 |
|
|
|
798f499263
|
Merge pull request 'cmx' (#30) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/30
|
2020-08-10 11:31:51 +08:00 |
|
cmxdd
|
64da585bd7
|
add login out
|
2020-08-10 11:31:03 +08:00 |
|
cmxdd
|
959afc776a
|
fixed bg adout login
|
2020-08-10 11:27:06 +08:00 |
|
|
|
f89803cf9b
|
消息
|
2020-08-10 10:41:20 +08:00 |
|
|
|
795726bdb8
|
Merge pull request 'cmx' (#29) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/29
|
2020-08-10 10:25:18 +08:00 |
|
cmxdd
|
de2b7fe26d
|
uopdate about conflict
|
2020-08-10 10:24:36 +08:00 |
|
cmxdd
|
a0e780d05b
|
update adout color of tag
|
2020-08-10 10:01:10 +08:00 |
|
cmxdd
|
0b5fa511bf
|
update adout tag color
|
2020-08-10 09:56:01 +08:00 |
|
|
|
a1cba0a7fd
|
Merge pull request 'meiyan' (#26) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/26
|
2020-08-09 18:37:34 +08:00 |
|
|
|
1b03d1be7e
|
Merge branch 'master' into xbx
|
2020-08-09 18:37:26 +08:00 |
|
|
|
55695f164b
|
meiyan
|
2020-08-09 18:36:37 +08:00 |
|
|
|
084826e144
|
Merge pull request 'xbx' (#25) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/25
|
2020-08-08 18:35:18 +08:00 |
|
|
|
ab4b418c8f
|
Merge branch 'master' into xbx
|
2020-08-08 18:35:11 +08:00 |
|
|
|
56eb7e551c
|
Merge branch 'xbx' of http://git.luyuan.tk/luyuan/demingshangjia into xbx
|
2020-08-08 18:34:45 +08:00 |
|
|
|
0279128637
|
解决了不出现的问题
|
2020-08-08 18:34:43 +08:00 |
|
|
|
d78b787967
|
Merge pull request 'xbx' (#24) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/24
|
2020-08-08 17:30:06 +08:00 |
|
|
|
242f22d2ce
|
Merge branch 'master' into xbx
|
2020-08-08 17:29:58 +08:00 |
|
|
|
427442f50a
|
关闭
|
2020-08-08 17:28:34 +08:00 |
|
|
|
641cb4a4a2
|
选中颜色
|
2020-08-08 16:53:44 +08:00 |
|
|
|
78d60bd9ac
|
消息提示
|
2020-08-08 16:32:37 +08:00 |
|
|
|
217e8b51ed
|
临时测试
|
2020-08-08 15:17:36 +08:00 |
|
|
|
74a9778a62
|
最初版本 合并
|
2020-08-08 15:09:56 +08:00 |
|
|
|
e83b5b1311
|
Merge pull request 'xbx' (#23) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/23
|
2020-08-07 18:03:55 +08:00 |
|
|
|
ceb2b8084d
|
聊天完成
|
2020-08-07 16:55:00 +08:00 |
|
|
|
4453742f3c
|
删除聊天搜索
|
2020-08-07 15:07:45 +08:00 |
|
|
|
93c412a515
|
聊天完成
|
2020-08-07 14:44:11 +08:00 |
|
cmxdd
|
71a25fd11d
|
fixed bug
|
2020-08-06 17:02:11 +08:00 |
|
cmxdd
|
6ec2318d0c
|
update photo adout publish
|
2020-08-06 14:40:11 +08:00 |
|
cmxdd
|
04a4ed523f
|
update bug
|
2020-08-06 11:48:45 +08:00 |
|
cmxdd
|
e67e2fe701
|
update code adout order
|
2020-08-06 10:04:38 +08:00 |
|
|
|
7d82d8d156
|
Merge pull request 'Merge pull request 'cmx' (#21) from cmx into master' (#22) from master into cmx
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/22
|
2020-08-05 20:12:03 +08:00 |
|
|
|
c1a3a11781
|
Merge pull request 'cmx' (#21) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/21
|
2020-08-05 20:11:36 +08:00 |
|
cmxdd
|
80e3a721a1
|
formatted style
|
2020-08-05 20:10:55 +08:00 |
|
cmxdd
|
31474f482f
|
update api
|
2020-08-05 20:03:53 +08:00 |
|
cmxdd
|
df1bad0a31
|
update other api
|
2020-08-05 17:42:06 +08:00 |
|
|
|
ec2bbcdc29
|
Merge pull request 'master' (#20) from master into cmx
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/20
|
2020-08-05 09:16:39 +08:00 |
|
|
|
e9f0b1ba78
|
Merge pull request 'cmx' (#19) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/19
|
2020-08-05 09:16:07 +08:00 |
|
cmxdd
|
61756ac875
|
update publish
|
2020-08-05 09:15:02 +08:00 |
|
|
|
c5e16abbc2
|
Merge pull request 'xbx' (#18) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/18
|
2020-08-03 17:44:23 +08:00 |
|
|
|
2d7ed292c0
|
Merge branch 'xbx' of http://git.luyuan.tk/luyuan/demingshangjia into xbx
|
2020-08-03 17:43:01 +08:00 |
|
