David Baker
|
7f27ffd7bd
|
Fix typos & variable shadowing from PR comments
|
2015-12-01 10:26:08 +00:00 |
|
David Baker
|
1de5d68e95
|
Un-commit accidentally committed file upload stuff
|
2015-12-01 10:25:35 +00:00 |
|
David Baker
|
1df03aa82a
|
Remove unintentional logging
|
2015-12-01 10:20:21 +00:00 |
|
Kegan Dougal
|
1e694da460
|
Move MatrixChat and login components to react SDK.
Removed Modulator as it is no longer necessary in this form. ConferenceHandler
is injected in src/vector/index.js
|
2015-11-30 18:11:04 +00:00 |
|
David Baker
|
4f8895f160
|
Copyright header on component index
|
2015-11-30 18:00:19 +00:00 |
|
David Baker
|
ae8c5bdcb0
|
better comment & regenerated index
|
2015-11-30 17:56:01 +00:00 |
|
David Baker
|
ef0cf1f28e
|
Merge branch 'develop' into skindex-nextgen
|
2015-11-30 17:34:40 +00:00 |
|
David Baker
|
730b33535a
|
More WIP component indexing
|
2015-11-30 17:33:04 +00:00 |
|
David Baker
|
4a144ac03d
|
WIP of new component indexing
|
2015-11-30 17:30:32 +00:00 |
|
Kegan Dougal
|
02a71b20a9
|
Merge and move RoomView to /structures. Add Resend.js from vector.
|
2015-11-30 17:15:57 +00:00 |
|
Matthew Hodgson
|
c67005c306
|
switch avatar initial layout to work with Open Sans
|
2015-11-30 17:15:02 +00:00 |
|
Kegan Dougal
|
f9e38e5326
|
Move and merge RoomList
|
2015-11-30 16:55:00 +00:00 |
|
Kegan Dougal
|
f96e7a0dc8
|
Add UserSettings structure
|
2015-11-30 15:52:41 +00:00 |
|
Kegan Dougal
|
03485c2fca
|
Merge branch 'develop' into kegan/controller-merging4
|
2015-11-30 15:39:14 +00:00 |
|
Matthew Hodgson
|
59d9b83099
|
Merge pull request #40 from matrix-org/matthew/rename-message-components
rename message components as per RL discussion this morning
|
2015-11-30 15:37:01 +00:00 |
|
Kegan Dougal
|
e008b5578d
|
Move and merge LogoutPrompt
|
2015-11-30 15:23:16 +00:00 |
|
Matthew Hodgson
|
a8fd1b5d7a
|
rename message components as per RL discussion this morning
|
2015-11-30 15:19:43 +00:00 |
|
Kegan Dougal
|
80a235adf9
|
Move and merge MemberList
|
2015-11-30 15:13:28 +00:00 |
|
Kegan Dougal
|
945a65f4b5
|
Move Notifier to src/ since it isn't a component.
|
2015-11-30 15:04:24 +00:00 |
|
Matthew Hodgson
|
960cc2d6b4
|
simplify avatar logic slightly
|
2015-11-30 14:39:42 +00:00 |
|
Kegan Dougal
|
8a98fcd427
|
Merge branch 'develop' into kegan/controller-merging4
|
2015-11-30 14:14:41 +00:00 |
|
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 |
|
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 |
|