SpiritCroc
|
0b4f56d7a0
|
Merge remote-tracking branch 'upstream/master' into sc
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c
Conflicts:
gradle/wrapper/gradle-wrapper.properties
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
vector/src/main/res/layout/fragment_known_users.xml
vector/src/main/res/layout/fragment_user_list.xml
|
2020-11-29 12:51:43 +01:00 |
|
SpiritCroc
|
ac89fb97f8
|
Increment version
Change-Id: Ic11038b22a85eb4ee863bb865439ae3c9751da1b
|
2020-11-24 16:13:49 +01:00 |
|
Benoit Marty
|
07c805a019
|
Create sanity test with all screens path
Introduce `com.schibsted.spain:barista`
|
2020-11-09 16:56:20 +01:00 |
|
SpiritCroc
|
164848e0aa
|
Increment version
Change-Id: Id0642c0e557b85b4209713028ba7c1d1223a070d
|
2020-11-07 11:37:55 +01:00 |
|
SpiritCroc
|
58d99e10a0
|
Merge remote-tracking branch 'upstream/master' into sc
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01
Conflicts:
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
vector/src/main/res/menu/menu_timeline.xml
|
2020-11-05 13:15:55 +01:00 |
|
Benoit Marty
|
17fed39b27
|
Version++
|
2020-11-04 16:00:16 +01:00 |
|
SpiritCroc
|
07e6cf2a8d
|
Increment version
Change-Id: I4a7d9c5fdd0cfa93a614fb214ddd953de6bbffaa
|
2020-11-02 13:20:05 +01:00 |
|
Benoit Marty
|
60556d0fa0
|
Version code: apply workaround from https://issuetracker.google.com/issues/171133218
|
2020-10-22 16:10:08 +02:00 |
|
Benoit Marty
|
c05147a019
|
Merge branch 'hotfix/bma/versionCode' into develop
|
2020-10-19 12:31:35 +02:00 |
|
Benoit Marty
|
a59c92f55a
|
Fix issue with VersionCode
|
2020-10-19 12:29:20 +02:00 |
|
SpiritCroc
|
5853709c97
|
Increment version
Change-Id: Id0f9498606265ff48842ca210358ee1541b18c38
|
2020-10-17 17:05:03 +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 |
|
Benoit Marty
|
1b7158a61d
|
Version++
|
2020-10-16 17:34:10 +02:00 |
|
ganfra
|
9bf615e90c
|
Fix composer: update constraints layout and fix some glitches
|
2020-10-16 11:24:59 +02:00 |
|
SpiritCroc
|
ca60a769d2
|
Increment version
Change-Id: I7ffc24a91c8960d0fdbba2881dc887bb09e43721
|
2020-10-13 15:42:19 +02:00 |
|
Constantin Wartenburger
|
7e5ee8f951
|
Made it backwards compatible
|
2020-10-11 22:09:19 +02:00 |
|
Benoit Marty
|
9e0ebc94c5
|
Upgrade other dependencies, and remove unused dependencies
|
2020-10-06 15:44:30 +02:00 |
|
Benoit Marty
|
1a0dba7422
|
Upgrade Moshi to 1.11.0, Dagger to 2.29.1, Epoxy to 4.1.0
|
2020-10-06 14:47:57 +02:00 |
|
Benoit Marty
|
5056615eb0
|
Upgrade kotlin version from 1.3.72 to 1.4.10 and kotlin coroutines version from 1.3.8 to 1.3.9
|
2020-10-06 12:33:40 +02:00 |
|
SpiritCroc
|
96aa885819
|
Increment version
Change-Id: I68a3f7a7806795a2f5ae7a1b582bb6d9e572872b
|
2020-09-30 12:23:15 +02:00 |
|
Valere
|
2908a5d345
|
Added first ui bootstrap test
|
2020-09-30 10:13:59 +02:00 |
|
Benoit Marty
|
487bbe42a9
|
Merge branch 'develop' into feature/ui_test
|
2020-09-29 16:13:44 +02:00 |
|
ganfra
|
8bc0afa75e
|
Timeline: add glide preloading
|
2020-09-29 15:42:21 +02:00 |
|
Benoit Marty
|
b14d22550b
|
PR Review
Cleanup and Add command line to run the UI tests
|
2020-09-29 15:12:25 +02:00 |
|
Valere
|
bc2c345e21
|
First automated UI tests
|
2020-09-29 12:51:27 +02:00 |
|
SpiritCroc
|
1cc4c7177f
|
Increment version
Change-Id: I1f2ddbb0e8ff82db6f3f321dc073f29426e8d5ac
|
2020-09-27 14:11:52 +02:00 |
|
SpiritCroc
|
43b99a2a9a
|
Merge remote-tracking branch 'upstream/master' into sc
Change-Id: Id1192801aa01317d36af3d0619ab281200ecfc80
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
vector/src/main/java/im/vector/app/core/utils/UserColor.kt
vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
vector/src/main/res/layout/activity_signed_out.xml
vector/src/main/res/layout/fragment_login.xml
vector/src/main/res/layout/fragment_login_captcha.xml
vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
vector/src/main/res/layout/fragment_login_reset_password.xml
vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
vector/src/main/res/layout/fragment_login_reset_password_success.xml
vector/src/main/res/layout/fragment_login_server_selection.xml
vector/src/main/res/layout/fragment_login_server_url_form.xml
vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
vector/src/main/res/layout/fragment_login_splash.xml
vector/src/main/res/layout/fragment_login_terms.xml
vector/src/main/res/layout/fragment_login_wait_for_email.xml
vector/src/main/res/layout/item_login_header.xml
vector/src/main/res/values-land/styles_login.xml
vector/src/main/res/values/styles_login.xml
|
2020-09-27 13:55:40 +02:00 |
|
Benoit Marty
|
6958d114a9
|
Version++
|
2020-09-25 14:09:25 +02:00 |
|
Benoit Marty
|
f271968238
|
Upgrade library PFLockScreen-Android
|
2020-09-24 08:20:17 +02:00 |
|
SpiritCroc
|
7bdc4c30ec
|
Increment version
Change-Id: I1c958f87747b78f856a7a6ad502a4ebc75f4af05
|
2020-09-22 10:22:29 +02:00 |
|
SpiritCroc
|
2e9195df2b
|
Merge remote-tracking branch 'upstream/master' into sc_1.0.7
Change-Id: Iccb1b1f0bee6b77c9f15d917c8073910841b6ff8
Conflicts:
vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
|
2020-09-17 12:03:17 +02:00 |
|
Benoit Marty
|
216138394f
|
Version++
|
2020-09-17 09:32:35 +02:00 |
|
SpiritCroc
|
cf24ca90f9
|
Increment version
Change-Id: Ice9536342a8eeff003019350a07e27f805426562
|
2020-09-10 18:14:11 +02:00 |
|
SpiritCroc
|
1d7681a893
|
Don't do ABI extra versioning
Doesn't work with F-Droid automatic update detection
Change-Id: I6bafe05f151e240fee37cd714ab2ac076a7a1a69
|
2020-09-10 18:14:06 +02:00 |
|
ganfra
|
c2880a5832
|
Strict mode: add a build entry to enable whenever we want to check
|
2020-09-09 11:52:05 +02:00 |
|
SpiritCroc
|
bdd71769a0
|
Merge remote-tracking branch 'upstream/master' into sc
Change-Id: Ibdd2790a7f2a8a1f126ef7af2032fe72f7dd777e
|
2020-09-08 18:52:59 +02:00 |
|
Benoit Marty
|
bf0b6d738a
|
Version++
|
2020-09-08 17:49:26 +02:00 |
|
SpiritCroc
|
372ae6e162
|
Increment version
Change-Id: I7de06d933fdddf3b4cd05538f0c5b3f29066b6c8
|
2020-09-02 11:58:48 +02:00 |
|
Valere
|
9d2ea19d7d
|
Upgrade to worker 2.4.0
|
2020-08-31 16:20:12 +02:00 |
|
Benoit Marty
|
59fa2e28c2
|
Fix sonar analysis version name issue
|
2020-08-27 18:15:53 +02:00 |
|
Onuray Sahin
|
776d892d27
|
Increase version of uCrop library which supports Android 10.
|
2020-08-26 12:27:12 +03:00 |
|
SpiritCroc
|
c7ae49df1b
|
Increment version
Change-Id: I2e30e69f149fa363d8a0391fd4c4682575a234ae
|
2020-08-24 17:54:08 +02:00 |
|
SpiritCroc
|
3b23ed9830
|
Increment version
Change-Id: Ia0033b834c7b1a9145ead4247fe70d427ef53ae9
|
2020-08-24 15:56:04 +02:00 |
|
SpiritCroc
|
4dfdfba42c
|
Increment version
Change-Id: I2b9b613775e1698a9b4339e153eb9b677f0898c7
|
2020-08-24 11:35:41 +02:00 |
|
Benoit Marty
|
328dc9ea5b
|
Merge pull request #1979 from vector-im/feature/update_dependencies
Update some dependencies, including coroutines for working debugging
|
2020-08-24 10:11:57 +02:00 |
|
SpiritCroc
|
5b5cfa5bf1
|
Increment version
|
2020-08-23 15:27:39 +02:00 |
|
SpiritCroc
|
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 |
|
SpiritCroc
|
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 |
|
ganfra
|
1f890324b4
|
Update some dependencies, including coroutines for working debugging
|
2020-08-21 17:17:51 +02:00 |
|
Benoit Marty
|
04fa7d9628
|
Version++
|
2020-08-21 17:04:05 +02:00 |
|