Commit Graph

Select branches

Hide Pull Requests

dev

dev_trial

main

release_0.0.1

release_0.0.2

release_1.1.1

release_1.1.2

release_1.2.1

release_1.3.0

tag_videoplay.done

yuxiaolei-patch-1

yuxiaolei-patch-2

#1

#2

#3

Mono Color

• b53cd0ae4e Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial wenlele 2022-08-02 14:05:19 +0800
• 8efcd2a77b 应用管理页面完成 wenlele 2022-08-02 14:05:15 +0800
• 9e2b6277ec api参数 巴林闲侠 2022-08-02 09:20:08 +0800
• 98dcbe6308 Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-08-01 15:59:54 +0800
• 03c69cedc8 信鸽故障fix 巴林闲侠 2022-08-01 15:59:40 +0800
• da90aa7fc2 播放器修改 wenlele 2022-08-01 14:55:40 +0800
• 5b9d2c746e 信鸽服务 deartibers 2022-07-22 14:51:46 +0800
• 80ddf0695a sql 巴林闲侠 2022-07-22 13:52:18 +0800
• da1ea56186 Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial tag_videoplay.done 巴林闲侠 2022-07-22 09:00:51 +0800
• bc5ecd3738 信鸽API 巴林闲侠 2022-07-22 09:00:49 +0800
• 5820112bc8 注释http转化成https的限制条件 wenlele 2022-07-21 08:42:53 +0800
• bac88851a7 状态码问题修改 release_1.1.1 deartibers 2022-07-20 17:05:27 +0800
• 396458a380 Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial wenlele 2022-07-19 17:39:40 +0800
• 3836ddde90 播放组件的修改 wenlele 2022-07-19 17:30:09 +0800
• d4c9bca218 状态码释义接口联调 deartibers 2022-07-18 09:58:13 +0800
• 3f8c4138db camera_status sql 巴林闲侠 2022-07-15 11:22:04 +0800
• 8323f72ce0 Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial deartibers 2022-07-15 11:05:56 +0800
• 562bc0746e Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-07-15 10:57:59 +0800
• 1381d67ed6 camera status 巴林闲侠 2022-07-15 10:51:43 +0800
• bdb2dbe84c 状态码页面静态页面及接口联调 deartibers 2022-07-15 10:47:01 +0800
• eded873264 信鸽页面未完成 yangsen 2022-07-14 09:24:12 +0800
• 1bd681b64c Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yangsen 2022-07-13 09:42:48 +0800
• a40ad82452 信鸽页面暂存 yangsen 2022-07-13 09:42:34 +0800
• fca2333459 表格属性 deartibers 2022-07-13 09:29:51 +0800
• 6915209046 状态码管理和信鸽服务主页面 deartibers 2022-07-12 15:08:21 +0800
• 1453d187c4 播放修改 release_0.0.2 wenlele 2022-07-08 11:14:48 +0800
• ce3e1c932d 萤石设备播放地址更新查询用时 巴林闲侠 2022-07-07 20:26:50 +0800
• df40d3d9df redis.Cluster 巴林闲侠 2022-07-07 19:44:06 +0800
• 4e192fe454 redis pswd 巴林闲侠 2022-07-07 18:49:31 +0800
• a9ced94fc7 播放器 params.videoObj 巴林闲侠 2022-07-07 18:22:29 +0800
• a31d4c04d3 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-07-07 18:09:08 +0800
• f0760bd0e5 https->http 巴林闲侠 2022-07-07 18:09:06 +0800
• d588ac9661 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial deartibers 2022-07-07 15:33:38 +0800
• 56e277b099 备注视频样式修改 deartibers 2022-07-07 15:33:31 +0800
• 13524a5cf1 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-07-07 15:04:55 +0800
• 04663f3cbf /camera 暂时不鉴权 巴林闲侠 2022-07-07 15:04:53 +0800
• 405c723228 备注按id排序 deartibers 2022-07-07 11:25:20 +0800
• 1ae93b7676 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-07-07 11:12:07 +0800
• ffc064fcb0 备注排序x 巴林闲侠 2022-07-07 11:12:06 +0800
• bb385d7536 默认信息 deartibers 2022-07-07 10:12:11 +0800
• 55928225d5 camera_remark 巴林闲侠 2022-07-07 08:55:44 +0800
• d372ce14fc Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-07-06 21:03:32 +0800
• c079740238 视频备注 100% 巴林闲侠 2022-07-06 21:03:30 +0800
• e6c365494d Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial wenlele 2022-07-06 21:01:44 +0800
• 766935ed75 表格添加备注功能 wenlele 2022-07-06 20:59:57 +0800
• c15990cd60 备注修改 deartibers 2022-07-06 20:32:24 +0800
• 761c829c0e 备注滚动 deartibers 2022-07-06 19:32:19 +0800
• a9ce108e9d CameraRemark 排序 巴林闲侠 2022-07-06 17:39:07 +0800
• 29244b7288 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial wenlele 2022-07-06 16:34:01 +0800
• cb6d752abc 测试 wenlele 2022-07-06 16:32:33 +0800
• c38fb8cbf9 备注功能 deartibers 2022-07-06 16:31:26 +0800
• f05ade2b91 获取流 同时获取备注 巴林闲侠 2022-07-06 15:46:40 +0800
• bfdf962443 定时任务 巴林闲侠 2022-07-06 12:28:37 +0800
• f0a380d64d 1.1.0 巴林闲侠 2022-07-06 11:50:11 +0800
• 36052b634c Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial deartibers 2022-07-05 13:51:07 +0800
• d067752179 文件包和备注 deartibers 2022-07-05 13:50:57 +0800
• 06fc355304 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial wenlele 2022-07-05 10:45:48 +0800
• 0c08d9e55d 置灰修改完成 wenlele 2022-07-05 10:45:40 +0800
• c8a00261a0 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-07-05 10:40:24 +0800
• 9131be6873 定时任务即刻启用 巴林闲侠 2022-07-05 10:40:21 +0800
• 17de5056e4 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial wenlele 2022-07-05 09:44:01 +0800
• 37b84265a1 播放完成 wenlele 2022-07-05 09:43:57 +0800
• ed1423141f Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-07-05 09:10:17 +0800
• ccaa56c1ea yingshi talk 巴林闲侠 2022-07-05 09:10:14 +0800
• c9bd721035 nvr全选显示时间 deartibers 2022-07-04 10:29:32 +0800
• 9d2420130b Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-07-04 09:52:15 +0800
• e3a6dc6e85 jessibuca.destroy() 巴林闲侠 2022-07-04 09:52:14 +0800
• 8cb1cfcf8b NVR添加名称格式修改 wenlele 2022-07-01 17:34:46 +0800
• 8e74408c87 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-07-01 17:16:47 +0800
• efdde52111 GB视频播放 巴林闲侠 2022-07-01 17:16:44 +0800
• c6b6345116 nav图标 deartibers 2022-07-01 16:53:48 +0800
• f72a28c30b mqtt 视频状态推送 巴林闲侠 2022-07-01 11:31:08 +0800
• 707f8437fe 定时更新时间 巴林闲侠 2022-07-01 09:15:32 +0800
• f6a7c66c68 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-30 17:33:21 +0800
• b6a763e3c8 安心云摄像头查询信息增加 巴林闲侠 2022-06-30 17:33:19 +0800
• feb1824eed 播放完成 wenlele 2022-06-30 17:14:40 +0800
• 623fae136e 解决合并冲突 deartibers 2022-06-30 16:08:14 +0800
• 73ee59529f 主题 deartibers 2022-06-30 16:06:26 +0800
• 30ccd213a7 视频播放cross 巴林闲侠 2022-06-30 15:52:51 +0800
• 13a97ea076 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-30 14:19:46 +0800
• b0d21b367c 萤石播放器 99.9% 巴林闲侠 2022-06-30 14:19:44 +0800
• 885c69d4d6 查询信息修改完毕 wenlele 2022-06-30 14:07:02 +0800
• 97d8d0337e Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial deartibers 2022-06-30 13:38:08 +0800
• 769ff49451 主题设置 deartibers 2022-06-30 13:38:00 +0800
• 09f72f5c9d 萤石播放器 89.9% 巴林闲侠 2022-06-29 17:30:27 +0800
• faf23bb4f6 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-29 16:54:23 +0800
• 6c646018a6 萤石播放器 88.8% 巴林闲侠 2022-06-29 16:54:21 +0800
• bccf70dec1 上下线推送 deartibers 2022-06-29 16:05:54 +0800
• 96e04ea0db 测试置灰完成 wenlele 2022-06-28 17:34:35 +0800
• ab2e4dc81a nvr摄像头视频流bug解决 wenlele 2022-06-27 17:46:35 +0800
• 09af37576b Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-27 16:41:00 +0800
• 32ded7ec5a 萤石状态更新逻辑 巴林闲侠 2022-06-27 16:40:59 +0800
• 3d1242fa31 级联视频流功能完成 wenlele 2022-06-27 16:25:32 +0800
• 1bbcd0c6a5 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-27 14:30:27 +0800
• 517929e1ce 播放地址拼接 巴林闲侠 2022-06-27 14:30:25 +0800
• a6c4ac075f Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial wenlele 2022-06-24 17:50:40 +0800
• d255cb4ef6 级联视频流 80% wenlele 2022-06-24 17:50:36 +0800
• 39fa23c823 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-24 17:45:10 +0800
• 263c79d246 萤石状态获取 巴林闲侠 2022-06-24 17:45:08 +0800
• ee1dee9f84 萤石状态获取 巴林闲侠 2022-06-24 17:45:03 +0800