OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
27,410 Commits
202 Branches
546 Tags
420 MiB
Commit Graph

261 Commits (36751280612e034d9faa210edd6bd82c311bfd52)

Author SHA1 Message Date
Michael Telatynski c74d890774 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 
 Conflicts:
	src/@types/global.d.ts
	src/components/structures/ToastContainer.tsx
 2020-05-26 13:38:17 +01:00
Jorik Schellekens b4624baf2f
Merge branch 'develop' into joriks/field-ts 2020-05-25 17:29:25 +01:00
Jorik Schellekens f34413c6ce update yarn lock 2020-05-25 17:24:15 +01:00
Jorik Schellekens 5c9398a6b1 Types exiliary files 2020-05-25 16:47:57 +01:00
Jorik Schellekens 63f78b0808 Move tooltip to ts 2020-05-25 13:40:05 +01:00
Michael Telatynski 880e16aaa2 Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks 
 Conflicts:
	src/components/views/avatars/BaseAvatar.js
	test/components/views/messages/TextualBody-test.js
 2020-05-23 11:12:58 +01:00
Michael Telatynski efeb8a8487 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 2020-05-23 11:01:36 +01:00
RiotRobot af59d3a094 Reset matrix-js-sdk back to develop branch 2020-05-22 14:14:09 +01:00
Michael Telatynski dc37469808 Convert ToastContainer and ToastStore to Typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 12:47:40 +01:00
Travis Ralston 7ff850deea
Merge pull request #4253 from matrix-org/travis/room-list-2 
Rewrite the room list store
 2020-05-21 13:30:32 -06:00
RiotRobot 833eccf5cd Reset matrix-js-sdk back to develop branch 2020-05-19 11:25:07 +01:00
RiotRobot 19e496cacc Merge branch 'master' into develop 2020-05-19 11:23:16 +01:00
RiotRobot 406839e89a Upgrade matrix-js-sdk to 6.1.0 2020-05-19 11:13:57 +01:00
Travis Ralston 38920e7f30 Merge branch 'develop' into travis/room-list-2 2020-05-18 23:23:59 -06:00
Travis Ralston 9aff2e836e
Merge pull request #4593 from matrix-org/travis/dispatcher-types 
Convert the dispatcher to TypeScript
 2020-05-18 23:22:32 -06:00
Michael Telatynski 1eea203db6
Merge pull request #4599 from matrix-org/t3chguy/progress_colour 
Consolidate password/passphrase fields into a component & add dynamic colour to progress
 2020-05-18 11:08:08 +01:00
Travis Ralston 798e7a1f86 Merge branch 'develop' into travis/dispatcher-types 2020-05-15 09:56:02 -06:00
Michael Telatynski e79959a4ec try fix tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-15 00:31:30 +01:00
Travis Ralston 2b4c19e9ba Merge branch 'travis/dispatcher-types' into travis/room-list-2 2020-05-14 13:40:37 -06:00
Michael Telatynski cf3c4d9e5f Extract Password field from Registration into a reusable component 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 20:20:36 +01:00
Travis Ralston 861268d39f Invent an AsyncStore and use it for room lists 
This is to get around the problem of a slow dispatch loop. Instead of slowing the whole app down to deal with room lists, we'll just raise events to say we're ready.

Based upon the EventEmitter class.
 2020-05-14 12:44:29 -06:00
