filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,210 Commits 6 Branches 119 Tags 221 MiB
Commit Graph

7210 Commits

Author SHA1 Message Date
random ad64651532 Translated using Weblate (Italian) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2020-11-08 10:49:57 +00:00
Auri B. P edc47b56a4 Translated using Weblate (Catalan) 
Currently translated at 59.4% (1149 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2020-11-08 10:49:56 +00:00
Slavi Pantaleev f39b3365db Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/bg/
 2020-11-08 10:49:55 +00:00
SpiritCroc 164848e0aa Increment version 
Change-Id: Id0642c0e557b85b4209713028ba7c1d1223a070d
 2020-11-07 11:37:55 +01:00
Dominic Fischer 0da4ff7b02 Run ktlint 2020-11-06 19:20:23 +00:00
Dominic Fischer 983e02888c Remove incorrect comment 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-06 19:17:45 +00:00
Dominic Fischer 35768ff7e8 Convert `AccountService` to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-06 16:49:51 +00:00
ganfra 6dfdc77ebd Use room member instead of user when it makes sense 2020-11-06 14:41:43 +01:00
SpiritCroc 786660f3bd merge_helpers.sh: downstream_latest_tag: Refer to HEAD instead of sc 
Fix getting the best tag in detached head state, when sc is not
up-to-date.

Change-Id: I50294b9de3134815deef30a4b1c61da81721de89
 2020-11-06 14:24:10 +01:00
SpiritCroc 10e67bd5df Remember expand status for all categories except invite 
We did remember low priority before. We might want to remember other
categories as well, but let's better keep the invite category expanded
by default.

Change-Id: Ia351de35751ce5a13f3739ed5f7a3528e315261f
 2020-11-06 14:24:03 +01:00
Benoit Marty 0753ba3495
Merge pull request #2342 from vector-im/feature/ons/open_existing_dm 
Navigate to an existing DM instead of creating a new one.
 2020-11-06 11:29:20 +01:00
Jeff Huang ffd3b9a7a7 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2020-11-06 02:50:00 +00:00
Auri B. P 428062e1e4 Translated using Weblate (Catalan) 
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
 2020-11-06 02:50:00 +00:00
Auri B. P cb49c7d060 Translated using Weblate (Catalan) 
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/ca/
 2020-11-06 02:50:00 +00:00
Jeff Huang 2a22d71e7c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2020-11-06 02:49:59 +00:00
Marcelo Filho eaa7fb7100 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.7% (1929 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2020-11-06 02:49:58 +00:00
Priit Jõerüüt 9755dd73eb Translated using Weblate (Estonian) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2020-11-06 02:49:58 +00:00
Auri B. P 4c2e62031a Translated using Weblate (Catalan) 
Currently translated at 58.9% (1140 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2020-11-06 02:49:58 +00:00
Benoit Marty 51a95554d7 Remove useless code. We can now inject element in the Fragment constructors 2020-11-05 18:30:00 +01:00
Benoit Marty 12d8bd1743 Cleanup after rebase - avoid computing twice the existing roomId 2020-11-05 17:34:10 +01:00
Onuray Sahin 458b4259fe Change menu action title for existing rooms. 2020-11-05 17:02:13 +01:00
Onuray Sahin e7714da8e8 Navigate to an existing DM instead of creating a new one. 2020-11-05 17:02:13 +01:00
Benoit Marty b4f9d40767
Merge pull request #2344 from vector-im/feature/bma/sync_h 
Small fixes
 2020-11-05 16:58:46 +01:00
Benoit Marty a0e074043b
Merge pull request #2339 from vector-im/feature/realm_10 
Realm 10: upgrade lib
 2020-11-05 16:57:24 +01:00
SpiritCroc 096e046556 merge_helpers.sh: Introduce NO_REQUIRE_CLEAN_GIT env var 
Change-Id: I278b39959c93d95869414ab00577953422057e28
 2020-11-05 16:46:32 +01:00
Benoit Marty 9068168378
Merge branch 'develop' into feature/realm_10 2020-11-05 16:14:19 +01:00
SpiritCroc 54b9cbd653 alternative_package.sh: Auto-commit, check, if git is clean 
Change-Id: Ieae93761dc51c1c141d138a34c6ae01dfef557d2
 2020-11-05 16:11:32 +01:00
Benoit Marty de39a17247 Fix issue on setting avatar on a room. 
We deleted the just added avatar because `withState {}` is asynchronous
 2020-11-05 16:09:04 +01:00
SpiritCroc 4a483986f0 increment_version.sh: Add preview mode 
Change-Id: Icc7169e4abdc289ed60884b3ed6aec74c37d19d1
 2020-11-05 15:48:16 +01:00
Benoit Marty 5c7a5fab94 Improve API: rename the method and return empty list instead of null 2020-11-05 15:47:28 +01:00
Benoit Marty c9e0aff839 DRY 2020-11-05 15:42:44 +01:00
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