Skip to content

Commit fc20321

Browse files
committed
Merge remote-tracking branch 'upstream/main' into codemirror
2 parents b651c34 + d211cf2 commit fc20321

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+275
-71
lines changed

.github/workflows/nightly-build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,15 @@
149149
- name: Install Node.js Packages
150150
run: npm install
151151

152+
- name: Install Cordova CLI
153+
run: npm install -g cordova
154+
152155
- name: Run npm setup
153156
run: npm run setup
154157

155158
- name: Run npm build paid dev apk
156159
run: |
160+
node utils/storage_manager.mjs y
157161
npm run build paid dev apk
158162
echo "VERSION: $UPDATED_VERSION" >> $GITHUB_STEP_SUMMARY
159163

package-lock.json

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@
3434
},
3535
"cordova-plugin-websocket": {},
3636
"cordova-plugin-buildinfo": {},
37-
"cordova-plugin-system": {},
3837
"cordova-plugin-browser": {},
39-
"com.foxdebug.acode.rk.exec.terminal": {},
40-
"com.foxdebug.acode.rk.exec.proot": {},
41-
"cordova-plugin-sftp": {}
38+
"cordova-plugin-sftp": {},
39+
"cordova-plugin-system": {},
40+
"com.foxdebug.acode.rk.exec.terminal": {}
4241
},
4342
"platforms": [
4443
"android"
@@ -63,7 +62,6 @@
6362
"@types/url-parse": "^1.4.11",
6463
"autoprefixer": "^10.4.21",
6564
"babel-loader": "^10.0.0",
66-
"com.foxdebug.acode.rk.exec.proot": "file:src/plugins/proot",
6765
"com.foxdebug.acode.rk.exec.terminal": "file:src/plugins/terminal",
6866
"cordova-android": "^14.0.1",
6967
"cordova-clipboard": "^1.3.0",

src/lang/ar-ye.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,5 +426,7 @@
426426
"reviews": "التقييمات",
427427
"overview": "نظرة عامة",
428428
"contributors": "المساهمون",
429-
"quicktools:hyphen": "إدراج شرطة"
429+
"quicktools:hyphen": "إدراج شرطة",
430+
"check for app updates": "Check for app updates",
431+
"prompt update check consent message": "Acode can check for new app updates when you're online. Enable update checks?"
430432
}

src/lang/be-by.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,5 +427,7 @@
427427
"reviews": "reviews",
428428
"overview": "Overview",
429429
"contributors": "Contributors",
430-
"quicktools:hyphen": "Insert hyphen symbol"
430+
"quicktools:hyphen": "Insert hyphen symbol",
431+
"check for app updates": "Check for app updates",
432+
"prompt update check consent message": "Acode can check for new app updates when you're online. Enable update checks?"
431433
}

src/lang/bn-bd.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,5 +426,7 @@
426426
"reviews": "রিভিউ",
427427
"overview": "সংক্ষিপ্ত বিবরণ",
428428
"contributors": "অবদানকারী",
429-
"quicktools:hyphen": "হাইফেন যুক্ত করুন"
429+
"quicktools:hyphen": "হাইফেন যুক্ত করুন",
430+
"check for app updates": "Check for app updates",
431+
"prompt update check consent message": "Acode can check for new app updates when you're online. Enable update checks?"
430432
}

src/lang/cs-cz.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,5 +426,7 @@
426426
"reviews": "reviews",
427427
"overview": "Overview",
428428
"contributors": "Contributors",
429-
"quicktools:hyphen": "Insert hyphen symbol"
429+
"quicktools:hyphen": "Insert hyphen symbol",
430+
"check for app updates": "Check for app updates",
431+
"prompt update check consent message": "Acode can check for new app updates when you're online. Enable update checks?"
430432
}

src/lang/de-de.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,5 +426,7 @@
426426
"reviews": "Bewertungen",
427427
"overview": "Überblick",
428428
"contributors": "Mitwirkende",
429-
"quicktools:hyphen": "Bindestrich-Symbol einfügen"
429+
"quicktools:hyphen": "Bindestrich-Symbol einfügen",
430+
"check for app updates": "Check for app updates",
431+
"prompt update check consent message": "Acode can check for new app updates when you're online. Enable update checks?"
430432
}

src/lang/en-us.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,5 +426,7 @@
426426
"reviews": "reviews",
427427
"overview": "Overview",
428428
"contributors": "Contributors",
429-
"quicktools:hyphen": "Insert hyphen symbol"
429+
"quicktools:hyphen": "Insert hyphen symbol",
430+
"check for app updates": "Check for app updates",
431+
"prompt update check consent message": "Acode can check for new app updates when you're online. Enable update checks?"
430432
}

src/lang/es-sv.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,5 +426,7 @@
426426
"reviews": "reviews",
427427
"overview": "Overview",
428428
"contributors": "Contributors",
429-
"quicktools:hyphen": "Insert hyphen symbol"
429+
"quicktools:hyphen": "Insert hyphen symbol",
430+
"check for app updates": "Check for app updates",
431+
"prompt update check consent message": "Acode can check for new app updates when you're online. Enable update checks?"
430432
}

0 commit comments

Comments
 (0)