PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
30979 commits 1 branch 0 tags 338 MiB
Commit graph

30979 commits

This branch
This branch
All branches
Author SHA1 Message Date
J. Ryan Stinnett
81bd919a18 Port avatar restore to user profile settings 2021-02-05 14:11:57 +00:00
J. Ryan Stinnett
bccfdde4ac Normalise cancel behaviour for room avatar 
This normalises the behaviour of the "Cancel" button for the room profile so
that it _always_ restores the existing value for all of room name, topic, and
avatar, instead of performing a mix of restore and remove.

Fixes https://github.com/vector-im/element-web/issues/16375
 2021-02-05 13:58:28 +00:00
J. Ryan Stinnett
bffce8689a Allow saving room topic or name only 
This changes the room profile settings to support saving _only_ the room topic or
name in case you have limited access to set one but not the other.

Fixes https://github.com/vector-im/element-web/issues/16375
 2021-02-05 13:34:06 +00:00
dangwynne
12f6272ab4 implement qa feedback for closing modals when logging out 2021-02-05 09:24:12 +00:00
Šimon Brandner
ec73f2ec49
Change comment styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-05 08:30:54 +01:00
Šimon Brandner
77248725ed
Added onHeightChanged call 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-05 08:29:24 +01:00
Šimon Brandner
ad5c8fe7e4
Revert "Rerender MessagePanel" 
This reverts commit c7e61ac71d.
 2021-02-05 08:27:07 +01:00
Šimon Brandner
9bd8fef6b3
Change comment styling 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-02-05 08:22:02 +01:00
Weblate
28b69958cc Merge branch 'origin/develop' into Weblate. 2021-02-04 17:01:30 +00:00
J. Ryan Stinnett
15a4032be0
Merge pull request #5530 from aaronraimist/option-hide-stickers 
Add option to hide the stickers button in the composer
 2021-02-04 17:01:23 +00:00
Šimon Brandner
9db86a38f6
Update src/components/views/messages/TextualBody.js 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-02-04 17:58:21 +01:00
Weblate
19ea4ffaa1 Merge branch 'origin/develop' into Weblate. 2021-02-04 16:30:49 +00:00
J. Ryan Stinnett
4a73f3c504
Merge pull request #5598 from SimonBrandner/fix-confusing-right-panel 
Fix confusing right panel button behaviour
 2021-02-04 16:30:41 +00:00
Weblate
c0612a3e7b Merge branch 'origin/develop' into Weblate. 2021-02-04 16:02:26 +00:00
J. Ryan Stinnett
a4318299ff
Merge pull request #5601 from weeman1337/fix-16325-timestamp-jump 
Fix jumping timestamp if hovering a message with e2e indicator bar
 2021-02-04 16:02:18 +00:00
