OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
33,992 Commits
211 Branches
549 Tags
658 MiB
Commit Graph

33992 Commits (b380e43e4f6407406d4050d60d2057266a8d6dba)

Author SHA1 Message Date
Germain Souquet 15132074e2 Restore copy button icon when sharing permalink 2021-06-09 13:44:31 +01:00
Germain Souquet 4e14c612b7 Remove extraenous instructions 2021-06-09 12:17:49 +01:00
Germain Souquet 90cc26c78f rename workflow 2021-06-09 12:17:12 +01:00
Germain Souquet 6e0a908c59 Merge branch 'develop' into gsouquet/react-17 2021-06-09 12:01:35 +01:00
Germain Souquet d492ee4d8a Update Enzyme adapter name 2021-06-09 11:57:29 +01:00
Germain Souquet 85d1bb65c6 Upgrade to React@17 2021-06-09 11:40:20 +01:00
Germain c9b1d1aef0
Only run e2e tests on develop and PR targetting develop 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-06-09 10:38:28 +01:00
Germain 8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf 2021-06-09 09:13:56 +01:00
Šimon Brandner fccd71f82e
Update styling based on review 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-09 06:23:51 +02:00
Robin Townsend a28f5754c7 Convert TextForEvent to TypeScript 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-08 21:58:48 -04:00
Travis Ralston 624aed053a
Merge pull request #6164 from matrix-org/dependabot/npm_and_yarn/css-what-5.0.1 
Bump css-what from 5.0.0 to 5.0.1
 2021-06-08 14:13:25 -06:00
dependabot[bot] dbb8aa47dc
Bump css-what from 5.0.0 to 5.0.1 
Bumps [css-what](https://github.com/fb55/css-what) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/fb55/css-what/releases)
- [Commits](https://github.com/fb55/css-what/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: css-what
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 20:08:39 +00:00
Travis Ralston 692200b9c5
Merge pull request #6145 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/ws-6.2.2 
Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests
 2021-06-08 14:08:24 -06:00
Travis Ralston 16ddf18e69
Merge pull request #6163 from matrix-org/dependabot/npm_and_yarn/trim-newlines-3.0.1 
Bump trim-newlines from 3.0.0 to 3.0.1
 2021-06-08 14:08:02 -06:00
dependabot[bot] 7155c033f2
Bump trim-newlines from 3.0.0 to 3.0.1 
Bumps [trim-newlines](https://github.com/sindresorhus/trim-newlines) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sindresorhus/trim-newlines/releases)
- [Commits](https://github.com/sindresorhus/trim-newlines/commits)

---
updated-dependencies:
- dependency-name: trim-newlines
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 19:20:10 +00:00
Michael Telatynski 2938bfbadf
Merge pull request #6162 from matrix-org/t3chguy/fix/17596 
Fix upgrade to element home button in top left menu
 2021-06-08 17:48:45 +01:00
Michael Telatynski 90982f9b3f Fix upgrade to element home button in top left menu 2021-06-08 17:31:08 +01:00
Michael Telatynski 2b99afc741 i18n 2021-06-08 17:05:56 +01:00
Michael Telatynski f34a2e61bc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 2021-06-08 16:54:49 +01:00
Michael Telatynski 34cc494a8e
Merge pull request #6140 from matrix-org/t3chguy/fix/17553 2021-06-08 16:45:35 +01:00
Michael Telatynski 93eb9feaa7 iterate PR based on feedback 2021-06-08 16:42:58 +01:00
Michael Telatynski f84ee22769 Add comment 2021-06-08 16:36:53 +01:00
David Baker 399be4fa5d
Merge pull request #6161 from matrix-org/dbkr/widget_load_error 
Better handling for widgets that fail to load
 2021-06-08 16:28:44 +01:00
David Baker 90a58380fd Make it translateable 
And also the other one that I copied from
 2021-06-08 16:15:20 +01:00
Šimon Brandner bf77a4a2ab
Merge remote-tracking branch 'upstream/develop' into show-username 2021-06-08 17:14:42 +02:00
Germain Souquet 5c62728d13 Migrate end to end tests pipeline to GitHub Actions 2021-06-08 12:52:32 +01:00
David Baker 26a030abcd Better handling for widgets that fail to load 2021-06-08 12:40:38 +01:00
Michael Telatynski 432373a00e
Merge pull request #5999 from robintown/improved-forwarding-ui 2021-06-08 10:52:06 +01:00
Michael Telatynski 826d56585e
Merge pull request #6118 from aaronraimist/share-room 2021-06-08 09:03:49 +01:00
Robin Townsend 372f24ff99 Hide download links from forward dialog preview 
since trying to interact with them is pointless.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-07 19:19:14 -04:00
Robin Townsend b00ad63a35 Fix whitespace nitpick 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-07 19:16:00 -04:00
Robin Townsend a8dab04d5e Remove mystery dot from forward dialog preview 
It was a bullet point, since EventTiles now get created as li by default
:P

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-07 19:10:45 -04:00
Robin Townsend b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00
Aaron Raimist 946416cf87
Make serverCandidates optional 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-06-07 17:09:56 -05:00
Aaron Raimist 9fdbd4c120 Merge branch 'develop' into share-room 2021-06-07 17:00:44 -05:00
Michael Telatynski 65cc42b555
Merge pull request #6160 from robintown/fix-setting-watchers 2021-06-07 22:56:39 +01:00
Aaron Raimist 773af6c7be
Fix test 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-06-07 16:54:53 -05:00
Aaron Raimist a5bf17ff65
Revert incorrect change to forShareableRoom 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-06-07 16:54:41 -05:00
Michael Telatynski ced6c43147
Merge pull request #6152 from matrix-org/t3chguy/fix/17571 
Fix Stickerpicker context menu
 2021-06-07 22:21:19 +01:00
Michael Telatynski 801b5f9c1a
Merge pull request #6155 from matrix-org/t3chguy/spacesteammatewarning 
Add warning to private space creation flow
 2021-06-07 22:21:07 +01:00
Šimon Brandner b39c615abc
Reorder 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 19:44:58 +02:00
Šimon Brandner 4185185cdc
Reduce number of DOM elements 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 19:42:48 +02:00
Šimon Brandner 025148d9fc
Merge branch 'develop' into show-username 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 19:37:22 +02:00
Tirifto ed80db73d4 Translated using Weblate (Esperanto) 
Currently translated at 99.9% (2978 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
 2021-06-07 17:34:41 +00:00
RiotRobot 8ccdf9a3e8 Reset matrix-js-sdk back to develop branch 2021-06-07 17:43:27 +01:00
RiotRobot bcd0ba8d45 Resetting package fields for development 2021-06-07 17:42:46 +01:00
RiotRobot 7e03d03ba2 Merge branch 'master' into develop 2021-06-07 17:42:46 +01:00
RiotRobot a3dac02e4c v3.23.0 2021-06-07 17:41:18 +01:00
RiotRobot 2983b3ace2 Prepare changelog for v3.23.0 2021-06-07 17:41:18 +01:00
Germain c6de1c3fc8
Merge pull request #6159 from matrix-org/gsouquet/fix-showtimestamps-notifpanel 
Add prop to alwaysShowTimestamps on TimelinePanel
 2021-06-07 17:21:19 +01:00