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

478 Commits (0d0934add7d83d7b1eac6ca5f92c9b985eee58c9)

Author SHA1 Message Date
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 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
Matthew Hodgson 721410b710 Merge branch 'develop' into matthew/slate 2018-05-13 19:50:55 +01:00
Luke Barnard d90292c6f1 v0.12.4-rc.3 2018-05-11 18:26:35 +01:00
Luke Barnard 6a0bff6685 v0.12.4-rc.2 2018-05-09 17:34:54 +01:00
Luke Barnard ddf98705f2 v0.12.4-rc.1 2018-05-09 13:44:42 +01:00
Luke Barnard 76a8b61772 Merge branch 'master' into develop 2018-05-09 13:31:42 +01:00
Luke Barnard 3d20bd00a2 Pin lolex at 2.3.2 to avoid bug causing tests to fail 
See https://github.com/sinonjs/lolex/issues/170
 2018-05-09 11:43:02 +01:00
Matthew Hodgson 02947063d3 Merge branch 'develop' into matthew/slate 2018-05-05 22:45:44 +01:00
Matthew Hodgson ccd99f4a49 increase max-warnings temporarily 2018-05-05 22:27:54 +01:00
Luke Barnard aa370b3b67
Merge pull request #1877 from matrix-org/luke/test-room-list 
Add tests for RoomList
 2018-05-04 13:57:57 +01:00