076a3e058d
Merge pull request #4635 from JorikSchellekens/joriks/field-ts
...
Move Field to Typescript
2020-05-26 16:13:03 +01:00
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
b4624baf2f
Merge branch 'develop' into joriks/field-ts
2020-05-25 17:29:25 +01:00
30e2b01022
unlock react types
2020-05-25 17:08:37 +01:00
63f78b0808
Move tooltip to ts
2020-05-25 13:40:05 +01:00
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
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
b9ea0af44c
Merge branch 'master' into develop
2020-05-22 14:35:27 +01:00
075299a7eb
v1.6.2
2020-05-22 14:21:24 +01:00
9e88a7d1c0
Upgrade matrix-react-sdk to 2.6.1
2020-05-22 14:17:58 +01:00
5ec8459468
Merge branch 'master' into develop
2020-05-22 14:13:01 +01:00
5a4da13e86
v2.6.1
2020-05-22 14:00:29 +01:00
3bbd3e246a
Fix EventEmitter typescript signature in node typings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-22 13:52:40 +01:00
dc37469808
Convert ToastContainer and ToastStore to Typescript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-22 12:47:40 +01:00
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
16ecc007d6
Reset matrix-react-sdk back to develop branch
2020-05-19 11:36:17 +01:00
92b94af9ed
Reset matrix-js-sdk back to develop branch
2020-05-19 11:36:07 +01:00
ef0076bd83
Merge branch 'master' into develop
2020-05-19 11:34:45 +01:00
482d6a7fb3
v1.6.1
2020-05-19 11:31:35 +01:00
a9fbc190bf
Upgrade matrix-react-sdk to 2.6.0
2020-05-19 11:28:08 +01:00
f35ec09b54
Upgrade matrix-js-sdk to 6.1.0
2020-05-19 11:27:41 +01:00
833eccf5cd
Reset matrix-js-sdk back to develop branch
2020-05-19 11:25:07 +01:00
19e496cacc
Merge branch 'master' into develop
2020-05-19 11:23:16 +01:00
26e6447be5
v2.6.0
2020-05-19 11:22:00 +01:00
406839e89a
Upgrade matrix-js-sdk to 6.1.0
2020-05-19 11:13:57 +01:00
38920e7f30
Merge branch 'develop' into travis/room-list-2
2020-05-18 23:23:59 -06:00
9aff2e836e
Merge pull request #4593 from matrix-org/travis/dispatcher-types
...
Convert the dispatcher to TypeScript
2020-05-18 23:22:32 -06:00
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
798e7a1f86
Merge branch 'develop' into travis/dispatcher-types
2020-05-15 09:56:02 -06:00
59f1657b43
Add jest-canvas-mock
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-15 00:25:19 +01:00
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
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
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
f56ee6df34
v1.6.1-rc.1
2020-05-14 16:53:00 +01:00
fe32590e30
Upgrade matrix-react-sdk to 2.6.0-rc.1
2020-05-14 16:35:02 +01:00
710dc18f2c
Upgrade matrix-js-sdk to 6.1.0-rc.1
2020-05-14 16:33:28 +01:00
81174b5f55
v2.6.0-rc.1
2020-05-14 16:30:17 +01:00
d8003df24c
Upgrade matrix-js-sdk to 6.1.0-rc.1
2020-05-14 16:22:30 +01:00
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
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
911bd2e469
Replace favico.js dependency with simplified variant grown from it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-13 05:19:08 +01:00
f4e21c3fc7
Remove electron_app as we now have riot-desktop repo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-06 11:32:13 +01:00
fb33b6082d
Reset matrix-react-sdk back to develop branch
2020-05-05 11:41:33 +01:00
99af02eecd
Reset matrix-js-sdk back to develop branch
2020-05-05 11:41:11 +01:00
aa0c6f1f71
Reset matrix-js-sdk back to develop branch
2020-05-05 11:40:37 +01:00
d5d4b95fee
Merge branch 'master' into develop
2020-05-05 11:39:12 +01:00
beda6c3b25
v1.6.0
2020-05-05 11:35:22 +01:00
3e13de3069
Upgrade matrix-react-sdk to 2.5.0
2020-05-05 11:31:28 +01:00
cc192ab882
Upgrade matrix-js-sdk to 6.0.0
2020-05-05 11:30:41 +01:00
338486b561
Merge branch 'master' into develop
2020-05-05 11:27:52 +01:00
Jorik Schellekens