mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 03:36:07 +03:00
Code Issues Projects Releases Packages Wiki Activity
11016 commits 215 branches 561 tags 411 MiB
Commit graph

487 commits

Author SHA1 Message Date
Michael Telatynski
6a0182a653
update Slate as fixes have now landed 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-24 15:53:48 +01:00
David Baker
a79caed0c9 Merge remote-tracking branch 'origin/develop' into dbkr/tiny_jitsi_follows_you_between_rooms 2018-07-16 17:21:51 +01:00
David Baker
d16ac4d80c
Merge pull request #1890 from matrix-org/matthew/slate 
Replace Draft with Slate
 2018-07-16 14:16:25 +01:00
David Baker
e56feea9ec Put always-on-screen widgets in top left 
always-on-screen widgets now appear in the top-left where the
call preview normally is if you're not in the room that they're in.

Fixes https://github.com/vector-im/riot-web/issues/7007
Based off https://github.com/matrix-org/matrix-react-sdk/pull/2053
 2018-07-12 18:43:49 +01:00
Matthew Hodgson
8665f10f27
pin slate to 0.33.4 to avoid https://github.com/ianstormtaylor/slate/pull/1958 
(cherry picked from commit 445faca)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:53:47 +01:00
Matthew Hodgson
efdc5430d7 merge develop 2018-07-09 17:50:07 +01:00
David Baker
487e3cb988 v0.12.9 2018-07-09 13:11:02 +01:00
David Baker
6245d78584 Released js-sdk 2018-07-09 13:08:28 +01:00
David Baker
64542da7cb v0.12.9-rc.2 2018-07-06 15:52:10 +01:00
David Baker
467423e0b4 js-sdk rc.1 2018-07-06 15:48:49 +01:00
David Baker
6e92cc3ea3 v0.12.9-rc.1 2018-07-04 11:23:21 +01:00
David Baker
41dee71d38 Merge branch 'master' into develop 2018-06-29 11:52:20 +01:00
David Baker
2dc94ac277 v0.12.8 2018-06-29 11:40:18 +01:00
David Baker
30ddc9610a Released js-sdk 2018-06-29 11:34:56 +01:00
Luke Barnard
4594b045d2
Merge pull request #1917 from akihikodaki/lolex 
Update lolex to 2.7.0
 2018-06-25 13:37:59 +01:00
Michael Telatynski
7b1ac9b754
upgrade minimum version of linkifyjs for more TLD support 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 19:28:42 +01:00
David Baker
64fc7d3840 v0.12.8-rc.2 2018-06-22 18:08:57 +01:00
David Baker
2b8bc8a800 v0.12.8-rc.1 2018-06-21 10:06:53 +01:00
David Baker
b18c95cdb5 js-sdk rc.1 2018-06-21 10:03:35 +01:00
David Baker
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group 
Share Dialog
 2018-06-15 10:52:27 +01:00
Akihiko Odaki
e98112254d Update lolex to 2.7.0 
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
 2018-06-13 19:08:07 +09:00
David Baker
e858cf3bcb Merge branch 'master' into develop 2018-06-12 14:26:29 +01:00
David Baker
ef1f580abb v0.12.7 2018-06-12 14:21:30 +01:00
David Baker
334dccbdc7 Released js-sdk 2018-06-12 14:14:14 +01:00
Michael Telatynski
074051297a
add a ShareDialog for sharing users,groups and rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:21:55 +01:00
David Baker
3983535536
Merge pull request #1916 from akihikodaki/sinon 
Update sinon to 5.0.7
 2018-06-08 16:41:11 +01:00
David Baker
4834816a06 v0.12.7-rc.1 2018-06-06 16:06:45 +01:00
David Baker
881e9a8070 js-sdk rc.1 2018-06-06 16:00:16 +01:00
Matthew Hodgson
ab41212258 fix double-nested code blocks & bump md-serializer 2018-05-26 00:37:21 +01:00
David Baker
bbdc27019a v0.12.6 2018-05-25 15:16:01 +01:00
David Baker
8a3ae1ed63 released js-sdk 2018-05-25 15:12:48 +01:00
David Baker
02377b57c0 v0.12.6-rc.1 2018-05-24 18:22:56 +01:00
David Baker
3851fa80ff js-sdk RC 2018-05-24 18:19:11 +01:00
Matthew Hodgson
864a33f978 switch to using 'code' for both blocks & marks to match md-serializer 2018-05-23 20:12:13 +01:00
Matthew Hodgson
87c3e92014 bump dep 2018-05-23 13:32:48 +01:00
Matthew Hodgson
5b4a036e8c bump dep 2018-05-23 03:53:05 +01:00
Matthew Hodgson
95bfface99 comment out broken logic for stripping p tags & bump dep 2018-05-23 03:43:40 +01:00
Matthew Hodgson
079b1238a1 bump right dep 2018-05-23 03:20:59 +01:00
Matthew Hodgson
a822a1c9a0 bump dep 2018-05-23 03:19:33 +01:00
Matthew Hodgson
6f3634c33f bump slate-md-serializer 2018-05-23 03:08:55 +01:00
Matthew Hodgson
edc8264cff shift to custom slate-md-serializer 2018-05-23 02:48:57 +01:00
Matthew Hodgson
fc1c4996fc slate-md-serializer 3.1.0 now escapes correctly 2018-05-23 02:15:34 +01:00
Akihiko Odaki
35ab573bc5 Update sinon to 5.0.7 2018-05-21 18:44:00 +09:00
Matthew Hodgson
4972a234c4 Merge branch 'develop' into matthew/slate 2018-05-19 12:58:43 +01:00
David Baker
fa7f6c2c4c v0.12.5 2018-05-17 17:04:39 +01:00
David Baker
bf0ec249b6 v0.12.4 2018-05-16 11:49:06 +01:00
David Baker
a0b6bd183c v0.12.4-rc.6 2018-05-15 18:03:40 +01:00
Luke Barnard
db092c81d3 v0.12.4-rc.5 2018-05-15 15:54:15 +01:00
Matthew Hodgson
b60ccad29b Merge branch 'develop' into matthew/slate 2018-05-15 01:00:07 +01:00
Luke Barnard
7bfc50bf42 v0.12.4-rc.4 2018-05-14 18:23:14 +01:00