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
14f43f2a79
update deltachat-core-rust to 'chore(release): prepare for 1.151.2 ( #6267 )' of 'v1.151.2'
2024-11-27 14:37:29 +01:00
8798275170
Merge remote-tracking branch 'origin/main'
2024-11-27 14:36:54 +01:00
f3353cf6e9
update local help
2024-11-27 14:36:33 +01:00
ac6495ff20
Merge remote-tracking branch 'origin/main'
2024-11-26 15:23:14 +00:00
722f2cad1e
Merge pull request #3449 from deltachat/adb/update-deeplink-api-impl
...
update to new deep-link API specs
2024-11-26 16:23:09 +01:00
b135093628
update to new deep-link API specs
2024-11-26 13:24:35 +01:00
8ae47e97cf
Merge remote-tracking branch 'origin/main'
2024-11-26 11:35:27 +00:00
be44789b01
Merge pull request #3447 from deltachat/adb/issue-3444
...
add "show in chat" to webxdc menu
2024-11-26 12:35:22 +01:00
6a1ff0bace
Merge remote-tracking branch 'origin/main'
2024-11-25 20:42:51 +01:00
233197095b
remove dead code
2024-11-25 20:42:46 +01:00
494cb728c3
Update src/main/res/menu/webxdc.xml
...
Co-authored-by: bjoern <r10s@b44t.com >
2024-11-25 19:59:51 +01:00
047cd9a121
Merge remote-tracking branch 'origin/main'
2024-11-25 14:44:35 +01:00
60e9a9101a
Don't always show the sender in notifications ( #3441 ), Always show "~" before overridden sender names ( #3442 )
...
* Don't always show the sender in notifications
In 1:1 chats, don't prepend the sender name to every line. The exception is when the display name is not equal to the chat name (i.e. there is an OverwriteSenderDisplayname), in this case we still prepend it.
* Always show the "~" before the sender name if it's overridden
When we introduced this, I assume that we weren't sure whether we should
do it and only showed it in some places. But I think it's nicer to
show the same sender name everywhere, i.e. always add the "~".
2024-11-25 14:44:31 +01:00
c23dac6f99
add "show in chat" to webxdc menu
2024-11-25 00:57:45 +01:00
555547b6cc
Merge remote-tracking branch 'origin/main'
2024-11-25 00:56:20 +01:00
3965319ef4
Merge pull request #3446 from deltachat/adb/deprecate-desc-param-of-sendUpdate
...
remove 'description' parameter from webxdc's sendUpdate()
2024-11-25 00:56:16 +01:00
5fe355fe90
Merge remote-tracking branch 'origin/main'
2024-11-24 20:37:20 +00:00
c4db7c515f
Merge pull request #3443 from deltachat/adb/issue-3439
...
notify DC_EVENT_INCOMING_WEBXDC_NOTIFY
2024-11-24 21:37:15 +01:00
Hosted Weblate