Commit Graph

6622 Commits (d483fb06056d26b514564e3848b56dfa3406b2c3)

Author SHA1 Message Date
Kegan Dougal 343670c5c4 Move MessageTimestamp 2015-11-26 14:38:48 +00:00
Kegan Dougal f21b6203ed Merge branch 'kegan/controller-merging' into kegan/controller-merging2 2015-11-26 14:31:31 +00:00
Kegan Dougal 8517f9f2bf Missed one 2015-11-26 14:29:26 +00:00
Kegan Dougal 3c12191cb7 Move Spinner 2015-11-26 14:25:20 +00:00
Kegan Dougal ab22ca6a28 Also move the existing login components to the new structure 2015-11-26 14:11:45 +00:00
Kegan Dougal 8898b444af Point things at the right places 2015-11-26 13:48:37 +00:00
Kegan Dougal d079617ce2 Nuke MemberAvatar/RoomAvatar; moved to react SDK 2015-11-26 13:25:56 +00:00
Matthew Hodgson 93c67771af Merge pull request #324 from vector-im/erikj/video
Add basic m.video view support
2015-11-24 16:06:11 +00:00
Matthew Hodgson f9040e08ce fix conflicts 2015-11-24 16:05:58 +00:00
Matthew Hodgson fd8864d528 STOP PEOPLE SHOUTING 2015-11-22 22:35:34 +00:00
Matthew Hodgson 841c790337 naughty override to stop RoomList panel scrolling horizontally 2015-11-22 15:47:50 +00:00
Matthew Hodgson 324c3e7dcf override more GFM css 2015-11-22 15:47:10 +00:00
Matthew Hodgson 92728ff4e6 spell out npm run build 2015-11-22 01:13:08 +00:00
Matthew Hodgson 01641543da only try to syntax highlight html 2015-11-21 12:33:45 +00:00
Matthew Hodgson 9038b984ff fix css link 2015-11-21 12:15:38 +00:00
Matthew Hodgson da97185fcd highlight <code/> blocks via highlight.js 2015-11-21 12:14:56 +00:00
Matthew Hodgson b6e9c1eaab oops, forgot gfm.css 2015-11-20 20:20:30 +00:00
Matthew Hodgson 76c6d6d4d6 add target=_blank onto all HTML links, and apply GFM.css for CSS for markdown 2015-11-20 20:12:23 +00:00
Matthew Hodgson 4c11de787e make h2 layout specific to the list 2015-11-20 20:11:06 +00:00
Matthew Hodgson 96c825b89f wrap whitespace on notices 2015-11-20 20:10:49 +00:00
Matthew Hodgson 29af81e827 Refactor HTML markup stuff into its own class, and whitelist h1 and h2 2015-11-20 18:58:13 +00:00
David Baker 3cf9f5248b Fix the ref we keep to be the react element and make velociraptor correctly track what nodes it had at the start (c.key not c.props.key) 2015-11-20 18:22:38 +00:00
Kegsay 9ec10e2b43 Merge pull request #404 from vector-im/kegan/gif-on-enter
Add support for playing gifs on mouse enter/leave
2015-11-20 16:43:05 +00:00
Kegan Dougal 06427d663d Add support for playing gifs on mouse enter/leave 2015-11-20 16:36:58 +00:00
David Baker 2c51a5c199 Bugfix: don't cache the read avatar rect as it's relative to the viewport and it will move when we scroll! 2015-11-20 16:01:51 +00:00
Kegsay 6dc5dd4930 Merge pull request #403 from vector-im/kegan/post-register
Re-add in post registration steps
2015-11-20 15:06:19 +00:00
Kegan Dougal 29ee7d2b13 Remove useless logging 2015-11-20 14:34:26 +00:00
Kegan Dougal 2e376b1eb9 Clear the 'screen' to load the main left/middle/right panels, then show the settings after post-reg is done 2015-11-20 14:27:39 +00:00
Kegan Dougal 37254e6243 Add PostRegistration component 2015-11-20 12:02:37 +00:00
Kegan Dougal 1edea2a62c Add a PostRegistration component; hook it up to MatrixChat. 2015-11-20 12:02:23 +00:00
Kegsay 99ccff098c Merge pull request #399 from vector-im/kegan/reg-refactor
Refactor registration
2015-11-20 10:28:26 +00:00
Kegan Dougal 3075c97bae Set busy Spinner 2015-11-20 10:27:21 +00:00
Kegan Dougal f62312fbf3 Remove old registration files. Move CaptchaForm to React SDK. 2015-11-20 10:18:04 +00:00
Matthew Hodgson 02d5154aaf more alt tags 2015-11-19 17:45:03 +00:00
Matthew Hodgson 41eaf18470 add hoverover test for edit button 2015-11-19 17:43:55 +00:00
Kegan Dougal d372018e61 Minor tweaks 2015-11-19 16:47:14 +00:00
Kegan Dougal bb6eeea0d8 Factor out div ID name to avoid tight coupling with logic class. 2015-11-19 16:08:25 +00:00
Kegan Dougal 3cf9f786aa Instantiate Signup.Register in Registration component
This has to be done rather than in MatrixChat because the render() calls
will create new instances otherwise. Pass in all the strings the logic class
requires to the Registration wire component. This isn't the "best" solution
because unloading/reloading the Registration component will lose registration
state which should be persisted. Ideally we'd DI from the top to ensure this
can't happen (as opposed to relying on module globals...)
2015-11-19 15:44:17 +00:00
Kegan Dougal 2d481a6302 Recheck registration state since we may be able to immediately do an HTTP hit if we've been given good QPs 2015-11-19 14:17:18 +00:00
Kegan Dougal e700a5a219 Add TODO on post register logic 2015-11-19 13:58:52 +00:00
Matthew Hodgson f7127ab701 Merge pull request #397 from vector-im/z_indices
Sort out dialog z index so read receipts avatars are behind the dialog background
2015-11-19 13:53:51 +00:00
Kegan Dougal eaafc11064 Factor out Captcha UI 2015-11-19 13:44:11 +00:00
Richard van der Hoff 3a003341ad Merge pull request #387 from vector-im/rav/suppress_unread_on_memberchange
Don't mark rooms as unread on m.room.member changes
2015-11-19 13:22:37 +00:00
David Baker f7fe871fee If read receipts avatar isn't on screen, animate it from the top of the screen. 2015-11-19 11:33:15 +00:00
David Baker 09b0d221df Kill the last getDOMNode() 2015-11-19 11:03:33 +00:00
David Baker ed3d3a9e23 Shift css around a bit so it more closely matches DOM order 2015-11-19 10:49:24 +00:00
David Baker eb1c6b347d Move z-index to the dialog wrapper because that's the shallowest positioned element in the DOM and therefore what creates the first stacking context 2015-11-19 10:46:49 +00:00
Kegan Dougal 5f57cd9559 Merge branch 'develop' into kegan/reg-refactor 2015-11-19 09:50:08 +00:00
David Baker 0dd85d9adf Hidden localstorage option to enable bouncy read receipts :p 2015-11-19 09:44:24 +00:00
Matthew Hodgson 23d45d7f33 fix initials behaviour on FF 2015-11-18 23:46:43 +00:00