Commit Graph

39831 Commits (328bbd0e089f8ad0b42ff9a96c3affd936a8ffa0)

Author SHA1 Message Date
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
Matthew Hodgson d0a4f908cf fix nightmarish underscore-versus-camelcase confusion in propTypes, and track default URLs for placeholder content 2015-11-11 00:04:30 +01:00
Matthew Hodgson 368c24e146 s/React/ReactDOM 2015-11-10 19:53:29 +00:00
Matthew Hodgson 5fea3c2673 store the custom HS/IS URL in local storage, add some review commentary 2015-11-10 19:10:30 +00:00
Matthew Hodgson 02ad2b5152 remove react-loader (not that the controller should be rendering spinners in the first place :( 2015-11-10 18:25:10 +00:00
David Baker 2f783a7ba9 Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-10 11:27:43 +00:00
Kegsay d4549e60cc Merge pull request #30 from matrix-org/kegan/3pid-invites
Support inviting by email address and hit the right API.
2015-11-10 10:57:17 +00:00
Matthew Hodgson b5402d0fa0 port to react 0.14, removing getDOMNode()s for DOM components and turning them into ReactDOM.findDOMNode()s for React components 2015-11-09 23:59:28 +00:00
Matthew Hodgson efd88b9a83 upgrade to react 0.14 2015-11-09 23:13:43 +00:00
Kegan Dougal 143483ec12 Support inviting by email address and hit the right API. 2015-11-09 17:36:14 +00:00
David Baker b556eff492 Merge pull request #28 from stevenhammerton/sh-cas-token-login
SH - CAS / Login Token Login Update
2015-11-06 15:40:56 +00:00
Steven Hammerton fec362c4df JS SDK no longer does redirect for us, get the URL and update browser window location 2015-11-06 12:12:51 +00:00
Steven Hammerton a7c53e99d9 Clear query params from url with a nasty location update 2015-11-06 11:42:13 +00:00
Steven Hammerton de165ea6ad Update CAS login to allow HS to do interaction with CAS and client receives and redeems login token 2015-11-06 11:21:13 +00:00
Kegan Dougal b0e71c9872 Fix bugs from typos from hackathon 2015-11-06 09:57:22 +00:00
David Baker 7882780357 Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-05 15:33:50 +00:00
Kegsay f5116fe026 Merge pull request #27 from matrix-org/kegan/syncing
Unbreak everything (JS SDK had breaking API change)
2015-11-05 15:20:42 +00:00
David Baker f4e65f8e17 Remove name event listener 2015-11-05 15:07:46 +00:00
David Baker 3114422cb7 Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-05 15:05:29 +00:00
David Baker d8edbd2e3c Requires js-sdk develop 2015-11-05 14:45:48 +00:00
Kegan Dougal a7c6a923f0 Unbreak everything (JS SDK had breaking API change) 2015-11-05 14:37:05 +00:00
David Baker f9385b455a Don't try to send read receipts if the room is null 2015-11-05 13:27:03 +00:00
David Baker 3fec3a7326 Better error message if there is no accessSync (which there isn't on old node) 2015-11-03 18:29:49 +00:00
David Baker 86ef0e762e Merge code to send read receipts into react-sdk RoomView controller 2015-11-03 14:08:51 +00:00
David Baker 5a72f199e1 listen for read receipts 2015-11-03 11:41:18 +00:00