LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 03:39:26 +08:00
Code Activity
9,160 Commits 12 Branches 0 Tags
f4fdde02285df90df41dceec05bfb5bb6d05b404
Commit Graph

151 Commits

Author SHA1 Message Date
xhqss
f33cfab853 Merge branch 'master_lme' 
# Conflicts:
#	module/webui/app.py
 2024-11-21 23:45:00 +08:00
SarContDeli
bd680eb3a8 Add: fake module PIL for webui (#4374) 
* Add: fake module PIL for webui

* Fix: Load runtime before module PIL

* Upd: Error message of MAA loading failure

* Upd: Adjust timing of import fake module
 2024-11-19 12:37:59 +08:00
LA_DI_DA
1bdaa5aa47 fix: merge mistake, lack of function in app.py 2024-09-13 23:07:29 +08:00
xhqss
48ba0f043e Merge branch 'master_lme' 
# Conflicts:
#	module/webui/app.py
 2024-09-13 20:17:43 +08:00
LmeSzinc
a66760b743 Opt: Patch aiofiles to reduce thread pool size 2024-09-11 22:47:58 +08:00
LA_DI_DA
6c702d49ef fix(InstanceRestart): record instance which has restarted too many times 2024-05-20 22:39:25 +08:00
LA_DI_DA
541737d81d Add: restart instance 2024-04-10 11:31:23 +08:00
LA_DI_DA
c30ed73736 Add: confirm for clear all task 2024-02-19 17:38:06 +08:00
LA_DI_DA
142cc1696d Add: one click clear all task 2024-02-15 19:23:34 +08:00
Zuosizhu
bb50753c29 Merge branch 'master_lme' 
# Conflicts:
#	module/device/device.py
 2023-12-16 00:39:48 +08:00
LmeSzinc
a37438bd02 Fix: [ALAS] Checkbox cannot be dynamically updated 2023-12-07 22:35:36 +08:00
Zuosizhu
8981d103c9 Merge branch 'LmeSzinc:master' into 20230309 2023-11-06 10:08:40 +08:00
LmeSzinc
eda63d72f8 Refactor: Config update callback 2023-11-03 03:34:23 +08:00
Zuosizhu
b842d27611 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-26 00:04:07 +08:00
LmeSzinc
6b88d338b5 Merge remote-tracking branch 'origin/dev' into dev 2023-10-22 19:04:05 +08:00
Zuosizhu
78d8ed1c5b Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/light-alas.css
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/webui/app.py
 2023-09-02 17:47:24 +08:00
18870
736fd52407 Opt: Refine file name processing 
- Prevent bypassing disabled button through devtool
- Remove auto export on override import
 2023-08-31 03:26:48 +08:00
18870
23d845b69a Opt: Move New config to manage page 2023-08-29 21:08:29 +08:00
18870
a4bd13b2bc Add: Config import/export 2023-08-29 19:56:47 +08:00
LmeSzinc
8987c9253b Add: Disable multi-instances on phone cloud environment 2023-08-28 17:30:46 +08:00
Zuosizhu
7cea084ecb Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/alas.css
#	module/config/argument/task.yaml
#	module/config/config_updater.py
 2023-06-22 01:06:48 +08:00
LmeSzinc
0c37354ed5 Opt: List tasks instead of collapsing them in submodules 2023-06-17 22:11:19 +08:00
Zuosizhu
8b8d8c9b67 Merge branch 'LmeSzinc:master' into 20230309 2023-06-14 22:05:37 +08:00
Zuosizhu
4d1fd01511 Merge branch 'master_lme' 
# Conflicts:
#	assets/jp/gacha/BUILD_CUBE_COUNT.png
#	module/campaign/run.py
#	module/gacha/assets.py
 2023-05-15 17:22:33 +08:00
hgjazhgj
59263237ab Add: TeamIndex 2023-05-07 09:17:14 +08:00
hgjazhgj
b18be2ae2b Fix: Redundant template-maa.maa.json config file (#2551) 2023-05-05 12:29:53 +08:00
Zuosizhu
53cfc78a11 Merge branch 'LmeSzinc:master' into 20230309 2023-04-28 20:50:44 +08:00
LmeSzinc
81f0135b8a Gui: Rename Develop page to Home page 2023-04-28 00:52:38 +08:00
Zuosizhu
f8abdd7e5a Del: Useless instructions 2023-03-28 17:48:55 +08:00
Zuosizhu
fbee41e473 Opt: Sequence of dashboard 2023-02-27 22:25:21 +08:00
Zuosizhu
feb64ebc4d Revert "Warning: 设置webui密码，此更新会在3天后删除" 
This reverts commit e5387bbd61.
 2023-02-24 18:48:34 +08:00
Zuosizhu
a688980eb1 Opt: Add a limit display for Pt limit 2023-02-21 20:07:31 +08:00
Zuosizhu
e5387bbd61 Warning: 设置webui密码，此更新会在3天后删除 2023-02-21 15:19:59 +08:00
Zuosizhu
40321ee906 Revert "Merge branch 'mydev' into master" 
This reverts commit 1b615ab99c, reversing
changes made to 081eb1a6ba.
 2023-02-17 11:35:09 +08:00
MengNianxiaoyao
24539dc428 upd: Zuosizhu'master and lme's master 2023-02-17 10:18:12 +08:00
MengNianxiaoyao
30f950f96f fix: date 2023-02-16 21:33:28 +08:00
Zuosizhu
3290f9a0b0 Upd: Dashboard for mobile 2023-02-16 10:23:38 +08:00
Zuosizhu
2e9ef99bb6 Upd: Dashboard 2023-02-16 04:07:38 +08:00
Zuosizhu
d59ac2c621 commit stashed for GG 2023-02-16 04:01:18 +08:00
Zuosizhu
8b3546c1d7 Fix:A new way to handle time delta 2023-02-14 02:21:54 +08:00
Zuosizhu
871d5acd19 Merge branch 'LmeSzinc:master' into master 2023-02-11 02:02:25 +08:00
18870
81c20a0b5c Opt: Remove log output to stdout when using electron 
Try to avoid #2051
 2023-02-08 16:37:11 +08:00
Zuosizhu
e6749a4e72 Fix: MNXY's odd UI 2023-02-08 08:56:55 +08:00
Zuosizhu
db9443be2e Merge branch master_GUI 2023-02-08 08:02:39 +08:00
Zuosizhu
28155a0f4e Merge branch GUI_Z 2023-02-08 01:18:27 +08:00
Zuosizhu
ec8742655b Fix: Dashboard not refreshing 2023-02-07 18:00:08 +08:00
Zuosizhu
c831a39041 Refactor: Halfway now!! Dashboard auto fit 2023-02-07 16:19:25 +08:00
MengNianxiaoyao
c40f4ffeca 修改css 2023-02-07 11:51:17 +08:00
Zuosizhu
13e5333569 Refactor: resource record and dashboard display 2023-02-07 10:48:11 +08:00
Zuosizhu
5aa1e7d00a Fix: Meet part of LmeSzinc's demand 2023-02-06 10:52:51 +08:00