cd5f1d32a4
Automatic upstream merge postprocessing
...
Change-Id: I9cb252cda154749c59e64ddb30d897c4ecc0632b
2023-02-10 12:08:32 +01:00
254393152d
[merge] Fix build and get footered rich editor styled textView to work
...
Change-Id: I75876d563760caec76673372ff560cbd17577f45
2023-02-10 12:07:42 +01:00
11b1e54429
[merge,TMP,DNM] Build wysiwyg from local maven
...
Builders: until this is published on maven, `make android` for
https://github.com/SchildiChat/matrix-rich-text-editor
to publish to local repository
Change-Id: I88e073db5fffeb60d82514d1b07267a5c35447d3
2023-02-10 11:34:38 +01:00
9ad0c0c44d
Merge pull request #8108 from vector-im/dependabot/gradle/com.google.firebase-firebase-bom-31.2.1
...
Bump com.google.firebase:firebase-bom from 31.2.0 to 31.2.1
2023-02-10 10:58:31 +01:00
b6896765a9
Bump com.googlecode.libphonenumber:libphonenumber from 8.13.5 to 8.13.6 ( #8107 )
...
Bumps [com.googlecode.libphonenumber:libphonenumber](https://github.com/google/libphonenumber ) from 8.13.5 to 8.13.6.
- [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.13.5...v8.13.6 )
---
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-10 09:42:11 +00:00
941153894c
Merge pull request #8098 from vector-im/dependabot/gradle/androidx.exifinterface-exifinterface-1.3.6
...
Bump androidx.exifinterface:exifinterface from 1.3.5 to 1.3.6
2023-02-10 10:17:51 +01:00
4c756cb12f
Bump com.google.firebase:firebase-bom from 31.2.0 to 31.2.1
...
Bumps com.google.firebase:firebase-bom from 31.2.0 to 31.2.1.
---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-bom
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-09 23:58:28 +00:00
4cc2daa5ef
Merge pull request #7920 from vector-im/hughns/msc3824-oidc-aware
...
Implementation of MSC3824 to make the client OIDC-aware
2023-02-09 16:57:54 +01:00
f4367a0855
Merge pull request #8100 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.6.1
...
Bump androidx.appcompat:appcompat from 1.6.0 to 1.6.1
2023-02-09 14:31:15 +01:00
b1d7831684
Session migration 51
2023-02-09 09:57:07 +00:00
10a1ea033b
Merge branch 'develop' into hughns/msc3824-oidc-aware
2023-02-09 09:53:26 +00:00
8c2b9ec6f4
[merge,WIP] interface'd FooteredTextView
...
Change-Id: I62f09fff7d094ebb3bf6690b17c951e4e48e80c7
2023-02-09 09:30:23 +01:00
35b7860ec2
Bump androidx.browser:browser from 1.4.0 to 1.5.0
...
Bumps androidx.browser:browser from 1.4.0 to 1.5.0.
---
updated-dependencies:
- dependency-name: androidx.browser:browser
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-08 23:03:07 +00:00
27c1e02764
Bump androidx.appcompat:appcompat from 1.6.0 to 1.6.1
...
Bumps androidx.appcompat:appcompat from 1.6.0 to 1.6.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>
2023-02-08 23:02:06 +00:00
5ac590a8e0
Bump androidx.work:work-runtime-ktx from 2.7.1 to 2.8.0
...
Bumps androidx.work:work-runtime-ktx from 2.7.1 to 2.8.0.
---
updated-dependencies:
- dependency-name: androidx.work:work-runtime-ktx
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-08 23:01:53 +00:00
4e1e30ef1d
Bump androidx.exifinterface:exifinterface from 1.3.5 to 1.3.6
...
Bumps androidx.exifinterface:exifinterface from 1.3.5 to 1.3.6.
---
updated-dependencies:
- dependency-name: androidx.exifinterface:exifinterface
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-08 23:01:36 +00:00
d922126f4b
[Rich text editor] Add code block, quote and list indentation actions ( #8045 )
...
* Add remaining rich text editor actions
* Render code blocks in the timeline
* Hide indentation buttons when not in a list
2023-02-08 17:47:22 +00:00
b9e18ac4b5
Ignore sonarlint generated files in repo
2023-02-08 14:16:00 +01:00
51274af2fe
Merge tag 'v1.5.24' into sc
...
Change-Id: I3eda119f38061c31595d9087f6067b269b87d8d1
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
2023-02-08 13:08:42 +01:00
5bfb39b81a
[TMP] Automatic upstream merge preparation
...
Change-Id: I2a27c4039c788f6d57dd6fddca7c7231b752a973
2023-02-08 11:28:22 +01:00
9f3939e216
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: I2cfeacd73519abd5309a7ae69a4d1886af2e6be5
2023-02-08 11:28:22 +01:00
4174023958
version++
2023-02-08 09:52:32 +01:00
81a2a4a8a4
Merge tag 'v1.5.24' into develop
...
tag
2023-02-08 09:51:29 +01:00
8667797246
Merge branch 'release/1.5.24' into main
2023-02-08 09:51:15 +01:00
427d9a70d5
Adding fastlane file for version 1.5.24
2023-02-08 09:51:08 +01:00
b37604ce39
Changelog for version 1.5.24
2023-02-08 09:50:19 +01:00
f8283e44ba
Merge pull request #8087 from ByeongsuPark/feature/bspark/bugfix-7928-next-button-disabled
...
Fix the next button disable issue after visiting homeserver screen
2023-02-07 18:19:13 +01:00
0971a28532
Merge pull request #8057 from vector-im/yostyle/vb_utd
...
Let the user know when we are not able to decrypt the voice broadcast…
2023-02-07 18:16:34 +01:00
8775c4d0a2
Fix lint
2023-02-07 16:54:24 +01:00
4226296990
Get Event from cache without using a `Room`
2023-02-07 14:52:12 +01:00
6e44f52c4a
Fix the next button disable issue after visiting homeserver screen
...
Signed-off-by: byeongsu@soongsil.ac.kr <byeongsu@soongsil.ac.kr>
2023-02-07 22:45:59 +09:00
5b5cbf52b2
Merge pull request #7971 from vector-im/dependabot/gradle/paparazzi-1.2.0
...
Bump paparazzi from 1.1.0 to 1.2.0
2023-02-07 14:35:21 +01:00
84f0f6f6dc
Merge pull request #7999 from vector-im/dependabot/gradle/com.google.android.material-material-1.8.0
...
Bump material from 1.7.0 to 1.8.0
2023-02-07 14:34:34 +01:00
ba7ee68b24
Merge pull request #8032 from vector-im/jmartinesp/fix/rte-cant-select-text-in-plain-text-mode
...
Fix: cannot select text in plain text mode in Rich Text Editor
2023-02-07 14:33:11 +01:00
a0e4263dda
Merge pull request #8034 from vector-im/dependabot/github_actions/danger/danger-js-11.2.3
...
Bump danger/danger-js from 11.2.2 to 11.2.3
2023-02-07 14:32:37 +01:00
120dd61123
Merge pull request #8038 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-8.0.2
...
Bump org.owasp:dependency-check-gradle from 8.0.1 to 8.0.2
2023-02-07 14:32:10 +01:00
c588ed5efa
Merge pull request #8055 from vector-im/dependabot/gradle/io.element.android-wysiwyg-0.23.0
...
Bump io.element.android:wysiwyg from 0.18.0 to 0.23.0
2023-02-07 14:31:27 +01:00
4ba84ddc82
Merge pull request #8064 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-reflect-1.8.10
...
Bump org.jetbrains.kotlin:kotlin-reflect from 1.8.0 to 1.8.10
2023-02-07 14:30:50 +01:00
5f2ffbb8d5
Merge pull request #8066 from vector-im/dependabot/gradle/com.google.devtools.ksp-1.8.10-1.0.9
...
Bump com.google.devtools.ksp from 1.8.0-1.0.8 to 1.8.10-1.0.9
2023-02-07 14:30:27 +01:00
a8778d003b
Merge pull request #8082 from RiotTranslateBot/weblate-element-android-element-app
...
Translations update from Weblate
2023-02-07 14:29:38 +01:00
c8ef57e365
Merge pull request #8084 from vector-im/dependabot/gradle/flipper-0.178.1
...
Bump flipper from 0.177.0 to 0.178.1
2023-02-07 14:29:00 +01:00
c083112c84
Merge pull request #8067 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.8.10
...
Bump org.jetbrains.kotlin:kotlin-gradle-plugin from 1.8.0 to 1.8.10
2023-02-07 14:03:56 +01:00
33200764ca
Merge pull request #8086 from vector-im/feature/bma/settingsPerformance
...
Open general settings performance
2023-02-07 14:03:07 +01:00
e362536037
Bump com.google.devtools.ksp from 1.8.0-1.0.8 to 1.8.10-1.0.9
...
Bumps [com.google.devtools.ksp](https://github.com/google/ksp ) from 1.8.0-1.0.8 to 1.8.10-1.0.9.
- [Release notes](https://github.com/google/ksp/releases )
- [Commits](https://github.com/google/ksp/compare/1.8.0-1.0.8...1.8.10-1.0.9 )
---
updated-dependencies:
- dependency-name: com.google.devtools.ksp
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-07 11:54:45 +00:00
67ae54f0a5
Bump com.autonomousapps.dependency-analysis from 1.18.0 to 1.19.0 ( #8085 )
...
Bumps com.autonomousapps.dependency-analysis from 1.18.0 to 1.19.0.
---
updated-dependencies:
- dependency-name: com.autonomousapps.dependency-analysis
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-07 11:53:49 +00:00
ae2fbf1ecd
Changelog
2023-02-07 12:37:43 +01:00
fa47c4b87e
Ensure storage is computed in background, to not block display of general settings.
2023-02-07 12:34:58 +01:00
86ec975f99
Remove outdated todo
2023-02-07 10:39:47 +01:00
cd9a3b9be2
[TEST] Fight duplicate read markers in main timeline
...
Let synced null and main markers both update the main marker.
Looks like desktop does the same:
7158a99a1c/src/sync-accumulator.ts (L459-L460)
2023-02-07 09:30:27 +01:00
cdb350c104
Add unit tests for GetTimelineEventUseCase
2023-02-07 09:22:54 +01:00
SpiritCroc
Florian Renaud
dependabot[bot]
Benoit Marty
Yoan Pintas
Hugh Nimmo-Smith
jonnyandrew
Benoit Marty
ByeongsuPark
Florian Renaud