filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-01 03:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,349 Commits 7 Branches 125 Tags 226 MiB
Commit Graph

3928 Commits

Author SHA1 Message Date
SpiritCroc
6eff36c1a7 Fix duplicate resource build error 
Move drawable-anydpi-v24 xmls to drawable-v24

Change-Id: I48aa8efb013715802cc87da0c43509dbda4ac5c8
 2020-10-17 16:13:16 +02:00
SpiritCroc
bde0020305 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings"""""""" 
This reverts commit c22f2b7a9bd255544ef6492824a254e2fb53e561.

Change-Id: I4b7ceb45da0ee77301c6323aa2ca12b76ca46738
 2020-10-17 15:33:36 +02:00
SpiritCroc
835bde286c Automatic SchildiChat string correction 
Change-Id: I44a73d45a7445a11037cbf3d0443147144a7d0ed
 2020-10-17 15:28:34 +02:00
SpiritCroc
44d3c0118a Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: If0e38334e7e479134cd05283f857e4871bb7692f

Conflicts:
	vector/build.gradle
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/res/drawable/ic_settings_root_advanced.xml
	vector/src/main/res/drawable/ic_settings_root_call.xml
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/drawable/ic_settings_root_general.xml
	vector/src/main/res/drawable/ic_settings_root_help_about.xml
	vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
	vector/src/main/res/drawable/ic_settings_root_labs.xml
	vector/src/main/res/drawable/ic_settings_root_legacy.xml
	vector/src/main/res/drawable/ic_settings_root_notification.xml
	vector/src/main/res/drawable/ic_settings_root_preferences.xml
	vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
	vector/src/main/res/layout/fragment_home_drawer.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/view_avatar_selector.xml
 2020-10-17 15:28:18 +02:00
SpiritCroc
25b6357408 Revert "Automatic SchildiChat string correction" 
This reverts commit 797e5a04902a31fa063a031896049c1a03d82196.
 2020-10-17 15:09:01 +02:00
SpiritCroc
c22f2b7a9b Revert "Revert "Revert "Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings""""""" 
This reverts commit f9fc7abbd201504451152799b8083bc0ed3c01ad.
 2020-10-17 15:09:00 +02:00
