OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
450 Commits
216 Branches
561 Tags
481 MiB
Commit Graph

355 Commits (8edfd60b643ac952447cb5e6ed31cee270825dd8)

Author SHA1 Message Date
Kegan Dougal 2002af6c7d Assign a default onFinished call to prevent TypeErrors being thrown. 2015-11-30 14:14:30 +00:00
Kegan Dougal fcb6db684b Move and merge QuestionDialog and ErrorDialog 2015-11-30 14:11:04 +00:00
Kegan Dougal 78cfaeb5c3 Merge branch 'develop' into kegan/controller-merging4 2015-11-30 10:56:39 +00:00
Kegan Dougal cf6b5461cc Move and merge CreateRoom 2015-11-30 10:55:15 +00:00
Matthew Hodgson 28b85bb226 remove unnecessary zalgo hacks 2015-11-30 01:12:41 +00:00
Matthew Hodgson 96aa42471d fix messagecomposer layout when switching between rooms on FF 2015-11-30 01:12:32 +00:00
Matthew Hodgson ba090a6ad5 only dispatch user_activity event if the mouse actually moves (rather than the DOM moving under the mouse) 2015-11-29 15:39:10 +00:00
Matthew Hodgson bed7d50ab8 reactor the highlighting code to avoid duplication and make it more coherent 2015-11-29 13:00:58 +00:00
Matthew Hodgson ca6cdfafd3 clean up spurious whitespace 2015-11-29 13:00:37 +00:00
Matthew Hodgson c96fa7f15d fix autoplay on chrome and remove loop for m.video 2015-11-29 12:34:01 +00:00
Matthew Hodgson d6b188751a s/autoplay/autoPlay/ 2015-11-29 03:25:55 +00:00
Matthew Hodgson 0b483c4707 rename searchTerms to highlights, and support highlighting multiple search terms 2015-11-29 03:22:01 +00:00
Matthew Hodgson 3cc1b1ad82 fix unwanted vertical scrollbar issue and typo 2015-11-29 03:21:21 +00:00
Matthew Hodgson f028b343b0 HTML and Markdown emotes. 2015-11-28 22:34:45 +00:00
Matthew Hodgson 52376091cb resize the composer when you change rooms 2015-11-28 22:20:14 +00:00
Matthew Hodgson 9befe243b5 combine M{Text,Notice,Emote}Message into a generic TextualMessage component 2015-11-28 21:12:02 +00:00
Matthew Hodgson 832da3aa8e support del tags for markdown 2015-11-28 12:44:10 +00:00
Kegan Dougal 5ba1ef5203 Move velocity stuff / contextual menu from Vector to React. 2015-11-27 15:37:40 +00:00
Kegan Dougal 1825b0317e Add components which were previously in vector 2015-11-27 15:02:32 +00:00
Kegan Dougal 4a2fe426bf Move and merge RoomTile and MemberTile. Extract DND stuff. 
DND stuff lives in Vector. RoomTile on its own is UNTESTED and will probably
break since we don't conditionally check for onDragXXX function props.
 2015-11-27 11:50:33 +00:00
Kegan Dougal bf46ce19e0 Merge and move RoomHeader/RoomSettings 2015-11-27 10:42:03 +00:00
Kegan Dougal 11efb1ede4 Move and merge MemberInfo 2015-11-26 17:49:39 +00:00
Kegan Dougal 6e9e314f24 Move and merge UserSelector 2015-11-26 17:37:40 +00:00
Kegan Dougal 206c45e703 Move and merge MessageComposer 2015-11-26 17:31:10 +00:00
Kegan Dougal 75afc3a7de Move and merge ProgressBar 2015-11-26 17:21:08 +00:00
Kegan Dougal fc7707971e Move and merge Change Avatar|DisplayName|Password components 2015-11-26 17:10:36 +00:00
Kegan Dougal 6c9f3303c6 Convert voip molecules to components 
Don't pull in VectorConferenceHandler; instead accept a prop which meets a
conference handler interface.
 2015-11-26 16:38:56 +00:00
Kegan Dougal 172735a837 Move create_room atoms to components 2015-11-26 15:44:42 +00:00
Kegan Dougal e55ecfeacb Add VideoFeed component 2015-11-26 15:20:57 +00:00
Kegan Dougal 4fda0ce0c9 Fix typo 2015-11-26 15:17:34 +00:00
Kegan Dougal 17d789eb97 Merge EditableText component 2015-11-26 15:16:50 +00:00
Kegan Dougal 8bde761a8a Add EnableNotificationButton component 2015-11-26 15:11:08 +00:00
Kegan Dougal c2ae6238b9 Nuke LogoutButton; nothing used it. 2015-11-26 14:48:02 +00:00
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
Kegan Dougal b12fc67a63 Add markdown support (enabled by default) 2015-11-20 16:08:57 +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
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 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
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
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 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