OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
26,170 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

950 Commits (df072a12b269ed088f77d61c028f095ca88f8d08)

Author SHA1 Message Date
RiotRobot 5c56a55cf0 Reset matrix-js-sdk back to develop branch 2020-07-03 13:29:56 +01:00
RiotRobot 21b7b88fde v2.9.0 2020-07-03 13:27:48 +01:00
RiotRobot 452bb73dcf Upgrade matrix-js-sdk to 7.1.0 2020-07-03 13:22:03 +01:00
RiotRobot f9cb0b9cab v2.9.0-rc.1 2020-07-01 14:32:20 +01:00
RiotRobot 161c37d93c Upgrade matrix-js-sdk to 7.1.0-rc.1 2020-07-01 14:21:35 +01:00
RiotRobot 0059d44e15 Merge branch 'master' into develop 2020-06-29 16:10:32 +01:00
RiotRobot e43311c0f4 v2.8.1 2020-06-29 15:59:37 +01:00
RiotRobot f3af603102 Reset matrix-js-sdk back to develop branch 2020-06-23 15:19:55 +01:00
RiotRobot 5256a86545 v2.8.0 2020-06-23 15:06:53 +01:00
RiotRobot 54ba75afd7 Upgrade matrix-js-sdk to 7.0.0 2020-06-23 14:48:23 +01:00
RiotRobot b5aa66015c v2.8.0-rc.1 2020-06-17 21:46:34 +01:00
RiotRobot dd23a50a3c Upgrade matrix-js-sdk to 7.0.0-rc.1 2020-06-17 21:40:30 +01:00
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