b5f9c2a5ac
Merge branch 'master' into develop
2016-09-02 17:17:24 +01:00
14227b5718
0.6.5-r3
2016-09-02 17:17:01 +01:00
fd664e893f
Merge branch 'master' into develop
2016-09-02 17:14:24 +01:00
c2ca261085
0.6.5-r2
2016-09-02 17:13:59 +01:00
1a4e236a50
Merge branch 'master' into develop
2016-09-01 22:18:32 +01:00
b9d98f918e
0.6.5-r1
2016-09-01 22:18:11 +01:00
3b2faa4cf9
pin to dev
2016-08-30 13:54:35 +01:00
90cfb06ba3
0.6.5
2016-08-28 16:55:04 +01:00
3dd337b553
dep on 0.5.6 of matrix-js-sdk
2016-08-28 16:51:51 +01:00
6786539550
pin linkifyjs to precisely 2.0.0-beta4, as 2.0.0-beta9 breaks links as per https://github.com/vector-im/vector-web/issues/2010
2016-08-25 18:30:48 +01:00
3c8a7e36aa
0.6.4-r1
2016-08-12 10:08:15 +01:00
ec9243d4b0
0.6.4
2016-08-11 17:29:10 +01:00
e4dd387376
JS SDK 0.5.5 released
2016-08-11 17:28:09 +01:00
d0158f5812
fix merge conflict
2016-08-04 23:45:28 +01:00
90e5ab2ca3
merge in develop
2016-08-04 13:39:47 +01:00
24cc4f52bf
Downgrade emojione to 2.2.3
...
... because @aviraldg says > 2.2.3 is broken :/
2016-08-03 21:36:52 +01:00
f4e40696bc
Bump emojione to 2.2.3
...
Because @aviraldg says it's better.
2016-08-03 21:17:54 +01:00
cf3cd69f37
Merge pull request #366 from matrix-org/rav/remove_relayoutonupdate
...
Remove relayoutOnUpdate prop on gemini-scrollbar
2016-07-27 15:21:46 +01:00
3308842121
Fix up reskindex.js path
...
Since npm does not put our *own* 'binaries' on the path, we need to use the full path to it
2016-07-27 13:28:23 +01:00
c8df9148b3
Remove relayoutOnUpdate prop on gemini-scrollbar
...
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
2016-07-27 11:35:48 +01:00
e3cdeed32b
Bump to react 15.2.1
...
This should also stop npm complaining about invalid peerDependencies.
2016-07-22 10:43:50 +01:00
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
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
cccc58b47f
feat: implement autocomplete replacement
2016-07-03 22:15:13 +05:30
cd928fe6f5
Merge remote-tracking branch 'upstream/develop' into feature-autocomplete
2016-07-03 00:00:02 +05:30
21cc4cba9a
Correct npm run lint command line
2016-07-01 19:30:53 +01:00
1c002866e8
feat: add and configure eslint
2016-07-01 23:08:51 +05:30
5cda2a6802
Disable colour output in jenkins script
...
As it really confuses jenkins
2016-06-23 14:38:08 +01:00
94aec10512
Merge branch 'develop' into dbkr/scalar
2016-06-19 22:40:48 +01:00
b9d7743e5a
Emoji provider, DDG working, style improvements
2016-06-17 04:58:09 +05:30
769b3f0c2a
Merge branch 'develop' into feature-autocomplete
2016-06-17 00:37:39 +05:30
4bc8ec3e6d
room, user, ddg autocomplete providers (wip)
2016-06-12 17:02:46 +05:30
0df201c483
Merge branch 'develop' into feature-autocomplete
2016-06-12 14:10:23 +05:30
e4217c3fb7
rte improvements, markdown mode
2016-06-11 15:52:08 +05:30
bf8e56e04c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-rte
2016-06-10 04:43:44 +05:30
cab24bb14c
Switch matrix-js-sdk back to develop
2016-06-08 21:34:30 +01:00
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
8679ce80c8
Update vector velocity fork package name
2016-06-07 20:28:38 +01:00
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
fdcebe1e56
Merge remote-tracking branch 'origin/develop' into dbkr/scalar
2016-06-06 17:19:38 +01:00
507f5e2ca1
0.6.3
2016-06-03 12:17:46 +01:00
b06ab78a81
0.6.2
2016-06-02 18:55:34 +01:00
168f74d6cf
correctly bump dep on js-sdk 0.5.4
2016-06-02 18:53:50 +01:00
204437e40c
0.6.1
2016-06-02 18:32:50 +01:00
268cedee0f
0.6.0
2016-06-02 13:38:19 +01:00
d812c77fc1
Bump to js-sdk 0.5.3
2016-06-02 13:36:45 +01:00
b979a16199
initial version of autocomplete
2016-06-01 16:54:21 +05:30
001011df27
Initial version of rich text editor
2016-05-27 10:15:55 +05:30
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
412512570b
0.5.2
2016-04-22 11:21:32 +01:00
Matthew Hodgson