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 |
gradle-update-robot
|
9216eed1b8
|
Update Gradle Wrapper from 6.7 to 6.7.1.
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
|
2020-11-17 00:40:54 +00:00 |
|
SpiritCroc
|
0449e0ef83
|
Android Studio doesn't like this sha256sum here
Change-Id: Ibfb56e49e33e1c049ca95af676973debf9b183e5
|
2020-10-17 15:52:35 +02:00 |
|
gradle-update-robot
|
f64a6d4ca4
|
Update Gradle Wrapper from 6.6.1 to 6.7.
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
|
2020-10-15 00:56:45 +00:00 |
|
gradle-update-robot
|
39532fc2aa
|
Update Gradle Wrapper from 5.6.4 to 6.6.1.
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
|
2020-10-01 00:53:05 +00:00 |
Benoit Marty
|
542d11d7f1
|
Upgrade build-tools from 3.5.3 to 3.6.6 and gradle from 5.4.1 to 5.6.4
|
2020-07-02 12:44:07 +02:00 |
Benoit Marty
|
4ad86a13a0
|
Upgrade the dependencies to the latest version
|
2019-10-07 16:21:18 +02:00 |
Benoit Marty
|
d8bff8201f
|
Use gradle all distribution
|
2019-03-19 10:17:33 +01:00 |
|
Benoit Marty
|
b8cceaa17a
|
Upgrade gradle wrapper to 5.2.1, and pass first sonar analysis
|
2019-03-18 18:16:59 +01:00 |
ganfra
|
ac2d20ad3f
|
Migration androidx : first commit where it compiles. Updates some libs and android studio version in the same time.
|
2019-01-16 19:25:43 +01:00 |
|
ganfra
|
b406e8301a
|
first commit
|
2018-10-03 17:58:12 +02:00 |