Commit graph

30499 commits

Author SHA1 Message Date
Š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
Š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
Šimon Brandner
5ca9e8d323
Remove spaces
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 18:18:07 +01:00
Šimon Brandner
828d401c6c
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 17:37:22 +01:00
Šimon Brandner
f1a3240ec3
Merge branch 'develop' into improve-codeblock 2021-01-21 17:36:22 +01:00
Šimon Brandner
c7e61ac71d
Rerender MessagePanel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 17:32:57 +01:00
Travis Ralston
f52405de38
Merge pull request #5557 from matrix-org/travis/fix-widget-resizing
Give a bigger target area to AppsDrawer vertical resizer
2021-01-21 07:17:29 -07:00
J. Ryan Stinnett
14556de3d5
Merge pull request #5493 from SimonBrandner/fix-left-panel-alignment
Fix minimized left panel avatar alignment
2021-01-21 13:37:36 +00:00
Šimon Brandner
97c5058f00
Removed log
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 13:10:21 +01:00
Šimon Brandner
da09362f99
Added option to hide line numbers
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 13:08:55 +01:00
Šimon Brandner
c737543114
Remove commented lines
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 13:04:51 +01:00
Šimon Brandner
bd2423a52c
Added line numbering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 10:53:18 +01:00
Travis Ralston
c7c055dd98 Give a bigger target area to AppsDrawer vertical resizer
The existing target was too hard to hit, which annoyed users. This change makes it the same sort of surface area as the horizontal resizers, as requested by design to fix the problem in the short term.
2021-01-20 15:05:18 -07:00
Šimon Brandner
14bf169631
Handle small codeblocks
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 15:01:23 +01:00
Šimon Brandner
f8179f0c7a
Fix inverted icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 14:08:57 +01:00
Šimon Brandner
19be3293e0
Remove commented code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 13:06:08 +01:00
Šimon Brandner
25f30ca79f
Fix indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 13:05:23 +01:00
Šimon Brandner
072cbe98b5
Simplifie
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 13:03:05 +01:00
Šimon Brandner
8535a11dd2
Rename some variable and cleanup a bit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 08:44:32 +01:00
Šimon Brandner
58b2c18cf5
This somehow works
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-19 21:02:39 +01:00
J. Ryan Stinnett
3115c4f3f3 Show only preview buttons in directory for guest users
This aligns the room directory with the rest of Element Web so that it does not
allow guest users to join rooms. Instead, we show preview buttons (even when the
preview might not actually happen).

Fixes https://github.com/vector-im/element-web/issues/16213
2021-01-19 17:59:30 +00:00
J. Ryan Stinnett
016140670b Fix let binding in reskindex.js 2021-01-19 17:58:17 +00: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
J. Ryan Stinnett
4cfd6e53aa
Merge pull request #5556 from matrix-org/jryans/fix-tmp-reskindex
Ensure component index has been written before renaming
2021-01-19 15:19:25 +00:00
J. Ryan Stinnett
4e5f25206a Ensure component index has been written before renaming
This ensures we correctly wait for `component-index.js.tmp` to be written to
disk before trying to rename into place. This fixes an issue where stray temp
files were being strewn about the repos after renaming failures.
2021-01-19 14:45:03 +00:00
J. Ryan Stinnett
0e137bd0f6 Fix code style 2021-01-19 14:42:10 +00:00
J. Ryan Stinnett
a22049a679 Use const / let instead of var 2021-01-19 14:38:36 +00: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