Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-25 15:08:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,301 Commits 530 Branches 158 Tags 486 MiB
d8ea9c8215
Commit Graph

19301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benoit Marty
e98bfe5c9b
Merge pull request #7156 from vector-im/feature/mna/device-manager-verify-other-session 
[Device management] Verify another session (PSG-722)
 2022-09-22 11:46:28 +02:00
Benoit Marty
4e30bc86b8
Merge pull request #7139 from vector-im/feature/mna/device-manager-verify-current-session 
[Device management] Verify current session (PSG-722)
 2022-09-22 11:46:07 +02:00
ganfra
fabfe36ede Update versions to 1.5.2 2022-09-22 10:31:31 +02:00
ganfra
21806efaa5 Merge branch 'release/1.5.0' into main 2022-09-22 10:28:04 +02:00
ganfra
2a9cf32829 Merge branch 'main' into develop 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
dependabot[bot]
44f6e66efb
Bump fragment from 1.5.2 to 1.5.3 
Bumps `fragment` from 1.5.2 to 1.5.3.

Updates `fragment-ktx` from 1.5.2 to 1.5.3

Updates `fragment-testing` from 1.5.2 to 1.5.3

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-21 23:10:46 +00: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
Adam Brown
600588dbbb adding trailing commas 2022-09-21 16:37:31 +01: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
Adam Brown
d75e37966c adding changelog entry 2022-09-21 15:39:13 +01:00
Adam Brown
9ab78c93e2 reducing sync timeout for instrumentation tests to speed them up 2022-09-21 15:39:13 +01:00
Adam Brown
7f31098ba1 lifting the sync timeout to the matrix configuration 2022-09-21 15:39:09 +01:00
Benoit Marty
b9c28ba4ce
Merge branch 'develop' into feature/bma/android12 2022-09-21 16:24:30 +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
Onuray Sahin
8de9ef8c7d Code review fixes. 2022-09-21 14:30:24 +03:00
Onuray Sahin
4ab798f88d Code review fixes. 2022-09-21 14:16:51 +03: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
Onuray Sahin
45cf7dcd63 Merge branch 'develop' into feature/ons/device_manager_security_sessions 2022-09-20 17:11:51 +03:00
Onuray Sahin
3ea054f8e1 Fix unit test. 2022-09-20 15:06:52 +03:00
Adam Brown
2168362a8b including appcompat (instead of the support library) to fix colorPrimary attribute compiliation issues 2022-09-20 10:06:21 +01: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
Maxime NATUREL
943ec7ee75 Reducing argument number in session info view update method 2022-09-20 10:46:10 +02:00
Maxime NATUREL
72637b465f Using viewState value to check if it is current session 2022-09-20 10:46:10 +02:00
Maxime NATUREL
aa7f7d7111 Fix after rebase 2022-09-20 10:46:10 +02:00
Maxime NATUREL
17bb14c1dc Fixing coding style issues 2022-09-20 10:46:10 +02:00