mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 17:40:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
7183 commits 7 branches 124 tags 230 MiB
Commit graph

7183 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
77bfa1a687 Automatic SchildiChat string correction 
Change-Id: Ib449487f435c24214e5856311683d857844d3047
 2020-12-15 16:18:37 +01:00
SpiritCroc
a51b44a40d merge_helpers: allow adding extra args to revert_last 
Change-Id: I5ef98b8130fe373d5a9f3d469140117c4570906e
 2020-12-15 16:05:43 +01:00
SpiritCroc
b0d09313e7 Automatic upstream merge postprocessing 
Change-Id: I9fbeeeaaf8ad10e2d7dfd585c6f73cd07e361dd0
 2020-12-15 15:55:57 +01:00
SpiritCroc
a35e246c4d Automatic color correction 
Change-Id: I83f5aed8537cf48dc2f9317b1481b84d63625e64
 2020-12-15 15:55:57 +01:00
SpiritCroc
38b82fb823 Merge tag 'v1.0.12' into sc 
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/drawable/ic_attachment.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/values-v23/theme_status.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/values/theme_status.xml

Note to self: need to check if URL preview works with wrap_content

Change-Id: I028b2873a33bb1a770f2da96d576b97202b5bcf9
 2020-12-15 15:55:14 +01:00
SpiritCroc
299902feed [TMP] Automatic upstream merge preparation 
Change-Id: I5ffadd9f7366002c522bb2ed126f9eb9878ca197
 2020-12-15 15:00:31 +01:00
SpiritCroc
310b7a262c Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I77578d6304946bb60a67134b1b2e034c919d0e73
 2020-12-15 15:00:31 +01:00
Benoit Marty
1946058c8e Merge branch 'release/1.0.12' 2020-12-15 14:16:17 +01:00
Benoit Marty
e230cd8ee3 Prepare release 1.0.12 2020-12-15 14:16:08 +01:00
Benoit Marty
45225e883e
Merge pull request #2539 from vector-im/feature/bma/cleanup 
Small cleanup before the release
 2020-12-15 14:11:31 +01:00
Benoit Marty
bb9a08d429 /confetti /snow commands: send emote if text is blank (iso Element Web) 2020-12-15 12:19:31 +01:00
Benoit Marty
6ddcd046d4 Import SAS strings 2020-12-15 12:19:31 +01:00
Benoit Marty
88a4dfd094 Ensure the message is understood as a debug indication (#2509) 2020-12-15 12:19:31 +01:00
Benoit Marty
7828e3f501
Merge pull request #2485 from vector-im/feature/ons/fix_hide_state_events 
Fix UTD when hiding member state events.
 2020-12-15 12:16:27 +01:00
Benoit Marty
b4b302c1f2
Merge pull request #2535 from vector-im/feature/bca/confetti 
Chat Effects XMAS PR ❄️ 🎉
 2020-12-15 11:41:29 +01:00
Benoit Marty
487ef870f9 Add /snow command 2020-12-15 10:56:05 +01:00
Benoit Marty
6957768567 PR Review 2020-12-15 10:21:12 +01:00
Valere
7da8b13cde Chat Effects 2020-12-15 09:39:16 +01:00
Benoit Marty
a027ef29e5
Merge pull request #2484 from vector-im/feature/bca/social_login 
Social Login
 2020-12-14 18:19:23 +01:00
Benoit Marty
211c158e23 Remove bad translation 2020-12-14 17:42:52 +01:00
Benoit Marty
338650cea7
Merge pull request #2537 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2020-12-14 17:37:51 +01:00
Benoit Marty
2d4eeb64c5 Translated using Weblate (French) 
Currently translated at 98.2% (1982 of 2018 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2020-12-14 16:37:12 +00:00
Benoit Marty
4f98031c6d
Merge pull request #2536 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2020-12-14 17:27:10 +01:00
Weblate
3813f6d659 Merge branch 'origin/develop' into Weblate. 2020-12-14 15:45:20 +00:00
Besnik Bleta
6687a74f5c Translated using Weblate (Albanian) 
Currently translated at 98.0% (206 of 210 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sq/
 2020-12-14 15:35:36 +00:00
Ihor Hordiichuk
545e13c843 Translated using Weblate (Ukrainian) 
Currently translated at 48.0% (955 of 1986 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2020-12-14 15:35:35 +00:00
Besnik Bleta
995ec25990 Translated using Weblate (Albanian) 
Currently translated at 99.4% (1975 of 1986 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2020-12-14 15:35:35 +00:00
Benoit Marty
09040b7095 Clear history (#1933) 2020-12-14 16:22:22 +01:00
Benoit Marty
5a69b33600 Move style for social login to a dedicated file 2020-12-14 15:53:16 +01:00
Benoit Marty
c8c4e10822 Cleanup layout 2020-12-14 15:46:31 +01:00
Benoit Marty
2f616cb6c5 Add some constants 2020-12-14 15:41:33 +01:00
Benoit Marty
776d7699bc Do not modify the DB in debug mode, and add to history only if valid 2020-12-14 15:33:32 +01:00
Benoit Marty
f3578e2538 Cleanup 2020-12-14 15:17:07 +01:00
Benoit Marty
8022430f0d Remove useless override 2020-12-14 15:14:46 +01:00
Benoit Marty
eb72d0c6d3 Revert formatting change 2020-12-14 15:13:08 +01:00
Benoit Marty
ae29cbdc34 Better name 2020-12-14 15:11:02 +01:00
Benoit Marty
cf59c7db95 Cleanup 2020-12-14 15:09:10 +01:00
Benoit Marty
924fac84b2 Move HomeServerHistoryService binding to AuthModule 2020-12-14 15:08:09 +01:00
Benoit Marty
db0a958708 Fix crash in Realm migration 2020-12-14 14:53:29 +01:00
Benoit Marty
b31dfcfe4f IdentityProvider -> SsoIdentityProvider 2020-12-14 14:32:20 +01:00
Benoit Marty
bba2daf0fc Capital H for GitHub 2020-12-14 14:13:50 +01:00
Benoit Marty
23e05200b5 Social login: cleanup 2020-12-14 14:13:36 +01:00
Valere
0fd8641cf6 Fix copyright + lint 2020-12-14 14:05:57 +01:00
Valere
26c01d46a7 Code review + Completion layout res 2020-12-14 14:05:57 +01:00
Valere
42d1bf57f6 Refactor + fix sso in LoginFragment 2020-12-14 14:05:57 +01:00
Valere
351793d456 Fix / support sso_with_password flow when no providers 2020-12-14 14:05:57 +01:00
Valere
03428ea9f5 Social Login 
And new custom homeserver completion (and remember history)
 2020-12-14 14:05:57 +01:00
Onuray Sahin
b321838502
Merge branch 'develop' into feature/ons/fix_hide_state_events 2020-12-14 12:03:49 +03:00
Ihor Hordiichuk
b915c91c86 Translated using Weblate (Ukrainian) 
Currently translated at 28.0% (59 of 210 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/uk/
 2020-12-13 14:35:36 +00:00
strix aluco
f83b478008 Translated using Weblate (Ukrainian) 
Currently translated at 48.0% (955 of 1986 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2020-12-13 14:35:36 +00:00