|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
a693827c79
|
fix:修复master_sky更新tag失败的问题
|
2025-05-30 18:22:10 +08:00 |
|
|
|
9a8678057d
|
fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题
|
2025-05-30 18:15:53 +08: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 |
|
|
|
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 |
|
|
|
c30dfdc1eb
|
Merge branch 'develop_sky' into 'master_sky'
Develop sky
See merge request StarlockTeam/app-starlock!111
|
2025-05-30 06:20:18 +00:00 |
|
|
|
4c9422bc5b
|
Merge branch 'master_sky' into 'develop_sky'
# Conflicts:
# lib/blue/blue_manage.dart
|
2025-05-30 06:19:57 +00:00 |
|
|
|
de73ffe64b
|
Merge branch 'develop_sky_testci' into 'develop_sky'
Develop sky testci
See merge request StarlockTeam/app-starlock!109
|
2025-05-30 06:01:30 +00:00 |
|
|
|
78ae2c3239
|
Merge remote-tracking branch 'origin/develop_sky' into develop_sky_testci
# Conflicts:
# .gitlab-ci.yml
# android/Gemfile.lock
# lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart
|
2025-05-30 14:00:52 +08:00 |
|
|
|
34eabe7eee
|
fix:测试开发ci流程
|
2025-05-30 13:57:18 +08:00 |
|
|
|
2b29e510ce
|
fix:调整rbenv global版本，修复build_android失败问题
|
2025-05-30 13:50:48 +08:00 |
|
|
|
a94e80e670
|
fix:调整rbenv global版本，修复build_android失败问题
|
2025-05-30 13:48:19 +08:00 |
|
|
|
0e399c5831
|
fix:调整rbenv global版本，修复build_android失败问题
|
2025-05-30 12:34:35 +08:00 |
|
|
|
285211804b
|
fix:调整rbenv global版本，修复build_android失败问题
|
2025-05-30 12:29:36 +08:00 |
|
|
|
9af93869a8
|
fix:测试skyci流程
|
2025-05-30 12:19:58 +08:00 |
|
|
|
dac34b8824
|
fix:测试skyci流程
|
2025-05-30 11:49:54 +08:00 |
|
|
|
c26f241b2b
|
fix:测试skyci流程
|
2025-05-30 11:36:17 +08:00 |
|
|
|
5af587466c
|
fix:ci流程调整为sky分支构建
|
2025-05-30 11:34:03 +08:00 |
|
|
|
35f7dd38e3
|
fix:同步修复后的ci文件
|
2025-05-30 10:54:37 +08:00 |
|
Liuyf
|
1dbb7497ff
|
fix: 写入通讯录权限移除
v1.4.452
|
2025-05-30 08:51:23 +08:00 |
|
Liuyf
|
6290fe36e5
|
fix: ios release构建错误
v1.4.451
|
2025-05-29 16:59:15 +08:00 |
|
DaisyWu
|
14fe6223e4
|
Merge branch 'release' into develop_address_book
v1.6.533
|
2025-05-28 14:44:31 +08:00 |
|
DaisyWu
|
9a11a5b0f7
|
fix: 修复我的--授权管理员的通讯录获取问题
|
2025-05-28 14:44:06 +08:00 |
|
刘燕峰
|
fcfff0e590
|
Merge branch 'develop_address_book' into 'release'
Develop address book
See merge request StarlockTeam/app-starlock!100
|
2025-05-28 03:08:39 +00:00 |
|
DaisyWu
|
600212aee5
|
Merge branch 'release' into develop_address_book
|
2025-05-28 11:04:10 +08:00 |
|
DaisyWu
|
879f42bd81
|
fix: 修复iOS端通讯录点击获取手机号问题
|
2025-05-28 11:03:09 +08:00 |
|
DaisyWu
|
c66b994c12
|
Merge branch 'develop' into develop_address_book
|
2025-05-28 10:11:25 +08:00 |
|
刘燕峰
|
fa18888df9
|
Merge branch 'develop_address_book' into 'release'
Develop address book
See merge request StarlockTeam/app-starlock!99
|
2025-05-27 06:16:37 +00:00 |
|
