mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-29 04:18:38 +03:00
Code Issues Projects Releases Packages Wiki Activity
7232 commits 7 branches 124 tags 230 MiB
Commit graph

7232 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
b9e8d7187c
Merge pull request #2075 from vector-im/feature/strict_mode_tracking 
Feature/strict mode tracking
 2020-09-10 13:46:44 +02:00
Onuray Sahin
926ff80525
Merge pull request #2086 from vector-im/feature/fix_event_read_elsewhere 
Clear the notification when the event is read elsewhere
 2020-09-10 13:24:57 +03:00
SpiritCroc
1d6fd71adb Make unread-counter for non-notifications a setting 
Change-Id: I6e097ee4577868b1e82a0cd69bd67122cb57a4d4
 2020-09-10 12:01:54 +02:00
SpiritCroc
91c7e39d50 Add increment_version.sh 
Change-Id: Id52547142003e34a68645655835b842cab19a869
 2020-09-10 11:33:20 +02:00
SpiritCroc
8cba674d01 merge_helpers.sh: Fix some tagging logic 
Change-Id: I81ae8acd49b8069b658b4cc5acfef0e9e2b35825
 2020-09-10 11:11:22 +02:00
Onuray Sahin
0cba8f3aa1 Start background sync even if the eventId or roomId is null. 2020-09-10 12:08:05 +03:00
SpiritCroc
5e4d9c18be Overview: display the year instead of the weekday for old chats 
i.e. chats that are older than one year

Change-Id: I439e78df1425eb57cf597449f09ef5549e90f9b8
 2020-09-10 10:35:58 +02:00
Benoit Marty
11fb2bcdfa ktlint... 2020-09-09 13:34:57 +02:00
Benoit Marty
94e43475e2
Merge pull request #2040 from vector-im/feature/date_formatting 
Feature/date formatting
 2020-09-09 12:16:18 +02:00
Benoit Marty
01a4905dc8 Changelog 2020-09-09 12:15:27 +02:00
Benoit Marty
8cb7260375 Small changes (PR review) 2020-09-09 12:10:46 +02:00
ganfra
dc04d2848d Default pref: make sure to use app context 2020-09-09 11:52:05 +02:00
ganfra
c2880a5832 Strict mode: add a build entry to enable whenever we want to check 2020-09-09 11:52:05 +02:00
ganfra
979c0832cf Use realmSessionProvider in localEchoRepository 2020-09-09 11:52:05 +02:00
ganfra
fa381cc06d Use a singleton for default shared pref 2020-09-09 11:45:47 +02:00
ganfra
f1d902b9ad Enable strict mode and remove some stuff from the main thread 2020-09-09 11:45:47 +02:00
Benoit Marty
b97d922808 ktlint 2020-09-09 11:33:22 +02:00
ganfra
18dcd6b9b1 Date format: add more comments and fix wrong format kind usage 2020-09-09 11:32:56 +02:00
ganfra
c6178e504f Clean files and update CHANGES 2020-09-09 11:32:56 +02:00
ganfra
0ff28c4f50 Date formatting: try to generalise usage of VectorDateFormatter and get proper formatting for Date + Time 2020-09-09 11:32:16 +02:00
ganfra
73ab32fd92 Start reworking date formatting 2020-09-09 11:32:16 +02:00
LinAGKar
925d4d077f Translated using Weblate (Swedish) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/sv/
 2020-09-09 07:42:55 +00:00
LinAGKar
4581efa4c3 Translated using Weblate (Swedish) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/sv/
 2020-09-09 07:42:55 +00:00
Nikita Epifanov
09ccf7cdde Translated using Weblate (Russian) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/ru/
 2020-09-09 07:42:54 +00:00
Nikita Epifanov
d1fedcac7c Translated using Weblate (Russian) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ru/
 2020-09-09 07:42:54 +00:00
@a2sc:matrix.org
a7ee451705 Translated using Weblate (German) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/de/
 2020-09-09 07:42:53 +00:00
