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

29934 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
560a8412d0
Merge pull request #5482 from matrix-org/travis/fix-confetti 
Only show confetti if the current room is receiving an appropriate event
 2020-12-09 12:06:50 -07:00
Travis Ralston
3e3a32cf10 Only show confetti if the current room is receiving an appropriate event 2020-12-09 11:56:57 -07:00
Michael Telatynski
d05ad1e36c
Merge pull request #5481 from matrix-org/t3chguy/fix/15905 
Throttle RoomState.members handler to improve performance
 2020-12-09 12:53:34 +00:00
Michael Telatynski
91ae8df423
Merge pull request #5477 from matrix-org/t3chguy/fix/15913 
Handle manual hs urls better for the server picker
 2020-12-09 11:32:33 +00:00
Michael Telatynski
5be65a525d Improve identifiers and code readability 2020-12-09 11:14:06 +00:00
Michael Telatynski
412d84ccb2 improve comments 2020-12-09 11:09:18 +00:00
Michael Telatynski
ecb0b0113f Also use getJoinedMemberCount as its capable of using the room summary member count instead 
Leave the useRoomMembers hook for future use as it is very useful.
 2020-12-09 11:07:40 +00:00
Michael Telatynski
184c73cca4 Throttle RoomState.members handler to improve performance 
Lazy Loading emits a RoomState.members for each member which in the case of a room like
Matrix HQ means it happens over 8000 times in a very short span of time causing the UI
to lock up.
 2020-12-09 11:02:30 +00:00
J. Ryan Stinnett
5f4320e80d
Merge pull request #5479 from matrix-org/jryans/add-olm 
Add Olm as a dev dependency for types
 2020-12-08 16:50:23 +00:00
J. Ryan Stinnett
49bd7887d2 Add Olm as a dev dependency for types 
Fixes https://github.com/vector-im/element-web/issues/15803
 2020-12-08 16:18:12 +00:00
Michael Telatynski
05e6b52191
Merge pull request #5476 from matrix-org/t3chguy/fix/15895 
Hide Invite to this room CTA if no permission
 2020-12-08 15:33:33 +00:00
Michael Telatynski
9a9b0433ce
Merge pull request #5478 from matrix-org/t3chguy/fix/15923 
Fix width of underline in server picker dialog
 2020-12-08 15:32:06 +00:00
Travis Ralston
36c65b8684
Merge pull request #5475 from matrix-org/travis/confetti-2 
Fix confetti room unread state check
 2020-12-08 07:54:39 -07:00
Michael Telatynski
d77c5b46eb Fix width of underline in server picker dialog 2020-12-08 11:56:42 +00:00
Michael Telatynski
e896b009f1 Handle manual hs urls better 2020-12-08 10:58:16 +00:00
Michael Telatynski
9f9699bf75 Hide Invite to this room CTA if no permission 2020-12-08 10:31:40 +00:00
Travis Ralston
f30d2ff1c5 Fix confetti room unread state check 
Turns out that if you want confetti from other people you would need to have rooms on "All Messages" or higher - this isn't as fun for those of us who have most of our rooms as Mentions Only.
 2020-12-07 16:54:09 -07:00
Travis Ralston
603a1c8ffb Fix linter 2020-12-07 15:37:26 -07:00
Travis Ralston
87dbc82a9f Merge branch 'feature_confetti#14676' into develop 2020-12-07 15:12:45 -07:00
Travis Ralston
550a5220d9 Undocumented linter cleanup 2020-12-07 15:12:26 -07:00
Travis Ralston
2c992c456e Merge remote-tracking branch 'origin/develop' into feature_confetti#14676 2020-12-07 14:58:56 -07:00
Travis Ralston
f5ce50a472
Merge pull request #5391 from su-ex/fix-inverted-settings-default 
Fix inverted settings default value
 2020-12-07 14:51:28 -07:00
Michael Telatynski
14600adf66
Merge pull request #5474 from matrix-org/t3chguy/socials 
Improve usability of the Server Picker Dialog
 2020-12-07 20:08:04 +00:00
Michael Telatynski
499f7e8af7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-12-07 16:08:11 +00:00
Michael Telatynski
d06a00bcce Improve usability of the Server Picker Dialog 2020-12-07 16:05:41 +00:00
Michael Telatynski
52ada641ba
Merge pull request #5473 from schwukas/fixed-typos 
Fix typos in some strings
 2020-12-07 14:35:30 +00:00
