5614 Commits

Author SHA1 Message Date
Richard van der Hoff e3cdeed32b Bump to react 15.2.1
This should also stop npm complaining about invalid peerDependencies.
2016-07-22 10:43:50 +01:00
Richard van der Hoff ad7f8d0a58 Bump to latest react-gemini-scrollbar
I've updated our forks of the gemini-scrollbar project to latest upstream.
2016-07-22 10:12:37 +01:00
Richard van der Hoff 3e53879adc Bump to olm 1.0.0
Fixes https://github.com/vector-im/vector-web/issues/1719
2016-07-11 14:53:51 +01:00
David Baker 6d403e792b Add --stage 1 to babel cmdline
So we can use trailing function commas. The trailing comma proposal is actually at stage 3 now and there's a babel 6 plugin for it, which  we should use when we switch back to babel 6.
2016-07-08 15:29:59 +01:00
Aviral Dasgupta cccc58b47f feat: implement autocomplete replacement 2016-07-03 22:15:13 +05:30
Aviral Dasgupta cd928fe6f5 Merge remote-tracking branch 'upstream/develop' into feature-autocomplete 2016-07-03 00:00:02 +05:30
David Baker 21cc4cba9a Correct npm run lint command line 2016-07-01 19:30:53 +01:00
Aviral Dasgupta 1c002866e8 feat: add and configure eslint 2016-07-01 23:08:51 +05:30
David Baker 5cda2a6802 Disable colour output in jenkins script
As it really confuses jenkins
2016-06-23 14:38:08 +01:00
Richard van der Hoff 4c6fa740f3 package.json: add olm as optionalDependency
Add olm as an optionalDependency to vector, so that the webpack config can find
it and include it in the bundle.
2016-06-20 15:10:19 +01:00
Matthew Hodgson 94aec10512 Merge branch 'develop' into dbkr/scalar 2016-06-19 22:40:48 +01:00
Aviral Dasgupta b9d7743e5a Emoji provider, DDG working, style improvements 2016-06-17 04:58:09 +05:30
Aviral Dasgupta 769b3f0c2a Merge branch 'develop' into feature-autocomplete 2016-06-17 00:37:39 +05:30
Aviral Dasgupta 4bc8ec3e6d room, user, ddg autocomplete providers (wip) 2016-06-12 17:02:46 +05:30
Aviral Dasgupta 0df201c483 Merge branch 'develop' into feature-autocomplete 2016-06-12 14:10:23 +05:30
Aviral Dasgupta e4217c3fb7 rte improvements, markdown mode 2016-06-11 15:52:08 +05:30
Aviral Dasgupta bf8e56e04c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-rte 2016-06-10 04:43:44 +05:30
Aviral Dasgupta b2459b2dc6 Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte 2016-06-10 04:43:06 +05:30
Richard van der Hoff 7999a70cab Switch to dev versions of react-sdk and js-sdk 2016-06-08 21:36:45 +01:00
Richard van der Hoff cab24bb14c Switch matrix-js-sdk back to develop 2016-06-08 21:34:30 +01:00
David Baker aca0e060a4 Also change velocity-vector commit & requires
Because it needs a versiob where the package name is actually updated and the requires need to use the right package name
2016-06-07 20:47:37 +01:00
David Baker 8679ce80c8 Update vector velocity fork package name 2016-06-07 20:28:38 +01:00
David Baker d5a522fdfe Second attempt at fixing the Velocity memory leak
1) Correct fix for Velociraptor (we need to find the DOM node and pass that in)
2) Do the same leak fix for the read marker
3) Update the dependency to our fork which is fixed to make the call we do to release memory actually work.
4) Remove the velocity-ui-pack dependency which is unnecessary because velocity-ui is included in the velocity package
2016-06-07 18:22:01 +01:00
David Baker c6cf5febd5 Merge pull request #1516 from vith/static-config-json
serve config.json statically instead of bundling it
2016-06-06 19:15:35 +01:00
David Baker fdcebe1e56 Merge remote-tracking branch 'origin/develop' into dbkr/scalar 2016-06-06 17:19:38 +01:00
Matthew Hodgson c672919d1e 0.7.3 2016-06-03 12:20:05 +01:00
Matthew Hodgson e68a2b5e1d pin to react sdk 0.6.3 for release 2016-06-03 12:19:04 +01:00
Matthew Hodgson 507f5e2ca1 0.6.3 2016-06-03 12:17:46 +01:00
Matthew Hodgson ddc4ac187c dep on react-sdk develop 2016-06-02 23:32:47 +01:00
Matthew Hodgson ded66bbdfc 0.7.2 2016-06-02 19:05:50 +01:00
Matthew Hodgson 4ec77eeca7 correctly bump dep on js-sdk and react-sdk 2016-06-02 19:04:22 +01:00
Matthew Hodgson b06ab78a81 0.6.2 2016-06-02 18:55:34 +01:00
Matthew Hodgson 168f74d6cf correctly bump dep on js-sdk 0.5.4 2016-06-02 18:53:50 +01:00
Matthew Hodgson 635fd927cd 0.7.1 2016-06-02 18:41:20 +01:00
Matthew Hodgson 204437e40c 0.6.1 2016-06-02 18:32:50 +01:00
Richard van der Hoff e0bf23fa7c 0.7.0 2016-06-02 13:42:25 +01:00
Richard van der Hoff f6ec858ac9 Bump js-sdk and react-sdk for new releases
js-sdk 0.5.3
react-sdk 0.6.0
2016-06-02 13:40:15 +01:00
Richard van der Hoff 268cedee0f 0.6.0 2016-06-02 13:38:19 +01:00
Richard van der Hoff d812c77fc1 Bump to js-sdk 0.5.3 2016-06-02 13:36:45 +01:00
Aviral Dasgupta b979a16199 initial version of autocomplete 2016-06-01 16:54:21 +05:30
Aviral Dasgupta 7e563b89c7 initial version of rich text editor 2016-05-27 10:17:01 +05:30
Aviral Dasgupta 001011df27 Initial version of rich text editor 2016-05-27 10:15:55 +05:30
Jason Papakostas 6a6118e136 serve config.json statically instead of bundling it
issue #1344
2016-05-24 19:08:09 -05:00
David Baker 0bb4f9dd5c add browser request as a dep
since we need to do requests directly for scalar integ
2016-05-16 15:35:39 +01:00
David Baker 4f64f70a12 Use react-sdk develop as email notifs needs it 2016-05-10 17:35:35 +02:00
Richard van der Hoff 4cddda67d9 0.6.1 2016-04-22 11:35:51 +01:00
Richard van der Hoff ee88fe55c1 Bump to react-sdk 0.5.2 2016-04-22 11:30:33 +01:00
Richard van der Hoff 412512570b 0.5.2 2016-04-22 11:21:32 +01:00
Richard van der Hoff e5e9a3819e Load babel-polyfill in tests
Object.values() isn't available natively, so use polyfill for it.
2016-04-21 08:10:46 +01:00
Richard van der Hoff b8018942fc Bump react-gemini-scrollbar
(to pick up a non-broken version)
2016-04-20 13:46:59 +01:00