Commit Graph

10628 Commits

Author SHA1 Message Date
57e57c19d0 Merge branch 'fix/GHZS-2242' into 'dev-5.25.0'
fix: 首页tab栏新增上传图片—0426UI测试 https://jira.shanqu.cc/browse/GHZS-2242

See merge request halo/android/assistant-android!985
2023-04-26 17:20:04 +08:00
475b03d591 fix: 首页tab栏新增上传图片—0426UI测试 https://jira.shanqu.cc/browse/GHZS-2242 2023-04-26 17:19:28 +08:00
a97091bf49 Merge branch 'fix/GHZS-2247' into 'dev-5.25.0'
fix: 论坛详情页相关UI优化—0426UI测试 https://jira.shanqu.cc/browse/GHZS-2247

See merge request halo/android/assistant-android!984
2023-04-26 17:18:32 +08:00
7a12c4ab1d fix: 论坛详情页相关UI优化—0426UI测试 https://jira.shanqu.cc/browse/GHZS-2247 2023-04-26 17:12:03 +08:00
4f732c3921 Merge branch 'fix/GHZS-2202' into 'dev-5.25.0'
fix: 新游开测相关功能优化—0423测试 https://jira.shanqu.cc/browse/GHZS-2202

See merge request halo/android/assistant-android!983
2023-04-26 16:15:15 +08:00
531deacc3d fix: 新游开测相关功能优化—0423测试 https://jira.shanqu.cc/browse/GHZS-2202 2023-04-26 16:14:46 +08:00
b219e60f13 Merge branch 'fix/GHZS-2230' into 'dev-5.25.0'
fix: 新游开测相关功能优化—0425UI测试 https://jira.shanqu.cc/browse/GHZS-2230

See merge request halo/android/assistant-android!982
2023-04-26 16:05:34 +08:00
387fc37b19 fix: 新游开测相关功能优化—0425UI测试 https://jira.shanqu.cc/browse/GHZS-2230 2023-04-26 16:04:48 +08:00
1b88c3e0a3 Merge branch 'fix/GHZS-2244' into 'dev-5.25.0'
fix: 新增镜像tab—0426测试 https://jira.shanqu.cc/browse/GHZS-2244

See merge request halo/android/assistant-android!981
2023-04-26 16:01:33 +08:00
af1c7ff2c9 fix: 新增镜像tab—0426测试 https://jira.shanqu.cc/browse/GHZS-2244 2023-04-26 15:53:16 +08:00
976f315ba8 Merge branch 'fix/GHZS-2242' into 'dev-5.25.0'
fix: 首页tab栏新增上传图片—0426UI测试 https://jira.shanqu.cc/browse/GHZS-2242

See merge request halo/android/assistant-android!980
2023-04-26 15:13:11 +08:00
216c13054b fix: 首页tab栏新增上传图片—0426UI测试 https://jira.shanqu.cc/browse/GHZS-2242 2023-04-26 15:04:27 +08:00
3fd4d330d2 Merge branch 'feature/GHZS-2144' into 'dev-5.25.0'
feat: 论坛详情页相关UI优化—客户端(1-2) https://jira.shanqu.cc/browse/GHZS-2144

See merge request halo/android/assistant-android!978
2023-04-26 13:55:01 +08:00
f811759bf4 Merge branch 'feature/GHZS-2145' into 'dev-5.25.0'
feat: 新增子版块图标配置—客户端 https://jira.shanqu.cc/browse/GHZS-2145

See merge request halo/android/assistant-android!977
2023-04-26 13:54:27 +08:00
6efc5bb4fa feat: 新增子版块图标配置—客户端 https://jira.shanqu.cc/browse/GHZS-2145 2023-04-26 11:50:37 +08:00
754d7f58c0 Merge branch 'feature/GHZS-2141' into 'dev-5.25.0'
feat: 首页tab栏新增上传图片 https://jira.shanqu.cc/browse/GHZS-2141

See merge request halo/android/assistant-android!975
2023-04-26 10:48:38 +08:00
dc39f9f207 feat: 首页tab栏新增上传图片 https://jira.shanqu.cc/browse/GHZS-2141 2023-04-26 10:10:52 +08:00
65c46c2eb4 Merge branch 'dev' into 'dev-5.25.0'
fix: 合并 5.22.5 的闪退修复

See merge request halo/android/assistant-android!974
2023-04-26 09:38:32 +08:00
923f212424 Merge branch 'release' into 'dev'
fix: 合并闪退修复

See merge request halo/android/assistant-android!973
2023-04-26 09:37:36 +08:00
092bdd4812 Merge branch 'legacy-release' into 'release'
fix: 合并 5.22.5 闪退修复

See merge request halo/android/assistant-android!972
2023-04-26 09:35:09 +08:00
40e30058f9 Merge branch 'feature/GHZS-2155' into 'dev-5.25.0'
feat: 游戏详情页tab顺序调整 https://jira.shanqu.cc/browse/GHZS-2155

See merge request halo/android/assistant-android!971
2023-04-25 14:13:02 +08:00
432f8dc090 Merge branch 'dev' into 'dev-5.25.0'
Dev

See merge request halo/android/assistant-android!969
2023-04-25 13:58:40 +08:00
ea68931461 feat: 游戏详情页tab顺序调整 https://jira.shanqu.cc/browse/GHZS-2155 2023-04-25 13:54:54 +08:00
648e6c9dc4 Merge branch 'feature-GHZS-2091-patch' into 'dev'
feat: 云存档数据埋点—客户端 https://jira.shanqu.cc/browse/GHZS-2091

