32966 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Travis Ralston	389e0b8e8e	wrong const	2021-05-07 21:11:31 -06:00
Travis Ralston	90798c2c8e	copy/paste will end me one day	2021-05-07 21:09:10 -06:00
Travis Ralston	b007ea81b2	Rescale and smooth playback waveform to better match expectation	2021-05-07 21:06:07 -06:00
Travis Ralston	c2ae6c279b	Merge pull request #5991 from robintown/forbid-encryption-redaction ... Forbid redaction of encryption events	2021-05-07 19:19:55 -06:00
Robin Townsend	119c14c3f9	Forbid redaction of encryption events ... Redacting m.room.encryption events will leave the room in a broken state, and so we shouldn't allow the user to do this. Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-07 12:49:37 -04:00
Travis Ralston	04d566e247	Merge pull request #5988 from matrix-org/travis/voicemessages/glitch-1 ... Fix voice message playback being squished up against send button	2021-05-07 08:00:45 -06:00
Michael Telatynski	1e6c6e9d80	Merge pull request #5983 from matrix-org/t3chguy/fix/16994 ... Improve style of notification badges on the space panel	2021-05-07 13:49:41 +01:00
Michael Telatynski	74bcb921ff	Merge pull request #5990 from matrix-org/t3chguy/ts/parse5 ... Add dev dependency for parse5 typings	2021-05-07 13:49:13 +01:00
Michael Telatynski	6338ced8a3	Merge pull request #5977 from matrix-org/t3chguy/fix/17176 ... Iterate Spaces admin UX around room management	2021-05-07 11:47:45 +01:00
Michael Telatynski	237399f13e	fix button height inconsistency between Chrome & FF	2021-05-07 11:40:39 +01:00
Michael Telatynski	6f28964b49	Merge pull request #5979 from matrix-org/t3chguy/spaces-logs ... Guard all isSpaceRoom calls behind the labs flag	2021-05-07 10:28:14 +01:00
Michael Telatynski	9205b74641	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176	2021-05-07 10:25:06 +01:00
Michael Telatynski	03ca7e0107	move notification dot on the space panel up by 1px	2021-05-07 10:22:56 +01:00
Michael Telatynski	db5c0012c2	Add dev dependency for parse5 typings	2021-05-07 10:11:56 +01:00
Travis Ralston	d270e232fd	Fix voice message playback being squished up against send button ... In the style shuffle of https://github.com/matrix-org/matrix-react-sdk/pull/5970 the playback bar got squished up against the send button. This just fixes the selector to actually hit the composer-based recorder all the time, not just when recording.	2021-05-06 21:41:04 -06:00
Travis Ralston	b5c25498c8	Merge pull request #5986 from matrix-org/dependabot/npm_and_yarn/lodash-4.17.21 ... Bump lodash from 4.17.20 to 4.17.21	2021-05-06 19:14:50 -06:00
Travis Ralston	340b6bb224	Merge pull request #5987 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/lodash-4.17.21 ... Bump lodash from 4.17.19 to 4.17.21 in /test/end-to-end-tests	2021-05-06 19:14:41 -06:00
dependabot[bot]	137189932e	Bump lodash from 4.17.19 to 4.17.21 in /test/end-to-end-tests ... Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-07 01:13:47 +00:00
dependabot[bot]	b37985a5d2	Bump lodash from 4.17.20 to 4.17.21 ... Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-07 01:13:44 +00:00
Travis Ralston	03ad901453	Merge pull request #5984 from matrix-org/dependabot/npm_and_yarn/ua-parser-js-0.7.28 ... Bump ua-parser-js from 0.7.23 to 0.7.28	2021-05-06 19:13:01 -06:00
dependabot[bot]	d924c7a186	Bump ua-parser-js from 0.7.23 to 0.7.28 ... Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.23 to 0.7.28. - [Release notes](https://github.com/faisalman/ua-parser-js/releases) - [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.23...0.7.28) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-06 22:22:53 +00:00
Travis Ralston	d531e3d59f	Merge pull request #5971 from matrix-org/travis/files/visual ... Update visual style of plain files in the timeline	2021-05-06 10:57:22 -06:00
Michael Telatynski	d2fc1c42b0	Improve style of notification badges on the space panel	2021-05-06 15:58:22 +01:00
Michael Telatynski	d9912651d6	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176 ... Conflicts: src/components/structures/SpaceRoomDirectory.tsx	2021-05-06 13:06:50 +01:00
Michael Telatynski	d47eecbd24	Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent	2021-05-06 13:05:58 +01:00
J. Ryan Stinnett	683aec1066	Merge pull request #5833 from SimonBrandner/feed ... Support for multiple streams (not MSC3077)	2021-05-06 11:20:09 +01:00
Michael Telatynski	9518e4d415	Guard all isSpaceRoom calls behind the labs flag	2021-05-05 23:59:07 +01:00
Michael Telatynski	68210b1415	Merge pull request #5963 from matrix-org/t3chguy/fix/17119 ... Update space ordering behaviour to match updates in MSC	2021-05-05 22:26:45 +01:00
Michael Telatynski	202dfd4521	Merge pull request #5976 from matrix-org/t3chguy/fix/17153 ... Improve performance of search all spaces and space switching	2021-05-05 22:13:05 +01:00
Travis Ralston	2236ec3eff	Move and update variable usage	2021-05-05 14:00:56 -06:00
Travis Ralston	60e3a8ac77	Merge branch 'develop' into travis/files/visual	2021-05-05 13:47:33 -06:00
Travis Ralston	3e1265b9bb	Merge pull request #5970 from matrix-org/travis/voicemessages/colors ... Update colours and sizing for voice messages	2021-05-05 11:09:18 -06:00
Michael Telatynski	2b703e8574	tweak code style	2021-05-05 17:30:14 +01:00
Michael Telatynski	650933096a	Iterate Spaces admin UX around room management	2021-05-05 17:25:29 +01:00
J. Ryan Stinnett	fa2b5103e2	Merge pull request #5973 from SimonBrandner/fix/17165/readme-android-sdk ... Update link to Android SDK	2021-05-05 17:10:11 +01:00
Šimon Brandner	39ef376a79	Use Android SDK instead ... Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>	2021-05-05 18:06:42 +02:00
J. Ryan Stinnett	62774d7c16	Merge pull request #5962 from jaiwanth-v/cleanup-imageview ... Add cleanup functions for image view	2021-05-05 17:02:43 +01:00
J. Ryan Stinnett	5daad1de67	Merge pull request #5961 from SimonBrandner/fix/15460/allow-p2p-calls ... Add a note about sharing your IP in P2P calls	2021-05-05 16:59:06 +01:00
Travis Ralston	570c082573	Promote colour to a variable ... I refuse to try and type this variable name freehand.	2021-05-05 09:58:45 -06:00
Michael Telatynski	81b97590f6	fix styling of the disabled danger_outline button	2021-05-05 16:51:46 +01:00
Michael Telatynski	01fa25f3fa	Merge pull request #5968 from matrix-org/t3chguy/fix/17044 ... Only aggregate DM notifications on the Space Panel in the Home Space	2021-05-05 16:35:07 +01:00
Michael Telatynski	7cae566011	Merge pull request #5975 from matrix-org/t3chguy/fix/16891 ... Add retry mechanism and progress bar to add existing to space dialog	2021-05-05 16:32:31 +01:00
J. Ryan Stinnett	4bc5990071	Merge pull request #5755 from aaronraimist/warn-on-access-token-reveal ... Warn on access token reveal	2021-05-05 16:32:12 +01:00
Michael Telatynski	7f396bedd0	add comment	2021-05-05 15:59:02 +01:00
Michael Telatynski	4279e99e4c	Improve performance of search all spaces and space switching	2021-05-05 15:29:04 +01:00
Michael Telatynski	886959f32d	port rate limiting code over to space creation wizard's add existing rooms	2021-05-05 11:54:14 +01:00
Michael Telatynski	acce9a4548	Fix rounded progress bars	2021-05-05 11:50:55 +01:00
Michael Telatynski	07f5b6e8c4	Add retry mechanism and progress bar to add existing to space dialog	2021-05-05 11:45:12 +01:00
Šimon Brandner	374d8c1c4c	Update link to Android SDK ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-05 08:43:24 +02:00
Travis Ralston	ccdc9fbef6	Fix issue where composer styles were being applied to the timeline	2021-05-04 21:15:22 -06:00