David Baker
a63bf7cb35
Merge branch 'develop' into skindex-nextgen
2015-12-01 18:10:57 +00:00
Kegan Dougal
e21d435d84
Remove debug logging
2015-12-01 16:57:40 +00:00
Kegan Dougal
a2b28b826c
Add CustomServerDialog for vector
2015-12-01 16:48:51 +00:00
Kegan Dougal
8d31f72f83
Add VectorLoginHeader
2015-12-01 16:27:23 +00:00
Kegan Dougal
e304a1925d
Add VectorLoginFooter with vector references
2015-12-01 16:12:38 +00:00
David Baker
c281fe785a
Merge branch 'develop' into skindex-nextgen
2015-12-01 15:53:11 +00:00
Kegan Dougal
8083e7f118
Move vector-only components to src/components.
2015-12-01 15:45:38 +00:00
Kegan Dougal
e07c03a7bb
Merge branch 'develop' into kegan/vector-components
2015-12-01 15:39:02 +00:00
Kegsay
e7f6e09def
Merge pull request #448 from vector-im/kegan/controller-merging4
...
Phase 4 controller merging
2015-12-01 15:34:25 +00:00
Kegan Dougal
2a025201b1
Move remaining vector molecules to be components in vector (for now)
2015-12-01 11:19:54 +00:00
Kegan Dougal
8f5f71ec80
Move MatrixChat to react-sdk. Move all login stuff to react SDK.
...
Removed Modulator stuff.
2015-11-30 18:10:09 +00:00
David Baker
6a4038daeb
Add 'replaces' tag to mark that the RoomDNDView is a RoomTile
2015-11-30 17:56:55 +00:00
Matthew Hodgson
4409f07c2e
oops, don't try to delete nonexistent tags when moving a room from conversations to favs or similar
2015-11-30 15:49:27 +00:00
Kegan Dougal
fd4d7eba12
Remove ErrorDialog and QuestionDialog to react-sdk
2015-11-30 14:11:28 +00:00
Kegan Dougal
f969ccb50c
Move and merge RoomTile/MemberTile to react SDK. Keep DND stuff in vector as RoomDNDView.
2015-11-27 11:52:29 +00:00
Kegan Dougal
fdad00790e
Move and merge Change* components to React SDK. Update references.
2015-11-26 17:11:26 +00:00
Kegan Dougal
0a8f5b6223
Move ImageView
2015-11-26 14:51:30 +00:00
Kegan Dougal
343670c5c4
Move MessageTimestamp
2015-11-26 14:38:48 +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
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
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
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
e700a5a219
Add TODO on post register logic
2015-11-19 13:58:52 +00:00
Kegan Dougal
eaafc11064
Factor out Captcha UI
2015-11-19 13:44:11 +00:00
Kegan Dougal
5f57cd9559
Merge branch 'develop' into kegan/reg-refactor
2015-11-19 09:50:08 +00:00
Matthew Hodgson
c9fe0b96b7
fix whitespace
2015-11-18 20:46:39 +00:00
Kegan Dougal
bc55959fad
Load the Recaptcha script if we have a container for it
...
This is complex enough that the Registration component shouldn't have to
care about it, so it should probably be split into a pure UI component.
2015-11-18 17:46:17 +00:00
Kegan Dougal
5424567a66
Hook up onFormSubmit to make registration (dummy only) work again.
2015-11-18 17:15:20 +00:00
Kegan Dougal
b4c0625961
Show validation errors
2015-11-18 15:32:44 +00:00
Kegan Dougal
ed3527e243
Merge branch 'develop' into kegan/reg-refactor
2015-11-17 17:43:22 +00:00
Kegan Dougal
8e8b27c893
Add RegistrationForm UI component and new Registration wire component
...
Hook it up to MatrixChat instead of the existing logic (this breaks reg). WIP.
2015-11-17 17:40:31 +00:00
Kegan Dougal
c57fb44c71
Fix path resolution
2015-11-17 13:26:23 +00:00
Kegan Dougal
8602e0665d
PR feedback from #355
2015-11-17 10:57:44 +00:00