Šimon Brandner
fdc78396fa
Replaced defaultDis and removed duplicate import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-04 16:53:25 +01:00
Weblate
077a6e1b80 Merge branch 'origin/develop' into Weblate. 2021-02-04 15:28:36 +00:00
Yamamoto Kenji
3c36ddf35b Translated using Weblate (Japanese) 
Currently translated at 50.5% (1387 of 2744 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
 2021-02-04 15:28:36 +00:00
Tim Al
6c52bab69c Translated using Weblate (Dutch) 
Currently translated at 82.4% (2262 of 2744 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-02-04 15:28:35 +00:00
J. Ryan Stinnett
a730170a5d
Merge pull request #5614 from SimonBrandner/fix-icon-position 
Fix avatar and trash alignment
 2021-02-04 15:28:11 +00:00
Weblate
3040f661e4 Merge branch 'origin/develop' into Weblate. 2021-02-04 12:06:07 +00:00
Slobodan Simić
7c55204197 Translated using Weblate (Serbian) 
Currently translated at 48.5% (1331 of 2744 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sr/
 2021-02-04 12:06:07 +00:00
random
d7429bb757 Translated using Weblate (Italian) 
Currently translated at 100.0% (2744 of 2744 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-02-04 12:06:03 +00:00
jelv
80019e19bf Translated using Weblate (Dutch) 
Currently translated at 78.2% (2147 of 2744 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-02-04 12:06:01 +00:00
RiotRobot
e9740f5a69 Merge branch 'master' into develop 2021-02-04 12:05:45 +00:00
RiotRobot
0fe54deab1 v3.13.1 2021-02-04 12:04:27 +00:00
RiotRobot
2cab6f66f0 Prepare changelog for v3.13.1 2021-02-04 12:04:27 +00:00
Weblate
10d6c77e6a Merge branch 'origin/develop' into Weblate. 2021-02-04 10:00:48 +00:00
waclaw66
c23cfd80bd Translated using Weblate (Czech) 
Currently translated at 100.0% (2744 of 2744 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-02-04 10:00:48 +00:00
Kaede
632d7f745e Translated using Weblate (Japanese) 
Currently translated at 50.4% (1384 of 2744 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
 2021-02-04 10:00:46 +00:00
Ihor Hordiichuk
b9d8a79a3b Translated using Weblate (Ukrainian) 
Currently translated at 53.6% (1471 of 2744 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-02-04 10:00:44 +00:00
Tim Al
691ed95dbf Translated using Weblate (Dutch) 
Currently translated at 77.6% (2130 of 2744 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-02-04 10:00:43 +00:00
Tomer Cohen
7ed0e937ef Translated using Weblate (Hebrew) 
Currently translated at 98.9% (2714 of 2744 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/he/
 2021-02-04 10:00:43 +00:00
Yaron Shahrabani
85dc7fc0b3 Translated using Weblate (Hebrew) 
Currently translated at 98.9% (2714 of 2744 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/he/
 2021-02-04 10:00:42 +00:00
Travis Ralston
20e6501366
Merge pull request #5618 from matrix-org/travis/rel-stickerpickerfix 
[Release] Fix z-index of stickerpicker
 2021-02-04 03:00:38 -07:00
Travis Ralston
5130347621
Merge pull request #5617 from matrix-org/travis/stickerpicker-zindex 
Fix z-index of stickerpicker
 2021-02-04 03:00:31 -07:00
Travis Ralston
bf3c27a37d Fix z-index of stickerpicker 2021-02-04 02:54:25 -07:00
Travis Ralston
97584af947 Fix z-index of stickerpicker 2021-02-04 02:50:54 -07:00
dangwynne
88aa2a6f70 fix whitespace change. Signed-off-by: Dan Gwynne dangwynne1@gmail.com 2021-02-04 09:33:21 +00:00
dangwynne
c1823e2e5a
Close current modal when session is logged out 2021-02-03 22:31:28 +00:00
Šimon Brandner
b73227eaca
Merge branch 'develop' into fix-icon-position 2021-02-03 18:46:45 +01:00
Šimon Brandner
b8ee23cdf4
Make consistent for all events 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-03 18:41:09 +01:00
Weblate
3986c0556b Merge branch 'origin/develop' into Weblate. 2021-02-03 16:30:56 +00:00
J. Ryan Stinnett
7489011ab7
Merge pull request #5615 from matrix-org/jryans/pill-room-via 
Fix permalink via parsing for rooms
 2021-02-03 16:30:48 +00:00
J. Ryan Stinnett
474c029db5 Fix permalink via parsing for rooms 
This adjusts the app local link parsing path to better handle `via`s in query
params. Previously this path only expected them when an event ID was also
present, but it's also valid to have `via`s without event IDs as well.

Fixes https://github.com/vector-im/element-web/issues/16345
 2021-02-03 15:18:19 +00:00
J. Ryan Stinnett
fd7c50f683 Move route splitting inside route parsing 2021-02-03 14:05:22 +00:00
Weblate
94c522440b Merge branch 'origin/develop' into Weblate. 2021-02-03 12:11:45 +00:00
RiotRobot
bd538823cf Reset matrix-js-sdk back to develop branch 2021-02-03 12:11:07 +00:00
RiotRobot
9840ac6f17 Resetting package fields for development 2021-02-03 12:10:42 +00:00
RiotRobot
b770d8d214 Merge branch 'master' into develop 2021-02-03 12:10:13 +00:00