mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-25 10:45:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
30472 commits 203 branches 553 tags 407 MiB
Commit graph

30472 commits

This branch
This branch
All branches
Author SHA1 Message Date
Šimon Brandner
58b2c18cf5
This somehow works 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 21:02:39 +01:00
Šimon Brandner
95939f3d6c
Added _wrapInDiv() method 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 18:21:59 +01:00
Šimon Brandner
e6ab47ff76
Fix bug 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 17:30:02 +01:00
Šimon Brandner
61281a855c
Redo expanding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 16:35:32 +01:00
Šimon Brandner
45d0270bca
Merge branch 'develop' into expand-codeblock 2021-01-18 19:08:24 +01:00
Michael Telatynski
7b882c6393
Merge pull request #5552 from 2580ayush2580/ayush25801 
Fixed continue button while selecting home-server
 2021-01-18 17:24:00 +00:00
Šimon Brandner
8a4af2f348
Merge branch 'develop' into expand-codeblock 2021-01-18 17:54:06 +01:00
Šimon Brandner
49dce58027
Added expanding based on the option 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-18 17:49:09 +01:00
Šimon Brandner
7f727be4f6
Added expand code block option 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-18 17:44:32 +01:00
Ayush Kumar
530a242aae Fixed continue button while selecting home server 2021-01-18 21:41:10 +05:30
Travis Ralston
83fb698bbc
Merge pull request #5527 from matrix-org/travis/widget-nav 
Wire up MSC2931 widget navigation
 2021-01-18 09:09:32 -07:00
RiotRobot
6c8e6096da Reset matrix-js-sdk back to develop branch 2021-01-18 15:16:31 +00:00
RiotRobot
5455b90c98 Resetting package fields for development 2021-01-18 15:16:18 +00:00
RiotRobot
82d90b2567 Merge branch 'master' into develop 2021-01-18 15:16:17 +00:00
RiotRobot
5a54bb0e7f v3.12.0 2021-01-18 15:14:53 +00:00
RiotRobot
5cf6d57883 Prepare changelog for v3.12.0 2021-01-18 15:14:52 +00:00
RiotRobot
c4570cdaee Upgrade matrix-js-sdk to 9.5.0 2021-01-18 15:09:22 +00:00
RiotRobot
9d75a796d8 Merge branch 'release-v3.12.0' of github.com:matrix-org/matrix-react-sdk into release-v3.12.0 2021-01-18 14:58:52 +00:00
Will Hunt
117d8843c4
Merge pull request #5454 from matrix-org/hs/bridge-info-v2 
Various fixes for Bridge Info page (MSC2346)
 2021-01-18 13:19:15 +00:00
Will Hunt
e9d2daab8f fix strings 2021-01-18 13:09:39 +00:00
Will Hunt
74b5febb9c oops strings 2021-01-18 11:38:49 +00:00
Will Hunt
d71b2cf04f Merge remote-tracking branch 'origin/develop' into hs/bridge-info-v2 2021-01-18 11:36:46 +00:00
Will Hunt
461c0733d9 Revert strings 2021-01-18 11:36:35 +00:00
J. Ryan Stinnett
1c5a234b93
Merge pull request #5547 from matrix-org/jryans/listener-overload 
Use room-specific listeners for message preview and community prototype
 2021-01-18 10:57:56 +00:00
Travis Ralston
f6a328a55b Update widget api 2021-01-16 23:34:16 -07:00
Travis Ralston
ea61c979f9 Try a different string 2021-01-16 23:29:27 -07:00
Travis Ralston
bebcabcde4 Merge branch 'develop' into travis/widget-nav 2021-01-16 23:28:11 -07:00
J. Ryan Stinnett
462e0889f0 Fix lint 2021-01-15 14:46:38 +00:00
J. Ryan Stinnett
8a341446aa Use room-specific listeners for community prototype 
Similar to message previews, this changes another area to use room-specific
listeners for better performance and avoiding warnings.
 2021-01-15 14:34:56 +00:00
J. Ryan Stinnett
729356394e Use room-specific listeners for message previews 
This should be a bit faster (since we now only notify one tile instead of all
for each update). It also resolves the max listener warning.

Fixes https://github.com/vector-im/element-web/issues/15121
 2021-01-15 14:21:21 +00:00
J. Ryan Stinnett
48a3154ab6
Merge pull request #5546 from matrix-org/jryans/react-warnings 
Fix some misc. React warnings when viewing timeline
 2021-01-15 13:55:04 +00:00
J. Ryan Stinnett
80f3e14faf Move LoggedInView subscriptions to after mounted 
This avoids a React warning about trying to call `setState` before the component
is mounted.
 2021-01-15 13:20:49 +00:00
J. Ryan Stinnett
e90009772d Fix React warnings about missing key for edited messages 
This uses a fragment instead of an array to avoid the need for key attributes.
 2021-01-15 13:20:49 +00:00
J. Ryan Stinnett
266162fa32
Merge pull request #5544 from matrix-org/jryans/guest-allow-widget 
Use device storage for allowed widgets if account data not supported
 2021-01-14 17:50:47 +00:00
J. Ryan Stinnett
97a551c04a Fix test 2021-01-14 17:39:58 +00:00
J. Ryan Stinnett
6d932e1352 Fix lint errors 2021-01-14 17:38:06 +00:00
J. Ryan Stinnett
accbe78d9a Add null path 2021-01-14 17:37:18 +00:00
J. Ryan Stinnett
658a8dfa99 Use device storage for allowed widgets if account data not supported 
With guest accounts, account data is not available, so we use device storage to
hold allowed widgets as a good enough place.

Fixes https://github.com/vector-im/element-web/issues/16145
 2021-01-14 17:30:25 +00:00
J. Ryan Stinnett
cb66f7493b Skip account settings for guest users 
Homeservers don't allow this currently, so we should use something else instead
for such cases.
 2021-01-14 15:58:27 +00:00
David Baker
35965aa276
Merge pull request #5543 from matrix-org/dbkr/fix_incoming_call_dark_theme_rel 
Fix incoming call box on dark theme
 2021-01-13 18:02:46 +00:00
David Baker
7f51553723
Merge pull request #5542 from matrix-org/dbkr/fix_incoming_call_dark_theme 
Fix incoming call box on dark theme
 2021-01-13 17:06:22 +00:00
David Baker
1b98ada55f Actually this is right colour 2021-01-13 17:05:02 +00:00
David Baker
d4470d2ed2 Actually this is right colour 2021-01-13 16:55:38 +00:00
David Baker
604b9378ce
Merge pull request #5541 from matrix-org/dbkr/dmroommap_ts 
Convert DMRoomMap to typescript
 2021-01-13 16:23:30 +00:00
David Baker
6371a4abd1 Fix tests 
Remove stray file extensions in includes and update shared instance
name.
 2021-01-13 16:02:35 +00:00
David Baker
008fdf8dfb Missed some underscores 2021-01-13 15:44:33 +00:00
David Baker
28fe6291d9 add public/privates & de-underscore 2021-01-13 15:37:49 +00:00
David Baker
20283eabe0 Fix incoming call box on dark theme 2021-01-13 15:33:22 +00:00
David Baker
150e8c9d56 Fix incoming call box on dark theme 2021-01-13 15:31:26 +00:00
David Baker
ea31d5821b Unintnetional commit (again) 2021-01-13 14:54:12 +00:00