SchildiChat-android/vector
Onuray Sahin 9ea30445ef Merge branch 'develop' into feature/ons/static_location
* develop: (281 commits)
  Add a comment about the workaround
  Remove deprecated restricted lab option (#4889)
  Bump actions/github-script from 3 to 5.1.0
  Add some missing language in the change language screen
  Workaround to not to reuse poll option cells.
  Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10
  Changelog
  Test: Fix test after change on OnBoarding screens
  Test: Analytics opt-in
  Cleanup
  Revert "Disable automatic opt-in screen display."
  - Do not add GitHub comments on successful ktlint runs  - Remove already existing comments when ktlint succeed
  restore deprecated lab preference
  Update nb of enum classes
  Change autoUisi label + rename matching_issue
  code review
  Fix enabling was broken
  Simple rate limiting of RS sending
  use flow instead of reactivex
  Fix UISIS preference listener
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
#	vector/src/main/res/layout/view_attachment_type_selector.xml
#	vector/src/main/res/values/strings.xml
2022-01-11 14:42:11 +03:00
..
sampledata Implement poll in timeline ui. 2021-12-03 11:39:41 +03:00
signature Share the debug signature to all machines which build the debug APK 2019-06-07 10:17:14 +02:00
src Merge branch 'develop' into feature/ons/static_location 2022-01-11 14:42:11 +03:00
.gitignore
build.gradle Merge branch 'develop' into feature/ons/static_location 2022-01-11 14:42:11 +03:00
lint.xml Fix lint issue (TypographyDashes) 2022-01-04 12:47:46 +01:00
proguard-rules.pro Fix Authenticated Jitsi not working in release #3841 2021-08-16 15:43:35 +02:00