Commit graph

263 commits

Author SHA1 Message Date
Luke Barnard
fe121126f5 Merge branch 'develop' into rte-fixes
Conflicts:
	src/UserSettingsStore.js
	src/autocomplete/EmojiProvider.js
	src/components/views/rooms/MessageComposerInput.js
2017-05-08 17:08:59 +01:00
David Baker
3366d3bbae Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2
Make left panel better for new users (mk II)
2017-05-08 10:37:55 +01:00
Matthew Hodgson
f056360f70 merge master post release 2017-05-07 20:01:11 +01:00
David Baker
396b38512c Remove babelcheck
Nobody is likley to be upgrading from babel 5 any more, so this
can go away now.
2017-05-04 16:50:47 +01:00
David Baker
909cdb6e9a Depend on prop-types module
So we can start writing code compatible with new React
2017-05-04 16:22:06 +01:00
Michael Telatynski
c8fb18dc93 Pin filesize ver to fix break upstream
https://travis-ci.org/vector-im/riot-web/builds/227340622
https://github.com/avoidwork/filesize.js/issues/87
3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us
2017-04-30 13:00:47 +01:00
David Baker
d81adb234a v0.8.8 2017-04-25 10:53:59 +01:00
David Baker
74dabb2087 Released js-sdk 2017-04-25 10:52:44 +01:00
David Baker
e569144d6f v0.8.8-rc.2 2017-04-24 18:24:29 +01:00
David Baker
a55eb00dad v0.8.8-rc.1 2017-04-21 18:22:39 +01:00
David Baker
665f507537 Update js-sdk dependency 2017-04-21 18:18:35 +01:00
Matthew Hodgson
8da07740d1 bump react-gemini-scrollbar 2017-04-19 23:34:29 +01:00
David Baker
1d836c7d02 Back to js-sdk develop 2017-04-12 10:04:25 +01:00
David Baker
1ff4439566 v0.8.7 2017-04-12 10:02:21 +01:00
David Baker
73888ea616 js-sdk 0.7.6 2017-04-12 10:00:35 +01:00
David Baker
25665a81ae v0.8.7-rc.4 2017-04-11 18:47:45 +01:00
David Baker
46b362b20c v0.8.7-rc.3 2017-04-10 16:52:30 +01:00
David Baker
a77fdd0383 js-sdk rc.2 2017-04-10 16:47:45 +01:00
David Baker
966dc3a071 v0.8.7-rc.2 2017-04-10 16:46:14 +01:00
David Baker
440307bd39 v0.8.7-rc.1 2017-04-07 17:04:03 +01:00
David Baker
2285239428 js-sdk prerelease 2017-04-07 17:02:47 +01:00
Aviral Dasgupta
78641a80dd
autocomplete: replace Fuse.js with liblevenshtein 2017-03-07 04:09:25 +05:30
Aviral Dasgupta
f4c0baaa2f
refactor MessageComposerInput: bind -> class props 2017-03-07 04:09:25 +05:30
Aviral Dasgupta
0e66b370d4
fix eslint's no-invalid-this rule for class properties 2017-02-16 16:49:00 +05:30
Richard van der Hoff
6d8dcd97af Merge branch 'master' into develop
(Keep js-sdk on develop)
2017-02-04 10:42:31 +00:00
Richard van der Hoff
a9cd1bfd4b v0.8.6 2017-02-04 10:30:16 +00:00
Richard van der Hoff
39488f294b bump to js-sdk 0.7.5 2017-02-04 10:23:56 +00:00
Richard van der Hoff
19b0f956d2 v0.8.6-rc.3 2017-02-03 15:32:37 +00:00
Richard van der Hoff
c52ae8ff01 Bump to js-sdk 0.7.5-rc.3 2017-02-03 15:28:03 +00:00
Richard van der Hoff
fd0a66ab99 Unpin js-sdk 2017-02-03 14:37:58 +00:00
David Baker
41936a957f v0.8.6-rc.2 2017-02-03 13:07:11 +00:00
David Baker
66e22d1d26 Bump js-sdk 2017-02-03 13:04:42 +00:00
David Baker
bded0a7e8e v0.8.6-rc.1 2017-02-03 12:13:42 +00:00
David Baker
25876837f5 released js-sdk 2017-02-03 12:11:24 +00:00
Richard van der Hoff
e23deac1bb Implement e2e export 2017-01-24 21:50:24 +00:00
David Baker
1e77b2eba3 Bundle eslint config 2017-01-23 16:19:29 +00:00
David Baker
4ba224aac3 Use eslint config from the js sdk
Extend the js sdk's eslint config to give as consistent a code
style as possible. Add react/jsx/flow stuff that we use here.
2017-01-20 14:08:14 +00:00
Richard van der Hoff
bb7d589287 Merge pull request #617 from matrix-org/rav/megolm_backup
Megolm session import and export
2017-01-19 16:14:18 +00:00
Richard van der Hoff
31df78f946 Use text-encoding-utf-8 as a TextEncoder polyfill
Somebody else seems to have done a good job of polyfilling TextEncoder, so
let's use that.
2017-01-18 11:39:44 +00:00
Kegsay
fcb1d7a664 Merge pull request #575 from kyrias/commonmark
Replace marked with commonmark
2017-01-17 11:57:08 +00:00
David Baker
1d5112db5d Back to develop js-sdk 2017-01-16 13:22:57 +00:00
David Baker
a9256b0ab1 v0.8.5 2017-01-16 13:21:34 +00:00
David Baker
3679e47002 js-sdk 0.7.4 2017-01-16 13:19:24 +00:00
David Baker
3ac9ed7f8f v0.8.5-rc.1 2017-01-13 11:14:26 +00:00
David Baker
57652c06e3 released js-sdk 2017-01-13 11:13:17 +00:00
Matthew Hodgson
97514cf80e Merge branch 'master' into develop 2016-12-24 19:03:42 +00:00
Matthew Hodgson
45bfb93f17 v0.8.4 2016-12-24 19:03:08 +00:00
Matthew Hodgson
223caae842 Merge branch 'master' into develop 2016-12-24 18:54:00 +00:00
Matthew Hodgson
1976bb70bd v0.8.3-electron 2016-12-24 18:53:24 +00:00
David Baker
9cbe401866 Back to js-sdk develop 2016-12-22 14:13:48 +00:00