4918b7e7bf
Merge branch 'unifiedpush' into sc
...
Change-Id: I0d19e4032b0f31cc1dee404cb383046d04a3259e
2021-08-21 09:21:19 +02:00
5f18fce771
Increment version
...
Change-Id: Iaee1fa3f6de051c2ea57b0e2cb286de25052e31c
2021-08-20 10:45:57 +02:00
cad30d4790
Actually, we're still at 1.2.0
...
Got develop in by accident due to unifiedpush, but whatever
Change-Id: I3d15dd820274076e4383aa17467a87dac9eebe31
2021-08-19 10:42:47 +02:00
8475f24f17
Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush
...
Change-Id: Ief98ae56d40f0724ba0e5f1f1c6ec09832425e58
2021-08-18 13:16:37 +02:00
3b3e39bbb6
Merge branch 'sc' into unifiedpush
...
Change-Id: I715e67cc1600706a6cfd7a2317df38909c74e11e
2021-08-18 13:16:19 +02:00
c584fa60dd
Merge remote-tracking branch 'upstream/develop' into unifiedpush
2021-08-16 18:00:33 +02:00
8fe2a0021f
Increment version
...
Change-Id: I5c2d1293f5251d6d4c0cb889195f2db8a509e378
2021-08-14 14:38:23 +02:00
cf756b8789
Merge branch 'sc' into unifiedpush
...
Change-Id: Ieae8e880360266f2f5e44aac371701e0356419de
2021-08-12 09:30:41 +02:00
58f5310e83
Merge tag 'v1.2.0' into sc
...
v1.2.0
Change-Id: I900672607ec264e60c96c886d0accb053934fa4a
Conflicts:
vector/src/main/res/xml/vector_settings_labs.xml
2021-08-12 09:03:42 +02:00
37e722e85d
version++
2021-08-12 02:36:39 +03:00
5b7e2fdcaa
Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush-2
...
Change-Id: If4c64b14513d70cd376e3e1a9fbaeb1efb0ded12
Conflicts:
vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
2021-08-11 18:08:02 +02:00
8216acfd5c
version++
2021-08-11 16:40:45 +03:00
7f3c4f0073
Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/reorg_account_notification_settings
2021-08-10 10:54:22 +01:00
677330921d
Merge tag 'v1.1.16' into sc
...
v1.1.16
Change-Id: Id68bd7e36129c9168cc871d81c5c0935b689e1e9
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
2021-08-10 09:54:58 +02:00
c167c8874d
version++
2021-08-09 00:54:16 +03:00
25ba52115b
Merge tag 'v1.1.15' into sc
...
Change-Id: I6bc7a7c052ccaae6adec247889b37baac2672ba4
Conflicts:
vector/src/main/assets/open_source_licenses.html
vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
vector/src/main/res/drawable/ic_insert_emoji.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/fragment_room_detail.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/xml/vector_settings_labs.xml
2021-08-01 09:37:33 +02:00
c7c589354e
version++
2021-07-30 18:01:22 +03:00
c6bd6e4961
Merge pull request #3598 from vector-im/feature/ons/voice_message
...
Voice Message
2021-07-30 17:24:17 +03:00
7091de9942
merge in static push definitions and adapt push v2 ui/logic
2021-07-27 19:54:17 +01:00
782141998d
Increment version
...
Change-Id: I710e0f58cc1fef70e5bc199ab4effb607ad321db
2021-07-27 14:53:48 +02:00
f8b9d3571c
Increment version
...
Change-Id: I04751368e916d37162f752abd25243400dc6575d
2021-07-26 12:51:54 +02:00
acb12c2005
Merge tag 'v1.1.14' into sc
...
Change-Id: I7668fc7603c8f6e7aafa89886bb0fdf586e4a871
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
2021-07-24 10:12:48 +02:00
bdbfbe6175
Version++
2021-07-23 11:53:21 +02:00
a75ceee03f
Bump appcompat from 1.3.0 to 1.3.1
...
Bumps appcompat from 1.3.0 to 1.3.1.
---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-22 12:13:24 +00:00
2070b0ecde
Merge pull request #3718 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.6
...
Bump fragment-ktx from 1.3.5 to 1.3.6
2021-07-22 14:12:42 +02:00
76f412ffe8
Bump fragment-ktx from 1.3.5 to 1.3.6
...
Bumps fragment-ktx from 1.3.5 to 1.3.6.
---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-21 23:05:41 +00:00
b6e739afd3
Bump media from 1.3.1 to 1.4.0
...
Bumps media from 1.3.1 to 1.4.0.
---
updated-dependencies:
- dependency-name: androidx.media:media
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-21 23:04:46 +00:00
e4ae80e348
Merge pull request #3708 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.28
...
Bump libphonenumber from 8.12.27 to 8.12.28
2021-07-21 09:28:19 +02:00
89dc4bb13e
Bump daggerVersion from 2.37 to 2.38
...
Bumps `daggerVersion` from 2.37 to 2.38.
Updates `dagger` from 2.37 to 2.38
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.37...dagger-2.38 )
Updates `dagger-compiler` from 2.37 to 2.38
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.37...dagger-2.38 )
---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger-compiler
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-20 23:06:50 +00:00
b809d4acf4
Bump libphonenumber from 8.12.27 to 8.12.28
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.27 to 8.12.28.
- [Release notes](https://github.com/google/libphonenumber/releases )
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md )
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.27...v8.12.28 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-20 23:06:30 +00:00
8497a307a1
Merge tag 'v1.1.13' into sc
...
Change-Id: Icc97ef8699b1cc96447369121f3c88582ac651bc
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
2021-07-19 16:10:57 +02:00
6d1cabaee3
Version++
2021-07-19 15:28:14 +02:00
0dcb14482d
Increment version
...
Change-Id: I8c9b382eea65a87575d0642eb8bfa5bc4f0b4707
2021-07-16 12:34:43 +02:00
bfc70be5bb
Record voice on Android 21
2021-07-15 17:23:46 +02:00
5044b21545
add changelog, checks/tests
2021-07-14 11:49:16 +01:00
baab726df2
Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/reorg_account_notification_settings
2021-07-14 10:18:54 +01:00
a3204fdad9
add resValue to enable feature, put back old code
2021-07-13 21:22:56 +01:00
b0ea022eea
Bump kluent-android from 1.67 to 1.68
...
Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent ) from 1.67 to 1.68.
- [Release notes](https://github.com/MarkusAmshove/Kluent/releases )
- [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MarkusAmshove/Kluent/commits )
---
updated-dependencies:
- dependency-name: org.amshove.kluent:kluent-android
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-12 23:07:08 +00:00
e391a1371c
Merge branch 'develop' into feature/ons/voice_message
2021-07-09 22:19:50 +02:00
76890a3b26
Bump libphonenumber from 8.12.26 to 8.12.27
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.26 to 8.12.27.
- [Release notes](https://github.com/google/libphonenumber/releases )
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md )
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.26...v8.12.27 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-07 23:06:17 +00:00
15c3bb7fc3
exclude firebase analytics
2021-07-07 23:11:18 +02:00
7ead76c8ca
up: moshi to parse json
2021-07-07 03:35:16 +02:00
4ac4755868
up pr: code reviewed
2021-07-07 01:49:39 +02:00
6c153d04da
Merge remote-tracking branch 'upstream/develop' into unifiedpush
2021-07-07 00:49:54 +02:00
7a1b138894
Merge branch 'develop' into feature/ons/voice_message
...
* develop: (286 commits)
Fix crash after video call
Fix issue on button styles
Clean after benoits review
Fix warning about implicit type, introduced in Kotlin 1.5.20. "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
Bump kotlin_version from 1.5.10 to 1.5.20
Bump libphonenumber from 8.12.25 to 8.12.26
Fix call invite processed after call is ended because of fastlane mode.
Jump to unread: removes unnecessary check which can cause scroll issue
Jump to unread: avoid blink when jumping
Clean after Benoits review
Delete unused drawable to avoid conflict on develop
Jump to unread: add towncrier file.
Read marker: fix some issues with jump to unread visibility.
Stop using ProgressDialog, there is a theme issue with it. It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
Reordering
Add text style for dialogs
Colored dialog button is now handled by the theme
Update theme for material dialog and create a destructive variant
Reorder buttons
Update doc
...
# Conflicts:
# library/ui-styles/src/main/res/values/theme_dark.xml
# library/ui-styles/src/main/res/values/theme_light.xml
# vector/build.gradle
# 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/composer/TextComposerView.kt
# vector/src/main/res/values/strings.xml
2021-07-06 13:17:49 +03:00
e22bd8f637
Merge pull request #3593 from vector-im/dependabot/gradle/androidx.test.ext-junit-1.1.3
...
Bump junit from 1.1.2 to 1.1.3
2021-07-05 21:36:38 +02:00
692adffa69
Merge pull request #3626 from vector-im/dependabot/gradle/com.google.android.material-material-1.4.0
...
Bump material from 1.3.0 to 1.4.0
2021-07-05 21:29:49 +02:00
e5c9c33a0f
Merge tag 'v1.1.12' into sc
...
Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236
Conflicts:
library/ui-styles/src/main/res/values/text_appearances.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/detail/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.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/RoomListViewModelFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
vector/src/main/res/layout/dialog_export_e2e_keys.xml
vector/src/main/res/layout/dialog_import_e2e_keys.xml
2021-07-05 16:58:45 +02:00
974d5c23d3
Bump junit from 1.1.2 to 1.1.3
...
Bumps junit from 1.1.2 to 1.1.3.
---
updated-dependencies:
- dependency-name: androidx.test.ext:junit
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 14:19:54 +00:00
8639582671
Bump espresso_version from 3.3.0 to 3.4.0
...
Bumps `espresso_version` from 3.3.0 to 3.4.0.
Updates `espresso-core` from 3.3.0 to 3.4.0
Updates `espresso-contrib` from 3.3.0 to 3.4.0
Updates `espresso-intents` from 3.3.0 to 3.4.0
---
updated-dependencies:
- dependency-name: androidx.test.espresso:espresso-core
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-contrib
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-intents
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 12:38:04 +00:00
SpiritCroc
S1m
Onuray Sahin
David Langley
Onuray Sahin
Benoit Marty
dependabot[bot]
Benoit Marty