OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
25,700 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

938 Commits (edafb2467d7659812b4852be216e2c3f347817c5)

Author SHA1 Message Date
RiotRobot 6f6793bc85 Reset matrix-js-sdk back to develop branch 2020-06-16 11:45:28 +01:00
RiotRobot 8047bace91 Merge branch 'master' into develop 2020-06-16 11:44:27 +01:00
RiotRobot 0f6a0bb3ae v2.7.2 2020-06-16 11:35:29 +01:00
RiotRobot 1374d2020a Upgrade matrix-js-sdk to 6.2.2 2020-06-16 11:26:12 +01:00
Travis Ralston 1467191a5d Update the CSS transition for breadcrumbs 
The actual transition length might need adjusting, but this is fairly close to what was requested.
 2020-06-09 15:06:54 -06:00
Michael Telatynski 69ea635398 Allow searching the emoji picker using other emoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-05 23:19:00 +01:00
Travis Ralston ee3d2c51d8
Merge pull request #4697 from matrix-org/travis/room-list/scrolling-resize 
New room list scrolling and resizing
 2020-06-05 13:17:59 -06:00
RiotRobot d54308a8c6 Reset matrix-js-sdk back to develop branch 2020-06-05 15:48:06 +01:00
RiotRobot c8366b7a47 v2.7.1 2020-06-05 15:43:24 +01:00
RiotRobot e78fa602c0 Upgrade matrix-js-sdk to 6.2.1 2020-06-05 15:13:55 +01:00
Travis Ralston cdf2d70aea Merge branch 'develop' into travis/room-list/scrolling-resize 2020-06-04 09:19:54 -06:00
RiotRobot 3c73930e9a Reset matrix-js-sdk back to develop branch 2020-06-04 15:14:34 +01:00
RiotRobot 260d448db6 Merge branch 'master' into develop 2020-06-04 15:13:41 +01:00
RiotRobot 65e59fd708 v2.7.0 2020-06-04 15:12:24 +01:00
RiotRobot 07a12a73ee Upgrade matrix-js-sdk to 6.2.0 2020-06-04 15:06:40 +01:00
Travis Ralston dbf996439b Wedge t3chguy's resizer prototype into the sublist 2020-06-03 21:17:51 -06:00
RiotRobot ec35445bf0 v2.7.0-rc.2 2020-06-02 14:37:47 +01:00
RiotRobot 039c42dc09 v2.7.0-rc.1 2020-06-02 13:59:10 +01:00
RiotRobot 98a6dd88e3 Upgrade matrix-js-sdk to 6.2.0-rc.1 2020-06-02 13:53:13 +01:00
Matthew Hodgson 9cdc1788b2 rebuild with emojibase-data 5 2020-05-31 16:04:15 +01:00
Matthew Hodgson c3ad15e479 upgrade to twemoji 13.0.0 2020-05-31 14:09:44 +01:00
Jorik Schellekens 076a3e058d
Merge pull request #4635 from JorikSchellekens/joriks/field-ts 
Move Field to Typescript
 2020-05-26 16:13:03 +01:00
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 30e2b01022 unlock react types 2020-05-25 17:08:37 +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 5ec8459468 Merge branch 'master' into develop 2020-05-22 14:13:01 +01:00
RiotRobot 5a4da13e86 v2.6.1 2020-05-22 14:00:29 +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 26e6447be5 v2.6.0 2020-05-19 11:22:00 +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 59f1657b43 Add jest-canvas-mock 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-15 00:25:19 +01: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 81174b5f55 v2.6.0-rc.1 2020-05-14 16:30:17 +01: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