See merge request halo/android/assistant-android!970
2023-04-25 11:35:10 +08:00
4d15361b37 feat: 云存档数据埋点—客户端 https://jira.shanqu.cc/browse/GHZS-2091 2023-04-25 11:35:10 +08:00
c1660a9816 Merge branch 'release' into 'dev'
Release

See merge request halo/android/assistant-android!968
2023-04-25 10:05:51 +08:00
e6a2f0528a Merge branch 'fix/GHZS-2202' into 'dev-5.25.0'
fix: 新游开测相关功能优化—0423测试 https://jira.shanqu.cc/browse/GHZS-2202

See merge request halo/android/assistant-android!967
2023-04-24 18:00:15 +08:00
71f2c937db fix: 新游开测相关功能优化—0423测试 https://jira.shanqu.cc/browse/GHZS-2202 2023-04-24 17:57:21 +08:00
2a8ae9a022 Merge branch 'fix/GHZS-2204' into 'dev-5.25.0'
fix: 新游开测相关功能优化—0423UI测试 https://jira.shanqu.cc/browse/GHZS-2204

See merge request halo/android/assistant-android!966
2023-04-24 17:31:58 +08:00
3f28fcc211 fix: 新游开测相关功能优化—0423UI测试 https://jira.shanqu.cc/browse/GHZS-2204 2023-04-24 17:30:45 +08:00
dd850bdbbc Merge branch 'feature/GHZS-1512' into 'dev-5.25.0'
feat: 新增镜像tab https://jira.shanqu.cc/browse/GHZS-2200

See merge request halo/android/assistant-android!965
2023-04-24 16:39:55 +08:00
6ae8b520ac Merge branch 'fix/GHZS-2223' into 'dev-5.25.0'
fix: 普通帖/视频帖详情页相关优化—0424测试 https://jira.shanqu.cc/browse/GHZS-2223

See merge request halo/android/assistant-android!964
2023-04-24 16:29:47 +08:00
6c7baf54f3 Merge branch 'feature-GHZS-2091' into 'dev'
feat: 云存档数据埋点—客户端 https://jira.shanqu.cc/browse/GHZS-2091

See merge request halo/android/assistant-android!963
2023-04-24 16:20:27 +08:00
d956081d61 feat: 新增镜像tab https://jira.shanqu.cc/browse/GHZS-2200 2023-04-24 16:16:38 +08:00
fe75be35fb fix: 普通帖/视频帖详情页相关优化—0424测试 https://jira.shanqu.cc/browse/GHZS-2223 2023-04-24 16:08:04 +08:00
9080f82b80 feat: 云存档数据埋点—客户端 https://jira.shanqu.cc/browse/GHZS-2091 2023-04-24 16:07:02 +08:00
15d6fd98b5 Merge branch 'fix/GHZS-2149' into 'dev-5.25.0'
fix: 修改帖子详情和视频详情页标题字体大小

See merge request halo/android/assistant-android!962
2023-04-24 15:22:52 +08:00
d1d22de559 fix: 修改帖子详情和视频详情页标题字体大小 2023-04-24 15:06:06 +08:00
8daf5a8feb Merge branch 'hotfix/v5.24.0-830/home_push_crash' into 'release'
fix: 修复首页推送相关闪退问题

See merge request halo/android/assistant-android!961
v5.24.0-830
2023-04-24 15:04:30 +08:00
ac86821871 fix: 修复首页推送相关闪退问题 2023-04-24 14:42:59 +08:00
1d10fc52b9 Merge branch 'fix/GHZS-2200' into 'dev'
fix: 云存档功能—0423UI测试 https://jira.shanqu.cc/browse/GHZS-2200

See merge request halo/android/assistant-android!960
2023-04-24 13:50:08 +08:00
1c1a1f3db0 fix: 云存档功能—0423UI测试 https://jira.shanqu.cc/browse/GHZS-2200 2023-04-24 13:49:40 +08:00
788cada5c9 Merge branch 'fix/GHZS-2200' into 'dev'
fix: 云存档功能—0423UI测试 https://jira.shanqu.cc/browse/GHZS-2200

See merge request halo/android/assistant-android!959
2023-04-24 11:22:46 +08:00
285c87568b fix: 云存档功能—0423UI测试 https://jira.shanqu.cc/browse/GHZS-2200 2023-04-24 11:21:58 +08:00
8a749ad730 Merge branch 'fix/GHZS-2214' into 'dev'
fix:【光环助手】同步正式环境问题-首页下拉推送-第1点 https://jira.shanqu.cc/browse/GHZS-2214

See merge request halo/android/assistant-android!958
2023-04-24 11:10:18 +08:00
1b19760562 fix:【光环助手】同步正式环境问题-首页下拉推送-第1点 https://jira.shanqu.cc/browse/GHZS-2214 2023-04-24 11:04:10 +08:00
2f69074418 Merge branch 'feature/GHZS-2148' into 'dev-5.25.0'
feat: 专区新增搜索栏 https://jira.shanqu.cc/browse/GHZS-2148

See merge request halo/android/assistant-android!957
2023-04-24 10:52:36 +08:00
684e7a63db feat: 专区新增搜索栏 https://jira.shanqu.cc/browse/GHZS-2148 2023-04-24 10:50:55 +08:00
89e588fb9e Merge branch 'fix/GHZS-2200' into 'dev'
fix: 云存档功能—0423UI测试 https://jira.shanqu.cc/browse/GHZS-2200

See merge request halo/android/assistant-android!956
2023-04-23 18:10:31 +08:00
d81b3002cb fix: 云存档功能—0423UI测试 https://jira.shanqu.cc/browse/GHZS-2200 2023-04-23 18:09:59 +08:00