Commit graph

20972 commits

Author SHA1 Message Date
SpiritCroc
48d83fe557 Disable space bar snapping
After experimenting with center snapping, better not snap at all while
we manually scroll to things.

Change-Id: Ic9a0262c1ec53e593e6fe40c927b7ebea0bc8e8a
2022-10-15 14:46:33 +02:00
SpiritCroc
6a626ea3be Old layout: Sort order setting to show unreads on top
Setting is in options menu.
Different setting for home than for spaces, to allow e.g. having unreads on
top only for home.

Change-Id: Ib390a5601ab78ba8372a4c3161311a52d1016b48
2022-10-15 10:12:12 +02:00
SpiritCroc
2d710923a1 Fix persisting room sections
Change-Id: Ia39e84c00bad8777605c237534cb6f13f5741fe0
2022-10-12 18:57:35 +02:00
SpiritCroc
bbc856ffa3 Automatic SchildiChat string correction
Change-Id: Iae820d99a022dc3ee57b89dcc466820806853749
2022-10-10 15:45:33 +02:00
SpiritCroc
b76f792586 Fix Element-Call string with minus
Change-Id: I1bee76fe63dae3a91d88c5b8a0e1b09c69184092
2022-10-10 15:40:56 +02:00
SpiritCroc
731dc8987d Bottom space bar: always try to center the selected space
Change-Id: Ia9820869d27b409da50900ab9819cec9e5e4691b
2022-10-09 14:12:59 +02:00
SpiritCroc
a53c183847 Hide unimportant unreads counter when spaces bottom bar is visible
Change-Id: I54df339e53877e334a6a2b463916017cb5ccbc30
2022-10-09 14:12:59 +02:00
SpiritCroc
43d77f553e Swipe spaces bottom bar
Change-Id: Ib15b3b28f5f429e73cf80130dc575ae2111a1cef
2022-10-09 14:12:59 +02:00
SpiritCroc
3b6821d627 Merge remote-tracking branch 'weblate/sc' into sc
Change-Id: Ib48a0a3cca605f7c51570b93958ce4204b9cbb1b
2022-10-09 14:12:19 +02:00
SpiritCroc
0e6eca191d Change default build-flavor to fdroid
Change-Id: I37cb532cbddc849c1a74a290fc75dc0cafb32f12
2022-10-08 11:25:40 +02:00
SpiritCroc
282abea98b [merge] Keep new layout disabled until I like it
Change-Id: Ib1a7318db1191ef2f9d8d81b5999a3c7957b1b62
2022-10-07 20:33:13 +02:00
SpiritCroc
d081d9ea5d Automatic SchildiChat string correction
Change-Id: I9000ce30703ce606f2e24ecc8387cede7296d891
2022-10-07 20:33:04 +02:00
SpiritCroc
993b9aae92 Automatic upstream merge postprocessing
Change-Id: I6e6b11d5707932dfce002e6379f71fc11caf4f7b
2022-10-07 20:33:02 +02:00
SpiritCroc
fe785613e7 Merge tag 'v1.5.2' into sc
Change-Id: I0fe8262be9f2e5852815ad5f93329ffa17970b0e

Conflicts:
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
	vector/src/main/res/layout/composer_layout.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
2022-10-07 20:32:26 +02:00
SpiritCroc
c634bb74e5 Merge tag 'v1.5.1' into sc
Note: we already had picked the internal v1.5.1 patch for the security
release, but we still do this merge to make git merge happy again for
future merges, and also clean up a little bit of UI things that I did
for that patch but abandonned later.