Benoit Marty
ca0af0f342 Fix bad cases 2020-10-16 16:38:33 +02:00
Benoit Marty
aa91c41082 Fix lint issue 2020-10-16 16:36:09 +02:00
Weblate
dea994c1fb Merge branch 'origin/develop' into Weblate. 2020-10-16 14:02:54 +00:00
ganfra
9bf615e90c Fix composer: update constraints layout and fix some glitches 2020-10-16 11:24:59 +02:00
Samu Voutilainen
003bffe463 Translated using Weblate (Finnish) 
Currently translated at 80.3% (1541 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
 2020-10-16 09:04:53 +00:00
Marcelo Filho
021c23cd19 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2020-10-16 09:04:53 +00:00
random
821b9dc187 Translated using Weblate (Italian) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2020-10-16 09:04:50 +00:00
TR_SLimey
ab8c9bd269 Translated using Weblate (Polish) 
Currently translated at 79.7% (1529 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2020-10-16 09:04:47 +00:00
linsui
1692a52e0a Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2020-10-16 09:04:46 +00:00
Nikita Epifanov
a086b2001b Translated using Weblate (Russian) 
Currently translated at 99.4% (1907 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2020-10-16 09:04:43 +00:00
Priit Jõerüüt
98086f1b6b Translated using Weblate (Estonian) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2020-10-16 09:04:41 +00:00
ginnyTheCat
c1ea4bc1a7 Translated using Weblate (German) 
Currently translated at 96.5% (1852 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-10-16 09:04:38 +00:00
@a2sc:matrix.org
7f48604820 Translated using Weblate (German) 
Currently translated at 96.5% (1852 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-10-16 09:04:38 +00:00
LinAGKar
572b0942ba Translated using Weblate (Swedish) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2020-10-16 09:04:38 +00:00
Jeff Huang
63dff842f6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2020-10-16 09:04:35 +00:00
Benoit Marty
93683d026b
Merge pull request #2260 from vector-im/feature/bma/fix_issue 
Feature/bma/fix issue
 2020-10-15 18:14:17 +02:00
Benoit Marty
6fcfd259b7
Merge pull request #2211 from ginnyTheCat/rainbow-color 
Changed rainbow algorithm
 2020-10-15 18:13:24 +02:00
Benoit Marty
6c335c7df1
Merge pull request #2257 from ginnyTheCat/share 
Ability to share text
 2020-10-15 18:12:27 +02:00
Benoit Marty
95142274fa Clear alerts if user sign out 2020-10-15 15:55:55 +02:00
Benoit Marty
f68eb449bd Be robust against StrandHogg task injection 2020-10-15 15:55:55 +02:00
Benoit Marty
7158f49fcb
Merge pull request #2244 from ginnyTheCat/direct_share 
Direct share support
 2020-10-14 14:27:08 +02:00
Benoit Marty
95df786227 Add a click action at the top of the drawer to open the general settings 2020-10-14 12:21:27 +02:00
Benoit Marty
2b026b6bc6 Fix vector tint compilation error. Tint at runtime. 
Also remove unused icon.
 2020-10-13 23:15:06 +02:00
Constantin Wartenburger
afe55ae57e
Merge remote-tracking branch 'upstream/develop' into direct_share 2020-10-13 20:26:07 +02:00
Constantin Wartenburger
7bee558e01
Using ApplicationId from BuildConfig 2020-10-13 20:17:56 +02:00
Benoit Marty
35b94d70e2 Fix compilation issue introduced when formatting code :/ 2020-10-13 16:04:44 +02:00
SpiritCroc
ca60a769d2 Increment version 
Change-Id: I7ffc24a91c8960d0fdbba2881dc887bb09e43721
 2020-10-13 15:42:19 +02:00
SpiritCroc
4d2ad801da Fix bubble min-width in forced timestamp case 
Change-Id: I4d486fa2576e9728cda854c61d5e29b177cc3bcd
 2020-10-13 15:36:26 +02:00
SpiritCroc
e81a7211b2 Refactor view visibilities 
Reduce redundant code when having alternative views for the same
information available for different styles.

While we are at it: fix the setting view timestamps for all messages in
dual-bubble mode (even though it looks bad with the current design).

Change-Id: Id9598c6536c3cb5d93073e9d09485c009a53cd00
 2020-10-13 15:36:21 +02:00
Benoit Marty
55a94d9888 Optimize import 2020-10-13 15:04:50 +02:00
Benoit Marty
ede5bb0e90 Format files, in particular align -> 2020-10-13 14:57:45 +02:00
Benoit Marty
ff56414695 Cleanup and log onResume and onPause for VectorAttachmentViewerActivity 2020-10-13 14:44:04 +02:00
Benoit Marty
ca99a52545 Remove dead code 2020-10-13 14:40:23 +02:00
Benoit Marty
0345ca47dd protected 2020-10-13 14:35:33 +02:00
Benoit Marty
db1f129034 Improve detection of encrypted rooms 2020-10-13 11:27:46 +02:00
Benoit Marty
e6d5d0f9c6 There is no more menu in this Fragment 2020-10-12 21:09:28 +02:00
Benoit Marty
b1625838ed Move the attibute to the correct View 2020-10-12 21:09:28 +02:00
Benoit Marty
4ac62bcf51 Display filter only if there are more than 2 members in this room 2020-10-12 21:09:28 +02:00
Benoit Marty
5ef97362cb Fix gravity on topic 2020-10-12 21:09:28 +02:00
Benoit Marty
d0cb5f4212
Merge pull request #2248 from vector-im/feature/bca/detect_reset 
Fix / reset cross signing not well supported
 2020-10-12 20:49:15 +02:00
Benoit Marty
17e7aedcba Move store data to /fastlane/metadata/android (#812) 2020-10-12 19:09:04 +02:00
Benoit Marty
648462f7f4 Remove unused string labs_merge_e2e_in_timeline 2020-10-12 19:02:54 +02:00
Benoit Marty
cb40485aad Format strings 2020-10-12 19:02:12 +02:00
Benoit Marty
52924d38bf
Merge pull request #2250 from RiotTranslateBot/weblate-element-android-element-app 
Update from Weblate
 2020-10-12 18:48:49 +02:00