@a2sc:matrix.org
11fc0fed75 Translated using Weblate (German) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/de/
 2020-09-09 07:42:53 +00:00
Priit Jõerüüt
f932100388 Translated using Weblate (Estonian) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
 2020-09-09 07:42:52 +00:00
Jeff Huang
f0b582fef0 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/zh_Hant/
 2020-09-09 07:42:51 +00:00
SpiritCroc
c20a6b8001 Fix mismerge 
Change-Id: I78b7e835c6ce477074aaf3220aef4193a51f3717
 2020-09-08 19:26:49 +02:00
SpiritCroc
7da51068bc Revert "Revert "Resolve required manual intervention in german strings"" 
This reverts commit b9607abbe6.
 2020-09-08 19:17:23 +02:00
SpiritCroc
2e16cc7997 Automatic SchildiChat string correction 
Change-Id: Iaa24753cf4596b31f9127dfc6178dc4d06139ba8
 2020-09-08 19:17:23 +02:00
SpiritCroc
a82ee6bc74 Automatic upstream merge postprocessing 
Change-Id: I6f2814261df91b8b4e2aeb0698cc39ea54a2899a
 2020-09-08 19:17:22 +02:00
SpiritCroc
7d467d622a Update merge helpers 
Change-Id: I2da35a52c6f7209acc822c7fd878255df082bc52
 2020-09-08 19:17:15 +02:00
SpiritCroc
bdd71769a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Ibdd2790a7f2a8a1f126ef7af2032fe72f7dd777e
 2020-09-08 18:52:59 +02:00
SpiritCroc
cc2058a58c Add merge_helpers.sh 
Change-Id: Ia11bf326b360a9845c8df65d386c239b7b3eb414
 2020-09-08 18:38:11 +02:00
SpiritCroc
700ff022d5 [TMP] Automatic upstream merge preparation 
Change-Id: I55e22241e686b30ee1f1674095004ea6fdb6d280
 2020-09-08 18:29:29 +02:00
SpiritCroc
1c8b720ff2 Revert "Automatic SchildiChat string correction" 
This reverts commit d912c5a356.
 2020-09-08 18:29:29 +02:00
SpiritCroc
b9607abbe6 Revert "Resolve required manual intervention in german strings" 
This reverts commit 19260fce65.
 2020-09-08 18:29:29 +02:00
SpiritCroc
cd7fb3e164 Add pre_merge.sh merge helper 
Change-Id: Ic1cbd5f124a6a56dd7cd384b5177f739f5085f73
 2020-09-08 18:29:26 +02:00
Benoit Marty
bf0b6d738a Version++ 2020-09-08 17:49:26 +02:00
Benoit Marty
0da106ba36 Merge branch 'release/1.0.6' 2020-09-08 17:47:17 +02:00
Benoit Marty
83a06b9657 Merge branch 'release/1.0.6' into develop 2020-09-08 17:47:15 +02:00
Benoit Marty
9b5bd3e226 Prepare release 1.0.6 2020-09-08 17:47:03 +02:00
Benoit Marty
135fcab558
Merge pull request #2074 from vector-im/feature/cleanup 
Cleanup and documentation after #2047
 2020-09-08 17:39:02 +02:00
Benoit Marty
f990600aea Cleanup and documentation after #2047 2020-09-08 12:40:21 +02:00
Benoit Marty
22cd6ae239
Merge pull request #2047 from vector-im/feature/universal_link_navigation 
Handle room, user, group, email verification links by converting them to permalinks.
 2020-09-08 12:21:54 +02:00
Benoit Marty
00b53ee577
Merge pull request #2053 from vector-im/feature/fix_poll_reply 
Feature/fix poll reply
 2020-09-08 12:19:32 +02:00
Benoit Marty
f65e96e7b4
Merge pull request #2069 from etherealvisage/develop 
Support data-mx-[bg-]color attribute on <font> tags in formatted messages.
 2020-09-08 10:09:25 +02:00
Benoit Marty
f98844db02 Privacy 2020-09-08 10:04:27 +02:00