9237c417ba
Merge remote-tracking branch 'upstream/master'
2021-06-25 15:38:37 -04:00
c5d04791ec
add support for openpgp4fpr schema in WebView
2021-06-25 15:41:17 +02:00
c31f41d800
Merge pull request #1961 from deltachat/adb-fix-log-scrolling
...
make log view's scroll to top/bottom work
2021-06-23 18:33:06 -04:00
48e768bc04
make scroll to top/bottom work in the log view when the EditText is not focused
2021-06-23 00:37:37 -04:00
feb58bffb9
Merge remote-tracking branch 'upstream/master'
2021-06-22 22:34:52 -04:00
9b4eae45fd
Merge pull request #1955 from deltachat/adb-issue-1937
...
don't open chat directly if user clicks in blocked addresses
2021-06-22 12:39:31 -04:00
645f823886
Merge pull request #1959 from deltachat/adb-issue-1939
...
URL-encode file name in openForViewOrShare()
2021-06-22 12:24:03 -04:00
ac3cbb673f
update translations
2021-06-22 12:53:14 +02:00
73f7daf119
URL-encode file name
2021-06-21 19:26:26 -04:00
1162210ade
Merge remote-tracking branch 'upstream/master'
2021-06-21 14:11:04 -04:00
05de12b58b
cleanup
2021-06-21 13:59:24 +02:00
a5415ecc14
don't open chat directly if user clicks in blocked addresses
2021-06-20 19:06:06 -04:00
62b05664ed
Merge remote-tracking branch 'upstream/master'
2021-06-18 17:28:03 -04:00
ebfc562345
use text color for links in signature
2021-06-18 16:01:33 +02:00
bd53a7ebe1
Merge remote-tracking branch 'upstream/master'
2021-06-17 18:27:41 -04:00
555544feb2
update translations
2021-06-14 12:35:32 +02:00
c873e9c607
allow quote-replies for stickers
...
once the sticker is sent together with the quote,
the quote is cleared.
if there is some draft text, however, that is kept as draft.
tickers together with text are discouraged.
2021-06-09 11:28:09 +02:00
073c915d24
also allow image/webp as sticker format
2021-06-09 11:28:09 +02:00
d7729b6001
send images from 'Image keyboard' as stickers
...
see https://developer.android.com/guide/topics/text/image-keyboard
2021-06-09 11:28:09 +02:00
f09a1e31c1
Merge remote-tracking branch 'upstream/master'
2021-06-07 20:08:42 -04:00
ccf8ca0a56
bump version to 1.20.5
2021-06-07 23:44:48 +02:00
d496ebb669
update changelog to 1.20.5
2021-06-07 23:44:48 +02:00
3b87c6bea7
update deltachat-core-rust submodule
2021-06-07 22:00:12 +02:00
894748b01b
Merge remote-tracking branch 'upstream/master'
2021-06-07 12:27:38 -04:00
ad5bc91cda
update submodule
2021-06-07 12:21:24 -04:00
41e4aa4fe2
update translations
2021-06-07 14:30:24 +02:00
01974ae7ab
update translations
2021-06-03 14:57:49 +02:00
c44f688f7c
update translations
2021-06-02 14:17:30 +02:00
096cfc81ab
refine wording of remaining screenlock ( #1944 )
...
we keep using the screenlock for "Backup" and "Manage keys";
these dialog always used the wording of the "global" screenlock,
sth. as "Please Unlock Delta Chat", however, that wording was always wrong
as Delta Chat itself is not locked in these situations.
this pr sets the title to the selected action
and just says "Please enter system secret to continue."
moreover, the toasts on canceling the action are removed,
they do not make much sense here,
there was a user action just before, so that is pretty clear anyway.
2021-06-02 14:08:14 +02:00
6602bb2639
update translations
2021-06-02 12:20:53 +02:00
8c0fac43c4
Remove screenlock ( #1942 )
...
* Remove screen lock feature, move the two remaining "App access" options into "Advanced"
Locking the app was removed a long time ago, so in "App access" in the
settings, the only two remaining items were "Screen security" and
"Incognito keyboard".
* Remove the now-unused strings
* remove app-access-category from main settings screen
Co-authored-by: B. Petersen <r10s@b44t.com >
2021-06-02 11:21:47 +02:00
058f98c3fc
update translations
2021-05-24 13:08:05 +02:00
bb01305e4c
Merge remote-tracking branch 'upstream/master'
2021-05-22 18:26:55 -04:00
652b409beb
Merge pull request #1938 from deltachat/adb-fix-strings
...
escape apostrophe
2021-05-22 18:26:08 -04:00
efc1b1f28b
Merge branch 'adb-issue-1753'
2021-05-22 17:20:25 -04:00
71d8fbac58
fix strings.xml
2021-05-22 17:19:29 -04:00
49954ef1d7
escape apostrophe
2021-05-22 16:49:34 -04:00
052f2ebe8a
update submodule
2021-05-22 15:10:21 -04:00
7164ef8d18
Merge remote-tracking branch 'upstream/master'
2021-05-22 15:05:36 -04:00
fc99b55dfb
update translations
2021-05-22 16:21:25 +02:00
8c3a8c8aac
push untranslated strings from desktop ( #1935 )
...
* push untranslated strings from desktop
* Apply suggestions from code review
Co-authored-by: bjoern <r10s@b44t.com >
* address suggestions
* change punycode related placeholders
* fix the xml I broke (invalid closing tags)
* Apply suggestions from code review
Co-authored-by: bjoern <r10s@b44t.com >
Co-authored-by: bjoern <r10s@b44t.com >
2021-05-22 16:18:38 +02:00
3ad83767e8
typo
2021-05-19 16:42:28 +02:00
0224780f5f
doc on translations
2021-05-19 16:40:10 +02:00
1c3ea40d05
update translations
2021-05-19 11:40:17 +02:00
ea5be6b07b
Merge branch 'adb-notify-quote-mentions'
2021-05-17 13:58:24 -04:00
8513444e26
notify quote-mentions in muted groups
2021-05-16 13:13:02 -04:00
0abedbfa6a
Merge pull request #1933 from deltachat/adb-more-emoji-consistency
...
use current emoji theme in "no_messages_text_view"
2021-05-16 13:11:02 -04:00
30b2111237
use current emoji theme in "no_messages_text_view"
2021-05-16 11:47:45 -04:00
60f8c41263
In-Chat-Search: Start searching at the newest (=last) message, not the oldest
2021-05-16 11:12:22 +02:00
e94a4535f9
prepare 1.20.2 release
2021-05-16 01:38:21 -04:00
adbenitez