copilot-swe-agent[bot]
|
82caccc18b
|
Resolve merge conflicts in docs and M22-bulletin module files
Keep origin/main version for all 25 conflict sections:
- README.md: 4 conflicts (bulletin timestamps, alert status)
- docs/HoloLake-Era-OS-Modules.md: 8 conflicts (module metadata, file listings)
- modules/M22-bulletin/index.html: 1 conflict (semantic header with i18n)
- modules/M22-bulletin/style.css: 11 conflicts (CSS class naming, state styles)
- modules/M22-bulletin/script.js: 1 conflict (IIFE pattern with dynamic rendering)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
2026-03-11 07:52:42 +00:00 |
zhizhi200271
|
d546bc0525
|
合并 Phase 2 与远程仓库
|
2026-03-11 11:06:16 +08:00 |
|
zhizhi200271
|
16abb8f776
|
[BC-M-DINGTALK-002-ZZ][DEV-004] Phase 2 完成 · EL-7 · 多维表格联动+自动更新+自助查询+看板
|
2026-03-11 10:57:23 +08:00 |
Awen
|
5eebfa6e28
|
DEV-012: M22环节6- 多语言支持+无障碍增强+i18n框架+ARIA标签+键盘导航
|
2026-03-10 23:57:32 +08:00 |
|
Awen
|
7d76d188c4
|
DEV-012: M22环节5- 实时数据接入+API对接+动态渲染 加载状态+错误处理+离线降级+缓存
|
2026-03-10 18:35:37 +08:00 |
juzi0412
|
962cd797be
|
Merge branch 'main' of github.com:qinfendebingshuo/guanghulab
|
2026-03-09 23:03:35 +08:00 |
|
juzi0412
|
04c615487e
|
feat(m-channel): 环节2~3 过渡动画+状态管理+模块间通信（all-in-one版）
|
2026-03-09 23:02:43 +08:00 |
|
Awen
|
b2ce11c3ee
|
M22环节3完成：光湖水面效果+过渡动画，八连胜
|
2026-03-09 01:10:34 +08:00 |
|
Awen
|
d06b380b51
|
BC-M22-002-AW 环节2完成：响应式+localStorage，七连胜
|
2026-03-08 23:17:48 +08:00 |
|
juzi0412
|
e4ef932e28
|
feat(m-channel): 环节0~1 SPA路由+模块动态加载完成
|
2026-03-08 21:07:27 +08:00 |