SpiritCroc
|
d9c1ec588d
|
Merge tag 'v1.6.0' into sc
v1.6.0
Change-Id: Iaca4b437bc5a267c40b83a87a98eb7761dae345b
Conflicts:
library/ui-styles/src/main/res/values/styles_app_bar_layout.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector-app/build.gradle
vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
vector/src/main/res/layout/dialog_disclaimer_content.xml
vector/src/main/res/xml/vector_settings_help_about.xml
|
2023-05-22 14:19:46 +02:00 |
Benoit Marty
|
3727b653ba
|
Code style
|
2023-05-04 11:57:49 +02:00 |
|
SpiritCroc
|
db6cfd3054
|
Merge tag 'v1.1.7' into sc
Change-Id: Icefe721894c7cd3d0702d07efbd0452f95775d32
Conflicts:
.idea/codeStyles/Project.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/values-ca/strings.xml
vector/src/main/res/values-cs/strings.xml
vector/src/main/res/values-de/strings.xml
vector/src/main/res/values-et/strings.xml
vector/src/main/res/values-fa/strings.xml
vector/src/main/res/values-fr/strings.xml
vector/src/main/res/values-it/strings.xml
vector/src/main/res/values-sq/strings.xml
vector/src/main/res/values-sv/strings.xml
vector/src/main/res/values-vi/strings.xml
vector/src/main/res/values-zh-rTW/strings.xml
vector/src/main/res/values/strings.xml
vector/src/main/res/xml/vector_settings_labs.xml
|
2021-05-12 16:01:36 +02:00 |
Benoit Marty
|
53b20a89ca
|
Change with Android Studio 4.2
|
2021-05-07 16:41:51 +02:00 |
|
Benoit Marty
|
17d1a4b6fb
|
revert change from AS
|
2020-10-13 22:15:23 +02:00 |
|
Benoit Marty
|
ede5bb0e90
|
Format files, in particular align `->`
|
2020-10-13 14:57:45 +02:00 |
|
SpiritCroc
|
83edf15727
|
Android-studio keeps changing this
|
2020-08-22 15:02:25 +02:00 |
|
Benoit Marty
|
a6150beed2
|
Stuff added by AS 4.0.1
|
2020-08-20 15:32:45 +02:00 |
|
Benoit Marty
|
19ed5a2d3d
|
Keys Backup API now use the unstable prefix (#1503)
|
2020-06-26 15:54:50 +02:00 |
ganfra
|
f762c4c7a2
|
Makes sure bind and unbind are calling super in items
|
2020-06-22 11:19:53 +02:00 |
|
Benoit Marty
|
0fd50892af
|
Temporary fix to show error when user is creating an account on matrix.org with userId containing only digits (#1410)
|
2020-06-03 18:41:07 +02:00 |
|
ganfra
|
91301197ea
|
Try to communicate with WidgetPostAPI
|
2020-05-13 20:04:08 +02:00 |
|
Benoit Marty
|
78bc2bbaa5
|
AndroidStudio cleanup
|
2020-03-04 12:15:33 +01:00 |
Valere
|
bdb1df75d4
|
Check trust on crypto thread
|
2020-02-26 12:20:03 +01:00 |
|
Benoit Marty
|
076ac23b38
|
Modification done by AndroidStudio 3.6
|
2020-02-26 07:59:54 +01:00 |
Ganard
|
f454078c6b
|
Clean code
|
2020-02-03 16:14:36 +01:00 |
|
Benoit Marty
|
f80f22fed2
|
XML formatting rule
|
2020-01-16 15:58:52 +01:00 |
|
Benoit Marty
|
fa57d0f6d5
|
160 char max per line
|
2020-01-16 15:27:00 +01:00 |
|
Benoit Marty
|
1104b5d483
|
DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION
|
2020-01-16 14:26:52 +01:00 |
|
Benoit Marty
|
464462022c
|
Kotlin code convention
|
2020-01-16 14:17:29 +01:00 |
|
Benoit Marty
|
1c63d3f8f0
|
Add rule
|
2020-01-16 14:15:50 +01:00 |
|
Benoit Marty
|
a916bd4ba8
|
Share the same code formatting rules
|
2020-01-16 14:05:14 +01:00 |
|
Benoit Marty
|
617f71fd51
|
Remove .idea files
|
2019-03-13 18:04:57 +01:00 |
|
ganfra
|
b406e8301a
|
first commit
|
2018-10-03 17:58:12 +02:00 |