mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-29 04:18:38 +03:00
Code Issues Projects Releases Packages Wiki Activity
6125 commits 7 branches 124 tags 230 MiB
Commit graph

6125 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
17d1a4b6fb revert change from AS 2020-10-13 22:15:23 +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
d8f2deb5d9 Update build tools from 4.0.1 to 4.1.0 2020-10-13 17:18:13 +02:00
Benoit Marty
cf98252bdb
Merge pull request #2254 from vector-im/feature/bma/cleanup 
Feature/bma/cleanup
 2020-10-13 16:49:51 +02:00
Benoit Marty
35b94d70e2 Fix compilation issue introduced when formatting code :/ 2020-10-13 16:04:44 +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
86b4e34031
Merge pull request #2253 from vector-im/feature/bma/small_fixies 
Feature/bma/small fixies
 2020-10-13 11:35:50 +02:00
Benoit Marty
db1f129034 Improve detection of encrypted rooms 2020-10-13 11:27:46 +02:00
Benoit Marty
9dc1034891 Fix some of the non-passing tests 2020-10-13 09:47:34 +02:00
Benoit Marty
68947588d7 Replace deprecated shouldEqual and shouldEqualTo by shouldBeEqualTo 2020-10-12 22:30:18 +02:00
Benoit Marty
0fc92889c1 Fix test compilation issue 2020-10-12 22:14:46 +02:00
Benoit Marty
778c5aee32 Add param to when 2020-10-12 21:13:26 +02:00
Benoit Marty
63eb119df6 Inject userId and deviceId instead of sessionParam 2020-10-12 21:13:26 +02:00
Benoit Marty
e6d5d0f9c6 There is no more menu in this Fragment 2020-10-12 21:09:28 +02:00
Benoit Marty
67f1fe69fa We are now API 21+ 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
a58ad3a871
Merge pull request #2251 from vector-im/feature/bma/weblate_clean 
Feature/bma/weblate clean
 2020-10-12 19:14:05 +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
Benoit Marty
10d905472c
Merge pull request #2245 from vector-im/feature/ons/add_members_fab 
Add fab to the member list screen to invite users.
 2020-10-12 18:16:10 +02:00
Benoit Marty
dff7f24187
Merge branch 'develop' into feature/ons/add_members_fab 2020-10-12 18:15:59 +02:00
Weblate
a6817e8281 Merge branch 'origin/develop' into Weblate. 2020-10-12 16:03:26 +00:00
Rob Johnson
19b6898568 Translated using Weblate (Spanish) 
Currently translated at 99.4% (1863 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/es/
 2020-10-12 16:01:04 +00:00
Marcelo Filho
9c6ea95df8 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
 2020-10-12 16:01:04 +00:00
Danial Behzadi
ecdec83c37 Translated using Weblate (Persian) 
Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/fa/
 2020-10-12 16:01:02 +00:00
Danial Behzadi
8d49121266 Translated using Weblate (Persian) 
Currently translated at 64.9% (1216 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/fa/
 2020-10-12 16:01:00 +00:00
Kahina Messaoudi
2b2a263ba6 Translated using Weblate (Kabyle) 
Currently translated at 99.8% (1870 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-10-12 16:00:13 +00:00
Besnik Bleta
087711f1f7 Translated using Weblate (Albanian) 
Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/sq/
 2020-10-12 16:00:12 +00:00
Besnik Bleta
1b0049aaf7 Translated using Weblate (Albanian) 
Currently translated at 99.5% (1864 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/sq/
 2020-10-12 16:00:11 +00:00
ganfra
5d59b445fd
Merge pull request #2249 from vector-im/feature/fga/hide_cross_signing_no_session 
Feature/fga/hide cross signing no session
 2020-10-12 17:57:29 +02:00
ganfra
5ad46d251d
Update CHANGES.md 
Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2020-10-12 17:57:09 +02:00
Constantin Wartenburger
c0a5402684
Removed version check 2020-10-12 17:54:02 +02:00
Constantin Wartenburger
741f3f4066
Merge remote-tracking branch 'upstream/develop' into direct_share 2020-10-12 17:52:01 +02:00
Onuray Sahin
d6b94802d8 Benoit code review fixes. 2020-10-12 18:32:31 +03:00
ganfra
d8e9d363fa Cross signing: update CHANGES and clean 2020-10-12 17:15:38 +02:00
Valere
840c8e0b91 Fix / reset cross signing not well supported 2020-10-12 17:10:46 +02:00
ganfra
69e624df41 Cross signing: we should not show the verify with other sessions when there is not 2020-10-12 17:10:22 +02:00
Benoit Marty
40aa012588
Merge pull request #2215 from vector-im/feature/ons/fix_email_confirmation_flow 
If there is a pending email validation continue on this step
 2020-10-12 14:54:46 +02:00
Benoit Marty
6f709a1e7c
Merge pull request #2203 from vector-im/feature/bma/pusher_data 
Feature/bma/pusher data
 2020-10-12 14:51:15 +02:00
Benoit Marty
ff78f378b5 ktlint 2020-10-12 14:49:04 +02:00