Aaron Raimist
9fdbd4c120
Merge branch 'develop' into share-room
2021-06-07 17:00:44 -05:00
Michael Telatynski
65cc42b555
Merge pull request #6160 from robintown/fix-setting-watchers
2021-06-07 22:56:39 +01:00
Aaron Raimist
773af6c7be
Fix test
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 16:54:53 -05:00
Aaron Raimist
a5bf17ff65
Revert incorrect change to forShareableRoom
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 16:54:41 -05:00
Michael Telatynski
ced6c43147
Merge pull request #6152 from matrix-org/t3chguy/fix/17571
...
Fix Stickerpicker context menu
2021-06-07 22:21:19 +01:00
Michael Telatynski
801b5f9c1a
Merge pull request #6155 from matrix-org/t3chguy/spacesteammatewarning
...
Add warning to private space creation flow
2021-06-07 22:21:07 +01:00
Šimon Brandner
b39c615abc
Reorder
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:44:58 +02:00
Šimon Brandner
4185185cdc
Reduce number of DOM elements
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:42:48 +02:00
Šimon Brandner
025148d9fc
Merge branch 'develop' into show-username
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:37:22 +02:00
Tirifto
ed80db73d4
Translated using Weblate (Esperanto)
...
Currently translated at 99.9% (2978 of 2979 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
2021-06-07 17:34:41 +00:00
RiotRobot
8ccdf9a3e8
Reset matrix-js-sdk back to develop branch
2021-06-07 17:43:27 +01:00
RiotRobot
bcd0ba8d45
Resetting package fields for development
2021-06-07 17:42:46 +01:00
RiotRobot
7e03d03ba2
Merge branch 'master' into develop
2021-06-07 17:42:46 +01:00
RiotRobot
a3dac02e4c
v3.23.0
2021-06-07 17:41:18 +01:00
RiotRobot
2983b3ace2
Prepare changelog for v3.23.0
2021-06-07 17:41:18 +01:00
Germain
c6de1c3fc8
Merge pull request #6159 from matrix-org/gsouquet/fix-showtimestamps-notifpanel
...
Add prop to alwaysShowTimestamps on TimelinePanel
2021-06-07 17:21:19 +01:00
Germain Souquet
187a367111
Add prop to alwaysShowTimestamps on TimelinePanel
2021-06-07 17:11:14 +01:00
RiotRobot
dd089bf969
Upgrade matrix-js-sdk to 11.2.0
2021-06-07 17:03:05 +01:00
J. Ryan Stinnett
a06e7ca477
Merge pull request #6158 from matrix-org/jryans/notif-timestamp-release
...
[Release] Fix notif panel timestamp padding
2021-06-07 16:50:17 +01:00
J. Ryan Stinnett
296186b844
Fix notif panel timestamp padding
...
This restores some space around the timestamp in the notif panel. We were
previously relying somewhat randomly on the presence on empty flair elements to
create space.
Fixes https://github.com/vector-im/element-web/issues/17580
2021-06-07 16:46:08 +01:00
J. Ryan Stinnett
9419dd9840
Merge pull request #6157 from matrix-org/jryans/notif-timestamp
...
Fix notif panel timestamp padding
2021-06-07 16:40:22 +01:00
J. Ryan Stinnett
a895b083a2
Fix notif panel timestamp padding
...
This restores some space around the timestamp in the notif panel. We were
previously relying somewhat randomly on the presence on empty flair elements to
create space.
Fixes https://github.com/vector-im/element-web/issues/17580
2021-06-07 16:21:53 +01:00
Michael Telatynski
6d80cd5913
Merge pull request #6149 from SimonBrandner/fix/jumps-image-view
2021-06-07 15:19:45 +01:00
Šimon Brandner
20a3dd67d6
Some more styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 16:12:06 +02:00
Šimon Brandner
255f996710
landscape -> imageIsNotFlipped
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 15:46:03 +02:00
Šimon Brandner
b5d271759f
Why would I format this myself if eslint can do it for me?
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 15:43:43 +02:00
Šimon Brandner
2e47a1176f
Get rid of weird rotation prop
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 15:39:11 +02:00
Šimon Brandner
0918ebad0a
calculateZoomAndRotate -> setZoomAndRotation
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 15:28:37 +02:00
Šimon Brandner
5880cb3b5f
Better wording
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 15:26:54 +02:00
Šimon Brandner
67c9fe1e07
Revert "Update curly braces styling"
...
This reverts commit ba0f6766ca
.
2021-06-07 15:25:57 +02:00
Michael Telatynski
f3aa505673
Add warning to private space creation flow
2021-06-07 14:14:31 +01:00
Michael Telatynski
bd8fd77d54
Merge pull request #6148 from robintown/fix-timestamps
2021-06-07 13:12:11 +01:00
Michael Telatynski
b60feab7d2
Merge pull request #6147 from robintown/easier-image-panning
2021-06-07 12:47:43 +01:00
Germain
a3a6f3fa31
Merge pull request #6154 from matrix-org/gsouquet/fix-files-scroll-token
2021-06-07 12:44:59 +01:00
Michael Telatynski
7abf680e51
Merge pull request #6153 from matrix-org/t3chguy/ts/123
2021-06-07 12:40:41 +01:00
Germain
ea6904ce2a
Fix local echo comment for scroll tokens
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-07 12:37:11 +01:00
Germain Souquet
d111f4cbb1
Merge branch 'develop' into gsouquet/fix-files-scroll-token
2021-06-07 12:25:08 +01:00
Germain Souquet
6693c39709
make event list summary a list item
2021-06-07 12:17:29 +01:00
Michael Telatynski
4cc95dd184
Make skinning less upset
2021-06-07 11:20:35 +01:00
Michael Telatynski
ae04b2ce4a
Fix Dialog/Modal types defn
2021-06-07 11:06:30 +01:00
Michael Telatynski
2525db6fb1
Convert Resend to Typescript
2021-06-07 11:03:39 +01:00
Michael Telatynski
f6e4943bef
Convert RoomAliasCache to Typescript
2021-06-07 11:01:38 +01:00
Michael Telatynski
50d3e04bda
Convert MatrixActionCreators to Typescript
2021-06-07 10:58:22 +01:00
Michael Telatynski
c8b3acb7e4
Convert utils to Typescript
2021-06-07 10:57:46 +01:00
Michael Telatynski
b2d9dd7214
Convert LifecycleStore to Typescript
2021-06-07 10:57:39 +01:00
Michael Telatynski
3431ebb995
Convert AsyncWrapper to Typescript
2021-06-07 10:57:25 +01:00
Michael Telatynski
9315a87ebf
Convert EventIndex to Typescript
2021-06-07 10:57:11 +01:00
Michael Telatynski
d2ce670d3e
Remove unused code
2021-06-07 10:56:10 +01:00
David Baker
96ab920577
Merge pull request #6142 from matrix-org/dbkr/lint_ts_tests
...
Lint the typescript tests
2021-06-07 09:51:24 +01:00
Germain Souquet
a6ddffe74c
Add scroll token to file and notif event tiles
2021-06-07 09:26:42 +01:00