Commit Graph

119 Commits

Author SHA1 Message Date
529011b0dd (#28)Add Schedule API 2022-01-20 23:47:02 +08:00
4da257c2e2 (#28)Add Schedule API 2022-01-20 22:19:10 +08:00
f11eb63ee1 Merge branch 'master' into dev-tamako 2022-01-20 21:45:30 +08:00
49c4f7f0d4 Merge pull request '(#52) Add EduBase API' (#53) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/53
2022-01-20 21:43:41 +08:00
4158887d2e (#52) Add EduBase API 2022-01-20 21:42:44 +08:00
a8e16f5972 (#28) Add output data mod 2022-01-20 20:57:41 +08:00
d9825d6d68 (#28)Add a api frame (incomplete file) 2022-01-20 20:38:57 +08:00
fab73f00ab Merge branch 'master' into dev-tamako 2022-01-20 20:33:02 +08:00
edb26b3d8b Merge branch 'dev-tamako' of http://git.mrkbear.com/MrKBear/mini-dlpu-v3 into dev-tamako 2022-01-20 20:31:52 +08:00
443f82ea75 (#28)Add a api frame (incomplete file) 2022-01-20 20:30:36 +08:00
75adb97abb (#28)Add a api frame (incomplete file) 2022-01-20 20:17:32 +08:00
b36996e352 Merge pull request '(#35) Add mask show hide motion' (#50) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/50
2022-01-20 17:20:42 +08:00
6bef08f12e (#35) Add mask show hide motion 2022-01-20 17:18:44 +08:00
1f24a59bd9 Merge pull request '(#48) Core Api baseUrl param can be overridden' (#49) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/49
2022-01-20 16:11:42 +08:00
14d0c9c123 (#48) Core Api baseUrl param can be overridden 2022-01-20 16:10:55 +08:00
b99a3412e2 Merge pull request '(#37) Optimize Account page' (#47) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/47
2022-01-20 13:27:16 +08:00
63300f68f8 (#37) Optimize Account page 2022-01-20 13:26:24 +08:00
acf4f94798 Merge pull request '(#45) Optimize Modular loading performance' (#46) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/46
2022-01-20 11:53:14 +08:00
87f4d220e5 (#45) Optimize Modular loading performance 2022-01-20 11:52:10 +08:00
cf4dd727c5 Merge pull request '(#37) Optimization function list' (#44) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/44
2022-01-19 21:58:20 +08:00
49055e892c (#37) Optimization function list 2022-01-19 21:55:55 +08:00
afedb81633 Merge pull request '(#37) Fix checkmark display' (#43) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/43
2022-01-19 21:22:03 +08:00
04b8bf365f Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/mini-dlpu-v3 into dev-mrkbear 2022-01-19 21:21:41 +08:00
874c64829a (#37) Add mask modular 2022-01-19 21:21:21 +08:00
82e1c0941e (#37) Fix checkmark display 2022-01-19 17:38:15 +08:00
3119c862b1 Merge pull request '用户页面实现 #37 dev-sanaesy' (#40) from dev-sanaesy into master
Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/40
2022-01-18 22:34:12 +08:00
23f46a24c9 (#37)Add Function List 2022-01-18 22:30:05 +08:00
fc8aa19c67 Merge 'master' into dev-sanaesy 2022-01-18 21:36:37 +08:00
72448038d1 Merge pull request '用户界面实现(#37)dev-gia_jie' (#41) from dev-gia_jie into master
Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/41
2022-01-18 21:18:46 +08:00
196be3099a (#37)Add main funcion modular 2022-01-18 21:16:08 +08:00
87d33bb1df Merge branch 'master' into dev-gia_jie 2022-01-18 20:32:01 +08:00
efd9b9be57 Merge pull request '(#37)Add icon' (#42) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/42
2022-01-18 20:30:53 +08:00
7dd46dbd15 (#37)Add ok no arrow ICON 2022-01-18 20:11:09 +08:00
d70ead2f77 (#37)Style optimization 2022-01-18 17:56:44 +08:00
95f1f6d484 (#37) 2022-01-18 11:47:25 +08:00
54d87fc5db (#37) 2022-01-18 11:39:15 +08:00
f434ad531c (#37) 2022-01-18 11:06:11 +08:00
gia_jie
3bb47109ed (#37) 2022-01-18 10:44:32 +08:00
84bc1c6fbc Merge pull request '(#37)Mod global image style' (#39) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/39
2022-01-18 08:40:20 +08:00
111
a92f2d06ea (#37) 2022-01-18 00:43:38 +08:00
111
45e8ef9322 (#37) 2022-01-17 23:03:48 +08:00
sanae kochiya
7c1e4e441a (#37) 2022-01-17 22:57:05 +08:00
7a5d43281b Add Schedule Api file 2022-01-17 22:52:51 +08:00
4d3c44be6e (#37)Mod global image style 2022-01-17 22:35:38 +08:00
2b300b83a4 Merge pull request '(#37)Separate Account page into Modular' (#38) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/38
2022-01-17 20:48:07 +08:00
77f9bc5223 Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/mini-dlpu-v3 into dev-mrkbear 2022-01-17 20:47:32 +08:00
f4d21f918f (#37)Add account icon 2022-01-17 20:45:58 +08:00
6531a07b26 (#37)Separate Account page into Modular 2022-01-17 17:30:11 +08:00
9dd73138e0 Merge pull request 'Add Login API(#20)' (#34) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/34
2022-01-14 17:09:56 +08:00
3285dba789 Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/mini-dlpu-v3 into dev-mrkbear 2022-01-12 17:14:55 +08:00