Commit Graph

771 Commits

Author SHA1 Message Date
5659fff54c
添加了提示 2020-10-30 15:08:34 +08:00
7cfc371999
提交问题提示 2020-10-30 14:59:07 +08:00
e496c3e0b3
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-30 14:55:59 +08:00
b224b35e4c
修复了提交问题 2020-10-30 14:53:31 +08:00
asd
aea196587a Merge pull request 'zj' (#96) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/96
2020-10-30 14:49:39 +08:00
1ea10e5a78
修复退出登录 2020-10-30 14:49:01 +08:00
asd
9c65b84bed Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-30 14:48:26 +08:00
asd
08cb0e2554 dyy 2020-10-30 14:47:39 +08:00
asd
18781b455a mmmn 2020-10-30 11:46:29 +08:00
8ded17d754
获取默认ip 2020-10-30 10:35:39 +08:00
7a3ca8fb62
直播完成 2020-10-30 09:54:39 +08:00
e0319762c9
周历完成 2020-10-30 09:31:33 +08:00
asd
2bfda1056f Merge pull request 'zj' (#95) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/95
2020-10-29 17:52:07 +08:00
asd
1eabf61cde Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-29 17:51:01 +08:00
asd
c5c5a8f7b1 duoyuyan 2020-10-29 17:50:26 +08:00
ad40d7749e
添加了时间top 2020-10-29 17:11:48 +08:00
7dfa3df22b Merge pull request '添加了跳转' (#94) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/94
2020-10-29 16:59:17 +08:00
8d38b222d7
添加了跳转 2020-10-29 16:58:56 +08:00
accbe02a5f Merge pull request 'xbx' (#93) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/93
2020-10-29 16:43:32 +08:00
98c0e6d603
切换 2020-10-29 16:42:46 +08:00
f6c95e9525
添加容错 2020-10-29 15:51:38 +08:00
24e5c4c50c
修复了直播 2020-10-29 15:46:21 +08:00
asd
99a36363da Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-29 10:40:52 +08:00
asd
0deba541ce 多语言 2020-10-29 10:40:31 +08:00
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