LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 11:59:26 +08:00
Code Activity
7,599 Commits 12 Branches 0 Tags
4caa2e2aec2ffd1c37253fbcddf4c6bdbfca7120
Commit Graph

230 Commits

Author SHA1 Message Date
Zuosizhu
934e05a87a Merge branch 'LmeSzinc:master' into 20230309 2023-10-04 17:10:01 +08:00
LmeSzinc
b91bf31bc3 Fix: Update check fallback to classic git pull if git-over-cdn fails (#3164) 2023-10-01 00:34:02 +08:00
Zuosizhu
7bc96058c8 Merge branch 'master_lme' 
# Conflicts:
#	deploy/Windows/config.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
 2023-09-20 18:52:47 +08:00
LmeSzinc
1b9fd01852 Add: git-over-cdn 2023-09-19 23:14:37 +08:00
Zuosizhu
3b27323132 Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature 2023-09-11 20:24:49 +08:00
LmeSzinc
1ae706f40f Merge branch 'master' into feature 2023-09-08 01:27:28 +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
f80bd61562 Merge branch 'master' into feature 
# Conflicts:
#	module/config/i18n/zh-TW.json
 2023-08-28 18:12:08 +08:00
LmeSzinc
8987c9253b Add: Disable multi-instances on phone cloud environment 2023-08-28 17:30:46 +08:00
Zuosizhu
72730a4147 Merge branch 'LmeSzinc:master' into 20230309 2023-08-08 20:40:20 +08:00
LmeSzinc
f81d53cf68 Fix: Catch RequestHumanTakeover in benchmark 2023-08-05 18:03:50 +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
093a6efba0 Merge branch 'dev' into feature 
# Conflicts:
#	module/config/argument/task.yaml
 2023-06-17 22:19:05 +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
LmeSzinc
ab8c24c2ed Merge branch 'master' into feature 2023-06-12 00:43:49 +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
LmeSzinc
b14b9af392 Merge branch 'master' into feature 2023-05-07 21:36:38 +08:00
hgjazhgj
59263237ab Add: TeamIndex 2023-05-07 09:17:14 +08:00
hgjazhgj
f6d52621fe Add: Submodule AlasFpyBridge (experimental) 2023-05-06 20:58:08 +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
ea9b198205 Merge branch 'master' into feature 2023-04-28 01:15:50 +08:00
Zuosizhu
1666c3e421 Merge branch 'master_lme' 
# Conflicts:
#	campaign/Readme.md
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-04-28 01:01:55 +08:00
LmeSzinc
81f0135b8a Gui: Rename Develop page to Home page 2023-04-28 00:52:38 +08:00
LmeSzinc
25c7512bc9 Opt: No for-append in put_arg_select() 2023-04-28 00:27:06 +08:00
LmeSzinc
075a420d4b Opt: Leave only one option if a select is disabled 
to stop people from asking why event is not selectable
 2023-04-27 23:50:16 +08:00
Zuosizhu
f8abdd7e5a Del: Useless instructions 2023-03-28 17:48:55 +08:00
LmeSzinc
0728f51b29 Refactor: Move easy install to deploy/Windows 2023-03-23 00:25:16 +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
b072baa596 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	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/retire/retirement.py
 2023-02-20 12:35:43 +08:00
18870
cd1dc663d0 Fix: Force kill alas when waiting timeout (#1241) 2023-02-17 22:35:28 +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
ea546c91e9 Dev for Gui to meet Lme's demands 2023-02-16 04:02:08 +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
1412f62d2f Fix: Format fix 2023-02-14 02:20:12 +08:00
Zuosizhu
871d5acd19 Merge branch 'LmeSzinc:master' into master 2023-02-11 02:02:25 +08:00
18870
76fadbe777 Opt: Add type hint for cached_property 2023-02-08 16:39:42 +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