Commit graph

27905 commits

Author SHA1 Message Date
Kegan Dougal
659fc8fcfb Point to new Spinner location 2015-11-26 14:24:21 +00:00
Kegan Dougal
1dc4e14606 Import things at the right levels 2015-11-26 13:49:39 +00:00
Kegan Dougal
7846d49403 Add missing deps; Move stuff in 'views' to have functional descriptors 2015-11-26 13:45:04 +00:00
Kegan Dougal
776369299d Move login components to views 2015-11-26 13:27:52 +00:00
Kegan Dougal
b69fff5b01 Define component directories. Merge MemberAvatar and RoomAvatar to new-style components.
Spoken to @ara4n about names/conventions. Settled on the following layout:

  src/components
      |_____________views
      |               |____ tiles
      |               |       |___ MTextTile.js
      |               |       |___ MNoticeTile.js
      |               |       |___ ...
      |               |
      |               |____ avatars
      |               |       |____ RoomAvatar.js
      |               |       |____ MemberAvatar.js
      |               |       |____ ...
      |               |
      |               |____ ...
      |
      |_____________structures
                      |____ RoomView.js
                      |____ UserSettings.js
                      |____ CreateRoom.js
                      |____ ...

Views are the "pure UI" components which can be reused. Structures are the
wire components which give important contextual information to the views e.g.
a view may be MemberList, but it's where it is in the structure that defines
that it is a *Room* MemberList.
2015-11-26 12:02:31 +00:00
Kegan Dougal
f5e2a54603 Only send HTML if we need to. 2015-11-20 17:30:14 +00:00
Matthew Hodgson
2e32383570 fix up the textbox after hitting enter 2015-11-20 17:09:28 +00:00
Kegsay
a04b34b6b2 Merge pull request #36 from matrix-org/kegan/markdown
Add markdown support (enabled by default)
2015-11-20 16:38:27 +00:00
Kegan Dougal
b12fc67a63 Add markdown support (enabled by default) 2015-11-20 16:08:57 +00:00
Kegsay
4e01d27f7b Merge pull request #35 from matrix-org/kegan/post-register
Re-add in post registration steps
2015-11-20 15:06:14 +00:00
Kegan Dougal
032fdc0abc Remove diff clutter 2015-11-20 14:32:00 +00:00
Kegan Dougal
1a72cb56c6 Log an error for unknown screens 2015-11-20 14:26:49 +00:00
Kegan Dougal
d46e42f8e7 Have a post-registration screen. Fix race in ChangeAvatar where if you hadn't got an initial avatar downloaded yet you couldn't update it after the component loaded. 2015-11-20 11:57:04 +00:00
Kegan Dougal
ad60e23459 Correctly display an error if a bad IS URL is entered. 2015-11-20 10:37:46 +00:00
Kegsay
8ea0117a09 Merge pull request #34 from matrix-org/kegan/reg-refactor
Refactor registration
2015-11-20 10:28:16 +00:00
Kegan Dougal
05a7d76785 Remove old Register files 2015-11-20 10:15:18 +00:00
Kegan Dougal
030e2f0979 Move CaptchaForm from Vector to React SDK 2015-11-20 10:14:00 +00:00
Kegan Dougal
cad3afc7a4 Remove unhelpful log lines 2015-11-20 10:11:51 +00:00
Kegan Dougal
23467de016 Remove missed debug log 2015-11-19 16:47:28 +00:00
Kegan Dougal
b12f0f1df7 Minor refactoring; remove debug logging; add comments 2015-11-19 16:07:58 +00:00
Kegan Dougal
cc74676718 Mostly fix 2nd step email registration
- Don't send u/p: null
- Remove unused functions
- Moar logging

