PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
2674 commits 1 branch 0 tags 338 MiB
Commit graph

149 commits

Author SHA1 Message Date
David Baker
7785797be0 Update to linkify 2.1.3 
To pull in https://github.com/SoapBox/linkifyjs/pull/166
 2016-10-04 11:29:13 +01:00
David Baker
898d792336 Update to linkifyjs 2.1.1 2016-09-23 14:05:31 +01:00
David Baker
77c4cd337e Merge branch 'develop' into dbkr/irc_links 2016-09-22 09:50:18 +01:00
David Baker
fedc0f2ec6 Back to develop 2016-09-21 17:32:54 +01:00
David Baker
be232bc1da 0.7.2 2016-09-21 17:28:08 +01:00
David Baker
58de14a4c6 Pin to released js-sdk 2016-09-21 17:26:15 +01:00
David Baker
59117f1905 Fix linkifying rooms with underscores, try 2 
Fixes https://github.com/vector-im/vector-web/issues/500
 2016-09-21 14:11:43 +01:00
David Baker
765ae3a715 Move back to js-sdk develop 2016-09-21 12:00:37 +01:00
David Baker
041b10539a 0.7.1 2016-09-21 11:57:51 +01:00
David Baker
681b45230e Pin to js-sdk 0.6.0 2016-09-21 11:50:17 +01:00
David Baker
c34108eab5 0.7.0 2016-09-21 11:43:15 +01:00
Matthew Hodgson
eadcc5e2b9 repin linkify 2016-09-13 19:02:44 +01:00
Matthew Hodgson
91b90aa1fd Merge pull request #460 from aviraldg/fix-linkify 
Fix linkification and bump linkifyjs dep
 2016-09-13 19:01:56 +01:00
Aviral Dasgupta
b62622a814 Improve autocomplete behaviour 
Fixes vector-im/vector-web#1761
 2016-09-13 15:46:02 +05:30
Aviral Dasgupta
8db2a4d46f Fix linkification and bump linkifyjs dep 2016-09-12 03:30:00 +05:30
Matthew Hodgson
b0a4b017c3 Merge pull request #440 from aviraldg/feature-rte-formatbar 
Formatting toolbar for RTE message composer.
 2016-09-08 13:54:26 +01:00
Aviral Dasgupta
71251293e4 RTE formatbar (wip) 
Fixes vector-im/vector-web#2024
 2016-09-08 00:02:16 +05:30
Matthew Hodgson
b5f9c2a5ac Merge branch 'master' into develop 2016-09-02 17:17:24 +01:00
Matthew Hodgson
14227b5718 0.6.5-r3 2016-09-02 17:17:01 +01:00
Matthew Hodgson
fd664e893f Merge branch 'master' into develop 2016-09-02 17:14:24 +01:00
Matthew Hodgson
c2ca261085 0.6.5-r2 2016-09-02 17:13:59 +01:00
Matthew Hodgson
1a4e236a50 Merge branch 'master' into develop 2016-09-01 22:18:32 +01:00
Matthew Hodgson
b9d98f918e 0.6.5-r1 2016-09-01 22:18:11 +01:00
Matthew Hodgson
3b2faa4cf9 pin to dev 2016-08-30 13:54:35 +01:00
Matthew Hodgson
90cfb06ba3 0.6.5 2016-08-28 16:55:04 +01:00
Matthew Hodgson
3dd337b553 dep on 0.5.6 of matrix-js-sdk 2016-08-28 16:51:51 +01:00
Matthew Hodgson
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
David Baker
3c8a7e36aa 0.6.4-r1 2016-08-12 10:08:15 +01:00
David Baker
ec9243d4b0 0.6.4 2016-08-11 17:29:10 +01:00
David Baker
e4dd387376 JS SDK 0.5.5 released 2016-08-11 17:28:09 +01:00
Matthew Hodgson
d0158f5812 fix merge conflict 2016-08-04 23:45:28 +01:00
Matthew Hodgson
90e5ab2ca3 merge in develop 2016-08-04 13:39:47 +01:00
Richard van der Hoff
24cc4f52bf Downgrade emojione to 2.2.3 
... because @aviraldg says > 2.2.3 is broken :/
 2016-08-03 21:36:52 +01:00
Richard van der Hoff
f4e40696bc Bump emojione to 2.2.3 
Because @aviraldg says it's better.
 2016-08-03 21:17:54 +01:00
David Baker
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
David Baker
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
Richard van der Hoff
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
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
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
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