Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
69,131 Commits 1 Branch 646 Tags
develop
Commit Graph

69131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RiotRobot 41deac302f v1.10.15 2022-06-14 14:58:08 +01:00
RiotRobot 6fa3cb2a3d Prepare changelog for v1.10.15 2022-06-14 14:58:07 +01:00
Michael Telatynski 40b77778f8 Abstract electron settings properly to avoid boilerplate-hell (#375) 
(cherry picked from commit 840a69451b)
 2022-06-14 14:54:20 +01:00
RiotRobot b69d4b6346 Reset matrix-react-sdk back to develop branch 2022-06-14 14:49:43 +01:00
RiotRobot a7260f004e Reset matrix-js-sdk back to develop branch 2022-06-14 14:49:30 +01:00
RiotRobot b400463ff3 Merge branch 'master' into develop 
# Conflicts:
#	package.json
#	yarn.lock
 2022-06-14 14:48:50 +01:00
RiotRobot ba38b73a15 v1.10.15 v1.10.15 2022-06-14 14:33:17 +01:00
RiotRobot 4013651ae2 Prepare changelog for v1.10.15 2022-06-14 14:33:16 +01:00
RiotRobot e0adf93e21 Upgrade matrix-react-sdk to 3.47.0 2022-06-14 14:29:51 +01:00
Michael Telatynski 3a4ac1373c Abstract electron settings properly to avoid boilerplate-hell (#22491) 
* Remove unused method `BasePlatform::screenCaptureErrorString`

* Extract SeshatIndexManager into its own file

* Improve platform typescripting

* Consolidate IPC call promisification into IPCManager

* Abstract electron settings properly to avoid boilerplate-hell

* i18n

* Iterate PR

(cherry picked from commit 2c0965c240)
 2022-06-14 14:28:14 +01:00
RiotRobot 7d14d15ba6 Merge remote-tracking branch 'origin/develop' into develop 2022-06-14 14:21:33 +01:00
Suguru Hirahara 1dee39f419 Improve help user settings tab styling (#8838) 
* Set the default margin between the debug button and the subsection texts

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove obsolete style rule for AccessibleButton

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove the special block margin setting from the reload button

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove obsolete class name - mx_HelpUserSettingsTab_versions

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Replace <br>s for spacing with a margin style declaration

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Replace <br> for spacing with a margin style declaration

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove <br>s for spacing

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Apply mx_SettingsTab_subsectionText to the credits list

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Apply spacing-16 instead of spacing-12

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
 2022-06-14 15:20:54 +02:00
RiotRobot 045d895f1c Merge branch 'master' into develop 2022-06-14 14:20:17 +01:00
RiotRobot 7ed87092c9 v3.47.0 2022-06-14 14:05:11 +01:00
RiotRobot 985f9e353c Prepare changelog for v3.47.0 2022-06-14 14:05:10 +01:00
Michael Weimann 6e786d6cd5 Prevent level order to be modified (#8821) 
(cherry picked from commit b87c537885)
 2022-06-14 13:54:17 +01:00
Michael Telatynski d6c162a5cf Abstract electron settings properly to avoid boilerplate-hell (#8798) 
* Remove unused method `BasePlatform::screenCaptureErrorString`

* Improve platform typescripting

* Remove redundant awaits

* Abstract electron settings properly to avoid boilerplate-hell

* i18n

* Fix stray semi-colons

* Fix setting level order for Platform settings

(cherry picked from commit ba2ce5ecba)
 2022-06-14 13:54:08 +01:00
Šimon Brandner ec9117dbd1 Improve Typescript in BasePlatform (#8768) 
* Improve Typescript in `BasePlatform`

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* `installUpdate()` should not be abstract

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
(cherry picked from commit 125a265806)
 2022-06-14 13:53:46 +01:00
Šimon Brandner 0841aca2a4 Fix CallView crash (#8735) 
(cherry picked from commit 6574c5c3e2)
 2022-06-14 13:51:44 +01:00
Suguru Hirahara d1b95e5491 Remove obsolete style rules for "Show my Communities" which has been removed (#8839) 
Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
 2022-06-14 13:43:51 +01:00
Michael Telatynski 79195dea8b Skip running jobs on fork develop where they lack secrets (#8837) 
* Skip running jobs on fork `develop` where they lack secrets

* Fix contexts
 2022-06-14 11:37:07 +01:00
Michael Telatynski 2ea12ea68d Skip running jobs on fork develop where they lack secrets (#22561) 
* Skip running jobs on fork `develop` where they lack secrets

* Fix contexts
 2022-06-14 11:30:12 +01:00
Suguru Hirahara 2c751a4fa6 Remove unique settings from labs user settings tab (#8828) 
* Remove redundant style declarations

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove obsolete float setting

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove special margin setting

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove unnecessary specificity

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Reset the margin with a variable

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
 2022-06-14 09:05:43 +02:00
Michael Telatynski b03aa2ebf5 Move room directory Puppeteer tests over to Cypress (#8832) 
* Fix user view percy test by sticking the user avatar colour

* Move room directory Puppeteer tests over to Cypress

* Consolidate import

* Fix tests

* Grab default widths

* Tweak Percy CSS mechanism
 2022-06-13 19:25:39 +01:00
Suguru Hirahara dfdba46d57 Remove _NotificationUserSettingsTab.scss (#8831) 2022-06-13 17:30:07 +02:00
Suguru Hirahara 95e8a9e419 Fix keyboard shortcuts on settings tab being wrapped (#8825) 
* Fix keyboard shortcuts being wrapped

Setting $spacing-8 gap between the labels and the shortcuts

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Add the block margin to the rows, not to the keys

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Add the inline margin to the shortcuts, not to the keys

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
 2022-06-13 16:12:48 +02:00
Michael Telatynski f10d35cb18 Add try-catch around blurhash loading (#8830) 2022-06-13 13:25:32 +01:00
Janne Mareike Koschinski 57dff8131c Prevent new composer from overflowing from non-breakable text (#8829) 2022-06-13 13:05:41 +02:00
Suguru Hirahara cda18a3dfb Improve CSS rules of zoom buttons on live location (#8728) 
* Use flex to stop redundant margin-top from appearing

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove ButtonResetDefault which resets nothing

It should be avoided to use ButtonResetDefault where there is nothing to be reset, in order to prevent resources from being wasted.

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Ensure that unexpected regressions will never happen on the buttons and their icons

Rules can be extracted when needed. Until then there is no point of exposing elements to possible regressions, which could easily happen on the current architecture.

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Use SASS variables and remove a redundant declaration

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
 2022-06-13 09:23:49 +02:00
Suguru Hirahara 68ce7bf35e Remove an obsolete style declaration of .mx_ReplyChain_show (#8743) 
It was added with https://github.com/matrix-org/matrix-react-sdk/pull/6291/files#diff-11808ff6468e6efa5982f414119fcc8a3a3eea4090b1a4ebda8ed6eae732418aR163

It has not been effective for unknown period, and since the layout of the area has changed, it should be able to be safely removed.

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
 2022-06-13 09:17:48 +02:00
Michael Weimann b87c537885 Prevent level order to be modified (#8821) 2022-06-13 08:03:16 +02:00
Suguru Hirahara 18d7f7c525 Use mx_SettingsTab_subsectionText for the text under the top header of appearance user settings tab (#8822) 2022-06-12 14:52:55 +00:00
Suguru Hirahara d1d4cc42bc Use common subheading on sidebar user settings tab (#8823) 2022-06-12 15:12:34 +02:00
Suguru Hirahara 6b40c0b2e3 Tidy _AppearanceUserSettingsTab.scss (#8824) 2022-06-12 15:11:33 +02:00
Suguru Hirahara 89743c9321 Fix clickable area of advanced toggle on appearance user settings tab (#8820) 2022-06-12 13:13:41 +02:00
Travis Ralston b5e18064ab Import React to appease IDE linter (#8817) 
Apparently we shouldn't be using global references to React, so import it.
 2022-06-11 21:17:55 +00:00
Michael Telatynski ba2ce5ecba Abstract electron settings properly to avoid boilerplate-hell (#8798) 
* Remove unused method `BasePlatform::screenCaptureErrorString`

* Improve platform typescripting

* Remove redundant awaits

* Abstract electron settings properly to avoid boilerplate-hell

* i18n

* Fix stray semi-colons

* Fix setting level order for Platform settings
 2022-06-10 22:38:50 +01:00
Michael Telatynski 840a69451b Abstract electron settings properly to avoid boilerplate-hell (#375) 2022-06-10 22:38:48 +01:00
Michael Telatynski 2c0965c240 Abstract electron settings properly to avoid boilerplate-hell (#22491) 
* Remove unused method `BasePlatform::screenCaptureErrorString`

* Extract SeshatIndexManager into its own file

* Improve platform typescripting

* Consolidate IPC call promisification into IPCManager

* Abstract electron settings properly to avoid boilerplate-hell

* i18n

* Iterate PR
 2022-06-10 22:38:46 +01:00
Jan Christian Grünhage fa5f42a627 support compilation on more targets (#376) 
* support compilation on more targets

* Update scripts/hak/target.ts

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2022-06-10 20:51:34 +00:00
Šimon Brandner 9b8b1d193e Disable redacting reactions if we don't have sufficient permissions (#8767) 2022-06-10 18:41:05 +00:00
Robin 867fc30ebf Work around a Jitsi bug with display name encoding (#22525) 2022-06-10 12:21:49 -04:00
Michael Telatynski 3f99f594de Keep draft in composer when a slash command syntax errors (#8811) 2022-06-10 17:16:31 +01:00
Travis Ralston 4171c008a4 Convert sticker end-to-end tests to Cypress (#8807) 
* Convert sticker end-to-end tests to Cypress

Reference materials:
* https://www.cypress.io/blog/2020/02/12/working-with-iframes-in-cypress/
* https://github.com/cypress-io/cypress/issues/136
* https://docs.cypress.io/api/commands/origin#Other-limitations

Ideally we'd be able to use `cy.origin()` to jump into the iframe, but it's explicitly not supported. Instead we disable web security as instructed by cypress because it's our only reasonable option here. Thankfully, disabling web security doesn't appear to remove the crypto libraries from the browser so we can still function in that respect.

Rationale for why we can't just serve the sticker picker off the app domain is included in the code.

* Appease the linter

* More linter appeasement
 2022-06-10 09:24:15 -06:00
Michael Telatynski 5b149bcffd Use a fixed matrix-org/github-action-benchmark (#8810) 2022-06-10 15:42:51 +01:00
Robin 53340db5e9 Update the live timeline when the JS SDK resets it (#8806) 2022-06-10 08:59:07 -04:00
Suguru Hirahara 1b7e9d95da Fix flex blowout on image reply (#8809) 
* Set min-width to prevent a flex blowout

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Use a native spacing property

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Set max-width: 100% to display name inside the image reply

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
 2022-06-10 12:36:17 +01:00
Suguru Hirahara 0d3fe300aa Enable background color on hover for chat panel and thread panel (#8644) 
* Enable background color on hover for chat panel and thread panel

- Display reactions row on hover
- Use variables

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Replace --BaseCard_EventTile-spacing-horizontal with --BaseCard_EventTile-spacing-inline

- horizontal: inline
- vertical: block

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* mx_EventTile.mx_EventTile_bad[data-layout=bubble] seems to require bubble layout

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* yarn run lint:style --fix

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
 2022-06-10 10:21:22 +02:00
Robin 8e9f7407e9 Allow AppTiles to shrink as much as necessary (#8805) 2022-06-09 13:30:58 -04:00
Robin e024a08271 Merge pull request #350 from robintown/video-rooms-beta 
Make video rooms opt-out on Nightly
 2022-06-09 13:08:06 -04:00