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

1834 Commits (a3659d864cacaf120d41c1289c921a7da7a61e60)

Author SHA1 Message Date
RiotRobot 3f192f927c Merge branch 'master' into develop 2022-10-26 16:51:07 +01:00
RiotRobot 271d2d7078 v1.11.12 2022-10-26 16:46:30 +01:00
ElementRobot 446d944888
Fix config.json failing to load for Jitsi wrapper in non-root deployment (#23577) (#23615) 
(cherry picked from commit a3ece528e5)

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2022-10-26 16:41:58 +01:00
RiotRobot 2f49467152 Reset matrix-react-sdk back to develop branch 2022-10-25 18:07:27 +01:00
RiotRobot b4399402a6 Reset matrix-js-sdk back to develop branch 2022-10-25 18:06:42 +01:00
RiotRobot b3ed90a9b3 Merge branch 'master' into develop 
# Conflicts:
#	yarn.lock
 2022-10-25 18:05:52 +01:00
RiotRobot 6eed898183 v1.11.11 2022-10-25 17:54:35 +01:00
RiotRobot 5f38137734 Upgrade matrix-react-sdk to 3.59.0 2022-10-25 17:48:39 +01:00
RiotRobot 748c900dce Upgrade matrix-js-sdk to 21.0.0 2022-10-25 17:47:47 +01:00
RiotRobot 4599cc9ca2 v1.11.11-rc.2 2022-10-24 17:19:00 +01:00
RiotRobot 629341894b Upgrade matrix-react-sdk to 3.59.0-rc.2 2022-10-24 17:05:23 +01:00
RiotRobot 416ca55fa9 Upgrade matrix-js-sdk to 21.0.0-rc.2 2022-10-24 17:04:14 +01:00
Michael Telatynski a3ece528e5
Fix config.json failing to load for Jitsi wrapper in non-root deployment (#23577) 2022-10-24 13:48:32 +01:00
RiotRobot 7af1f21d9b v1.11.11-rc.1 2022-10-18 14:26:20 +01:00
RiotRobot e4e2738c3c Upgrade matrix-react-sdk to 3.59.0-rc.1 2022-10-18 14:23:41 +01:00
RiotRobot a7478f58ae Upgrade matrix-js-sdk to 21.0.0-rc.1 2022-10-18 14:21:49 +01:00
Michael Telatynski 172f2f3993
Fix tests and convert to RTL (#23474) 2022-10-13 09:22:34 +01:00
Michael Telatynski 2ef6abbfb8
Move from `browser-request` to `fetch` (#23427) 2022-10-12 18:59:10 +01:00
RiotRobot 44eeb6fddc Reset matrix-react-sdk back to develop branch 2022-10-11 18:04:37 +01:00
RiotRobot 8383c021f1 Reset matrix-js-sdk back to develop branch 2022-10-11 18:04:19 +01:00
RiotRobot 7afa416ed5 Merge branch 'master' into develop 
# Conflicts:
#	package.json
#	yarn.lock
 2022-10-11 18:03:36 +01:00
RiotRobot bd5d22d0e9 v1.11.10 2022-10-11 17:57:53 +01:00
RiotRobot e356c38948 Upgrade matrix-react-sdk to 3.58.1 2022-10-11 17:55:10 +01:00
RiotRobot d1f7454dc0 Reset matrix-react-sdk back to develop branch 2022-10-11 14:10:12 +01:00
RiotRobot 3bf3237774 Reset matrix-js-sdk back to develop branch 2022-10-11 14:09:53 +01:00
RiotRobot f0e6673fec Merge branch 'master' into develop 2022-10-11 14:09:34 +01:00
RiotRobot 8ac2e0100e v1.11.9 2022-10-11 14:05:22 +01:00
RiotRobot 2aae3de956 Upgrade matrix-react-sdk to 3.58.0 2022-10-11 14:02:50 +01:00
RiotRobot c61556e885 Upgrade matrix-js-sdk to 20.1.0 2022-10-11 14:01:39 +01:00
RiotRobot d2c2a51ce6 v1.11.9-rc.2 2022-10-05 14:18:07 +01:00
RiotRobot 5f355bf25e Upgrade matrix-react-sdk to 3.58.0-rc.2 2022-10-05 14:16:02 +01:00
RiotRobot 1708f7f1b8 Upgrade matrix-js-sdk to 20.1.0-rc.2 2022-10-05 13:48:58 +01:00
renovate[bot] fb686ec5b6
Update dependency jest-mock to v29 (#23421) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-10-04 22:18:56 +01:00
RiotRobot 4d00249d97 v1.11.9-rc.1 2022-10-04 14:46:47 +01:00
RiotRobot e5dcb6e8c2 Upgrade matrix-react-sdk to 3.58.0-rc.1 2022-10-04 14:44:19 +01:00
RiotRobot db89364395 Upgrade matrix-js-sdk to 20.1.0-rc.1 2022-10-04 14:26:21 +01:00
RiotRobot 8e841be393 Reset matrix-react-sdk back to develop branch 2022-09-28 16:07:23 +01:00
RiotRobot 1b164dbc42 Reset matrix-js-sdk back to develop branch 2022-09-28 16:07:01 +01:00
RiotRobot 5ae4d0b8c9 Merge branch 'master' into develop 
# Conflicts:
#	package.json
#	yarn.lock
 2022-09-28 16:06:22 +01:00
RiotRobot 72ca95e97d v1.11.8 2022-09-28 16:01:20 +01:00
RiotRobot 2d0becc8c5 Upgrade matrix-react-sdk to 3.57.0 2022-09-28 15:59:24 +01:00
RiotRobot a074636773 Upgrade matrix-js-sdk to 20.0.0 2022-09-28 15:59:01 +01:00
RiotRobot 9009e62cc6 Reset matrix-react-sdk back to develop branch 2022-09-28 14:29:17 +01:00
RiotRobot dca486ca10 Reset matrix-js-sdk back to develop branch 2022-09-28 14:29:01 +01:00
RiotRobot fa966348ee Merge branch 'master' into develop 
# Conflicts:
#	package.json
#	yarn.lock
 2022-09-28 14:27:56 +01:00
RiotRobot 981a64aac4 v1.11.7 2022-09-28 14:22:49 +01:00
RiotRobot a529afc133 Upgrade matrix-react-sdk to 3.56.0 2022-09-28 14:20:52 +01:00
RiotRobot 2ba9c13165 Upgrade matrix-js-sdk to 19.7.0 2022-09-28 14:20:28 +01:00
RiotRobot 40ba9c76b1 Reset deps back to develop branch 2022-09-27 20:15:57 +01:00
RiotRobot 958f4d6b86 Merge branch 'master' into develop 2022-09-27 20:04:30 +01:00