mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-21 08:43:02 +03:00
Code Issues Projects Releases Packages Wiki Activity
20559 commits 7 branches 123 tags 230 MiB
Commit graph

20559 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
bf78ec8964 Increment version 
Change-Id: I2bc1e70cf0eaec2180b569e608f724d3ef145c26
 2022-09-28 17:05:14 +02:00
SpiritCroc
bee145f951 [merge] Add missed MessageActions shield 
Change-Id: I3cf37f8ecac6c8b581c28f39fb4bc008435d34cb
 2022-09-28 15:19:07 +02:00
SpiritCroc
0b917fc935 [sec-merge related] Render encryption warnings for all layouts again 
Change-Id: I3af2a350af2988803f7114d1652a85dd3f75681d
 2022-09-28 11:58:01 +02:00
SpiritCroc
97d0dbcfb8 [merge] Fix NoticeItem compile 
Change-Id: I536e759913715c0aa627fc60cda9a5453bc8a243
 2022-09-28 10:52:17 +02:00
SpiritCroc
833bb110d8 Automatic SchildiChat string correction 
Change-Id: I6a3d058924b84ab17f4cc548dc09937343488630
 2022-09-28 10:41:17 +02:00
SpiritCroc
b1971fcae3 Automatic upstream merge postprocessing 
Change-Id: Ie55a039e5367f704efa30ccf19d020459bd1b491
 2022-09-28 10:41:16 +02:00
SpiritCroc
87eaf85224 Security patch v1.5.1 
Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt

Change-Id: I0c8f5e098f92d0bf42e5ddc41bb6ad43c69bfdd2
 2022-09-28 10:41:00 +02:00
SpiritCroc
479b6ae004 [TMP] Automatic upstream merge preparation 
Change-Id: I17e23cf7e1efb0d04021a57a137954ab6238c082
 2022-09-28 10:25:21 +02:00
SpiritCroc
ca11f4c4dd Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I761ae27a08413c6da4e586d013fdcc802643acf2
 2022-09-28 10:25:21 +02:00
SpiritCroc
00e5853081 [merge] Never show Element's release notes 
Change-Id: I37d761d7602c16511c907a7d41e09c42c880afb6
 2022-09-23 16:32:05 +02:00
SpiritCroc
4e5b89dbd0 Automatic SchildiChat string correction 
Change-Id: If24b31c76bedaa83f5e5e2effed599d0d5c6b784
 2022-09-23 16:28:05 +02:00
SpiritCroc
db02b4a34e Automatic upstream merge postprocessing 
Change-Id: I5cd3120e30b99a8f8683064fe8c917e3fd2eac48
 2022-09-23 16:28:03 +02:00
SpiritCroc
bb6595110b Merge tag 'v1.5.0' into merge-v1.5.0 
Change-Id: Ifaa56941340ac1774d8b7bd470e32c5203d15f69

Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
	vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteEmojiDataItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/menu/menu_new_home.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-09-23 16:28:00 +02:00
SpiritCroc
6850ed5846 [TMP] Automatic upstream merge preparation 
Change-Id: I1d2ccda0028d0ab22b3328aa7ec2776d80808356
 2022-09-23 15:15:46 +02:00
SpiritCroc
5ac23e3839 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ia98247d06010a7fe03b6ef249d790e078fc94f2a
 2022-09-23 15:15:45 +02:00
