filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,207 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

13207 Commits

Author SHA1 Message Date
ariskotsomitopoulos 3bd21d04d8 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	tools/check/forbidden_strings_in_code.txt
 2022-01-11 14:09:49 +02:00
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
Benoit Marty 51c764c2f3 Remove unused strings 2022-01-11 12:41:37 +01:00
Benoit Marty 5b1de70742
Merge pull request #4902 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-01-11 12:26:23 +01:00
Benoit Marty d2bad95044
Merge pull request #4904 from vector-im/feature/adm/ftue-copy-typo 
Typo in carousel title
 2022-01-11 12:15:59 +01:00
Adam Brown d485e69062
Merge pull request #4740 from vector-im/feature/adm/automatic-splash-carousel-transitions 
Automatic carousel rotation
 2022-01-11 11:14:41 +00:00
Adam Brown 71eaac39aa fixing typo in carousel title 2022-01-11 11:06:29 +00:00
ariskotsomitopoulos 37ec3fdf84 Refactor threads to support the new timeline implementation 2022-01-11 12:13:53 +02:00
Weblate 7cbaf92690 Merge branch 'origin/develop' into Weblate. 2022-01-11 09:08:49 +00:00
Benoit Marty 6a1940cdd2
Merge pull request #4896 from vector-im/feature/bma/add_languages 
Add some missing languages in the change language screen
 2022-01-11 10:04:02 +01:00
Benoit Marty f5291f4730 Add a comment about the workaround 2022-01-11 10:03:30 +01:00
Valere bf447afa5a
Remove deprecated restricted lab option (#4889) 
Remove deprecated restricted lab option
 2022-01-11 09:01:37 +00:00
Benoit Marty 008034895b
Merge pull request #4893 from vector-im/feature/ons/fix_create_poll_recyclerview 
Workaround to not to reuse poll option cells
 2022-01-11 10:00:16 +01:00
Weblate 175b8cc78b Merge branch 'origin/develop' into Weblate. 2022-01-11 08:54:39 +00:00
LinAGKar 25a88fed2e Translated using Weblate (Swedish) 
Currently translated at 100.0% (43 of 43 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2022-01-11 08:54:31 +00:00
Benoit Marty dded566cb5
Merge pull request #4900 from vector-im/dependabot/github_actions/actions/github-script-5.1.0 
Bump actions/github-script from 3 to 5.1.0
 2022-01-11 09:41:46 +01:00
dependabot[bot] 48944eabcc
Bump actions/github-script from 3 to 5.1.0 
Bumps [actions/github-script](https://github.com/actions/github-script) from 3 to 5.1.0.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v3...v5.1.0)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-10 23:03:21 +00:00
Benoit Marty 7581a0b549 Fix test compilation 2022-01-10 18:36:04 +01:00
Benoit Marty 75541e0296 Add some missing language in the change language screen 2022-01-10 18:22:30 +01:00
Benoit Marty 3bdb05f7b4 Changelog 2022-01-10 17:49:47 +01:00
Benoit Marty 7be01ab7ae Avoid allowing null String for state_key. Should always be an empty String according to the Matrix specification. 
There is no functional change, just a change in the SDK API for clarity regarding the Matrix specs.
 2022-01-10 17:47:27 +01:00
Benoit Marty 56ff5f795a
Merge pull request #4882 from vector-im/feature/bma/olm_3.2.9 
Olm lib is now hosted in MavenCentral
 2022-01-10 17:39:08 +01:00
Valere 5cbb1d99c7 Code review 2022-01-10 17:38:35 +01:00
Valere 5c5f2766b6 post rebase fix 2022-01-10 17:17:35 +01:00
Valere 2dbe2b5f30 show/hide fab on scroll 2022-01-10 17:00:46 +01:00
Valere ff4bbf0a8a Add "Create room" shortcut in Explore Space screen 2022-01-10 17:00:32 +01:00
Onuray Sahin 5feafbdbf1 Workaround to not to reuse poll option cells. 2022-01-10 17:28:07 +03:00
Benoit Marty ae8d1d1429 Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10 2022-01-10 15:10:08 +01:00
Benoit Marty f368ec15d8
Merge pull request #4892 from vector-im/feature/bma/analytics_opt_in 
Revert "Disable automatic opt-in screen display."
 2022-01-10 15:03:19 +01:00
Valere 30aae3f07a
Merge pull request #4325 from vector-im/feature/bca/auto_uisi 
Auto report unable to decrypt errors via lab option
 2022-01-10 14:55:30 +01:00
Benoit Marty 10e8808b88
Merge pull request #4888 from vector-im/feature/aris/linter__remove_github_comment_on_success 
Add comment only on ktlint fail
 2022-01-10 14:44:29 +01:00
Benoit Marty 5d70aa9947 Changelog 2022-01-10 14:33:47 +01:00
Benoit Marty d5968e442c Test: Fix test after change on OnBoarding screens 2022-01-10 14:31:29 +01:00
Benoit Marty a552be040d Test: Analytics opt-in 2022-01-10 14:16:58 +01:00
Benoit Marty 67c2f9ac51 Cleanup 2022-01-10 14:16:03 +01:00
Benoit Marty 6f348813a2 Revert "Disable automatic opt-in screen display." 
This reverts commit 08def813cc.
 2022-01-10 13:45:02 +01:00
ariskotsomitopoulos 1b41a72e72 Fix Quote from within a thread 2022-01-10 14:14:11 +02:00
ariskotsomitopoulos 6503412928 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
 2022-01-10 13:26:57 +02:00
ariskotsomitopoulos 71fbc3c5c7 - Do not add GitHub comments on successful ktlint runs 
- Remove already existing comments when ktlint succeed
 2022-01-10 13:07:18 +02:00
ariskotsomitopoulos 1224144487 Merge branch 'feature/aris/integration_tests_improvement' of https://github.com/vector-im/element-android into feature/aris/integration_tests_improvement 2022-01-10 11:26:18 +02:00
ariskotsomitopoulos 0fb26da355 PR Remarks 2022-01-10 11:26:03 +02:00
ariskotsomitopoulos e541636802 Make TimelineSettings aware of rootThreadEventId and welcome a new Thread mode for the timeline creation 2022-01-10 11:20:31 +02:00
Valere a047bcbabe restore deprecated lab preference 2022-01-10 09:46:11 +01:00
Valere 3f0122be01 Update nb of enum classes 2022-01-10 09:44:11 +01:00
Valere 258d731102 Change autoUisi label + rename matching_issue 2022-01-10 09:41:51 +01:00
Valere de08afdfad code review 2022-01-10 09:41:51 +01:00
Valere aa89e721aa Fix enabling was broken 2022-01-10 09:41:51 +01:00
Valere 56dac76ca8 Simple rate limiting of RS sending 2022-01-10 09:41:51 +01:00
Valere 401e8e6712 use flow instead of reactivex 2022-01-10 09:41:51 +01:00
Valere cf026b22b8 Fix UISIS preference listener 2022-01-10 09:41:51 +01:00