Commit Graph

797 Commits

Author SHA1 Message Date
32fccd3147 Merge pull request 'xbx' (#92) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/92
2020-10-29 10:13:48 +08:00
bd59677bb5
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-29 10:11:30 +08:00
3de931e747
日历 2020-10-29 10:11:19 +08:00
ac4b1b4ea9
修复了登录 2020-10-29 09:52:51 +08:00
8575d2dcac
修复了日历的报错 2020-10-29 09:40:15 +08:00
asd
9322f51e09 Merge pull request 'zj' (#91) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/91
2020-10-28 17:32:25 +08:00
asd
c0a84ac057 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-28 17:31:10 +08:00
asd
d65c7f8012 中文 2020-10-28 17:28:50 +08:00
99c88e9e77 Merge pull request 'xbx' (#90) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/90
2020-10-28 15:25:58 +08:00
4f8b5519a3
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-28 15:25:35 +08:00
5c6e6b0516
引入了fb 2020-10-28 15:23:28 +08:00
asd
57002f1ba6 Merge pull request '0.0.0' (#89) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/89
2020-10-28 11:40:57 +08:00
asd
ce602a5ff9 0.0.0 2020-10-28 11:39:20 +08:00
62464051c3
升级到最新 2020-10-28 09:56:35 +08:00
cefcf52257 Merge pull request '直播一部分' (#88) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/88
2020-10-28 09:34:47 +08:00
asd
4bc3f290b6 Merge pull request 'zj' (#87) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/87
2020-10-28 09:34:02 +08:00
36d2ee935a
直播一部分 2020-10-28 09:34:02 +08:00
asd
7683f27306 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-28 09:31:49 +08:00
asd
34dc5033df 各种bug 2020-10-28 09:30:56 +08:00
asd
0a512f38f1 视频发布 2020-10-27 12:01:25 +08:00
asd
1e94852bc2 Merge pull request 'zj' (#86) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/86
2020-10-27 09:10:13 +08:00
asd
380601ea9c 登录的验证 2020-10-27 09:06:54 +08:00
asd
a647c70b28 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-26 16:37:52 +08:00
asd
7cbc851cc5 按钮颜色 2020-10-26 16:37:25 +08:00
63630848db Merge pull request '右侧' (#85) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/85
2020-10-26 16:35:40 +08:00
e5189222ba
右侧 2020-10-26 16:35:23 +08:00
asd
25a4b5e70d Merge pull request 'zj' (#84) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/84
2020-10-26 15:13:01 +08:00
asd
5564f3197d Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-26 15:12:16 +08:00
asd
7add118b24 各種bug 2020-10-26 15:11:48 +08:00
4c7372e81d Merge pull request '解决了多次加载中' (#83) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/83
2020-10-26 15:10:51 +08:00
509c3df652
解决了多次加载中 2020-10-26 15:10:21 +08:00
debdfba61d Merge pull request '添加了头像' (#82) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/82
2020-10-26 14:19:34 +08:00
80d159f344
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-26 14:19:16 +08:00
8670671172
添加了头像 2020-10-26 14:17:46 +08:00
asd
da58fc9923 Merge pull request 'zj' (#81) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/81
2020-10-26 12:02:07 +08:00
asd
c792837983 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-26 12:01:08 +08:00
asd
10141bb795 HUOBI 2020-10-26 12:00:30 +08:00
662521ea33 Merge pull request '添加了开始直播' (#80) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/80
2020-10-26 11:11:14 +08:00
4198488214
添加了开始直播 2020-10-26 11:10:53 +08:00
ca9b05cd9b Merge pull request '退出登录之后不能导航' (#79) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/79
2020-10-26 10:54:38 +08:00
fa65e674d4
退出登录之后不能导航 2020-10-26 10:54:10 +08:00
asd
41cfdc6d71 Merge pull request 'zj' (#78) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/78
2020-10-26 10:46:04 +08:00
asd
eda8341c0b Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-26 10:45:10 +08:00
asd
91191371e5 gaibug 2020-10-26 10:44:42 +08:00
c8892a9be7 Merge pull request '关于修复跳转' (#77) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/77
2020-10-26 10:42:57 +08:00
718caa7457
关于修复跳转 2020-10-26 10:42:35 +08:00
6f4a165f2c Merge pull request '删除了首页跳转' (#76) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/76
2020-10-26 10:38:26 +08:00
97c98f70ff
删除了首页跳转 2020-10-26 10:38:05 +08:00
ed99c66726 Merge pull request '修正了视频列表页' (#75) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/75
2020-10-26 10:34:35 +08:00
9a9f28f176
修正了视频列表页 2020-10-26 10:33:50 +08:00