Commit graph

1977 commits

Author SHA1 Message Date
Matthew Hodgson
ef8f9ecbf3 pin matrix-js-sdk and matrix-react-sdk deps for release 2016-08-28 17:36:57 +01:00
Matthew Hodgson
36a608952d make /user URLs work 2016-08-28 14:04:25 +01:00
Matthew Hodgson
9b8e127e23 switch to using matrix.to for permalinks 2016-08-28 02:11:57 +01:00
Matthew Hodgson
88dba1bf6c CSS for room settings leave button 2016-08-27 23:59:26 +01:00
Matthew Hodgson
8d7daf61b9 fix CSS namespacing 2016-08-27 23:59:15 +01:00
Matthew Hodgson
ee1fae8ced fix RoomTagContextMenu so it works on historical rooms 2016-08-27 23:58:35 +01:00
Matthew Hodgson
13983900c0 clarify electron instructions 2016-08-27 22:21:52 +01:00
Matthew Hodgson
881739b478 try to unbreak jenkins >:( 2016-08-27 01:54:19 +01:00
Matthew Hodgson
e06caa9ca1 mention not just a problem for Vector 2016-08-27 00:13:56 +01:00
Matthew Hodgson
efc5462131 warn people to put their Matrix HS on a separate domain 2016-08-27 00:13:20 +01:00
Matthew Hodgson
2199fe5cbf unbreak changelog 2016-08-27 00:06:00 +01:00
Matthew Hodgson
30f774cf9c add whitespace padding to composer RHS 2016-08-27 00:00:09 +01:00
Matthew Hodgson
be9aa44ca8 fix NPE checking tag order 2016-08-26 23:49:07 +01:00
Matthew Hodgson
2f375e4f67 DIE ZALGO 2016-08-26 16:08:56 +01:00
Matthew Hodgson
c6d4eb7fd3 try to make the changelog commit links suck less 2016-08-26 00:40:21 +01:00
Matthew Hodgson
abca5faf78 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:35 +01:00
Richard van der Hoff
64bbebb135 Merge pull request #2007 from vector-im/rav/travis
Add .travis.yml
2016-08-25 14:33:32 +01:00
Richard van der Hoff
ebad3da6dd Use node v6 for travis 2016-08-25 14:26:56 +01:00
Richard van der Hoff
4633d16a6b Merge branch 'develop' into rav/travis 2016-08-25 14:26:20 +01:00
Richard van der Hoff
df026aede2 Switch to node 6
... because 4 is ooold, and I'd like to use the same version on travis.
2016-08-25 14:25:05 +01:00
Richard van der Hoff
d495a5b747 Merge branch 'rav/fix_build' into develop 2016-08-25 12:23:48 +01:00
Richard van der Hoff
042a6b58c4 Remove redundant whatwg import
This has been rewritten to use browser-request rather than whatwg, so remove
the import, which was causing the build to fail on npm 2. (It worked, for the
wrong reasons, on npm 3.)
2016-08-25 12:14:49 +01:00
Richard van der Hoff
d87cf6c02b Transpile the react-sdk before running travis tests 2016-08-25 12:12:20 +01:00
Richard van der Hoff
0c99c5563f Add .travis.yml 2016-08-25 11:56:49 +01:00
Matthew Hodgson
3934e37f77 Merge pull request #1972 from aviraldg/feature-changelog
add fancy changelog dialog
2016-08-24 18:02:00 +01:00
Matthew Hodgson
2ee4fa484e Merge pull request #1978 from aviraldg/feature-autocomplete-improvements
Update autocomplete design
2016-08-24 14:48:06 +01:00
Richard van der Hoff
bc7948d75f Merge remote-tracking branch 'origin/master' into develop 2016-08-24 10:24:35 +01:00
Richard van der Hoff
5348b8a980 Merge pull request #2001 from vector-im/rav/fix_readme_lies
Update encryption info in README
2016-08-24 10:22:38 +01:00
Richard van der Hoff
f2936dc15c Update encryption info in README 2016-08-23 18:07:07 +01:00
Matthew Hodgson
864f9747f0 Merge pull request #2000 from vector-im/wmwragg/chat-message-presentation
Added event/info message avatars back in
2016-08-23 17:14:21 +01:00
wmwragg
3ea62eb73a Added event/info message avatars back in 2016-08-23 15:57:53 +01:00
Matthew Hodgson
1d1f89e0de Merge pull request #1987 from vector-im/wmwragg/chat-message-presentation
Wmwragg/chat message presentation
2016-08-23 12:19:58 +01:00
Aviral Dasgupta
554c33a883 Extract autocomplete styling to CSS 2016-08-23 00:36:01 +05:30
Aviral Dasgupta
56813eb11e remove whatwg-fetch and use browser-request 2016-08-22 23:59:32 +05:30
wmwragg
e9eafc3380 Further tweak 2016-08-22 11:15:49 +01:00
wmwragg
600a1cae79 Read avatars position tweaked, now that the spacing has changed 2016-08-22 11:13:42 +01:00
wmwragg
0b1fc1b925 Avatar and Sender Profile alignment, along with reducing the distance between initial messages and the previous one 2016-08-22 10:45:00 +01:00
wmwragg
bdaa9faea0 Added the font-size back in, as the textarea gets overidden otherwise 2016-08-19 18:03:12 +01:00
wmwragg
dbadb07adf Moved the font-size into the .mx_MessageComposer_input so that it sets the size for RTE as well as normal composer 2016-08-19 17:57:24 +01:00
wmwragg
4a2c899d05 Merge branch 'develop' into wmwragg/chat-message-presentation 2016-08-19 17:22:26 +01:00
wmwragg
85084f5fd7 Fixed spacing on multiline messages 2016-08-19 16:46:15 +01:00
wmwragg
78692c83a6 Removal of the mini avatars for action (info) messages 2016-08-19 16:37:45 +01:00
wmwragg
173e6011e8 Alignment tweak to the readAvatars 2016-08-19 11:12:06 +01:00
wmwragg
9e542ba232 Alignment adjustment so that the readAvatars sit in the center of the top line in a new message 2016-08-19 10:58:51 +01:00
wmwragg
5005675561 Some CSS tidy-up, and fix for readAvatars when the message is not classed as a continuation, but is an info message 2016-08-18 22:50:40 +01:00
wmwragg
29759ca71e Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message 2016-08-18 21:54:07 +01:00
Aviral Dasgupta
be28a96d8d add fancy changelog dialog 2016-08-18 22:53:47 +05:30
Matthew Hodgson
9b5e5c9acb squidge video icon a bit 2016-08-18 16:48:28 +01:00
David Baker
fbbbd44dc3 Merge pull request #1982 from vector-im/dbkr/make_notif_silder_work
Make the notification slider work
2016-08-18 15:24:14 +01:00
David Baker
0bb3eaaf67 Use constants 2016-08-18 13:46:47 +01:00