Commit Graph

820 Commits

Author SHA1 Message Date
adbenitez aee68fe49f Merge remote-tracking branch 'upstream/master' into deltalab 2020-07-11 19:12:27 -04:00
B. Petersen 317462fa13 update translations 2020-07-11 17:34:50 +02:00
adbenitez e7649d54e7 Merge branch 'master' into deltalab 2020-07-09 21:23:09 -04:00
B. Petersen 0d07096454 reword 'delete old: off' to 'delete old: never', adapt summary 2020-07-09 14:58:39 +03:00
Alexander Krotov 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
B. Petersen 4071a98b04 reword 'timer is set' to just 'timer set' 2020-07-09 13:24:59 +02:00
B. Petersen fe2c33a6ba reword 'auto-delete' and 'message deletion' to 'disappearing messages' 2020-07-08 18:24:12 +02:00
B. Petersen 0b75e607a4 update translations 2020-07-08 17:37:07 +02:00
adbenitez 2d7108e248 Merge branch 'master' into deltalab 2020-07-02 17:43:06 -04:00
Alexander Krotov 062ec88800 Update ru translation 2020-07-02 00:23:39 +03:00
Alexander Krotov 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
adbenitez c3388881f7 Merge branch 'master' into deltalab 2020-07-01 14:10:40 -04:00
cyberta 794fba6110 adapt strings after PR review 2020-07-01 20:34:00 +03:00
cyberta a3fd4bf962 add system message strings related to ephemeral messages 2020-07-01 20:34:00 +03:00
cyberta 1a0853a9f8 add missing system message strings unreleated to ephemeral messages 2020-07-01 20:34:00 +03:00
Alexander Krotov 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 74036fc301 Merge branch 'master' into deltalab 2020-06-30 23:07:54 -04:00
cyBerta a2dc69e27e Merge pull request #1341 from deltachat/fix-sharing-multiple
Relay to multiple contacts, rework message relaying
2020-06-30 23:03:37 +02:00
cyberta 34361d7f7d avoid redundant strings in strings.xml 2020-06-30 11:50:53 +02:00
cyberta fee6859208 call it self-destructing instead of ephemeral 2020-06-29 23:56:01 +03:00
cyberta 66b33bd7b1 implement dialog for ephemeral message time selection 2020-06-29 23:56:01 +03:00
cyberta 6cb57a4227 show and hide ephemeral message entry in chat menu depending on experimental feature switch 2020-06-29 23:56:01 +03:00
cyberta b13b03c56b add ephemeral messages time strings 2020-06-29 23:56:01 +03:00
cyberta f6599e3ae0 add experimental feature switch for ephemeral messages 2020-06-29 23:56:01 +03:00
cyberta c5c90b36a9 fix localization of experimental location streaming settings entry 2020-06-29 23:56:01 +03:00
adbenitez 8de820f2c7 Merge branch 'master' into deltalab 2020-06-25 18:30:53 -04:00
B. Petersen 1b86c2f13c update translations 2020-06-25 18:07:05 +02:00
adbenitez f903c804c8 Merge branch 'master' into deltalab 2020-06-24 15:30:29 -04:00
B. Petersen f766cbc3c2 add device message for 1.10 2020-06-24 14:17:03 +02:00
adbenitez 4b358e615f Merge branch 'master' into deltalab 2020-06-24 01:25:23 -04:00
B. Petersen 2877f17d05 improve layout of emoji popups
in light mode, input field and emoji popups are both white,
therefore opening the emoji popup (used eg. for diversified emojis)
in the first line looks weird, you do not really know
if the display is part of the emoji picker or of the input field.
fixing that by adding a small border around the popup.

in dark mode, things are already fine.
2020-06-23 13:33:32 +02:00
adbenitez c972a28a96 Merge branch 'master' into deltalab 2020-06-22 15:57:49 -04:00
cyberta 1599fc93e4 add info.plist permission description 2020-06-22 20:33:44 +02:00
B. Petersen 262900a57c update translations 2020-06-21 12:19:24 +02:00
adbenitez 56d3a95290 change app name in all locales 2020-06-21 04:24:14 -04:00
adbenitez 3797611307 change app name and logo 2020-06-21 04:14:48 -04:00
adbenitez d8836d64b2 Merge remote-tracking branch 'upstream/master' into deltalab 2020-06-19 23:43:32 -04:00
B. Petersen ae247359fb update translations 2020-06-19 22:23:36 +02:00
B. Petersen 128667c35f say, what we're doing 2020-06-19 21:18:01 +02:00
adbenitez 1a39e78962 fix themes 2020-06-17 21:15:54 -04:00
adbenitez 2518dcade7 update Spanish translations 2020-06-17 21:15:01 -04:00
adbenitez 63ee5a050c add pink theme 2020-06-17 20:25:16 -04:00
adbenitez 6e36e08c4d port to fork (first official commit) 2020-06-17 19:22:09 -04:00
B. Petersen 25124a7225 update translations 2020-06-17 16:50:18 +02:00
B. Petersen e61a3fe488 add dark wallpaper for portrait and landscape mode 2020-06-17 15:11:48 +02:00
B. Petersen 1a620d6d8f add a landscape default background, toggle on orientation change 2020-06-17 14:44:56 +02:00
B. Petersen b268981a84 move background to raw drawable folder, it does not contain dpi information 2020-06-17 13:13:49 +02:00
B. Petersen e8853a4329 Revert "fixes #466. Setting the background image provides for a image that is sufficiently large to fit portrait and landscape orientations. When displayed the shorter side is scaled to fit, the larger is then centered and cropped."
This reverts commit 16f5c6d889.
2020-06-17 11:50:18 +02:00
B. Petersen 8c9cc638c4 use new MediaKeyboard instead of EmojiDrawer also in profile 2020-06-16 00:46:07 +02:00
cyBerta 41cb804d5a Merge pull request #1410 from deltachat/diversify_emojis
United colors of emoji
2020-06-15 17:29:35 +02:00