mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-21 00:32:09 +03:00
Code Issues Projects Releases Packages Wiki Activity
4114 commits 7 branches 123 tags 230 MiB
Commit graph

4114 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
714f598df6 Revert "Nicer deleted message view" 
No longer necessary, upstream did something similar (better).
Actually already reverted in merge commit 8cf2a51588.
This commit just cleans up a little bit.

This reverts commit 4679ab0e79.
 2020-06-05 16:30:54 +02:00
SpiritCroc
8cf2a51588 Merge tag 'v0.21.0' into sc 
Conflicts:
	vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
 2020-06-05 16:28:18 +02:00
SpiritCroc
0eb8b61a3d Revert "Follow system locale" 
This reverts commit 7b6a1ed2e7.
 2020-06-02 12:58:46 +02:00
SpiritCroc
3712a35480 Revert "Follow system locale pt.2: immediately apply it" 
This reverts commit bce7845f9b.
 2020-06-02 12:58:41 +02:00
SpiritCroc
f4d0317253 Fix missed hardcoded accent for addByMatrixId icon 2020-06-01 10:27:54 +02:00
SpiritCroc
5c08aa6462 Missed icon 2020-05-30 16:06:52 +02:00
SpiritCroc
761580c930 Increment version 2020-05-29 15:01:10 +02:00
SpiritCroc
043a908d24 Same side read receipts for both side bubbles 2020-05-29 13:40:18 +02:00
SpiritCroc
37a64004e4 Redacted messages better go in bubbles for both sides style 2020-05-28 12:40:31 +02:00
Benoit Marty
997101a44b Merge branch 'hotfix/crash_locales' 2020-05-28 11:31:38 +02:00
Benoit Marty
ec1422b0f0 Fix crash due to bad script. Tha bad value has already been fixed on Weblate. 2020-05-28 11:27:11 +02:00
SpiritCroc
3b5c092759 Increment version 2020-05-28 11:12:28 +02:00
SpiritCroc
ba88edb667 Update legacy icons 2020-05-28 11:12:20 +02:00
Benoit Marty
d1c4d4b099 Merge branch 'release/0.21.0' 2020-05-28 10:43:55 +02:00
Benoit Marty
9a972b2f73 Prepare release 0.21.0 2020-05-28 10:43:40 +02:00
SpiritCroc
adaecddb48 Disable some more reporting mechanisms 2020-05-28 10:12:28 +02:00
SpiritCroc
c755c5de0a Merge tag 'v0.20.0' into sc 2020-05-28 09:26:11 +02:00
SpiritCroc
70e43ee8a8 Further SC theme improvements 2020-05-28 09:24:29 +02:00
Benoit Marty
116bab5bc8 Fix call event not rendered in e2e rooms. 2020-05-27 19:02:27 +02:00
Benoit Marty
c76eb3bc98 Fix lint issue 2020-05-27 18:58:45 +02:00
Benoit Marty
81c1717384 Format strings 2020-05-27 18:49:34 +02:00
Benoit Marty
0fd0500d30
Merge pull request #1414 from RiotTranslateBot/weblate-riot-android-riotx-application 
Update from Weblate
 2020-05-27 17:50:06 +02:00
SpiritCroc
1d97f79564 Don't prompt for crash report 2020-05-27 16:08:56 +02:00
SpiritCroc
02e3e2b12e Better determine MessageFileItem width 2020-05-27 15:51:01 +02:00
Benoit Marty
34d638da4f
Merge pull request #1411 from vector-im/feature/attachment_e2e 
Feature/attachment e2e
 2020-05-27 15:13:17 +02:00
SpiritCroc
d8e5697168 Message bubble cleanup, visibility fix, alignment fix 2020-05-27 15:12:38 +02:00
Weblate
e39b177b5b Merge branch 'origin/develop' into Weblate. 2020-05-27 13:04:35 +00:00
LinAGKar
07aa3ee64c Translated using Weblate (Swedish) 
Currently translated at 19.9% (335 of 1682 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/sv/
 2020-05-27 13:04:29 +00:00
yuuki-san
c94856cdf8 Translated using Weblate (Slovak) 
Currently translated at 95.7% (156 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/sk/
 2020-05-27 13:04:26 +00:00
yuuki-san
4dd0c04537 Translated using Weblate (Slovak) 
Currently translated at 53.9% (906 of 1682 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/sk/
 2020-05-27 13:04:26 +00:00
Амёба
99c409b6d2 Translated using Weblate (Russian) 
Currently translated at 82.6% (1390 of 1682 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/ru/
 2020-05-27 13:04:26 +00:00
Marko Dimjašević
8cb2c2532f Translated using Weblate (Croatian) 
Currently translated at 54.2% (912 of 1682 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/hr/
 2020-05-27 13:04:24 +00:00
Benoit Marty
6f804cab4d Avoid duplicated events in DB (one with localId and one with eventId from homeserver, once synced) 2020-05-27 11:27:54 +02:00
Benoit Marty
cf3dbb378e Get uploaded files for e2e rooms, from local DB 2020-05-26 22:06:51 +02:00
Benoit Marty
0eb36a607b
Merge pull request #1402 from vector-im/feature/rageshake_dialogs 
Feature/rageshake dialogs
 2020-05-26 00:04:33 +02:00
Benoit Marty
0509e76f18 var -> val 2020-05-25 23:54:53 +02:00
Benoit Marty
e379ccf086 Extract MatrixConfiguration to its own file, for a better visibility 2020-05-25 23:53:36 +02:00
Benoit Marty
7ae52d676d Use directly java.net.proxy class 2020-05-25 23:50:10 +02:00
Benoit Marty
3d33018ffa
Merge pull request #1147 from unclejay80/http_proxy_init 
added network proxy configuration
 2020-05-25 23:43:11 +02:00
SpiritCroc
96ca414d44 [WIP] Advanced both-side bubble layout 
TODO:
- MessageFileItem minWidth might be calculatable
- No-bubble alignment got broken
 2020-05-25 18:05:15 +02:00
Benoit Marty
860595520b
Merge pull request #1401 from vector-im/feature/cleanup 
Small PR with code cleanup
 2020-05-25 17:30:31 +02:00
Benoit Marty
ae318a835e
Merge pull request #1387 from vector-im/feature/attachments_list 
Attachments list
 2020-05-25 17:29:54 +02:00
Benoit Marty
7a3dbecc08 Fixes #860 2020-05-25 17:05:17 +02:00
Benoit Marty
c52aae7c29 Uploads: Snackbar 2020-05-25 17:05:17 +02:00
Benoit Marty
f0f3e8ddb9 Uploads: auto-review 2020-05-25 17:05:17 +02:00
Benoit Marty
a95102a78f Uploads: Use StateView for better Loading/Empty rendering 2020-05-25 17:02:57 +02:00
Benoit Marty
2adafbeb03 Uploads: use SenderInfo in TimelineEvent 2020-05-25 17:02:57 +02:00
Benoit Marty
f3a5fb7fe3 Uploads: rework: provide information about the sender 2020-05-25 16:54:08 +02:00
Benoit Marty
907a786b1a Uploads: load element until loader not displayed anymore 2020-05-25 16:54:08 +02:00
Benoit Marty
e3ed3e5b05 Uploads: cleanup 2020-05-25 16:54:08 +02:00