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

32175 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
688407abe6
Merge branch 'develop' into t3chguy/spaces4.9 2021-03-16 11:14:38 +00:00
Michael Telatynski
11cd791c76 Tweak left panel min widths for better flexibility 2021-03-16 11:13:39 +00:00
Michael Telatynski
baaceccfda Rearrange dom hierarchy to put space panel at same level as LeftPanel 
so they don't steal horizontal space from each other
 2021-03-16 11:13:39 +00:00
Michael Telatynski
4ae6c2f808
Merge pull request #5762 from timokoesters/fix-servername-parsing 
fix: make room directory correct when using a homeserver with explicit port
 2021-03-16 10:12:58 +00:00
Šimon Brandner
787a62846e
Merge branch 'develop' into resizable-call-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-16 07:55:56 +01:00
Travis Ralston
0e0ccfea88
Merge pull request #5756 from SimonBrandner/hangup-all-on-logout 
Hangup all calls on logout
 2021-03-15 21:10:13 -06:00
Hubert Chathi
7f141276ff initial work on room history key sharing, take 2 2021-03-15 22:56:56 -04:00
Travis Ralston
78f7711dfd
Merge pull request #5757 from matrix-org/travis/cleanup-login 
Remove now-unused assets and CSS from CompleteSecurity step
 2021-03-15 16:27:53 -06:00
Timo Kösters
f575625c7a
fix: make room directory correct when using a homeserver with explicit port 
Server names are allowed to contain ':' to specify a port, see https://matrix.org/docs/spec/appendices#server-name
User ids on the other hand are not allowed to contain ':', even
historical user ids, see https://matrix.org/docs/spec/appendices#historical-user-ids

Therefore we can use change the regex to make sure the localpart is not
allowed to contain ':'.
 2021-03-15 23:13:16 +01:00
RiotRobot
3154dd6cd4 Add SDK version to changelog 2021-03-15 14:48:40 +00:00
RiotRobot
a696c09e1e Reset matrix-js-sdk back to develop branch 2021-03-15 14:47:08 +00:00
RiotRobot
1d1263c39a Resetting package fields for development 2021-03-15 14:46:57 +00:00
RiotRobot
a9a50663a3 Merge branch 'master' into develop 2021-03-15 14:46:56 +00:00
RiotRobot
44fd41cb1e v3.16.0 2021-03-15 14:45:36 +00:00
RiotRobot
2ef9f3327e Prepare changelog for v3.16.0 2021-03-15 14:45:35 +00:00
RiotRobot
da627dab20 Upgrade matrix-js-sdk to 9.9.0 2021-03-15 14:38:57 +00:00
Michael Telatynski
62983ca48e Fix space panel alignments when no scrollbar is present 2021-03-15 12:57:35 +00:00
Michael Telatynski
272f06d57a Fix Space Panel exploding with cyclic hierarchies 2021-03-15 12:16:48 +00:00
Michael Telatynski
f9eace1729 Rebuild alignment of the menu buttons and notification badges 2021-03-15 11:59:46 +00:00
Michael Telatynski
a2d63f5fb7
Merge pull request #5760 from maunium/allow-details 
Add details and summary to allowed HTML tags
 2021-03-15 09:24:28 +00:00
Tulir Asokan
830080c23e Add details and summary to allowed HTML tags 
Implements MSC2184 (https://github.com/matrix-org/matrix-doc/pull/2184)

Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2021-03-14 19:34:35 +02:00
Clemens Zeidler
228070f533 Fix comment style + improve comments 2021-03-13 21:57:43 +13:00
Travis Ralston
4811154f25 Remove now-unused assets and CSS from CompleteSecurity step 2021-03-12 15:24:16 -07:00
Travis Ralston
9b6d9b3bf1 years are difficult 2021-03-12 15:02:39 -07:00
Travis Ralston
75cfd9a8f5 Redirect to login properly 2021-03-12 15:01:05 -07:00
Travis Ralston
c8d7b0e1b9 Collapse copyright 2021-03-12 14:56:47 -07:00
Travis Ralston
25485edb3f Merge branch 'develop' into travis/welcome-login 2021-03-12 14:55:40 -07:00
Travis Ralston
d3541b78eb
Merge pull request #5714 from matrix-org/travis/media-customization 
Support a media handling customisation endpoint
 2021-03-12 11:01:59 -07:00
libexus
3e50b12548 Translated using Weblate (German) 
Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-03-12 17:49:59 +00:00
Sven Grewe
7854cef727 Translated using Weblate (German) 
Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-03-12 17:49:59 +00:00
Michael Telatynski
6210614ce7 Rebuild space panel layout to resolve weirdness with selections and nesting 2021-03-12 17:37:15 +00:00
@a2sc:matrix.org
442122564f Translated using Weblate (German) 
Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-03-12 17:04:30 +00:00
Sven Grewe
4e267da6ad Translated using Weblate (German) 
Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-03-12 17:04:27 +00:00
libexus
86e13eeba6 Translated using Weblate (German) 
Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-03-12 17:04:26 +00:00
Šimon Brandner
02051a39ff
Hangup all calls on logout 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-12 13:55:14 +01:00
J. Ryan Stinnett
4987359eef
Merge pull request #5718 from panoschal/edit-view-source 
Edit button on View Source dialog that takes you to devtools -> SendCustomEvent
 2021-03-12 11:40:54 +00:00
Clemens Zeidler
a8a8741c06 Make FocusRoomSearch a NavigationAction 2021-03-12 19:40:28 +13:00
Clemens Zeidler
2a21d45ac0 Merge branch 'develop' into key-bindings 2021-03-12 16:44:12 +13:00
Šimon Brandner
5b65f367d3 Use resourceId in plain body 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-11 11:30:09 -07:00
Šimon Brandner
37b6162c25 Use resourceId in formatted body 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-11 11:30:06 -07:00
Travis Ralston
7c8c85161d
Merge pull request #5748 from SimonBrandner/compat-for-non-rich-text-clients 
Show room alias in plain/formatted body
 2021-03-11 11:29:26 -07:00
Šimon Brandner
d4f67d94a4
Use resourceId in plain body 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-11 18:53:06 +01:00
Šimon Brandner
62fa60f109
Use resourceId in formatted body 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-11 18:50:54 +01:00
Michael Telatynski
9ac5f4d2ee
Merge pull request #5754 from panoschal/fix/pills-selection-bug 
Allow pills on the beginning of a part string
 2021-03-11 17:28:45 +00:00
panoschal
104bcdd0b0
Merge branch 'develop' into forgot-password-validation 2021-03-11 19:18:08 +02:00
Panagiotis
a1eabde3a3 fix: create a PillCandidatePart on the beginning of a part string 2021-03-11 19:14:04 +02:00
Travis Ralston
6ab235f10c Fix tests for new call path 
We have to mock `fetch` for the caching of the download icon, and then mock out all the function calls used by components to feed a Media object.
 2021-03-11 09:42:55 -07:00
Travis Ralston
90817f3bc6 Developer documentation 
The lint rules don't currently exist, but would apply to `mxcUrlToHttp` and `getHttpUriForMxc`
 2021-03-11 09:19:59 -07:00
Travis Ralston
a9a4bd50ca Merge branch 'develop' into travis/media-customization 2021-03-11 08:37:49 -07:00
Panagiotis
be7fb33a67 Merge branch 'develop' into edit-view-source 2021-03-11 17:07:56 +02:00