Commit graph

12734 commits

Author SHA1 Message Date
Benoit Marty
194a584e4c Merge branch hotfix/1.3.15 2022-01-18 14:21:09 +01:00
Benoit Marty
5e96e87bdc fastlane 2022-01-18 14:13:31 +01:00
Benoit Marty
68cd303a59 towncrier 2022-01-18 14:11:01 +01:00
Benoit Marty
ea8465f5f3 Version 1.3.15 for hotfix release 2022-01-18 14:06:02 +01:00
Benoit Marty
f0d5260be8 Fix unit test 2022-01-18 12:34:14 +01:00
Benoit Marty
2a7719cdf6 ktlint 2022-01-18 12:12:36 +01:00
Benoit Marty
e8d71feef1
Merge pull request #4973 from vector-im/feature/adm/ftue-other-sso-crash
Fixing onboarding crash when signing in/up on non `matrix.org` server with SSO
2022-01-18 12:09:14 +01:00
Benoit Marty
bdd30e3b8f Fix crash when viewing source which contains an emoji.
Import source of jsonviewer as a module of this project.
2022-01-18 12:04:06 +01:00
Adam Brown
54a5c3e52a adding changelog entry 2022-01-18 10:51:55 +00:00
Adam Brown
114c60cfed fixing onboarding crash when signing in/up with sso -
handles the sso flows by not forwarding to the signin/signup pages and instead using the previous onLoginFlowRetrieved when the selected server type is other
2022-01-18 10:51:54 +00:00
Benoit Marty
f5b16b834c Changelog 2022-01-18 09:20:08 +01:00
Benoit Marty
961f821ab9 Create and use removeIfCompat (#4961) 2022-01-18 09:19:52 +01:00
Benoit Marty
13881a589a Remove temporary change on the "NewApi" lint error. 2022-01-18 09:17:51 +01:00
Benoit Marty
a083047888 Fix typo 2022-01-18 09:12:39 +01:00
ganfra
cc89a8fc77 Timeline : fix 4959 2022-01-18 09:11:55 +01:00
Adam Brown
256929b78f
Merge pull request #4880 from vector-im/feature/adm/carousel-images-update
Updated splash carousel images and copy
2022-01-17 15:11:08 +00:00
Benoit Marty
eafb76b9b6
Merge pull request #4960 from vector-im/feature/aris/improve_local_echo_stuck_fix
Avoid deleting sent messages on non room events
2022-01-17 15:26:46 +01:00
Benoit Marty
c59bb5740a Add comment after merge of #4952 2022-01-17 15:24:51 +01:00
Benoit Marty
95b116b8a1
Merge pull request #4952 from abaker/disable_http_2
Force HTTP/1.1
2022-01-17 15:20:23 +01:00
ariskotsomitopoulos
52348e399e ktlint fixes 2022-01-17 13:30:59 +02:00
ariskotsomitopoulos
879c4ffef6 Improve logic 2022-01-17 13:00:34 +02:00
Benoit Marty
ab29a15572
Merge pull request #4942 from vector-im/feature/bma/delete_rx
Remove unused module matrix-sdk-android-rx and do some cleanup
2022-01-17 11:59:23 +01:00
ariskotsomitopoulos
01ade64f3b fix ktlint format 2022-01-17 12:27:53 +02:00
ariskotsomitopoulos
493374c423 Add changelog 2022-01-17 12:21:22 +02:00
ariskotsomitopoulos
3656896af9 Avoid deleting sent messages on non room events 2022-01-17 12:13:01 +02:00
Adam Brown
1528238a2f adding changelog entry 2022-01-17 09:27:04 +00:00
Adam Brown
7d0b833aa5 using app name template for the carousel content which contains the app name
- also marks the now unused strings for deletion
2022-01-17 09:24:53 +00:00
Adam Brown
be319f596d fixing pixel rounding to 451x451, image should be 450x450 2022-01-17 09:24:53 +00:00
Adam Brown
f4cacb2d16 applying percentage based heights to the carousel hero image and paddings 2022-01-17 09:24:53 +00:00
Adam Brown
43acc7a6f8 adding dark variants of the carousel images 2022-01-17 09:24:53 +00:00
Adam Brown
c0b855e7c7 adding non light mode carousel background which uses a vertical gradient 2022-01-17 09:24:53 +00:00
Adam Brown
982b480613 including updated copy for the carousel
- marked as donottranslate whilst waiting for sign off
- removed the positioning from the naming schema in favour of location of context
2022-01-17 09:24:53 +00:00
Adam Brown
fbe60f5a52 applying english override for the last carousel page copy 2022-01-17 09:24:53 +00:00
Adam Brown
b137009e6e replacing onboarding vectors with png to avoid performance overheads
- also fixes the carousel text reposition based on line count
2022-01-17 09:24:53 +00:00
Adam Brown
e521fd9059 fixing typo in carousel body 2022-01-17 09:24:53 +00:00
Adam Brown
bb2e3b1078 splitting the CharSequence creation from the conversion to EpoxyCharSequence 2022-01-17 09:24:53 +00:00
Adam Brown
7c5e7a902d updating splash carousel copy to match latest copy 2022-01-17 09:24:53 +00:00
Adam Brown
689c817606 updating splash carousel images with latest designs 2022-01-17 09:24:53 +00:00
Adam Brown
19f328bf9d styling last full stop in the carousel titles to use the accent colour
- also meant extracting out a separate state creation factory to avoid having too much logic inside the fragment
2022-01-17 09:24:53 +00:00
Benoit Marty
f025554612
Merge pull request #4953 from vector-im/feature/adm/in-dev-category
In development release notes category
2022-01-14 17:48:16 +01:00
Benoit Marty
9232206947
Merge pull request #4948 from vector-im/feature/bma/alerter_analytics_optin
Prevent Alerts to be displayed on the analytics opt-in screen
2022-01-14 17:46:32 +01:00
Adam Brown
7259324b3b updating the removal towncrier usage to be an explicit sdk category 2022-01-14 16:22:46 +00:00
Adam Brown
37aadf4dbf using .wip extension and updates the docs for more clarity 2022-01-14 14:51:19 +00:00
Adam Brown
cdce8df002 adding a construction emoji to the in dev release notes section for more context 2022-01-14 11:40:31 +00:00
Adam Brown
13c34865f2 adding .dev changelogs for the currently merged wip tasks 2022-01-14 11:25:22 +00:00
Adam Brown
053fe1e187 adding .dev towncrier category to the release notes
- the aim is to link  merged PRs to WIP features so that every change is traceable to every release
2022-01-14 11:21:56 +00:00
Benoit Marty
31e487b073
Merge pull request #4911 from vector-im/feature/nfe/rename_kick_command
Remove "X kicked X" terminology when removing people from a room
2022-01-14 08:42:18 +01:00
Alex Baker
7e4e8339e6 Force HTTP/1.1
Signed-off-by: Alex Baker <alex@beeper.com>
2022-01-13 17:50:24 -06:00
Benoit Marty
4cdf55e7dd Prevent Alerts to be displayed in the automatically displayed analytics opt-in screen (#4933) 2022-01-13 21:53:42 +01:00
Benoit Marty
006b212189 Change remaining Observable to something more accurate 2022-01-13 21:19:52 +01:00