Travis Ralston 08419d195e Initial breakout for room list rewrite 
This does a number of things (sorry):
* Estimates the type changes needed to the dispatcher (later to be replaced by https://github.com/matrix-org/matrix-react-sdk/pull/4593)
* Sets up the stack for a whole new room list store, and later components for usage.
* Create a proxy class to ensure the app still functions as expected when the various stores are enabled/disabled
* Demonstrates a possible structure for algorithms
 2020-05-14 12:44:29 -06:00
RiotRobot d8003df24c Upgrade matrix-js-sdk to 6.1.0-rc.1 2020-05-14 16:22:30 +01:00
Michael Telatynski 1ba19e78f8 Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode 
 Conflicts:
	package.json
 2020-05-14 10:50:42 +01:00
Travis Ralston fa83df4bde Convert dispatcher to TypeScript and replace async usage with new class 
Due to TypeScript and flux's types being annoying and highly typesafe, we need an AsyncActionPayload which intentionally doesn't use the 'action' property. This looks a bit awkward, though for the rare cases we do actually fire async actions it should be fine enough.

The call signature changes slightly for async events, therefore this commit also updates its usages for async events. 

The `fire()` function is to be used in a future commit.
Remove biased comment
 2020-05-13 21:07:50 -06:00
RiotRobot aa0c6f1f71 Reset matrix-js-sdk back to develop branch 2020-05-05 11:40:37 +01:00
RiotRobot 338486b561 Merge branch 'master' into develop 2020-05-05 11:27:52 +01:00
RiotRobot 1423c2e4bc Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:04:24 +01:00
RiotRobot b5cb912cfd Upgrade matrix-js-sdk to 6.0.0-rc.2 2020-05-01 16:24:59 +01:00
RiotRobot 5a29bf569d Upgrade matrix-js-sdk to 6.0.0-rc.1 2020-04-30 11:21:33 +01:00
Michael Telatynski 42a857cb5e Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support" 
(cherry picked from commit 972f9d354d)
 2020-04-24 13:24:54 +01:00
Michael Telatynski 972f9d354d
Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support" 2020-04-24 12:25:19 +01:00
RiotRobot 86200812a5 Upgrade matrix-js-sdk to 5.3.1-rc.4 2020-04-23 15:49:21 +01:00
Travis Ralston a55698e943 Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements 2020-04-20 09:22:38 -06:00
Michael Telatynski 3bc5a0a0b2 Convert submit-rageshake to typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-19 12:06:56 +01:00
RiotRobot 383915d5cc Upgrade matrix-js-sdk to 5.3.1-rc.3 2020-04-17 17:46:55 +01:00
RiotRobot c6746e68b2 Upgrade matrix-js-sdk to 5.3.1-rc.2 2020-04-16 19:56:11 +01:00
RiotRobot 5022eaf483 Upgrade matrix-js-sdk to 5.3.1-rc.1 2020-04-15 19:13:00 +01:00
Travis Ralston 77bdde4021 Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements 2020-04-14 12:58:16 -06:00
Michael Telatynski 4fc88d69a3 Remove unused react-addons-css-transition-group 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-12 01:04:54 +01:00
Michael Telatynski 237084da78 wrap node-qrcode in a React FC and use it for ShareDialog instead of qrcode-react 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-11 23:46:58 +01:00
Travis Ralston 0165ff0bc9 Allow iframes and Jitsi URLs in /addwidget 
Fixes https://github.com/vector-im/riot-web/issues/12784
 2020-04-09 16:03:40 -06:00
J. Ryan Stinnett c87d6c22df yarn upgrade 2020-04-08 14:49:52 +01:00
Michael Telatynski 5ac68d4ce0 Update emojibase for fixed emoji codepoints and Emoji 13 support 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-06 11:10:00 +01:00
RiotRobot 84da483264 Reset matrix-js-sdk back to develop branch 2020-04-01 15:00:05 +01:00
RiotRobot 78fd8e4569 Reset matrix-js-sdk back to develop branch 2020-03-30 13:42:52 +01:00
RiotRobot d369695e22 Upgrade matrix-js-sdk to 5.2.0 2020-03-30 13:31:42 +01:00
RiotRobot a1c83a4f0e Upgrade matrix-js-sdk to 5.2.0-rc.1 2020-03-26 13:02:54 +00:00
Travis Ralston 94d23c815a Improve naming of Jitsi conferences 
Fixes https://github.com/vector-im/riot-web/issues/12812
 2020-03-20 14:19:47 -06:00
Michael Telatynski d593a76f28 Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd 2020-03-18 20:41:13 +00:00
Michael Telatynski cad28c81c0 Add Keyboard shortcuts dialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-18 16:40:21 +00:00
Michael Telatynski 42ee157645
Merge pull request #4217 from matrix-org/t3chguy/gemini 
Remove Gemini Scrollbars
 2020-03-18 14:03:51 +00:00
RiotRobot b09c063d1b Reset matrix-js-sdk back to develop branch 2020-03-17 14:25:44 +00:00
RiotRobot 8e8723bb36 Merge branch 'master' into develop 2020-03-17 14:24:35 +00:00
RiotRobot 83b6155637 Upgrade matrix-js-sdk to 5.1.1 2020-03-17 14:12:15 +00:00
Michael Telatynski 44b0aa2d88 Remove remainders of gemini-scrollbar and react-gemini-scrollbar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-17 10:31:45 +00:00
Travis Ralston 57a61efabf Remove stuff that yarn install doesn't think we need 2020-03-12 10:46:42 -06:00
David Baker 1a1782fc06
Merge pull request #4201 from matrix-org/dbkr/yarn_upgrade_20200311 
yarn upgrade
 2020-03-12 09:45:32 +00:00
Travis Ralston 7dd7417f12 Enable support for TypeScript in components 
Includes: compilation, translations, IDE support (use .tsx not .ts), typings, and other build tools.

TypeScript component have to import PropTypes and React with `import * as React from 'react';`
 2020-03-11 18:03:43 -06:00
RiotRobot 57022d9355 Reset matrix-js-sdk back to develop branch 2020-03-11 16:25:15 +00:00
RiotRobot 15d5190b9b js-sdk rc.1 2020-03-11 16:18:08 +00:00
David Baker 6b4d3cad7c yarn upgrade 2020-03-11 14:54:03 +00:00
RiotRobot 845656064e Reset matrix-js-sdk back to develop branch 2020-03-04 11:58:00 +00:00
RiotRobot 00dc187f71 Reset matrix-js-sdk back to develop 2020-03-02 17:43:21 +00:00
RiotRobot 55419a1bf5 Merge branch 'master' into develop 2020-03-02 17:39:51 +00:00
RiotRobot 7fcad8c82c Upgrade matrix-js-sdk to 5.1.0 2020-03-02 17:29:36 +00:00
J. Ryan Stinnett 65e002cfe9 Upgrade deps 2020-02-26 15:03:24 +00:00
RiotRobot 9afa66364e Upgrade matrix-js-sdk to 5.1.0-rc.1 2020-02-26 14:24:58 +00:00
Travis Ralston f74b283287
Merge pull request #4091 from matrix-org/travis/qr-binary 
Use binary packing for verification QR codes
 2020-02-21 10:05:12 -07:00
J. Ryan Stinnett 766f523c00 Reset matrix-js-sdk back to develop branch 2020-02-20 11:41:53 +00:00
Travis Ralston 45963adeb4 Use binary packing for verification QR codes 
Fixes https://github.com/vector-im/riot-web/issues/12257
Fixes https://github.com/vector-im/riot-web/issues/12375

We do not remove the existing QR code library in this commit because it is still used elsewhere (like the share dialog). 

This should be as accurate as possible to what [MSC1543](https://github.com/matrix-org/matrix-doc/pull/1544) asks for.
 2020-02-19 17:02:14 -07:00
RiotRobot a687d158e8 Released js-sdk 2020-02-19 15:59:37 +00:00
RiotRobot 34dbeb0604 Released js-sdk 2020-02-17 13:21:07 +00:00
RiotRobot 1970dbff94 Try JS SDK upgrade one more time 2020-02-13 17:43:27 +00:00
RiotRobot 163539d9f4 Upgrade JS SDK to 5.0.0-rc.1 2020-02-13 15:57:48 +00:00
J. Ryan Stinnett 805e9abb39 Flip back to develop 2020-01-27 16:00:25 +00:00
RiotRobot 692c993a34 js-sdk v4.0.0 2020-01-27 11:40:05 +00:00
Travis Ralston a330ee186a Move & upgrade babel runtime into dependencies (like it wants) 
https://babeljs.io/docs/en/babel-runtime
 2020-01-23 15:43:48 -07:00
David Baker d2ef6ba3f5 js-sdk 4.0.0-rc.1 2020-01-20 14:27:19 +00:00
Michael Telatynski f228f70987 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/deps 2020-01-18 02:02:51 +00:00
Michael Telatynski c97de43f69 Remove unused fetch polyfills, querystring, require-json. Move glob to dev-dep 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-18 02:01:45 +00:00
Michael Telatynski 9365a9cb30 Remove lolex where its not needed and move to dev-deps. Remove unused optimist 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-18 01:39:14 +00:00
Travis Ralston f535fdbcaa Update chokidar to fix reskindex not working 
The major version bump doesn't appear to affect us. It wasn't working before on Windows, but now it is.
 2020-01-16 15:39:07 -07:00
Travis Ralston d763d7e633 Merge branch 'develop' into travis/ftue/user-lists/5.2-i18n 2020-01-15 10:49:38 -07:00
Travis Ralston b69b284efa Humanize the recent DM rooms ourselves for translations 2020-01-13 21:20:01 -07:00
Travis Ralston 5fd27a10bb Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:19:41 -07:00
RiotRobot 389e1194ff Merge branch 'master' into develop 2020-01-13 13:09:56 +00:00
RiotRobot 9a3ca28978 js-sdk 3.0.0 2020-01-13 13:01:36 +00:00
Travis Ralston d7dd67f69e Remove subtly irrelevant package 2020-01-09 17:28:32 -07:00
Travis Ralston 0e8af15b9c Add webcrypto dep back 
Probably accidentally merge-conflicted out
 2020-01-09 17:15:13 -07:00
Travis Ralston 23eb6cbeb3 Upgrade Jest and babel-jest to match js-sdk 
This also magically gets rid of a ton of errors
 2020-01-09 16:17:27 -07:00
Travis Ralston a8c8406ac4 Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps 2020-01-09 16:06:46 -07:00
Travis Ralston a6376461d0 Use yarn's updated lockfile 
Didn't manually handle this conflict, just let yarn do its thing.
 2020-01-09 14:19:19 -07:00
Travis Ralston fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Michael Telatynski f3f929207c Update yarn.lock 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-09 12:18:14 +00:00
Travis Ralston 1d9d706b9c
Merge pull request #3789 from matrix-org/t3chguy/render_html_entities_in_og-description 
Render encoded html entities in og:description
 2020-01-08 21:38:31 -07:00
RiotRobot 6b8f6239c5 js-sdk 3.0.0-rc.1 2020-01-06 13:58:43 +00:00
RiotRobot 93c4439045 js-sdk rc.1 2020-01-06 13:30:56 +00:00
Michael Telatynski d31c863563 Remove all usages of slate in favour of CIDER 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:15:48 +00:00
Michael Telatynski 4bea87f00d Merge branches 'develop' and 't3chguy/render_html_entities_in_og-description' of github.com:matrix-org/matrix-react-sdk into t3chguy/render_html_entities_in_og-description 
 Conflicts:
	package.json
 2020-01-05 22:23:03 +00:00