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

6879 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
61ed436c44 Move some method to the companion 2020-11-05 15:41:52 +01:00
Benoit Marty
b7a1f96294 Append to file but before the extension 2020-11-05 15:40:12 +01:00
Benoit Marty
15ad351579 Some fixes from Valere about verification 2020-11-05 15:33:28 +01:00
Benoit Marty
6cb4645514 Add a key to the category, to be able to hide it 2020-11-05 15:28:13 +01:00
SpiritCroc
d245af4d9c increment_version.sh: Add possibility for test releases 
Change-Id: I1ae628b56d0d2f49373cf507815f5efa3a881208
 2020-11-05 15:10:10 +01:00
SpiritCroc
6844c71987 increment_version.sh: No sc version change required for upstream merges 
Change-Id: I55e414902a232426e0af48911183f7f267cc3419
 2020-11-05 15:03:13 +01:00
SpiritCroc
eecbdde2fb Fix some colors (and fix compile) 
Change-Id: I2cb3d144afbb9af306774bf3d763d1f299133517
 2020-11-05 13:58:41 +01:00
SpiritCroc
2590f8f690 Resolve required manual intervention in german strings 
This reverts commit 85b77f6555.

Change-Id: I4f0056cdfd099205899f46b19962799052a6b461
 2020-11-05 13:27:39 +01:00
SpiritCroc
5a4907362a Automatic SchildiChat string correction 
Change-Id: I2b19a9bd837a14a3aaf5830bcde6af5026ff9c05
 2020-11-05 13:16:03 +01:00
SpiritCroc
c3f62cf80d Automatic upstream merge postprocessing 
Change-Id: Ib14a077c026657aff23ffbc42ade1e4524b0b8c2
 2020-11-05 13:16:02 +01:00
SpiritCroc
58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/res/menu/menu_timeline.xml
 2020-11-05 13:15:55 +01:00
SpiritCroc
fc33d50c61 [TMP] Automatic upstream merge preparation 
Change-Id: Idd7894614eec671dcce0eecda95e2b7cf31ee7a6
 2020-11-05 13:14:16 +01:00
SpiritCroc
3837ce4204 Revert "Automatic SchildiChat string correction" 
This reverts commit 835bde286c.
 2020-11-05 13:14:16 +01:00
