Commit Graph

892 Commits

Author SHA1 Message Date
6111abafc4
直播 2020-10-15 14:51:34 +08:00
b92d59b01d Merge pull request 'xbx' (#46) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/46
2020-10-15 09:22:40 +08:00
c240c7aba3
添加了put方法 2020-10-15 09:21:00 +08:00
6bf0fbc16f
video样式 2020-10-15 09:14:23 +08:00
7a821adee5
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-14 18:55:57 +08:00
ffe57d9938
上传文件 2020-10-14 18:55:15 +08:00
asd
397e7b8f36 Merge pull request 'zj' (#45) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/45
2020-10-14 18:53:55 +08:00
asd
a341593ba6 fin 2020-10-14 18:52:50 +08:00
asd
edc7242f3f Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-14 16:27:46 +08:00
asd
f9066bcdf1 视频详情 2020-10-14 16:27:24 +08:00
e23b1ba7f7 Merge pull request '出现tokne自动切登录' (#44) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/44
2020-10-14 16:22:07 +08:00
b41672ce8b
出现tokne自动切登录 2020-10-14 16:21:40 +08:00
8703d9b303 Merge pull request '删除' (#43) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/43
2020-10-14 15:36:29 +08:00
5832f7a0bc
删除 2020-10-14 15:36:13 +08:00
5fb97c7c78 Merge pull request '添加del方法' (#42) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/42
2020-10-14 15:34:10 +08:00
4b095a853c
添加del方法 2020-10-14 15:33:46 +08:00
asd
c46671ef8e Merge pull request 'zj' (#41) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/41
2020-10-14 15:32:31 +08:00
asd
240b0e068a Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-14 15:31:24 +08:00
068c04faa2 Merge pull request 'xbx' (#40) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/40
2020-10-14 15:30:29 +08:00
asd
9dbaebfff2 视频列表 2020-10-14 15:30:29 +08:00
34beff1594
个人信息回显 2020-10-14 15:30:09 +08:00
83ffc8cc83
下拉菜单样式 2020-10-14 11:12:03 +08:00
fb9ca6f040
注册 短信发送失败 2020-10-14 10:25:49 +08:00
5e4db83a24
帐号退出 2020-10-14 09:32:12 +08:00
9fa44512e4 Merge pull request 'ceshi' (#38) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/38
2020-10-14 09:13:30 +08:00
f446297dca
添加日历返回 2020-10-14 09:10:40 +08:00
asd
c8c50ec491 Merge pull request '直播管理' (#39) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/39
2020-10-14 09:00:56 +08:00
asd
3d7070b8d7 直播管理 2020-10-14 08:57:57 +08:00
51f0be0fec
日历样式完成 2020-10-13 16:44:32 +08:00
651fb0f692
ceshi 2020-10-13 11:51:32 +08:00
8709d8ffb7 Merge pull request '添加了属性' (#37) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/37
2020-10-13 11:04:40 +08:00
033ef6867a
添加了属性 2020-10-13 11:03:35 +08:00
3af83b4c7a Merge pull request '升级了部分依赖 安装了新的包' (#36) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/36
2020-10-13 09:30:40 +08:00
84f5841176
升级了部分依赖 安装了新的包 2020-10-13 09:30:06 +08:00
5430f133ba Merge pull request 'xbx' (#35) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/35
2020-10-13 09:15:43 +08:00
9e2122a466
日历深色当天 2020-10-13 09:15:08 +08:00
asd
e608057e08 Merge pull request '分享和乱七八糟的东西' (#34) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/34
2020-10-12 17:28:38 +08:00
asd
3dca24773b 分享和乱七八糟的东西 2020-10-12 17:27:05 +08:00
bbe9e3bcc2
日历完成 2020-10-12 16:44:22 +08:00
4683d8882d
日历 2020-10-12 16:15:31 +08:00
ab2be88b14 Merge pull request '添加了部分接口' (#33) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/33
2020-10-12 10:51:15 +08:00
3f8c8c302b
添加了部分接口 2020-10-12 10:50:58 +08:00
955df3fa09 Merge pull request '删除安全验证' (#32) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/32
2020-10-12 09:55:49 +08:00
a7ca08ec34
删除安全验证 2020-10-12 09:55:28 +08:00
asd
0336d72d26 Merge pull request '直播返修' (#31) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/31
2020-10-10 15:32:55 +08:00
asd
be094d44f4 直播返修 2020-10-10 15:31:18 +08:00
cb940f9973 Merge pull request '直播路由' (#30) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/30
2020-10-10 14:34:48 +08:00
3755425b0e
直播路由 2020-10-10 14:34:23 +08:00
96e9284abb Merge pull request 'xbx' (#29) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/29
2020-10-10 14:08:45 +08:00
asd
8469167824 Merge pull request 'ujok' (#28) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/28
2020-10-10 14:05:18 +08:00