Commit Graph

463 Commits

Author SHA1 Message Date
Liujian 3fc784ec9d Merge remote-tracking branch 'origin/main' into feature/permit 2024-11-01 17:59:30 +08:00
杨梦洁 ba0088ed73 Merge branch 'feature/v1.2' into 'main'
fix: Modify consumer list reload and subscriber option

See merge request apipark/APIPark!78
2024-11-01 16:44:48 +08:00
maggieyyy 452e64c919 fix: Modify consumer list reload and subscriber option 2024-11-01 16:42:34 +08:00
Liujian ad7df9a6ef Merge remote-tracking branch 'origin/main' into feature/permit 2024-11-01 16:19:35 +08:00
Liujian abb55346f9 update subscribe permit 2024-11-01 16:19:25 +08:00
杨梦洁 b16ed52378 Merge branch 'feature/v1.2' into 'main'
fix: Add team selector to consumer

See merge request apipark/APIPark!77
2024-11-01 15:49:53 +08:00
maggieyyy be8d347b0c fix: Add team selector to consumer 2024-11-01 15:48:51 +08:00
Liujian bbee4b42ae Merge remote-tracking branch 'github-pro/main' into feature/permit 2024-11-01 14:59:54 +08:00
杨梦洁 935227f104 Merge branch 'feature/v1.2' into 'main'
Feature/v1.2

See merge request apipark/APIPark!76
2024-11-01 14:51:56 +08:00
Maggie 9e540a2128 Merge pull request #127 from APIParkLab/feature/v1.2
Feature/v1.2
2024-11-01 14:49:21 +08:00
maggieyyy 3c7dbd6b0b fix: consumer menu access bug 2024-11-01 14:48:18 +08:00
maggieyyy 4809299f86 fix: consumer menu access bug 2024-11-01 14:48:10 +08:00
杨梦洁 41ad5f5109 Merge branch 'feature/v1.2' into 'main'
fix: consumer menu access bug

See merge request apipark/APIPark!75
2024-11-01 14:46:49 +08:00
maggieyyy 104bd61576 fix: consumer menu access bug 2024-11-01 14:45:32 +08:00
Liujian e833233982 Merge remote-tracking branch 'github-pro/main' into feature/permit 2024-11-01 14:26:37 +08:00
Maggie 8f83dc5fd4 Merge pull request #126 from APIParkLab/feature/v1.2
Feature/v1.2
2024-11-01 14:24:51 +08:00
杨梦洁 9f9d45e59c Merge branch 'feature/v1.2' into 'main'
Feature/v1.2

See merge request apipark/APIPark!74
2024-11-01 14:24:14 +08:00
maggieyyy bb27293aba fix: Modify department children type 2024-11-01 14:23:05 +08:00
maggieyyy 445b1277e9 fix: Modify department children type 2024-11-01 14:21:04 +08:00
刘健 3016f563bf Merge branch 'feature/permit' into 'main'
Feature/permit

See merge request apipark/APIPark!73
2024-11-01 14:19:48 +08:00
Liujian d1b9c29f0f update permit bug 2024-11-01 14:19:17 +08:00
maggieyyy 255c03a4a3 fix: Add empty to member transfer 2024-11-01 13:54:33 +08:00
Liujian 45fcda443c Merge remote-tracking branch 'origin/main' into feature/permit 2024-11-01 11:03:21 +08:00
Liujian 73daecf9b7 update permit 2024-11-01 11:01:45 +08:00
杨梦洁 e6f5e06ca5 Merge branch 'feature/v1.2' into 'main'
fix: Modify subscribe options

See merge request apipark/APIPark!72
2024-10-31 14:16:30 +08:00
maggieyyy 9677d1dba9 fix: Modify subscribe options 2024-10-31 14:14:44 +08:00
杨梦洁 003758e8cc Merge branch 'feature/v1.2' into 'main'
fix: delete log

See merge request apipark/APIPark!71
2024-10-31 09:25:28 +08:00
Maggie 3054a4ee49 Merge pull request #124 from APIParkLab/feature/v1.2
fix: delete log
2024-10-31 09:25:15 +08:00
maggieyyy 21aeadcc56 fix: delete log 2024-10-31 09:14:24 +08:00
Maggie d5b4374c0d Merge pull request #123 from APIParkLab/feature/v1.2
fix: Modify access
2024-10-30 18:40:10 +08:00
杨梦洁 39f6e449ed Merge branch 'feature/v1.2' into 'main'
fix: Modify access

See merge request apipark/APIPark!70
2024-10-30 18:39:59 +08:00
maggieyyy a87cbedd52 fix: Modify access 2024-10-30 18:38:39 +08:00
Maggie 5f4c573282 Merge pull request #122 from APIParkLab/feature/v1.2
fix: Modify local path
2024-10-30 10:59:54 +08:00
Liujian 16084dabfe update ap-account version 2024-10-30 10:45:58 +08:00
杨梦洁 7c46243641 Merge branch 'feature/v1.2' into 'main'
fix: Modify local path

See merge request apipark/APIPark!69
2024-10-30 09:08:35 +08:00
maggieyyy 96f1913592 fix: Modify local path 2024-10-29 18:32:45 +08:00
杨梦洁 b92cad8d91 Merge branch 'feature/v1.2' into 'main'
Feature/v1.2

See merge request apipark/APIPark!68
2024-10-29 17:46:36 +08:00
JackLiu f968dbe926 Merge pull request #121 from rolealiu/main
Update v1.2 translation
2024-10-29 17:29:21 +08:00
JackLiu c693a78cc1 Merge branch 'APIParkLab:main' into main 2024-10-29 17:28:51 +08:00
HaoZhen Liu 4aa1b6070b update v1.2 translation 2024-10-29 17:28:41 +08:00
Maggie 08724b1d53 Merge pull request #120 from APIParkLab/feature/v1.2
Feature/v1.2
2024-10-29 17:05:29 +08:00
杨梦洁 6c39c8c73b Merge branch 'feature/v1.2' into 'main'
fix: Add psw to account

See merge request apipark/APIPark!67
2024-10-29 16:47:44 +08:00
maggieyyy c3d35ac282 fix: Add psw to account 2024-10-29 16:44:31 +08:00
杨梦洁 37c6a562cd Merge branch 'feature/v1.2' into 'main'
fix: Modify member transfer icon and department

See merge request apipark/APIPark!66
2024-10-29 15:13:44 +08:00
maggieyyy 98ab569665 fix: Modify member transfer icon and department 2024-10-29 15:12:43 +08:00
Dot.L 318d4194c3 Merge pull request #119 from APIParkLab/feature/permission
update i18n
2024-10-29 14:20:19 +08:00
Liujian 4b50b27e14 update i18n 2024-10-29 14:19:36 +08:00
杨梦洁 af02d1727c Merge branch 'feature/v1.2' into 'main'
fix: update translation

See merge request apipark/APIPark!65
2024-10-29 13:54:49 +08:00
Maggie d2a39999be Merge pull request #118 from APIParkLab/feature/v1.2
fix: update translation
2024-10-29 13:54:42 +08:00
maggieyyy 3207a06e3f fix: update translation 2024-10-29 13:52:48 +08:00