SpiritCroc
85b77f6555 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings""""""""" 
This reverts commit bde0020305.
 2020-11-05 13:14:16 +01:00
ganfra
eb1fa0919f Room member: add methods to get directly from session 2020-11-04 18:09:51 +01:00
Benoit Marty
45edf6025e SAS Strings for Italian 2020-11-04 16:01:33 +01:00
Benoit Marty
17fed39b27 Version++ 2020-11-04 16:00:16 +01:00
Benoit Marty
bba167d4ea Merge branch 'release/1.0.10' 2020-11-04 15:58:45 +01:00
Benoit Marty
9ebda42d34 Merge branch 'release/1.0.10' into develop 2020-11-04 15:58:44 +01:00
Benoit Marty
619ec4faa4 Prepare release v1.0.10 2020-11-04 15:57:56 +01:00
Benoit Marty
49beae431f
Merge pull request #2343 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2020-11-04 15:14:28 +01:00
Weblate
f3b8bb066c Merge branch 'origin/develop' into Weblate. 2020-11-04 13:43:47 +00:00
LinAGKar
b879be2b02 Translated using Weblate (Swedish) 
Currently translated at 100.0% (1929 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2020-11-04 13:43:37 +00:00
Hivaa
52e699e125 Translated using Weblate (Persian) 
Currently translated at 98.4% (1899 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2020-11-04 13:43:36 +00:00
Benoit Marty
8a86b2c940
Merge pull request #2341 from vector-im/feature/bma/multi_home 
Two elements in the task switcher (#2299)
 2020-11-04 14:34:33 +01:00
Benoit Marty
b15fa7c0d7 Two elements in the task switcher (#2299) 2020-11-04 14:32:54 +01:00
Benoit Marty
6cd50cfaf1
Merge pull request #2336 from vector-im/feature/ons/fix_markdown_formatter 
Markdown body should be pure text, see #739, #1506.
 2020-11-04 13:50:46 +01:00
Onuray Sahin
9ed529b944
Merge branch 'develop' into feature/ons/fix_markdown_formatter 2020-11-04 13:43:26 +03:00
Onuray Sahin
bbc3dc0504 Set br softbreak to html parser. 2020-11-04 13:42:52 +03:00
Benoit Marty
d1d2c5f117
Merge pull request #2327 from vector-im/feature/bma/keysbackupcrash 
Feature/bma/keysbackupcrash
 2020-11-04 00:02:48 +01:00
ganfra
9f3f5d8053 Realm 10: upgrade lib and make it works on our current code. 2020-11-03 16:53:30 +01:00
Onuray Sahin
f24b593349 Update MarkdownParserTest. 2020-11-03 15:56:51 +03:00
SpiritCroc
600674e871 Room topic: tweak collapse behaviour some more 
One could argue that collapsing is only useful if we have more than 2
lines to hide.
Also, @su-ex wants more lines, so let's go for 5+3.

Change-Id: I5f3580171d4b1544fd8f91f1de48cea85023b60a
 2020-11-03 10:46:25 +01:00
Benoit Marty
0db1095373
Merge pull request #2334 from vector-im/feature/bca/crypto_db_clean 
Feature/bca/crypto db clean
 2020-11-03 10:31:53 +01:00
Benoit Marty
997cd68344 Add some padding for easier readability 2020-11-03 09:57:34 +01:00
Onuray Sahin
b40334f7db Markdown body should be pure text, see #739, #1506. 2020-11-03 11:53:50 +03:00
SpiritCroc
56b84a5201 Move footer time slighlty down in the bubble 
Change-Id: I0d61691ca56a44a6c8efb01d2c447bac9d50c9cb
 2020-11-03 09:49:53 +01:00
Benoit Marty
a216f82b35 Avoid code duplication and log total count 2020-11-03 09:30:26 +01:00
Benoit Marty
5eb2f14375 Move RealmDebugTools and make it an internal class 2020-11-03 09:20:24 +01:00
Benoit Marty
d4963dfb31 Use the same name for the 2 db log methods 2020-11-03 09:17:07 +01:00
Valere
3c7f61e45c Clean oldest gossiping entries on open 
Add a dump of DB size on bug report
 2020-11-02 17:45:08 +01:00
Besnik Bleta
10eef60f45 Translated using Weblate (Albanian) 
Currently translated at 99.4% (189 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sq/
 2020-11-02 15:49:57 +00:00
zeritti
cb70757790 Translated using Weblate (Czech) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
 2020-11-02 15:49:57 +00:00
Corentin Noël
ac0418c796 Translated using Weblate (French) 
Currently translated at 100.0% (1929 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2020-11-02 15:49:57 +00:00
Alexia Ŭerner
86b0094cdb Translated using Weblate (Esperanto) 
Currently translated at 99.1% (1913 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/eo/
 2020-11-02 15:49:56 +00:00
zeritti
c0f07bc0a5 Translated using Weblate (Czech) 
Currently translated at 100.0% (1929 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2020-11-02 15:49:56 +00:00
Valere
c3b8ed223d Increase log level of file logger 2020-11-02 16:39:06 +01:00
Benoit Marty
3947a78b56
Merge pull request #2058 from vector-im/feature/fix_sync_after_call_invite 
Start sync when receive m.call.invite.
 2020-11-02 14:45:22 +01:00
Benoit Marty
51ae2ce1e0
Merge branch 'develop' into feature/fix_sync_after_call_invite 2020-11-02 14:45:05 +01:00
Benoit Marty
9ff78051a9 Cleanup 2020-11-02 14:15:27 +01:00