e3835f70f7
Merge remote-tracking branch 'origin/main'
2024-12-06 09:57:59 +00:00
708a68119e
Merge pull request #3476 from deltachat/adb/fix-upload-relese-script
...
fix scripts/upload-release.sh
2024-12-06 10:57:55 +01:00
1d5ab98892
fix scripts/upload-release.sh
2024-12-06 07:59:49 +01:00
bbb803f91c
Merge remote-tracking branch 'origin/main'
2024-12-06 07:47:14 +01:00
07753e211d
Merge pull request #3475 from deltachat/prep-1.50.2
...
prepare 1.50.2
2024-12-06 07:47:10 +01:00
8135d96300
update build.gradle
2024-12-06 07:44:00 +01:00
d151e825da
update changelog
2024-12-06 07:42:34 +01:00
6a4c73c821
Merge remote-tracking branch 'origin/main'
2024-12-06 06:40:34 +00:00
d5289cc3df
Merge pull request #3474 from deltachat/adb/update-translations-6/12/24
...
update translations
2024-12-06 07:40:29 +01:00
af40a8b57e
update translations
2024-12-06 07:39:00 +01:00
853ce3c7a3
Merge remote-tracking branch 'origin/main'
2024-12-06 00:19:50 +00:00
529139099e
fix starting of webxdc
...
the issue is that unset `EXTRA_HREF` is passed around as an empty string,
however `Bundle.getString(href, "index.html")` returns `index.html` only when `href` is `NULL`,
which is mostly never the case.
this results in webxdc never started with index.html,
and then not started at all
2024-12-06 01:19:44 +01:00
d2ab4817b1
Merge remote-tracking branch 'origin/main'
2024-12-05 20:40:44 +00:00
b4aa18abae
amend 1.50 changelog
2024-12-05 21:40:28 +01:00
9ff1cafd5e
Merge remote-tracking branch 'origin/main'
2024-12-05 17:47:38 +01:00
a7cee63d1c
Merge pull request #3469 from deltachat/update-core-and-stuff-5.12.25
...
Update core to 1.151.5
2024-12-05 17:47:34 +01:00
eda735925a
update local help and translations
2024-12-05 17:46:03 +01:00
46650c8cc3
update deltachat-core-rust to 'chore(release): prepare for 1.151.5' of 'v1.151.5'
2024-12-05 16:34:26 +01:00
bf6b678e2b
Merge remote-tracking branch 'origin/main'
2024-12-04 15:54:42 +00:00
539cb670f1
Merge pull request #3465 from deltachat/adb/force-base-url-in-webxdc-href
...
always prefix href with baseURL
2024-12-04 16:54:32 +01:00
7d879f8d1f
always prefix href with baseURL
2024-12-04 11:24:13 +01:00
6c1f787a38
Merge remote-tracking branch 'origin/main'
2024-12-03 14:08:04 +01:00
1b57880be3
Merge pull request #3464 from deltachat/adb/fix-strings
...
fix strings.xml
2024-12-03 14:07:59 +01:00
f54144e7e8
fix strings.xml
2024-12-03 13:41:09 +01:00
b059741161
Merge remote-tracking branch 'origin/main'
2024-12-03 13:22:33 +01:00
b735759bd0
Merge pull request #3462 from deltachat/prep-1.50.0
...
prepare 1.50.0
2024-12-03 13:22:29 +01:00
a7199ecedf
Update src/main/res/values/strings.xml
...
Co-authored-by: bjoern <r10s@b44t.com >
2024-12-03 13:22:10 +01:00
e8eb036594
prepare 1.50.0
2024-12-03 11:36:26 +01:00
fdd5cc5d4b
Merge remote-tracking branch 'origin/main'
2024-12-03 11:02:52 +01:00
d531eb8b47
Merge pull request #3461 from deltachat/update-core-and-stuff-3.12.24
...
update core to 1.151.3
2024-12-03 11:02:46 +01:00
a88a619099
update deltachat-core-rust to 'chore(release): prepare for 1.151.3' of 'v1.151.3'
2024-12-03 10:56:47 +01:00
77465b5802
Merge remote-tracking branch 'origin/main'
2024-12-02 18:40:35 +01:00
00bc429f20
Merge pull request #3460 from deltachat/adb/dont-notify-open-webxdc
...
do not notify if the webxdc is open
2024-12-02 18:40:31 +01:00
3f25d002e4
do not notify if the webxdc is open
2024-12-02 18:01:50 +01:00
d17567029d
Merge remote-tracking branch 'origin/main'
2024-12-02 14:41:08 +01:00
74c6f20c3e
Merge pull request #3457 from deltachat/adb/fix-callJavascriptFunction
...
fix WebxdcActivity.callJavaScriptFunction()
2024-12-02 14:41:05 +01:00
4610a64732
Merge remote-tracking branch 'origin/main'
2024-12-02 13:30:44 +01:00
8728a0a39b
remove dead code
...
these RPC calls are probably a relict of first tries,
they are not exhaustive in their area are nor were ever used,
maybe not even working.
if we decide to go that way at some point anyways much more is needed :)
2024-12-02 13:30:38 +01:00
a0c71a5387
fix WebxdcActivity.callJavaScriptFunction()
...
now even if internet access is enabled, the index.html is wrapped in
an iframe
2024-11-30 12:03:44 +01:00
0358e8ffcb
Merge remote-tracking branch 'origin/main'
2024-11-27 20:36:50 +01:00
7131f5774e
adapt to changed deltachat-pages output folder
2024-11-27 20:36:46 +01:00
406c263d82
Merge remote-tracking branch 'origin/main'
2024-11-27 20:36:33 +01:00
aa572508dc
prepare 1.49.0 ( #3453 )
...
* update changelog
* update build.gradle
* update changelog
* update scripts/upload-beta.sh
2024-11-27 20:36:30 +01:00
6ed070e437
Merge remote-tracking branch 'origin/main'
2024-11-27 18:15:46 +00:00
1f880efb3f
Merge pull request #3454 from deltachat/adb/update-link-generation
...
remove Util.QrDataToInviteURL()
2024-11-27 19:15:41 +01:00
72ace5c156
remove Util.QrDataToInviteURL()
2024-11-27 19:01:49 +01:00
1e4cfa124e
Merge remote-tracking branch 'origin/main'
2024-11-27 18:02:12 +01:00
2f34a6ffa4
do not quote a dedicated message; current android shows them grouped and you do not really know what the message refers to
2024-11-27 18:02:07 +01:00
c42ba0f599
Merge remote-tracking branch 'origin/main'
2024-11-27 14:37:32 +01:00
afdfe7bbaa
update strings
2024-11-27 14:37:29 +01:00
Hosted Weblate