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

23637 Commits

Author SHA1 Message Date
SpiritCroc a187bb4c47 Automatic upstream merge postprocessing 
Change-Id: I1e1e35826455a93de37b68150accb293ff981054
 2023-02-15 15:53:06 +01:00
SpiritCroc daacdd038c Merge tag 'v1.5.25' into sc 
Change-Id: I45d2198b25e7ebee157f4836596ef59ddb1fbe8e
 2023-02-15 15:53:00 +01:00
SpiritCroc 4468b0efcf [TMP] Automatic upstream merge preparation 
Change-Id: I689f1ff8d7d21247f60a4007e35c77fec5b8bc56
 2023-02-15 15:52:50 +01:00
SpiritCroc 387e73b379 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I92d9aa8f50be6a2ec94755c3fc35a7d8211aa300
 2023-02-15 15:52:50 +01:00
Benoit Marty f74a885aa1 Merge branch 'hotfix/1.5.25' into main 2023-02-15 15:26:03 +01:00
Benoit Marty 4cf78795bd Add extra cases. 2023-02-15 15:06:34 +01:00
Benoit Marty f6711a3d16 Fix issue on timer when recording/playing voice message or voice broadcast. All the seconds were not properly displayed. 2023-02-15 12:23:12 +01:00
Benoit Marty 671435c7f7 fastlane 2023-02-15 10:49:06 +01:00
Benoit Marty 1edfefa71e Towncrier 2023-02-15 10:24:47 +01:00
Benoit Marty bb08def69b Hotfix 1.5.25 2023-02-15 10:18:02 +01:00
Benoit Marty afe133ed7a
Merge pull request #8127 from vector-im/bugfix/fre/fix_countuptimer_stackoverflow 
Fix StackOverFlow exception when stop action is called within the tick event
 2023-02-15 09:30:29 +01:00
Florian Renaud 225f51d3fd Update comment wording 2023-02-14 12:27:39 +01:00
Florian Renaud 450d3d2238 Add changelog 2023-02-14 12:25:38 +01:00
Florian Renaud 68712513b3 Fix StackOverFlow exception when stop action is called within the tick event 2023-02-14 12:16:24 +01:00
SpiritCroc b65bd730b8 Add some missed read receipt debugging 
Change-Id: I431f18d433b49e382b70bc14dc999ca14e8f05f3
 2023-02-14 10:49:18 +01:00
Linerly 3704d9de3b Translated using Weblate (Indonesian) 
Currently translated at 100.0% (171 of 171 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/id/
 2023-02-12 11:57:31 +00:00
waclaw66 2da0610b68 Translated using Weblate (Czech) 
Currently translated at 100.0% (171 of 171 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/cs/
 2023-02-12 11:57:31 +00:00
SpiritCroc c35224f538 Debugging: Only show read receipt thread when showing duplicate receipts 
The new pref is better suitable for controling visibility here.

Change-Id: I76cff0282bd2ac562dc5f0ed0ca51f629c63360e
 2023-02-11 14:35:09 +01:00
SpiritCroc d7ef3225c9 Bump wysiwyg version 
We need this to be able to subclass EditorStyledTextView

Change-Id: I3e59fdd9af4ee6c943cb172d7937dfd52c704347
 2023-02-11 08:49:43 +01:00
SpiritCroc 917b7ef5b7 Revert "[merge,TMP,DNM] Build wysiwyg from local maven" 
This reverts commit 11b1e54429.
 2023-02-11 08:49:43 +01:00
waclaw66 ee67027484 Translated using Weblate (Czech) 
Currently translated at 100.0% (170 of 170 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/cs/
 2023-02-11 07:38:28 +00:00
SpiritCroc 98b98c069d [merge] Fix room summary preview mismerge 
Change-Id: I7a1511fc0c6adc1a98cea4a0517835efae83e069
 2023-02-11 08:36:41 +01:00
SpiritCroc 6a2f318c1d [merge] Fix removing reply fallbacks before rendering 
Change-Id: Id3427fdcdd5be1715ca31bfe1764544a4f08d80d
 2023-02-11 08:33:05 +01:00
SpiritCroc a48ce4b18c [TESTING] Fight duplicate read markers in main timeline, pt.2 
- Make my read-marker experiments backwards-compatible, by introducing a
  new artificial marker
- Fix sometimes the marker going missing, by not deduplicating read
  markers, then filtering out the other one because duplicates didn't
  respect the thread id
Needs an initial sync to fully apply.

Change-Id: Id02ae19d03077016cbeb8d9a8fd5130d77931b2d
 2023-02-10 16:04:26 +01:00
SpiritCroc a52dd364f6 Automatic SchildiChat string correction 
Change-Id: I8c3103b8011ba7275c50f7a8b9b5d77296bc6bc1
 2023-02-10 12:08:33 +01:00
SpiritCroc cd5f1d32a4 Automatic upstream merge postprocessing 
Change-Id: I9cb252cda154749c59e64ddb30d897c4ecc0632b
 2023-02-10 12:08:32 +01:00
SpiritCroc 254393152d [merge] Fix build and get footered rich editor styled textView to work 
Change-Id: I75876d563760caec76673372ff560cbd17577f45
 2023-02-10 12:07:42 +01:00
SpiritCroc 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
SpiritCroc 8c2b9ec6f4 [merge,WIP] interface'd FooteredTextView 
Change-Id: I62f09fff7d094ebb3bf6690b17c951e4e48e80c7
 2023-02-09 09:30:23 +01:00
SpiritCroc 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
SpiritCroc 5bfb39b81a [TMP] Automatic upstream merge preparation 
Change-Id: I2a27c4039c788f6d57dd6fddca7c7231b752a973
 2023-02-08 11:28:22 +01:00
SpiritCroc 9f3939e216 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I2cfeacd73519abd5309a7ae69a4d1886af2e6be5
 2023-02-08 11:28:22 +01:00
Benoit Marty 8667797246 Merge branch 'release/1.5.24' into main 2023-02-08 09:51:15 +01:00
Benoit Marty 427d9a70d5 Adding fastlane file for version 1.5.24 2023-02-08 09:51:08 +01:00
Benoit Marty b37604ce39 Changelog for version 1.5.24 2023-02-08 09:50:19 +01:00
Benoit Marty 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
Benoit Marty 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
yostyle 8775c4d0a2 Fix lint 2023-02-07 16:54:24 +01:00
Benoit Marty 4226296990 Get Event from cache without using a `Room` 2023-02-07 14:52:12 +01:00
ByeongsuPark 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
Benoit Marty 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
Benoit Marty 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
Benoit Marty 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
Benoit Marty 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
Benoit Marty 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
Benoit Marty 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
Benoit Marty 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
Benoit Marty 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
Benoit Marty a8778d003b
Merge pull request #8082 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2023-02-07 14:29:38 +01:00
Benoit Marty 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