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
451138617b
Upgrade matrix-react-sdk to 2.7.0
2020-06-04 15:23:38 +01:00
RiotRobot
a0ea1bfda8
Upgrade matrix-js-sdk to 6.2.0
2020-06-04 15:23:02 +01: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
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
f8dad68958
Add flux types as a dev dependency
...
This is not the right thing to do, since we don't directly use Flux at this
layer, but for the moment we need it to get distribution builds working.
2020-06-02 15:53:11 +01:00
RiotRobot
e37680b6c1
Upgrade matrix-react-sdk to 2.7.0-rc.2
2020-06-02 14:41:44 +01:00
RiotRobot
94fee233a8
Upgrade matrix-js-sdk to 6.2.0-rc.1
2020-06-02 14:40:00 +01:00
RiotRobot
98a6dd88e3
Upgrade matrix-js-sdk to 6.2.0-rc.1
2020-06-02 13:53:13 +01:00
Matthew Hodgson
aab8f6755f
bump yarn lock
2020-05-31 16:06:33 +01:00
Matthew Hodgson
c3ad15e479
upgrade to twemoji 13.0.0
2020-05-31 14:09:44 +01:00
Travis Ralston
b9794ea6e4
Remove webpack-build-notifier from lockfile
2020-05-26 13:50:31 -06: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
43c0148123
Fix @types/react conflict in matrix-react-sdk
2020-05-25 18:37:30 +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
ef60265bb6
Reset matrix-react-sdk back to develop branch
2020-05-22 14:36:23 +01:00
RiotRobot
aed4568882
Reset matrix-js-sdk back to develop branch
2020-05-22 14:36:11 +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
16ecc007d6
Reset matrix-react-sdk back to develop branch
2020-05-19 11:36:17 +01:00
RiotRobot
92b94af9ed
Reset matrix-js-sdk back to develop branch
2020-05-19 11:36:07 +01:00
RiotRobot
ef0076bd83
Merge branch 'master' into develop
2020-05-19 11:34:45 +01:00
RiotRobot
a9fbc190bf
Upgrade matrix-react-sdk to 2.6.0
2020-05-19 11:28:08 +01:00
RiotRobot
f35ec09b54
Upgrade matrix-js-sdk to 6.1.0
2020-05-19 11:27:41 +01: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
fe32590e30
Upgrade matrix-react-sdk to 2.6.0-rc.1
2020-05-14 16:35:02 +01:00
RiotRobot
710dc18f2c
Upgrade matrix-js-sdk to 6.1.0-rc.1
2020-05-14 16:33:28 +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