6219e67a8a
add dep eslint-config-matrix-org
2020-07-20 21:19:49 +01:00
4ba1f91a2b
Fix lint issues in new code
2020-07-20 20:43:55 +01:00
b3fa855bd8
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/eslint-config
2020-07-20 16:22:32 +01:00
65d7a82644
Merge pull request #5004 from matrix-org/dependabot/npm_and_yarn/lodash-4.17.19
...
Bump lodash from 4.17.15 to 4.17.19
2020-07-16 14:44:21 -06:00
4aedf857cb
Bump lodash from 4.17.15 to 4.17.19
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-07-16 15:12:26 +00:00
2f9bfdbb69
Reset matrix-js-sdk back to develop branch
2020-07-16 16:11:59 +01:00
bc97f731fc
Upgrade matrix-js-sdk to 7.1.0
2020-07-16 16:03:00 +01:00
7098cbfce1
Reset matrix-js-sdk back to develop branch
2020-07-15 12:01:14 +01:00
c339e5cbf9
Upgrade matrix-js-sdk to 7.1.0
2020-07-15 11:40:31 +01:00
3912f2d21c
Merge remote-tracking branch 'origin/develop' into travis/room-list/resizable
2020-07-08 07:55:10 -06:00
c5e8a0b5af
Convert HtmlUtils to TypeScript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-08 08:40:58 +01:00
15b6a273c9
Swap out the resizer lib for something more stable
...
react-resizer appears to be okay at tracking state, but it often desyncs from reality. re-resizer is more maintained and more broadly used (160k downloads vs 110k), and appears to generally do a better job of tracking the cursor.
The new library has some oddities though, such as deltas, touch support (hence the polyfill), and calling handles "Enable".
For https://github.com/vector-im/riot-web/issues/14022
2020-07-07 22:21:00 -06:00
2c1eb07768
Merge pull request #4883 from matrix-org/t3chguy/ts123
...
Convert things to Typescript, including languageHandler
2020-07-06 18:54:19 +01:00
5c56a55cf0
Reset matrix-js-sdk back to develop branch
2020-07-03 13:29:56 +01:00
452bb73dcf
Upgrade matrix-js-sdk to 7.1.0
2020-07-03 13:22:03 +01:00
48ce294a49
Transition languageHandler to Typescript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 23:15:08 +01:00
161c37d93c
Upgrade matrix-js-sdk to 7.1.0-rc.1
2020-07-01 14:21:35 +01:00
b110639c76
Merge remote-tracking branch 'origin' into joriks/eslint-config
2020-06-29 16:49:33 +01:00
0a2934203f
Remove tslint
2020-06-23 17:01:40 +01:00
7699aafcaf
Use new eslint package- fix lint issues in ts and js
2020-06-23 17:01:19 +01:00
f3af603102
Reset matrix-js-sdk back to develop branch
2020-06-23 15:19:55 +01:00
54ba75afd7
Upgrade matrix-js-sdk to 7.0.0
2020-06-23 14:48:23 +01:00
dd23a50a3c
Upgrade matrix-js-sdk to 7.0.0-rc.1
2020-06-17 21:40:30 +01:00
6f6793bc85
Reset matrix-js-sdk back to develop branch
2020-06-16 11:45:28 +01:00
8047bace91
Merge branch 'master' into develop
2020-06-16 11:44:27 +01:00
1374d2020a
Upgrade matrix-js-sdk to 6.2.2
2020-06-16 11:26:12 +01:00
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
1315ed503b
Upgrade deps
2020-06-08 10:12:11 +01:00
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
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
d54308a8c6
Reset matrix-js-sdk back to develop branch
2020-06-05 15:48:06 +01:00
1d6141cf73
Merge branch 'master' into develop
2020-06-05 15:47:23 +01:00
e78fa602c0
Upgrade matrix-js-sdk to 6.2.1
2020-06-05 15:13:55 +01:00
cdf2d70aea
Merge branch 'develop' into travis/room-list/scrolling-resize
2020-06-04 09:19:54 -06:00
3c73930e9a
Reset matrix-js-sdk back to develop branch
2020-06-04 15:14:34 +01:00
260d448db6
Merge branch 'master' into develop
2020-06-04 15:13:41 +01:00
07a12a73ee
Upgrade matrix-js-sdk to 6.2.0
2020-06-04 15:06:40 +01:00
dbf996439b
Wedge t3chguy's resizer prototype into the sublist
2020-06-03 21:17:51 -06:00
98a6dd88e3
Upgrade matrix-js-sdk to 6.2.0-rc.1
2020-06-02 13:53:13 +01:00
aab8f6755f
bump yarn lock
2020-05-31 16:06:33 +01:00
c3ad15e479
upgrade to twemoji 13.0.0
2020-05-31 14:09:44 +01:00
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
f34413c6ce
update yarn lock
2020-05-25 17:24:15 +01:00
5c9398a6b1
Types exiliary files
2020-05-25 16:47:57 +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
af59d3a094
Reset matrix-js-sdk back to develop branch
2020-05-22 14:14:09 +01:00
Jorik Schellekens