Commit graph

1568 commits

Author SHA1 Message Date
David Baker
55c7c08ac2 Sender can be null, so null check. 2016-02-23 17:59:13 +00:00
Richard van der Hoff
72393bf75f Merge branch 'rav/read_marker' into develop 2016-02-23 17:57:50 +00:00
David Baker
497cb8bc9c Merge pull request #993 from vector-im/dbkr/keypair_3pid_invites
Pass through params for other URLs
2016-02-23 11:08:28 +00:00
David Baker
a063efe250 Remove no-longer accurate comment. 2016-02-23 10:57:50 +00:00
David Baker
45c8500f28 Pass through params for other URLs (in this case, for keypair invite signing urls) 2016-02-23 10:22:22 +00:00
Richard van der Hoff
b04ce6a376 Fix default hs url after it was broken in 77b45e72 2016-02-22 17:07:26 +00:00
Matthew Hodgson
f2fc4a88ae gemini up roomdirectory 2016-02-22 09:35:11 +00:00
Matthew Hodgson
77b45e7231 oooooooops - remember opensans v13 2016-02-22 09:18:56 +00:00
Matthew Hodgson
484736bf57 oops, add sanitize-html 2016-02-21 00:05:44 +00:00
Matthew Hodgson
e91a108738 Merge pull request #972 from vector-im/matthew/room-directory
Skin RoomDirectory almost as per design
2016-02-20 23:59:02 +00:00
Matthew Hodgson
2ca5529faa support hyperlinked topics 2016-02-20 23:54:47 +00:00
Matthew Hodgson
a35ab6bcef tart up room directory 2016-02-20 13:36:48 +00:00
Matthew Hodgson
e33e9b5d4a upgrade OpenSans and add semibold 2016-02-20 13:36:33 +00:00
Matthew Hodgson
3910877f8f ensure local activity bumps rooms up the roomlist 2016-02-19 02:09:04 +00:00
Matthew Hodgson
f538a0d5de scale local video feed to fit on the page properly 2016-02-19 01:16:55 +00:00
Matthew Hodgson
4e5b971d3a accomodate 800px wide thumbs 2016-02-18 19:09:32 +00:00
Matthew Hodgson
ffb1584e10 horizontally scale images properly 2016-02-18 18:59:45 +00:00
Matthew Hodgson
dbf3439e35 fix statusbar layout some more 2016-02-18 18:13:23 +00:00
Matthew Hodgson
11ac6defed tint searchbar 2016-02-18 17:32:15 +00:00
Richard van der Hoff
718c1cbe6f Merge branch 'rav/update_status_bar' into develop 2016-02-17 21:16:22 +00:00
Matthew Hodgson
27222a54c7 somewhat cryptic hack to make empty RoomStatusBars not take up 41px rather than 36px of height 2016-02-17 18:54:46 +00:00
Matthew Hodgson
3263076ea6 Merge branch 'develop' into rav/update_status_bar 2016-02-17 18:37:40 +00:00
Matthew Hodgson
3c659dcf57 experimental fix for https://github.com/vector-im/vector-web/issues/947 and https://github.com/vector-im/vector-web/issues/946. may well introduce more problems 2016-02-17 12:43:42 +00:00
Matthew Hodgson
2cd3150c56 tart up mx_EventTile_selected 2016-02-15 20:22:45 +00:00
Matthew Hodgson
cdc1447804 fix search highlight css 2016-02-15 20:19:30 +00:00
Matthew Hodgson
11c9aff69a fix radiobutton css 2016-02-15 22:06:16 +02:00
Matthew Hodgson
58959d014a show vaguely accurate default avatar 2016-02-15 22:01:30 +02:00
Richard van der Hoff
1a9125a886 Fix horizontal alignment of top unread-messages bar 2016-02-15 18:10:11 +00:00
Matthew Hodgson
8e008572e5 CSS for setting display name prompt 2016-02-15 19:37:19 +02:00
Richard van der Hoff
18c6aa38e4 Styling and imgs to support new read_marker semantics
Support for adding a new 'Scroll up' bar in react-sdk
2016-02-15 17:22:55 +00:00
Matthew Hodgson
177fba360d shrink 3pid invite placeholder text 2016-02-15 11:13:24 +02:00
Matthew Hodgson
ad9935739c proper fix for https://github.com/vector-im/vector-web/issues/917 and resolve https://github.com/vector-im/vector-web/issues/928 2016-02-15 09:56:52 +02:00
Matthew Hodgson
a2193d61b0 show the leave button by default for now as it causes too much pain otherwise 2016-02-14 21:34:32 +02:00
Matthew Hodgson
0ca6efdfca fix the nightmarish https://github.com/vector-im/vector-web/issues/917 2016-02-14 21:28:01 +02:00
Matthew Hodgson
f3df0d07f8 filter room directory case insensitively 2016-02-14 13:32:15 +02:00
David Baker
95a3354b90 Merge pull request #914 from vector-im/dbkr/package_use_tar
Use tar for packaging because zip can't traverse directory symlinks
2016-02-11 15:09:49 +00:00
David Baker
82b498017d Bumb webpack micro version (although it would have installed the latest micro version anyway) to maybe get a webpack that doesn't throw stack depth errors. 2016-02-11 15:01:32 +00:00
David Baker
b929f80be8 Use tar for packaging because zip can't traverse directory symlinks, hence ditch windows support for packaging. 2016-02-11 14:59:22 +00:00
David Baker
05a30e7c68 Merge pull request #902 from vector-im/dbkr/add_package_script
Add 'package' script to build a webapp bundle
2016-02-11 14:18:06 +00:00
David Baker
3c75c43d37 Bail if build step fails 2016-02-11 13:59:40 +00:00
David Baker
369e357742 We expect the mkdir to fail when the dir exists, so use ; not && 2016-02-11 13:40:26 +00:00
David Baker
93f8fcbacc Add 'package' script to build a webapp bundle for straight unzipping on a production server. 2016-02-10 15:35:06 +00:00
Matthew Hodgson
155728b136 make babel actually do full ES6 emulation for Safari 8 2016-02-10 14:54:55 +00:00
David Baker
98551c3f9a Merge pull request #900 from vector-im/dbkr/parse_queries_in_hash
Always parse the hash of a URL as we do elsewhere
2016-02-10 13:51:36 +00:00
David Baker
1732805f31 Always parse the hash of a URL as we do elsewhere by looking for a query string part, otherwise we end up passing the query into showscreen which then spreads havok. 2016-02-10 13:45:24 +00:00
Matthew Hodgson
562a1d8836 USE DEVELOP! 2016-02-09 18:10:57 +00:00
Richard van der Hoff
bab9de1899 CSS fixes to match matrix-org/matrix-react-sdk#30b4b91.
This mostly works, but there is some weirdness with the status bar being too
high by default, and getting smaller when it has content in it.
2016-02-09 14:44:59 +00:00
Kegan Dougal
27791c06ee Cache-bust on /version request 2016-02-05 15:53:33 +00:00
David Baker
01bfb67b5b Merge branch 'dbkr/rate_limit_funcs' into develop 2016-02-05 10:58:18 +00:00
David Baker
485343864c semicolon 2016-02-05 10:57:49 +00:00