Change-Id: I51b674093e6f32e19fc9556109fb0d231d8f8f3e
2022-10-07 19:45:09 +02:00
SpiritCroc
cbffb06c97 [TMP] Automatic upstream merge preparation
Change-Id: Id27ca5a0d019229e834272d95f33618636faf66f
2022-10-06 17:19:34 +02:00
SpiritCroc
025bf4d0c2 Automatic revert to unchanged upstream strings, pt.1
Change-Id: I8d58ed0e1b87f4eada01b5c11b3d1044a819a354
2022-10-06 17:19:33 +02:00
joshua
309e77e37c Translated using Weblate (Swedish)
Currently translated at 100.0% (155 of 155 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/sv/
2022-10-06 17:19:28 +02:00
Benoit Marty
f6411d673f Merge branch 'release/1.5.2' into main 2022-10-05 17:17:27 +02:00
Benoit Marty
b49585bde3 Fastlane 2022-10-05 17:17:08 +02:00
Benoit Marty
a6cb936ae6 Reorder changes 2022-10-05 17:08:19 +02:00
Benoit Marty
94fa3343b4 Run towncrier 2022-10-05 17:06:58 +02:00
Benoit Marty
c76945f9c6 Fix tests, there is a new item in the list 2022-10-05 16:46:15 +02:00
Benoit Marty
8934eabc99 Remove TODO, the string a11y_create_room is actually used. 2022-10-05 16:33:05 +02:00
Benoit Marty
47457b39d0 Fix typo 2022-10-05 16:03:26 +02:00
Benoit Marty
3f27df81bd
Merge pull request #7298 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2022-10-05 15:57:19 +02:00
Weblate
5d8a8545f4 Merge branch 'origin/develop' into Weblate. 2022-10-05 13:54:54 +00:00
Valere
502b12a07e
Merge pull request #7290 from vector-im/feature/bca/hinder_verification
E2ee dos not hinder verification
2022-10-05 14:34:34 +02:00
Weblate
672ad3a5e5 Merge branch 'origin/develop' into Weblate. 2022-10-05 12:32:46 +00:00
Valere
ec7c8c8b31
Merge pull request #6726 from vector-im/feature/bca/block_unverified
Per room block unverified devices
2022-10-05 14:29:59 +02:00
Weblate
d13606bdcc Merge branch 'origin/develop' into Weblate. 2022-10-05 12:28:06 +00:00
Nui Harime
111f77b017 Translated using Weblate (Russian)
Currently translated at 98.3% (2380 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2022-10-05 12:27:54 +00:00
lvre
4de0f0a1e8 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2419 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2022-10-05 12:27:53 +00:00
Sveinn í Felli
c39e64dfc7 Translated using Weblate (Icelandic)
Currently translated at 84.5% (2046 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
2022-10-05 12:27:53 +00:00
Vri
d5f542095c Translated using Weblate (German)
Currently translated at 100.0% (2419 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2022-10-05 12:27:39 +00:00
Amit Kumar
aad2eed396
Add initial Sentry setup for crashes and perf tracking (#7141)
* Add initial Sentry setup for crashes and perf tracking

* Fix failing analytics tests

* Reformat code to fix style issue

* Close sentry when user signs out

* Add initial unit tests for Sentry

* Remove unused import

* Exclude amitkma from signoff requirements for PRs
2022-10-05 16:49:14 +05:30
Benoit Marty
70976c355a
Merge pull request #7291 from vector-im/tech/fix-room-member-list-controller-test
Try to fix flaky RoomMemberListControllerTest
2022-10-05 11:04:00 +02:00
Benoit Marty
a036cc6d75
Merge pull request #7287 from vector-im/feature/bma/en-us
Use American English by default.
2022-10-05 11:02:58 +02:00
Benoit Marty
2cd78282d9
Fix typo
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2022-10-05 11:02:33 +02:00
Valere
fddeddacc7 fix outdated doc 2022-10-05 10:42:29 +02:00
Valere
37458d41f2 E2ee dos not hinder verification 2022-10-05 10:42:29 +02:00
Valere
b567fc5be6 remove commented code 2022-10-05 10:27:12 +02:00
Valere
68d4ac34c7 Move setting to room profile 2022-10-05 10:27:12 +02:00
Valere
8de2fe8917 Update library/ui-strings/src/main/res/values/strings.xml
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-05 10:27:12 +02:00
Valere
8c7e7a8f35 open global settings from room settings 2022-10-05 10:27:12 +02:00
Valere
f7d8356327 post rebase fix & cleaning 2022-10-05 10:27:12 +02:00
Valere
92a72cb1e9 cleaning 2022-10-05 10:27:12 +02:00
Valere
e9b33f6234 Per room block unverified devices 2022-10-05 10:27:12 +02:00
Jorge Martín
ed545c7e2b Try to fix flaky RoomMemberListControllerTest 2022-10-05 08:50:12 +02:00
Jorge Martín
0b7e52e60b Fix EventHtmlRendererTest 2022-10-05 07:46:05 +02:00