Matthew Hodgson
832da3aa8e
support del tags for markdown
2015-11-28 12:44:10 +00:00
Kegsay
144feb6af9
Merge pull request #39 from matrix-org/kegan/controller-merging3
...
Phase 3 controller merging
2015-11-27 16:17:31 +00:00
Kegan Dougal
12f90ba849
Merge branch 'develop' into kegan/controller-merging3
2015-11-27 15:45:10 +00:00
Kegsay
471d016a78
Merge pull request #38 from matrix-org/kegan/controller-merging2
...
Phase 2 controller merging (all atoms)
2015-11-27 15:43:58 +00:00
Kegan Dougal
9950e45b7d
Add required imports
2015-11-27 15:39:52 +00:00
Kegan Dougal
5ba1ef5203
Move velocity stuff / contextual menu from Vector to React.
2015-11-27 15:37:40 +00:00
Kegan Dougal
73d619b8e8
Merge branch 'develop' into kegan/controller-merging2
2015-11-27 15:02:48 +00:00
Kegan Dougal
1825b0317e
Add components which were previously in vector
2015-11-27 15:02:32 +00:00
Kegsay
063dbd419a
Merge pull request #37 from matrix-org/kegan/controller-merging
...
Phase 1 controller merging (general structure)
2015-11-27 14:59:45 +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
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
