d912c5a356
Automatic SchildiChat string correction
2020-08-22 11:33:19 +02:00
ce90a36891
Theme update as in upstream merge
2020-08-22 11:23:59 +02:00
7b4b5be759
Merge tag 'v1.0.5' into sc
...
Conflicts:
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_file_stub.xml
vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
vector/src/main/res/values-v21/styles_login.xml
vector/src/main/res/values/theme_dark.xml
vector/src/main/res/values/theme_light.xml
vector/src/main/res/values/theme_status.xml
2020-08-22 11:23:45 +02:00
7240e4562a
Remove unused drawables since merge
2020-08-22 11:05:06 +02:00
27a6b3c79e
Merge commit '11b5512cb86369a9c3b50e5b469a8182cce79f52' into sc
...
Merge v1.0.5 pt. 6
Conflicts:
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreMigration.kt
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryUpdater.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
2020-08-22 11:00:23 +02:00
28f65ec0e8
Merge commit 'e3bf4c1e7bce8c752b4fef54be9a76893561a24a' into sc
...
Merge v1.0.5 pt. 5
Conflicts:
README.md
vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
2020-08-22 10:54:14 +02:00
589068cbf8
Revert "Update strings"
...
This reverts commit 7c959176fd
2020-08-22 10:51:24 +02:00
8a2d1d5011
Merge commit '0127339eac46cd7032682eeae923eb5805099704' into sc
...
Merge v1.0.5 pt. 4
2020-08-22 10:30:50 +02:00
7ddae5726b
Merge commit '05b849de13dcabb6a90b4ec9b28fe0c5a57ad3e4' into sc
...
Merge v1.0.5 pt. 3
2020-08-22 10:29:39 +02:00
cbd22a1257
Merge commit 'a1f90abcd20d2100e02767a6fd2cfb9969f12a4d' into sc
...
Merge v1.0.5 pt. 2
Conflicts:
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt
vector/src/main/java/im/vector/app/core/ui/views/WrapWidthTextView.kt
vector/src/main/java/im/vector/app/core/utils/UserColor.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/RoomColor.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/timeline/item/AbsMessageItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListActivity.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
vector/src/main/java/im/vector/app/features/themes/BubbleThemeUtils.kt
vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
vector/src/main/res/layout/fragment_login_server_selection.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/layout/item_timeline_event_base_state.xml
vector/src/main/res/xml/vector_settings_advanced_settings.xml
vector/src/main/res/xml/vector_settings_preferences.xml
2020-08-22 10:29:31 +02:00
c2e1a33864
Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc
...
Merge v1.0.5 pt. 1
Conflicts:
vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
vector/src/main/res/layout/fragment_login_server_selection.xml
vector/src/main/res/values/theme_dark.xml
vector/src/main/res/values/theme_light.xml
2020-08-22 09:52:54 +02:00
80f7ffd7a6
Fix Potential Plurals - 3
2020-08-21 14:19:06 +02:00
d86536c949
Fix Potential Plurals (removing unused resource) - 2
2020-08-21 13:07:37 +02:00
f84ea0ad5b
Fix Potential Plurals - 1
2020-08-21 12:55:15 +02:00
28ed6cb3b6
Fix typos reported by Lint
2020-08-21 12:47:39 +02:00
927c3e7e94
Update element web url ( Fixes #1974 )
2020-08-21 12:31:06 +02:00
5416f4194c
Fix lint issue
2020-08-21 12:27:57 +02:00
b09c1e3cbf
Format strings
2020-08-21 12:23:25 +02:00
43d0a11cba
Merge branch 'origin/develop' into Weblate.
2020-08-21 09:30:51 +00:00
a27b22a972
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (3 of 3 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/hu/
2020-08-21 09:30:37 +00:00
338c569c0b
Translated using Weblate (Estonian)
...
Currently translated at 89.8% (1649 of 1836 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
2020-08-21 09:30:37 +00:00
f7db14fb02
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (3 of 3 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/pt_BR/
2020-08-21 00:42:34 +00:00
cfd0e00c0c
Translated using Weblate (Portuguese)
...
Currently translated at 44.5% (817 of 1836 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt/
2020-08-21 00:42:34 +00:00
7c4afd922c
Translated using Weblate (Estonian)
...
Currently translated at 87.4% (1605 of 1836 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
2020-08-21 00:42:34 +00:00
f07bf43ada
Merge branch 'develop' into feature/highlight
2020-08-20 19:04:03 +02:00
2acda2c5da
Merge pull request #1962 from vector-im/feature/membership_state_event
...
A Kick appears has "someone has made no change" (Fixes #1959 )
2020-08-20 18:29:23 +02:00
cbe093fe77
Highlighted Event when opening a permalink from another room ( Fixes #1033 )
2020-08-20 18:20:53 +02:00
2c90e33ceb
Move package
2020-08-20 17:33:55 +02:00
af10344b6b
Share button in rooms gives room ID link without via parameters ( #1927 )
...
Following the algorithm described in #1927
Create a PermalinkService
2020-08-20 17:33:55 +02:00
187edbd32a
Merge pull request #1968 from vector-im/feature/biometrics
...
Improve PIN code feature
2020-08-20 17:16:27 +02:00
828bf44b2b
Better handling DM creation when invitees cannot be inviting due to denied federation
...
As we do not know the created roomId, we cannot add it to the DM list though. But at least the user is informed that a room has been created and won't retry because the screen will be closed.
2020-08-20 15:44:28 +02:00
b090468109
Logout after 3 wrong PIN codes
2020-08-20 14:21:24 +02:00
4cba1388f9
Add support for biometrics (not only Fingerprint)
2020-08-20 14:11:23 +02:00
61caa3474b
Merge pull request #1956 from vector-im/feature/fix_package_renaming_issues
...
Some cleanup after the package renaming thing
2020-08-20 13:58:13 +02:00
45ca480de1
Ganfra's review
2020-08-20 13:56:23 +02:00
95d05a9c28
Make the user's Avatar live in the general settings
...
Also remove unused class RoomAvatarPreference
2020-08-19 18:32:06 +02:00
e860062553
Translated using Weblate (Turkish)
...
Currently translated at 66.7% (2 of 3 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/tr/
2020-08-19 15:42:50 +00:00
80fc66e097
Translated using Weblate (Turkish)
...
Currently translated at 65.0% (1194 of 1836 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/tr/
2020-08-19 15:42:49 +00:00
6b89dfdc8d
Translated using Weblate (Slovak)
...
Currently translated at 100.0% (3 of 3 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/sk/
2020-08-19 15:42:46 +00:00
312a5855c6
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (1836 of 1836 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
2020-08-19 15:42:46 +00:00
c8d95f701d
Translated using Weblate (Estonian)
...
Currently translated at 76.4% (1403 of 1836 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
2020-08-19 15:42:45 +00:00
9b6c45e112
A Kick appears has "someone has made no change" ( Fixes #1959 )
2020-08-19 15:54:46 +02:00
482a8f1fb8
Merge pull request #1955 from vector-im/feature/fix_unique_filename
...
Fix save media error: Failed to build unique file
2020-08-19 14:44:37 +02:00
eb109aa755
ktlint fix.
2020-08-19 13:15:42 +03:00
0b8127e21b
Only show message bubble tail for messages with shown avatar
2020-08-19 11:01:15 +02:00
c01d98d308
Remember low priority expand status across restarts
2020-08-19 10:07:13 +02:00
4a4a544860
Translated using Weblate (Estonian)
...
Currently translated at 51.6% (948 of 1836 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
2020-08-18 18:17:42 +00:00
08292c874b
Merge pull request #1943 from vector-im/feature/design_quick_win
...
Feature/design quick win
2020-08-18 18:30:25 +02:00
e76c32b74e
Add missing copyright mention for PFLockScreen-Android
2020-08-18 18:21:20 +02:00
7613073373
Some cleanup after the package renaming thing
2020-08-18 18:15:48 +02:00
SpiritCroc
Benoit Marty
Weblate
notramo
Priit Jõerüüt
Lua
Benoit Marty
Ege Sertçetin
Peter Vágner
Marcelo Filho
Onuray Sahin
aethralis