gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,600 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

974 Commits

Author SHA1 Message Date
Kegan Dougal e10d5eb0be Pin to the commit so it picks it up 2020-05-29 18:59:26 +01:00
Kegan Dougal ff6c4ac837 Use my fork so we can get IDBFS support 2020-05-29 18:26:47 +01:00
Kegan Dougal bcba891df1 reskindex on react too 2020-05-29 17:48:15 +01:00
Kegan Dougal 708a7146d5 Maybe build p2p without relying on yarn start 2020-05-29 17:23:09 +01:00
Kegan Dougal b0fb043c2b Add localforage support for persisting dendrite data 2020-05-19 11:54:08 +01:00
Kegan Dougal 671315c36e Use p2p branch of react-sdk 2020-04-17 11:28:59 +01:00
Kegan Dougal 52641c5674 [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.13-rc.1...v1.5.13) 
* Upgrade to JS SDK 5.1.1 and React SDK 2.2.3
 -----BEGIN PGP SIGNATURE-----
 
 iQHFBAABCAAvFiEEXqfg9wRho7y+vk1e9hUYBgMgJvkFAl5w39MRHHJlbGVhc2Vz
 QHJpb3QuaW0ACgkQ9hUYBgMgJvlVwQv/QXhOEaioBDRvIgBAd4Q0r1TNNjck4bNu
 kSnxusvuK8WBELPurF8IKk2Nx1rzO7AuY4nnjCJH/9Hzi+xKYAIv79j3kleJxlDB
 DZ2jTV3wLleAJQbmBtvphSaf5bYGH/A6KNcFBXzKID+fbHoY2reayw1FIe3pCeMe
 HDMjyBbkQj0jkHwiO+aMyHd/CBcOXw5MugOk/hi6ftzyQYWCxA+EhCERAC3P7XtT
 3/l5DlBepXqFgvnXnKRSyW91+Q6YXrHSmLLv/ZD7Iu5XMB2QvOiX8/yBEHCO8y0L
 SxVm/8fBnbyfafGb3+pL5LJk8cY0lde4X4Nwwi+ZgLO4v24B6d9KdOomg8a857Zp
 JgZtBmgapDpdoLmQXmnipWBB6QGoF+AqeO47E8weRB3mNko3BuLlfTNjFM4lkthJ
 h/xnVuCK7ruYdIoEHqTuOqkDEYOm2fJq0ShD+B77xfdf1B1GaM/0njLXrPCxgdHh
 avDv8YswPT17JMG+6SrAFI2Hb87DJQKg
 =x4LI
 -----END PGP SIGNATURE-----

Merge tag 'v1.5.13' into matthew/p2p

[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.13-rc.1...v1.5.13)
* Upgrade to JS SDK 5.1.1 and React SDK 2.2.3
 2020-03-26 11:50:30 +00:00
Kegan Dougal 6f43a14c43 Remove go-sqlite-js and just use sql.js directly 2020-03-26 10:35:40 +00:00
RiotRobot c4f3d39d42 v1.5.13 2020-03-17 14:31:49 +00:00
RiotRobot 8002bc66d7 Upgrade matrix-react-sdk to 2.2.3 2020-03-17 14:29:06 +00:00
RiotRobot c3553a2649 Upgrade matrix-js-sdk to 5.1.1 2020-03-17 14:28:23 +00:00
RiotRobot d4a578542f v1.5.13-rc.1 2020-03-11 17:38:21 +00:00
RiotRobot 34817a0044 js-sdk & react-sdk rc.1 2020-03-11 17:36:18 +00:00
RiotRobot 872a7a74fb Reset matrix-react-sdk back to develop branch 2020-03-04 13:07:59 +00:00
RiotRobot 4548831ac5 Reset matrix-js-sdk back to develop branch 2020-03-04 13:07:45 +00:00
RiotRobot d88f9ed2c0 Merge branch 'master' into develop 2020-03-04 13:06:43 +00:00
RiotRobot 6e68c106f7 v1.5.12 2020-03-04 12:58:03 +00:00
RiotRobot c26396d693 Upgrade matrix-react-sdk to 2.2.1 2020-03-04 12:01:31 +00:00
Michael Telatynski 48c8f16a4c
Merge pull request #12590 from vector-im/t3chguy/sso 
riot-desktop open SSO in browser so user doesn't have to auth twice
 2020-03-03 22:27:46 +00:00