ganfra
8d112a47d7 Merge branch 'hotfix/1.5.0_disable_applayout' into main 2022-09-23 12:20:00 +02:00
ganfra
f8ed3520f5 Applayout: disable applayout by default 2022-09-23 11:45:34 +02:00
ganfra
cb6d0a66cb Merge branch 'hotfix/1.5.0_v2' into main 2022-09-22 18:18:26 +02:00
ganfra
8d94643ff7 RoomList: revert changes on LiveData and fix previous issues (not updated list) 2022-09-22 18:17:55 +02:00
ganfra
21806efaa5 Merge branch 'release/1.5.0' into main 2022-09-22 10:28:04 +02:00
ganfra
14e7c913df Release 1.5.0: update CHANGES 2022-09-22 09:50:50 +02:00
ganfra
d08b33ec07 Translations: fix some mispells 2022-09-22 09:45:06 +02:00
ganfra
619791d24f
Merge pull request #7201 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-09-21 21:40:06 +02:00
Danial Behzadi
1446e8f50b Translated using Weblate (Persian) 
Currently translated at 99.8% (2415 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2022-09-21 19:16:35 +00:00
Auri B. P
401ce61930 Translated using Weblate (Catalan) 
Currently translated at 98.7% (2389 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2022-09-21 19:16:32 +00:00
ganfra
feb33ce32b Translation: cleanup remaining TODOs 2022-09-21 19:43:47 +02:00
ganfra
03d843ac51 Rename device_manager strings 2022-09-21 18:04:32 +02:00
ganfra
658a8dfd04
Merge pull request #7199 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-09-21 17:09:32 +02:00
Weblate
12e0e263fa Merge branch 'origin/develop' into Weblate. 2022-09-21 14:40:42 +00:00
ganfra
0a8e6c1758 Weblate: fix conflict 2022-09-21 16:39:56 +02:00
ganfra
c05cbb4eed
Merge pull request #7196 from vector-im/feature/ons/revert_string_key_changes 
Revert changes of string keys
 2022-09-21 16:02:18 +02:00
Onuray Sahin
793138bf1b Revert changes of string keys. 2022-09-21 16:44:47 +03:00
Nui Harime
d9faad6364 Translated using Weblate (Russian) 
Currently translated at 98.0% (2339 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2022-09-21 12:45:19 +00:00
Michael Weimann
b82b5a6979 Translated using Weblate (German) 
Currently translated at 98.9% (2362 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-09-21 12:45:18 +00:00
Benoit Marty
d31d833959
Merge pull request #7180 from vector-im/feature/fre/deferred_dm_labs_flag 
Deferred DMs - Add and enable the feature by default in the labs settings
 2022-09-21 12:17:19 +02:00
Benoit Marty
52d7369ac3
Merge pull request #7186 from vector-im/bugfix/eric/fixes-room-list-updates 
Fixes Room List not getting updated when fragment is not in focus
 2022-09-21 12:14:20 +02:00
NIkita Fedrunov
d8060a7922 review fixes 2022-09-21 11:28:21 +02:00
NIkita Fedrunov
602b378b65 cancel flow when order is changed 2022-09-21 10:43:08 +02:00
ganfra
bf19ef81d0
Merge pull request #7185 from vector-im/bugfix/nfe/app_layout_all_screens_test_fix 
fixed all screens test to follow latest changes
 2022-09-21 10:28:22 +02:00
Florian Renaud
c252f6eb70 Update lab setting wording following design review 2022-09-21 09:50:05 +02:00
Florian Renaud
fa8b56b1ad Restore tracking for deferred DMs 2022-09-21 09:36:07 +02:00
Florian Renaud
dd92bb756a Add visibility setting field for lab setting 2022-09-21 09:36:07 +02:00
Florian Renaud
3786bd9c65 changelog 2022-09-21 09:36:07 +02:00
Florian Renaud
e9d809d9c3 Move and enable deferred DMs into labs settings 2022-09-21 09:36:07 +02:00
ericdecanini
821636bcb2 Adds changelog file 2022-09-20 18:36:25 -04:00
ericdecanini
1a93bbf92f Renames roomsPagedList 2022-09-20 18:32:59 -04:00
ericdecanini
fe1e74fa06 Fixes room list not getting updated when not in focus 2022-09-20 18:22:39 -04:00
NIkita Fedrunov
f6dfd64326 fixed all screens test to follow latest changes 2022-09-20 23:27:00 +02:00
Nui Harime
32536a4009 Translated using Weblate (Russian) 
Currently translated at 97.9% (2338 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2022-09-20 14:32:47 +00:00
Florian Renaud
8624199be3
Merge pull request #7154 from vector-im/bugfix/fre/start_dm_app_layout 
Deferred DMs - Handle the local rooms within the new AppLayout
 2022-09-20 10:53:51 +02:00