aee68fe49f
Merge remote-tracking branch 'upstream/master' into deltalab
2020-07-11 19:12:27 -04:00
696044132b
typo
2020-07-11 18:14:25 +02:00
0a7447a46a
Merge pull request #1481 from deltachat/prep-1.10.5
...
Prep 1.10.5
2020-07-11 17:51:43 +02:00
cb803cda57
bump version to 1.10.5
2020-07-11 17:49:46 +02:00
f9165a5c67
update changelog for 1.10.5
2020-07-11 17:36:15 +02:00
f54f050aba
update help
2020-07-11 17:35:51 +02:00
317462fa13
update translations
2020-07-11 17:34:50 +02:00
92f56009b4
update deltachat-core-rust submodule
2020-07-11 16:13:56 +02:00
5dceb5cfea
Merge remote-tracking branch 'upstream/master' into deltalab
2020-07-10 19:22:42 -04:00
5af790f585
update deltachat-core-rust submodule
2020-07-10 14:07:34 +02:00
988ca13b3e
update deltachat-core-rust submodule
2020-07-10 11:35:26 +02:00
e7649d54e7
Merge branch 'master' into deltalab
2020-07-09 21:23:09 -04:00
71c3530141
update changelog
2020-07-10 01:40:17 +02:00
0d07096454
reword 'delete old: off' to 'delete old: never', adapt summary
2020-07-09 14:58:39 +03:00
c71aaed79c
Rename "Auto-delete messages" into "Delete old messages"
...
This change makes it clear which messages are deleted, so this setting
can't be confused with Ephemeral-Timer header, configured per chat.
2020-07-09 14:58:39 +03:00
f526d3d344
Merge pull request #1478 from deltachat/disappearing-messages
...
disappearing messages
2020-07-09 13:25:36 +02:00
4071a98b04
reword 'timer is set' to just 'timer set'
2020-07-09 13:24:59 +02:00
fe2c33a6ba
reword 'auto-delete' and 'message deletion' to 'disappearing messages'
2020-07-08 18:24:12 +02:00
0b75e607a4
update translations
2020-07-08 17:37:07 +02:00
18d6e4f3fa
update changelog message
2020-07-07 21:04:16 -04:00
b1001af04e
Merge remote-tracking branch 'upstream/master' into deltalab
2020-07-07 17:31:12 -04:00
08caeea49a
Merge pull request #1475 from deltachat/fix_mailto_links
...
Fix mailto links
2020-07-07 01:43:40 +02:00
e95dfabd06
update bots msg
2020-07-06 17:19:43 -04:00
8af77665be
auto-accept contact requests
2020-07-06 17:09:10 -04:00
e38f2bf50f
changelog
2020-07-06 17:12:30 +02:00
85502c9d05
cleanup
2020-07-06 13:12:51 +02:00
889f467b30
Merge pull request #1470 from deltachat/fix_profile_selection
...
Fix profile selection
2020-07-06 13:04:05 +02:00
af2798dd7c
keep activity stack intact, of forwarding message was successful, close the current ConversationActivity and go back to the initial chat the message was forwarded from
2020-07-06 12:52:43 +02:00
69b587cbfb
allow to share images as drafts w/o sending them as before, instead disallow to go back and forth between chat and chat list while sharing
2020-07-06 12:51:11 +02:00
2d7108e248
Merge branch 'master' into deltalab
2020-07-02 17:43:06 -04:00
20189fdb51
instead of stacking more ConversationListActivities, close the current one and go back to the origin chat so that the activity stack keeps clean
2020-07-02 16:58:10 +02:00
7dde6c4d98
fix mailto link handling
2020-07-02 16:53:03 +02:00
fb4f58fe67
remove unused imports
2020-07-02 13:55:38 +02:00
062ec88800
Update ru translation
2020-07-02 00:23:39 +03:00
9755094721
Merge pull request #1471 from deltachat/ephemeral-strings
...
Update strings used for ephemeral messages
2020-07-01 22:20:32 +02:00
8e17a29f49
Update deltachat-core-rust submodule
2020-07-01 22:56:20 +03:00
07c802c976
Update strings used for ephemeral messages
...
- For chat menu item, use already translated auto-delete string.
- For experimental setting, use untranslatable hard-coded string.
- Introduce a new translatable string for ephemeral dialog title
2020-07-01 22:53:54 +03:00
c3388881f7
Merge branch 'master' into deltalab
2020-07-01 14:10:40 -04:00
794fba6110
adapt strings after PR review
2020-07-01 20:34:00 +03:00
1e1c789120
update core for ephemeral message stock strings
2020-07-01 20:34:00 +03:00
a3fd4bf962
add system message strings related to ephemeral messages
2020-07-01 20:34:00 +03:00
1a0853a9f8
add missing system message strings unreleated to ephemeral messages
2020-07-01 20:34:00 +03:00
30dc83ec3d
catch exceptions related to file uri resolution
2020-07-01 19:20:32 +02:00
517a76336b
FileProvider.getFileUriForFile can throw a IllegalStateException, indicate that in FileProviderUtil
2020-07-01 18:52:04 +02:00
7eee615c8d
fix lint warning: set URI and content type subsequently will clear the former intent URI value
2020-07-01 18:50:31 +02:00
a6095c12de
fix file suffix for temporary profile picture file
2020-07-01 18:49:05 +02:00
8d0c0cb4c6
fix blurring of images after using highlighting pencil ( #1467 )
2020-07-01 19:10:04 +03:00
3c825ff955
Merge pull request #1454 from deltachat/dc-msg-list-loader
...
Remove unused DcMsgListLoader class
2020-07-01 13:00:29 +02:00
836dd9cb27
Merge pull request #1465 from deltachat/ephemeral_minute_hour
...
Fix mismatch between ephemeral options and strings
2020-07-01 11:12:18 +02:00
b551a5040a
Fix mismatch between ephemeral options and strings
...
Selecting 1 minute actually set timer to one hour and there was no
"one hour" option in the menu.
2020-07-01 12:05:01 +03:00
adbenitez