Still doesn't work yet though.
2015-11-19 15:19:30 +00:00
Kegan Dougal
7568a3b2d3 Hookup 2nd stage email registration; not finished as we aren't storing u/p 2015-11-19 14:16:49 +00:00
Kegan Dougal
8d7d338f44 Pass the right session ID 2015-11-19 13:58:34 +00:00
Kegan Dougal
f2f5496b78 Get email auth sending working (not the link back though) 2015-11-19 11:41:49 +00:00
Kegan Dougal
e800d3d477 Merge branch 'develop' into kegan/reg-refactor 2015-11-19 09:50:32 +00:00
Kegan Dougal
3e903be73d Get Recaptcha working again. Add a backchannel for stage prodding.
Recaptcha is a special snowflake because it dynamically loads the script
and THEN renders with info from the registration request. This means we
need a back-channel for the UI component to 'tell' the stage that everything
is loaded. This Just Works which is nice.
2015-11-18 17:43:38 +00:00
Kegan Dougal
991a96cfc5 Get dummy registrations working
This means you can now register on localhost without needing an email. Email
and Recaptcha are still broken.
2015-11-18 17:13:43 +00:00
David Baker
caabe02fca Merge pull request #32 from matrix-org/read_receipts
Read receipts
2015-11-18 14:53:25 +00:00
David Baker
31b083d93e new Date() syntax & units on var name 2015-11-18 14:51:06 +00:00
David Baker
0df0935b9c Fix presence exception. Yay, javascript. 2015-11-18 09:57:14 +00:00
Kegan Dougal
1fca3f6606 Better const name 2015-11-17 17:38:37 +00:00
Matthew Hodgson
95cdbe3a48 stop launch from wedging solid for 5 minutes >:( 2015-11-17 17:36:15 +00:00
Kegan Dougal
0f34f8b494 Extend from a Signup class to keep hs/is URL logic together 2015-11-17 17:25:14 +00:00
Kegan Dougal
257a65de14 Fix path resolution 2015-11-17 13:26:07 +00:00
Kegsay
9f7a504a20 Merge pull request #31 from matrix-org/kegan/login-refactor
Refactor login page
2015-11-17 10:47:47 +00:00
Matthew Hodgson
e9132a873b experiment with turning the UserSettings controller into a UserSettingsStore logic class 2015-11-17 02:13:42 +00:00
Matthew Hodgson
0d1c06d586 relayout whenever the input textarea's scrollheight increases 2015-11-15 21:37:22 +00:00
Matthew Hodgson
152872b342 don't clobber the initial room to roomdirectory 2015-11-15 03:58:05 +00:00
Matthew Hodgson
999bb9a206 implement multiline input 2015-11-15 03:36:59 +00:00
Kegan Dougal
900b7dd94a Guard onLoggedIn since registration uses it too and that isn't done yet 2015-11-12 16:14:01 +00:00
Kegan Dougal
b8d579ac5c Remove old login code 2015-11-12 15:53:50 +00:00
Kegan Dougal
ccd24dd3ea Move Cas/PasswordLogin to a new directory so it isn't confused with existing stuff 2015-11-12 15:28:57 +00:00
Kegan Dougal
b127c30436 Implement logging in via password 2015-11-12 15:15:00 +00:00
Kegan Dougal
f4dd88ed64 Remove ServerConfig; Add Signup logic class
- ServerConfig seems too specific to Vector, but we can always add it back later.
- Signup.js contains all the logic for determining what to show which was
  previously in UI components.
2015-11-12 11:54:35 +00:00
Matthew Hodgson
a082a24f9a fix previous commit to allow deep-linking to specific pages better 2015-11-11 02:32:16 +01:00
Matthew Hodgson
6ad210cde3 support tracking URLs for settings, new & directory 2015-11-11 02:01:48 +01:00
Matthew Hodgson
ab10f1d6b0 fix warning 2015-11-11 02:01:37 +01:00
Matthew Hodgson
a4968ca967 don't break if the user misses out an email address 2015-11-11 00:05:14 +01:00
Matthew Hodgson
b669f587de be less shouty 2015-11-11 00:05:00 +01:00
Matthew Hodgson
e7be1ae832 you don't have to pass a description, and if you do, it could be JSX or a string 2015-11-11 00:04:50 +01:00