update fork #116

Manually merged
lookshe merged 20 commits from mirror/monocles_chat_clean:master into master 2025-11-12 16:58:57 +01:00

20 commits

Author SHA1 Message Date
Arne
6df68dcdc9 Add missing string
Some checks failed
Android CI / build (pull_request) Has been cancelled
2025-11-11 10:07:29 +01:00
Daniel Gultsch
233f6ed837 introduce setting to always use relays
(cherry picked from commit 91ccbfe3d51b5f1c69edfb8497563a7014e36437)
2025-11-11 10:04:41 +01:00
Arne-Brün Vogelsang
eeb09831a1 Merge pull request 'Add kotlinkOptions to match jvmTarget with compileOptions' (#345) from goodspeed/monocles_chat:kotlinkOptions into master
Some checks failed
Android CI / build (pull_request) Has been cancelled
Reviewed-on: https://codeberg.org/monocles/monocles_chat/pulls/345
2025-11-09 17:26:43 +01:00
Arne-Brün Vogelsang
cd0901f0a0 Merge pull request 'Dismiss reaction popup when back pressed or IME closed' (#344) from goodspeed/monocles_chat:reactionPopupFix into master
Reviewed-on: https://codeberg.org/monocles/monocles_chat/pulls/344
2025-11-09 17:25:22 +01:00
William Goodspeed
1d76e1d34c Add kotlinkOptions to match jvmTarget with compileOptions
If sourceCompatibility and targetCompatibility was specified, kotlin
compilers sometimes choose a different jvmTarget casuing build to fail.

It's not happening on some machines but adding this wouldn't affect them.

Signed-off-by: William Goodspeed <goodspeed@anche.no>
2025-11-09 22:16:15 +08:00
William Goodspeed
d045395a7b Dismiss reaction popup when back pressed or IME closed
ConversationsActivity onBackPressed was also hooked to ConversationFragment, this
enables cancelling on back press for reaction popup.

Signed-off-by: William Goodspeed <goodspeed@anche.no>
2025-11-09 22:11:21 +08:00
Arne
66a595c029 Improve extension deletion logic
Some checks failed
Android CI / build (pull_request) Has been cancelled
2025-10-31 15:14:50 +01:00
Arne
290640ffb7 Allow retracting file/geo messages and before upload 2025-10-31 14:34:27 +01:00
Arne
d707b97f05 Bump version to 2.0.17
Some checks failed
Android CI / build (pull_request) Has been cancelled
2025-10-30 16:18:07 +01:00
Arne-Brün Vogelsang
d0bf4345b5 Merge pull request 'Added Turkish README' (#342) from xmppkeyboardguy/monocles_chat:master into master
Reviewed-on: https://codeberg.org/monocles/monocles_chat/pulls/342
2025-10-30 14:08:29 +01:00
xmppkeyboardguy
60430af9cb Merge branch 'master' into master 2025-10-30 14:01:45 +01:00
Arne
4b514fe4ed Change default for spam check of new chat requests to 'disabled' 2025-10-30 13:28:15 +01:00
Arne
9173753839 Fix attach photo to media preview when skipping editor 2025-10-30 13:23:38 +01:00
xmppkeyboardguy
c3d917705f Update README.md 2025-10-28 18:38:36 +01:00
xmppkeyboardguy
172a1ce6f3 Update README-pl.md 2025-10-28 18:38:18 +01:00
xmppkeyboardguy
3811968f66 Update README-it.md 2025-10-28 18:37:57 +01:00
xmppkeyboardguy
db176c8dc2 Update README-fr.md 2025-10-28 18:37:31 +01:00
xmppkeyboardguy
a6a1e388be Update README-en.md 2025-10-28 18:36:54 +01:00
xmppkeyboardguy
e688e5f2cc Add README-tr.md 2025-10-28 18:36:23 +01:00
xmppkeyboardguy
46f13a8581 Add play store badges 2025-10-28 18:35:16 +01:00