J. Ryan Stinnett adc329c67f Revert "Upgrade to Electron 8.0.2" 
This reverts commit 9b9d585af0.
 2020-03-03 13:21:49 -07:00
Michael Telatynski bb6afd7c30 backport riot-desktop implementation into riot-web 2020-03-02 20:16:41 +00:00
RiotRobot 94ceb5a46b Reset SDKs back to develop branch 2020-03-02 17:57:08 +00:00
RiotRobot 43b70bf720 v1.5.11 2020-03-02 17:51:01 +00:00
RiotRobot 620414187f Upgrade matrix-react-sdk to 2.2.0 2020-03-02 17:47:53 +00:00
RiotRobot e71dcacd2d Upgrade matrix-js-sdk to 5.1.0 2020-03-02 17:47:32 +00:00
RiotRobot 03f63397ff v1.5.11-rc.1 2020-02-26 14:37:19 +00:00
RiotRobot a4d01a5f04 Upgrade matrix-react-sdk to 2.2.0-rc.1 2020-02-26 14:34:56 +00:00
RiotRobot 4fced076b7 Upgrade matrix-js-sdk to 5.1.0-rc.1 2020-02-26 14:33:57 +00:00
J. Ryan Stinnett 9b9d585af0 Upgrade to Electron 8.0.2 2020-02-26 13:44:07 +00:00
J. Ryan Stinnett de71e36843 Reset matrix-react-sdk back to develop branch 2020-02-20 12:01:58 +00:00
J. Ryan Stinnett 120d36d70b Reset matrix-js-sdk back to develop branch 2020-02-20 12:01:58 +00:00
RiotRobot eb66d62f1a v1.5.10 2020-02-19 16:23:51 +00:00
RiotRobot dafb2f01b1 released react-sdk & js-sdk 2020-02-19 16:20:44 +00:00
David Baker 5ac9902384 Switch back to develop deps 2020-02-17 14:15:21 +00:00
RiotRobot a5d5e2800c v1.5.9 2020-02-17 13:42:37 +00:00
RiotRobot 9b5655c1fa Released js-sdk & react-sdk 2020-02-17 13:39:24 +00:00
RiotRobot 08c149ed66 v1.5.9-rc.1 2020-02-13 17:56:15 +00:00
RiotRobot 35204416bf Upgrade JS SDK to 5.0.0-rc.1 and React SDK to 2.1.0-rc.2 2020-02-13 17:50:29 +00:00
J. Ryan Stinnett 036348cd60 Electron 8.0.0 crashes on macOS, reverting to 7.1.12 2020-02-13 15:24:59 +00:00
J. Ryan Stinnett 2c0968e40e Return to default deb after install script 
Upstream electron-builder now contains the SUID sandbox change.

See also https://github.com/electron-userland/electron-builder/pull/4163
 2020-02-13 14:52:44 +00:00
J. Ryan Stinnett 3eb5eb1d21 Upgrade electron-builder 2020-02-13 14:50:19 +00:00
J. Ryan Stinnett 4a1b9d8ea4 Upgrade to Electron 8.0.0 2020-02-13 14:45:42 +00:00
Travis Ralston b107da09fa
Merge pull request #12251 from vector-im/jaywink/add-contribute-json 
Add contribute.json
 2020-02-05 15:21:07 +00:00
Jason Robinson 9534a25270 Fix contribute.json location as per spec 
Signed-off-by: Jason Robinson <jasonr@matrix.org>
 2020-02-05 16:28:44 +02:00
Michael Telatynski bceca49cdc Update vendored modernizr 2020-02-04 11:00:47 +00:00
Travis Ralston d50b52cdc5 Try to fix Jest 2020-01-28 14:31:09 +00:00
J. Ryan Stinnett 8ca6c2c433 Flip SDKs back to develop 2020-01-27 16:01:12 +00:00
RiotRobot 9782599c69 Merge branch 'master' into develop 2020-01-27 12:02:44 +00:00
RiotRobot 768cabe4bb v1.5.8 2020-01-27 11:57:49 +00:00
RiotRobot dd26d43173 js-sdk 4.0.0 & react-sdk 2.0.0 2020-01-27 11:52:18 +00:00