mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-01 13:58:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
11217 commits 7 branches 124 tags 230 MiB
Commit graph

11217 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nikita Epifanov
04e4ad0d6e Translated using Weblate (Russian) 
Currently translated at 100.0% (85 of 85 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/ru/
 2021-08-01 12:26:01 +02:00
SpiritCroc
ab1fcaca62 Scroll to linked message: better control the final scroll position 
With scrollToPosition(), the layout will only scroll such that the view
is visible *somewhere* on the screen. Defining a precise offset where to
show it is better, so the user can expect where the message will show
up.

Change-Id: Idd25a062c4be8f45ba804e442d63409f279f2a76
 2021-08-01 12:22:27 +02:00
SpiritCroc
6c9c2eaef5 Fix scrolling to bottom if it's not far and it wasn't at bottom initially 
Change-Id: Ifaf2395140d30b456acd9130bd058ed573888423
 2021-08-01 12:11:58 +02:00
SpiritCroc
6399e71e25 [merge-features] Fix and properly style voice message recording for SC 
Change-Id: Iba97f334b07e0fa1f4a4cc8fc92c97e53d919dd4
 2021-08-01 11:42:17 +02:00
SpiritCroc
3959a838d1 [merge-features] Fix voice messsage bubble layout + SC themes 
Change-Id: Idd2dddc8c8f6333ca90fa5411c69e084e3a4cdcf
 2021-08-01 10:31:17 +02:00
SpiritCroc
899168e84c increment_version.sh: Exclude merge-specific changes from changelog 
Change-Id: I8ec4f78b129efc63613f3881975f9738ac463eb6
 2021-08-01 09:39:49 +02:00
SpiritCroc
3cb509c58a Automatic SchildiChat string correction 
Change-Id: I9c40b43cf33abd696d421bdafd77db159eeb6545
 2021-08-01 09:37:47 +02:00
SpiritCroc
9b9964e506 Automatic upstream merge postprocessing 
Change-Id: I5e4bd152529574c753fb2dd8b39ceafb8638ed02
 2021-08-01 09:37:46 +02:00
SpiritCroc
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
Valere
60caac4214
Merge pull request #3663 from vector-im/feature/bca/room_caps_restriced 
Feature/bca/room caps restricted
 2021-07-30 19:41:16 +02:00
Valere
aaa9c7e795 fix rebase 2021-07-30 19:05:47 +02:00
Valere
efdaa49e70 Code review 2021-07-30 18:44:25 +02:00
Valere
a7dc7e8d8a klint 2021-07-30 18:44:14 +02:00
Valere
88fec379c4 Cleaning 2021-07-30 18:44:14 +02:00
Valere
5adceaca23 Code quality 2021-07-30 18:44:14 +02:00
Valere
a626f42a3b Add change log 2021-07-30 18:43:50 +02:00
Valere
30c299ebe1 cleaning 2021-07-30 18:43:50 +02:00
Valere
c9ef08d8a9 handle migration before setting restricted 2021-07-30 18:43:50 +02:00
Valere
2f16a7fff3 Restricted room mgmt when supported 2021-07-30 18:43:34 +02:00
Valere
3da20aea29 Cleaning 2021-07-30 18:43:34 +02:00
Valere
6c2a917d9f WIP 2021-07-30 18:43:34 +02:00
SpiritCroc
c3f3e13d26 [TMP] Automatic upstream merge preparation 
Change-Id: I980573f83c23136057e6cf47093567d89a023458
 2021-07-30 18:33:30 +02:00
SpiritCroc
26b1a478f0 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ieaa970a813aa29bdc792add82c43f73062262056
 2021-07-30 18:33:30 +02:00
Onuray Sahin
c7c589354e version++ 2021-07-30 18:01:22 +03:00
Onuray Sahin
53568f1477 Merge branch 'develop' into main 
* develop: (127 commits)
  fastlane changelog added.
  Changelog added.
  Fix lint error.
  Translated using Weblate (Slovenian)
  Lint fixes.
  cleanup
  Update initial recording state to restore from background.
  Hide mic if there is a draft message.
  Migration to cleanup orphan TrustLevelEntities
  Design review fixes.
  Better algorithm to update user devices Should fix the problem of too many TrustLevelEntity objects
  Small optimization
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Italian)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Hungarian)
  Fix wording when verification is cancelled.
  Design review fixes.
  Do not check the baseURL to override if it is the same than the one previously known and used
  Translated using Weblate (Portuguese (Brazil))
  ...
 2021-07-30 17:55:56 +03:00
