2707 Commits

Author SHA1 Message Date
3240167eaa Merge branch 'release_sky' into 'master_sky'
Release sky

See merge request StarlockTeam/app-starlock!148
v1.4.465_sky
2025-06-06 01:07:36 +00:00
b77f29a0bf Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!147
2025-06-06 01:06:42 +00:00
12b29534f7 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整FCM版本

See merge request StarlockTeam/app-starlock!146
2025-06-06 01:05:11 +00:00
f950392c22 fix:调整FCM版本 2025-06-05 14:31:39 +08:00
700e713279 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!144
2025-06-05 03:52:36 +00:00
06a38603f7 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加ci时的flutter依赖镜像源为国内镜像源

See merge request StarlockTeam/app-starlock!143
2025-06-05 03:27:03 +00:00
951571f95e fix:增加ci时的flutter依赖镜像源为国内镜像源 2025-06-05 11:26:26 +08:00
7d4e18f7b1 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!142
2025-06-05 02:55:31 +00:00
7d6ade5a3b Merge branch 'develop_ios键盘收起问题(1004900)' into 'develop_sky_liyi'
fix:增加返回页面时和点击搜索时收起键盘

See merge request StarlockTeam/app-starlock!141
2025-06-05 02:54:19 +00:00
621838a0cb fix:调整密码详情点击删除不出现弹窗的问题 2025-06-05 10:52:51 +08:00
7bf5d9147d fix:增加返回页面时和点击搜索时收起键盘 2025-06-04 15:59:07 +08:00
fb43163654 Merge branch 'release_sky' into 'master_sky'
Release sky

See merge request StarlockTeam/app-starlock!140
v1.4.461_sky
2025-06-04 07:21:32 +00:00
5a8f4afc26 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!139
2025-06-04 07:11:09 +00:00
c30c16897a Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整ci流程,只保留sky的flavor构建

See merge request StarlockTeam/app-starlock!138
2025-06-04 07:02:50 +00:00
5257fec08e fix:调整ci流程,只保留sky的flavor构建 2025-06-04 15:01:48 +08:00
318524e3d0 Merge branch 'release_sky' into 'master_sky'
Release sky

See merge request StarlockTeam/app-starlock!137
v1.4.460_sky
2025-06-04 01:20:33 +00:00
2a2e6d31f5 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!136
2025-06-04 01:19:31 +00:00
a6051abdf7 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:注释一键登录初始化逻辑

See merge request StarlockTeam/app-starlock!135
2025-06-04 01:18:16 +00:00
d825377f39 fix:注释一键登录初始化逻辑 2025-06-03 10:10:22 +08:00
3094e9d5d4 Merge branch 'release_sky' into 'master_sky'
Release sky

See merge request StarlockTeam/app-starlock!134
v1.4.459_sky
2025-06-03 01:55:52 +00:00
fad838a6c6 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!133
2025-06-03 01:55:07 +00:00
c229356547 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加生成tag版本号时移除Merge和Revert操作对版本号进行递增的逻辑,增加对commit id 的去重

See merge request StarlockTeam/app-starlock!132
2025-06-03 01:54:08 +00:00
064e5ed542 fix:增加生成tag版本号时移除Merge和Revert操作对版本号进行递增的逻辑,增加对commit id 的去重 2025-06-03 09:53:21 +08:00
4540536ad2 Merge branch 'release_sky' into 'master_sky'
Release sky

See merge request StarlockTeam/app-starlock!131
2025-06-03 01:50:52 +00:00
b41bf00f8a Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!130
2025-06-03 01:49:59 +00:00
dc31fc1f06 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加生成tag版本号时移除Merge和Revert操作对版本号进行递增的逻辑,增加对commit id 的去重

See merge request StarlockTeam/app-starlock!129
2025-06-03 01:46:20 +00:00
82df2f6e4b fix:增加生成tag版本号时移除Merge和Revert操作对版本号进行递增的逻辑,增加对commit id 的去重 2025-06-03 09:36:51 +08:00
f08f1007b4 Merge branch 'release_sky' into 'master_sky'
Release sky

See merge request StarlockTeam/app-starlock!128
v1.4.463_sky
2025-06-03 01:27:31 +00:00
b8d34cda29 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!127
2025-06-03 01:25:21 +00:00
b640d6156d Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!126
2025-06-03 01:24:08 +00:00
1220653526 fix:修复指纹详情删除时不弹出确认框 2025-06-03 09:23:31 +08:00
f956ec175f Merge branch 'release_sky' into 'master_sky'
fix:修复master_sky更新tag失败的问题

See merge request StarlockTeam/app-starlock!125
2025-05-30 10:22:58 +00:00
a693827c79 fix:修复master_sky更新tag失败的问题 2025-05-30 18:22:10 +08:00
40c8619c06 Merge branch 'release_sky' into 'master_sky'
fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题

See merge request StarlockTeam/app-starlock!124
2025-05-30 10:16:51 +00:00
9a8678057d fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题 2025-05-30 18:15:53 +08:00
6ceb684470 Merge branch 'release_sky' into 'master_sky'
fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题

See merge request StarlockTeam/app-starlock!123
2025-05-30 09:57:35 +00:00
d4f64f37ea Merge branch 'develop_sky' into 'release_sky'
fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题

See merge request StarlockTeam/app-starlock!122
2025-05-30 09:21:49 +00:00
71887da5c9 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题

See merge request StarlockTeam/app-starlock!121
2025-05-30 08:40:19 +00:00
6f9787605a fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题 2025-05-30 16:39:09 +08:00
58c103bebc Merge branch 'release_sky' into 'master_sky'
Release sky

See merge request StarlockTeam/app-starlock!120
2025-05-30 07:42:22 +00:00
01e7a098ba Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!119
2025-05-30 07:31:03 +00:00
6a76e45e7f Merge branch 'develop_sky_testci' into 'develop_sky'
fix:测试ci流程

See merge request StarlockTeam/app-starlock!118
2025-05-30 07:27:53 +00:00
7a39446f4d fix:测试ci流程 2025-05-30 15:27:02 +08:00
e6e17ebb89 Merge branch 'master_sky' into 'release_sky'
Master sky

See merge request StarlockTeam/app-starlock!116
2025-05-30 06:47:59 +00:00
9452cc2bdc Merge branch 'develop_sky' into 'master_sky'
Develop sky

See merge request StarlockTeam/app-starlock!115
v1.4.452_sky
2025-05-30 06:46:43 +00:00
faa88e6668 Merge branch 'develop_sky_testci' into 'develop_sky'
fix:调整tag生成逻辑

See merge request StarlockTeam/app-starlock!114
2025-05-30 06:45:31 +00:00
5231e62550 fix:调整tag生成逻辑 2025-05-30 14:44:46 +08:00
5d40153907 Merge branch 'develop_sky' into 'master_sky'
增加tag生成时输出日志,ci中判断tag的正则调整为增加sky后缀之后的

See merge request StarlockTeam/app-starlock!113
2025-05-30 06:38:10 +00:00
64a5fde201 Merge branch 'develop_sky_testci' into 'develop_sky'
fix:增加tag生成时输出日志,ci中判断tag的正则调整为增加sky后缀之后的

See merge request StarlockTeam/app-starlock!112
2025-05-30 06:37:05 +00:00
f8b3303d0b fix:增加tag生成时输出日志,ci中判断tag的正则调整为增加sky后缀之后的 2025-05-30 14:36:08 +08:00