gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
979 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

979 Commits

Author SHA1 Message Date
Kegan Dougal 0f3ea9f4ce Merge branch 'develop' into kegan/controller-merging2 2015-11-27 15:01:23 +00:00
Kegsay f9a5f4b61e Merge pull request #420 from vector-im/kegan/controller-merging 
Phase 1 controller merging (general structure)
 2015-11-27 14:59:38 +00:00
Kegan Dougal 9ecf5bed64 Nuke old CallView controller 2015-11-26 16:48:32 +00:00
Kegan Dougal ff9608c914 Move and merge voip molecules. Inject the ConferenceHandler as a prop 
This keeps the vector conf logic munge separate from react SDK.
 2015-11-26 16:39:58 +00:00
Kegan Dougal 49e5f18f62 Move and merge create_room atoms to react SDK 2015-11-26 15:43:57 +00:00
Kegan Dougal c5b0ea7e9f Move VideoFeed to React SDK 2015-11-26 15:24:32 +00:00
Kegan Dougal 83eae1b64a Move and merge EditableText into React SDK 2015-11-26 15:15:45 +00:00
Kegan Dougal 35ee9c9ddd Move and merge EnableNotificationsButton to react SDK 2015-11-26 15:10:49 +00:00
Kegan Dougal 0a8f5b6223 Move ImageView 2015-11-26 14:51:30 +00:00
Kegan Dougal 3f120c7027 Nuke LogoutButton; nothing used it. 2015-11-26 14:47:11 +00:00
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