960cc2d6b4
simplify avatar logic slightly
2015-11-30 14:39:42 +00:00
8a98fcd427
Merge branch 'develop' into kegan/controller-merging4
2015-11-30 14:14:41 +00:00
2002af6c7d
Assign a default onFinished call to prevent TypeErrors being thrown.
2015-11-30 14:14:30 +00:00
fcb6db684b
Move and merge QuestionDialog and ErrorDialog
2015-11-30 14:11:04 +00:00
78cfaeb5c3
Merge branch 'develop' into kegan/controller-merging4
2015-11-30 10:56:39 +00:00
cf6b5461cc
Move and merge CreateRoom
2015-11-30 10:55:15 +00:00
28b85bb226
remove unnecessary zalgo hacks
2015-11-30 01:12:41 +00:00
96aa42471d
fix messagecomposer layout when switching between rooms on FF
2015-11-30 01:12:32 +00:00
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
bed7d50ab8
reactor the highlighting code to avoid duplication and make it more coherent
2015-11-29 13:00:58 +00:00
ca6cdfafd3
clean up spurious whitespace
2015-11-29 13:00:37 +00:00
c96fa7f15d
fix autoplay on chrome and remove loop for m.video
2015-11-29 12:34:01 +00:00
d6b188751a
s/autoplay/autoPlay/
2015-11-29 03:25:55 +00:00
0b483c4707
rename searchTerms to highlights, and support highlighting multiple search terms
2015-11-29 03:22:01 +00:00
3cc1b1ad82
fix unwanted vertical scrollbar issue and typo
2015-11-29 03:21:21 +00:00
f028b343b0
HTML and Markdown emotes.
2015-11-28 22:34:45 +00:00
52376091cb
resize the composer when you change rooms
2015-11-28 22:20:14 +00:00
9befe243b5
combine M{Text,Notice,Emote}Message into a generic TextualMessage component
2015-11-28 21:12:02 +00:00
832da3aa8e
support del tags for markdown
2015-11-28 12:44:10 +00:00
144feb6af9
Merge pull request #39 from matrix-org/kegan/controller-merging3
...
Phase 3 controller merging
2015-11-27 16:17:31 +00:00
12f90ba849
Merge branch 'develop' into kegan/controller-merging3
2015-11-27 15:45:10 +00:00
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
9950e45b7d
Add required imports
2015-11-27 15:39:52 +00:00
5ba1ef5203
Move velocity stuff / contextual menu from Vector to React.
2015-11-27 15:37:40 +00:00
73d619b8e8
Merge branch 'develop' into kegan/controller-merging2
2015-11-27 15:02:48 +00:00
1825b0317e
Add components which were previously in vector
2015-11-27 15:02:32 +00:00
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
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
bf46ce19e0
Merge and move RoomHeader/RoomSettings
2015-11-27 10:42:03 +00:00
11efb1ede4
Move and merge MemberInfo
2015-11-26 17:49:39 +00:00
6e9e314f24
Move and merge UserSelector
2015-11-26 17:37:40 +00:00
206c45e703
Move and merge MessageComposer
2015-11-26 17:31:10 +00:00
75afc3a7de
Move and merge ProgressBar
2015-11-26 17:21:08 +00:00
fc7707971e
Move and merge Change Avatar|DisplayName|Password components
2015-11-26 17:10:36 +00:00
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
172735a837
Move create_room atoms to components
2015-11-26 15:44:42 +00:00
e55ecfeacb
Add VideoFeed component
2015-11-26 15:20:57 +00:00
4fda0ce0c9
Fix typo
2015-11-26 15:17:34 +00:00
17d789eb97
Merge EditableText component
2015-11-26 15:16:50 +00:00
8bde761a8a
Add EnableNotificationButton component
2015-11-26 15:11:08 +00:00
c2ae6238b9
Nuke LogoutButton; nothing used it.
2015-11-26 14:48:02 +00:00
659fc8fcfb
Point to new Spinner location
2015-11-26 14:24:21 +00:00
1dc4e14606
Import things at the right levels
2015-11-26 13:49:39 +00:00
7846d49403
Add missing deps; Move stuff in 'views' to have functional descriptors
2015-11-26 13:45:04 +00:00
776369299d
Move login components to views
2015-11-26 13:27:52 +00:00
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
f5e2a54603
Only send HTML if we need to.
2015-11-20 17:30:14 +00:00
2e32383570
fix up the textbox after hitting enter
2015-11-20 17:09:28 +00:00
a04b34b6b2
Merge pull request #36 from matrix-org/kegan/markdown
...
Add markdown support (enabled by default)
2015-11-20 16:38:27 +00:00
b12fc67a63
Add markdown support (enabled by default)
2015-11-20 16:08:57 +00:00
Matthew Hodgson