Lukas
9bb04a857b Add generated i18n json 2020-12-07 15:21:31 +01:00
J. Ryan Stinnett
07a1754768
Merge pull request #5472 from matrix-org/dependabot/npm_and_yarn/highlight.js-10.4.1 
Bump highlight.js from 10.1.2 to 10.4.1
 2020-12-07 12:58:21 +00:00
RiotRobot
7d41604569 Reset matrix-js-sdk back to develop branch 2020-12-07 12:33:18 +00:00
RiotRobot
6360bc7a01 Merge branch 'master' into develop 2020-12-07 12:32:20 +00:00
RiotRobot
fefe84d101 v3.10.0 2020-12-07 12:31:08 +00:00
RiotRobot
ae835fb8a9 Prepare changelog for v3.10.0 2020-12-07 12:31:07 +00:00
RiotRobot
1241b7c335 Upgrade matrix-js-sdk to 9.3.0 2020-12-07 12:13:04 +00:00
J. Ryan Stinnett
d967f01055
Merge pull request #5471 from matrix-org/jryans/rm-temp-test-sl 
Remove old app test script path
 2020-12-07 10:18:31 +00:00
Lukas
a856484139 Fix typos in some strings 
This commit fixes some typos that I've stumbled upon.
 2020-12-06 10:32:52 +01:00
dependabot[bot]
58eaccbba8
Bump highlight.js from 10.1.2 to 10.4.1 
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 10.1.2 to 10.4.1.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/master/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/10.1.2...10.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-04 17:35:40 +00:00
J. Ryan Stinnett
c13891c670
Merge pull request #5260 from orangecms/redact-with-reason 
add support for giving reason when redacting
 2020-12-04 15:13:40 +00:00
J. Ryan Stinnett
c63c8540f1 Remove old app test script path 
Now that https://github.com/matrix-org/pipelines/pull/112 has merged, we no
longer need to support this old path for launching app-level tests.
 2020-12-04 11:05:05 +00:00
David Baker
0154c5aef1
Merge pull request #5469 from matrix-org/dbkr/fetchdep_netlify 
Add support for Netlify to fetchdep script
 2020-12-03 19:00:03 +00:00
David Baker
c853085e29 Add support for Netlify to fetchdep script 
and remove support for Jenkins
 2020-12-03 18:40:33 +00:00
J. Ryan Stinnett
624e43823e
Merge pull request #5467 from matrix-org/jryans/netlify 
Nest other layers inside on automation
 2020-12-03 16:41:24 +00:00
J. Ryan Stinnett
883d5d96a7 Nest other layers inside on automation 
This changes the nesting style because some CI / CD systems do not allow moving
to a directory above the checkout for the primary repo (`react-sdk` in this
case).

Part of https://github.com/vector-im/element-web/issues/12624
 2020-12-03 16:21:40 +00:00
J. Ryan Stinnett
3dfa535c8c
Merge pull request #5466 from matrix-org/jryans/rebrand-ci 
Rebrand various CI scripts and modules
 2020-12-03 16:04:30 +00:00
Travis Ralston
af49030b2f
Merge pull request #5462 from matrix-org/travis/widget-sanity-2 
Add more widget sanity checking
 2020-12-03 08:50:46 -07:00
Michael Telatynski
b200211660
Merge pull request #5465 from matrix-org/t3chguy/socials 
Fix React complaining about unknown DOM props
 2020-12-03 15:20:16 +00:00
Michael Telatynski
1e80c936c4
Merge pull request #5464 from matrix-org/t3chguy/fix/15882 
Jump to home page when leaving a room
 2020-12-03 15:19:58 +00:00
J. Ryan Stinnett
a6e69db8f5 Rebrand E2E test Docker image 2020-12-03 14:56:24 +00:00
J. Ryan Stinnett
cdc57cf1f5 Add temporary symlink for pipeline 2020-12-03 13:58:25 +00:00
J. Ryan Stinnett
1fda735222 Rebrand various CI scripts and modules 
This replaces Riot with Element in various CI scripts, modules, parameters, etc.
This _should_ be the last major rebranding pass (hopefully).

Fixes https://github.com/vector-im/element-web/issues/14894
 2020-12-03 13:56:27 +00:00
Michael Telatynski
1afece9a14 Fix React complaining about unknown DOM props 2020-12-03 12:20:48 +00:00