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

7199 Commits

Author SHA1 Message Date
SpiritCroc 4b5aab3c8d Show "more" again in case topic is shown in easy mode 
Change-Id: Ib5e93fd0b471746dc3fb58be581f35b0ff28c64b
 2020-11-29 14:56:51 +01:00
SpiritCroc 6830ffd3f0 Easy mode: Hide encryption status and action in room profile 
Change-Id: Ia12cd69a5c4cad5577049020478987fb588932a1
 2020-11-29 13:31:41 +01:00
SpiritCroc f23bea23e5 Fix compile after v1.0.11 merge 
Change-Id: I122e4d98b464606c25c837d6d28e32a2c9f08c72
 2020-11-29 13:15:47 +01:00
SpiritCroc 86e638428b Revert "Revert "Resolve required manual intervention in german strings"" 
This reverts commit 77df970e1b.

Change-Id: Idbb71587c4e54a53cf9890416376444e7c8b5907
 2020-11-29 12:57:03 +01:00
SpiritCroc 4afb6aa469 Automatic SchildiChat string correction 
Change-Id: I4a542ccc442ce0ec5a2bde5daf8c612342b8410d
 2020-11-29 12:52:26 +01:00
SpiritCroc 0469beab1c Automatic upstream merge postprocessing 
Change-Id: Ib47b978128f8c6c0b243410591a1f9566ba08c6b
 2020-11-29 12:52:25 +01:00
SpiritCroc e0ca1f2751 Automatic color correction 
Change-Id: Ia5d7d0bcba99005bb81a16a02edcc18b2480db1c
 2020-11-29 12:52:25 +01:00
SpiritCroc 6f0a1acaf7 post_merge.sh: Add some automatic accent color correction 
Change-Id: Ie0cf3b2d89fa8b24ac7544cba2f1540be041674b
 2020-11-29 12:52:07 +01:00
SpiritCroc 0b4f56d7a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/res/layout/fragment_known_users.xml
	vector/src/main/res/layout/fragment_user_list.xml
 2020-11-29 12:51:43 +01:00
SpiritCroc b283ba3b0a [TMP] Automatic upstream merge preparation 
Change-Id: I4824f735104a794acc944d39d52b61463a6fe17f
 2020-11-29 12:32:30 +01:00
SpiritCroc 857ebde8ba Revert "Automatic SchildiChat string correction" 
This reverts commit 5a4907362a.
 2020-11-29 12:32:30 +01:00
SpiritCroc 77df970e1b Revert "Resolve required manual intervention in german strings" 
This reverts commit 2590f8f690.
 2020-11-29 12:32:30 +01:00