Onuray Sahin
3900a3ef33 fastlane changelog added. 2021-07-30 17:44:09 +03:00
Onuray Sahin
e7d9ffc992 Changelog added. 2021-07-30 17:35:04 +03:00
Onuray Sahin
c6bd6e4961
Merge pull request #3598 from vector-im/feature/ons/voice_message 
Voice Message
 2021-07-30 17:24:17 +03:00
Onuray Sahin
8e28872c9f Fix lint error. 2021-07-30 17:17:55 +03:00
Onuray Sahin
10bd1006e1
Merge pull request #3762 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-07-30 17:14:32 +03:00
Weblate
7e79473df5 Merge branch 'origin/develop' into Weblate. 2021-07-30 12:37:18 +00:00
Vojko Rajh
d4d43f228c Translated using Weblate (Slovenian) 
Currently translated at 1.0% (27 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sl/
 2021-07-30 12:36:56 +00:00
Onuray Sahin
1aa706dee5 Lint fixes. 2021-07-30 15:25:02 +03:00
Benoit Marty
7cd90b0b14
Merge pull request #3760 from vector-im/feature/bma/otk1 
2 small fixes
 2021-07-30 12:55:57 +02:00
Florian Renaud
0a08746937 Set DirectMessagesContent immutable 2021-07-30 11:20:35 +02:00
Benoit Marty
25f25b0e95
Merge pull request #3757 from vector-im/feature/bma/trustLevelEntity 
Cleanup TrustLevelEntity
 2021-07-30 11:01:01 +02:00
Benoit Marty
57f3a2437e cleanup 2021-07-30 10:59:46 +02:00
Onuray Sahin
cfe64eed2a Update initial recording state to restore from background. 2021-07-30 11:27:14 +03:00
Onuray Sahin
e945b8911c Hide mic if there is a draft message. 2021-07-30 11:14:29 +03:00
ganfra
ec09532df6 Timeline call tiles: fix call event grouper 2021-07-29 20:00:43 +02:00
ganfra
dc7cc2ed5c Timeline call tiles: remove usage of TimelineControllerInterceptorHelper. 2021-07-29 19:23:55 +02:00
Benoit Marty
54f707644c Migration to cleanup orphan TrustLevelEntities 2021-07-29 17:42:55 +02:00
Onuray Sahin
cdd2fca258 Design review fixes. 2021-07-29 18:41:29 +03:00
Benoit Marty
b4e7f10019 Better algorithm to update user devices 
Should fix the problem of too many TrustLevelEntity objects
 2021-07-29 16:46:09 +02:00
Florian Renaud
a399747bb4 change 2021-07-29 15:55:42 +02:00
Benoit Marty
5eb794f8af Small optimization 2021-07-29 15:39:03 +02:00
chagai95
426389194e
removing double the 2021-07-29 13:35:03 +02:00
ganfra
f405532e4c Introduces CallEventGrouper so we can manage properly call history 2021-07-29 12:06:44 +02:00
Florian Renaud
ac56b1ef3e Update account data for invited users by email 
When an user has been invited by email to a DM, account data entry was stuck on the user email after the user account creation.
When the user has joined element, an event m.room.member is triggered for each room attached to the user, containing a third party invite with the user matrix id. We use this event to update the user account with the matrix id.
 2021-07-29 09:37:33 +02:00
Jeff Huang
ec87faa24b Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (24 of 24 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2021-07-28 21:25:13 +00:00