Marcelo Filho f14b390849 Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2020-11-28 17:50:18 +00:00
Besnik Bleta 431f5d76ce Translated using Weblate (Albanian) 
Currently translated at 95.2% (200 of 210 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sq/
 2020-11-28 17:50:18 +00:00
Marcelo Filho dd50399a21 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (210 of 210 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/pt_BR/
 2020-11-28 17:50:18 +00:00
sblondon eb17463b68 Translated using Weblate (French) 
Currently translated at 100.0% (210 of 210 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/fr/
 2020-11-28 17:50:17 +00:00
Priit Jõerüüt 88e05ffd05 Translated using Weblate (Estonian) 
Currently translated at 100.0% (210 of 210 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/et/
 2020-11-28 17:50:17 +00:00
Besnik Bleta a5079f5243 Translated using Weblate (Albanian) 
Currently translated at 99.3% (1973 of 1986 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2020-11-28 17:50:17 +00:00
krikra01 422c681e55 Translated using Weblate (Russian) 
Currently translated at 97.1% (1930 of 1986 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2020-11-28 17:50:14 +00:00
Marcelo Filho 9531a38486 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (1986 of 1986 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2020-11-28 17:50:13 +00:00
sblondon 493cd2a0e3 Translated using Weblate (French) 
Currently translated at 98.8% (1963 of 1986 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2020-11-28 17:50:10 +00:00
Priit Jõerüüt f7f7e808f2 Translated using Weblate (Estonian) 
Currently translated at 100.0% (1986 of 1986 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2020-11-28 17:50:08 +00:00
zeritti 217c88f342 Translated using Weblate (Czech) 
Currently translated at 100.0% (1986 of 1986 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2020-11-28 17:50:05 +00:00
SpiritCroc 7ca37b8b46 Bug report template: add note to link upstream issues 
Change-Id: Icf58edbe6e26726febf9b5c47e42901e332102ad
 2020-11-28 12:20:43 +01:00
Valere cf70916764 Fix / double bottomsheet effect 2020-11-28 00:41:29 +01:00
Benoit Marty b84d7f0834 Version** 2020-11-27 20:42:02 +01:00
Benoit Marty dffdcfe1e4 Merge branch 'release/1.0.11' 2020-11-27 20:40:03 +01:00
Benoit Marty 11deaa049e Merge branch 'release/1.0.11' into develop 2020-11-27 20:40:01 +01:00
Benoit Marty 7b969ebd74 Ensure the Activity is destroyed, it seems that the intent flags are not enough now. - finish all 2020-11-27 16:00:30 +01:00
Onuray Sahin 245aa6e9e7 Create a new pin when tap on change pin item. 2020-11-27 17:17:24 +03:00
Benoit Marty 163f4cfaf2 Ensure the Activity is destroyed, it seems that the intent flags are not enough now. 2020-11-27 15:15:56 +01:00
Dominic Fischer 33a5cc1488 Remove redundant returns 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-27 13:18:07 +00:00
Benoit Marty 9a8f45fc6f Prepare version 1.0.11 2020-11-27 13:59:23 +01:00
Benoit Marty e3ca89a81b Fix issue when there is no display name 2020-11-27 13:54:21 +01:00
Benoit Marty 8696650f20 Cleanup 2020-11-27 13:53:19 +01:00
Benoit Marty 942f050579
Merge pull request #2450 from vector-im/feature/bca/home_empty_screens 
Home empty screen design update
 2020-11-27 13:51:04 +01:00
Onuray Sahin 89e7e28bfa Add settings item to change pin. 2020-11-27 15:22:31 +03:00
Onuray Sahin 221eddd995 Add changelog. 2020-11-27 15:02:08 +03:00
Benoit Marty 32d42794dd
Merge branch 'develop' into feature/bca/home_empty_screens 2020-11-27 12:02:30 +01:00
Benoit Marty 14c71d6c07 Fix issue with too big icons 2020-11-27 12:01:19 +01:00
Benoit Marty cce4d7d4d9 Use style instead of duplicating the whole layout file 2020-11-27 11:09:13 +01:00
Benoit Marty 708cdad38b Update changelog 2020-11-27 10:24:07 +01:00
Benoit Marty bc889cbcf4
Merge pull request #2444 from vector-im/feature/bca/deeplink_mxto 
Fix issues with matrix.to deep linking
 2020-11-27 10:22:51 +01:00
Valere 7c9b943733 Try other asset strategy as lint not happy 2020-11-27 09:58:14 +01:00
Benoit Marty e3b88d1162
Merge pull request #2461 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2020-11-27 09:45:22 +01:00
Weblate d80927a8f9 Merge branch 'origin/develop' into Weblate. 2020-11-27 07:37:32 +00:00
Dominic Fischer 27050b911b Convert TermsService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-26 21:53:22 +00:00
Dominic Fischer a3a2c0a9a8 Convert UploadsService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-26 21:51:58 +00:00
Dominic Fischer 92ceb0e8fb Convert IntegrationManagerService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-26 21:17:58 +00:00
Valere 835a36986d Refactoring following review 2020-11-26 17:39:00 +01:00