ffaea371ac
Merge branch 'kegan/slash-command-tab-complete' into matthew/roomsettings2
2016-01-14 16:02:29 +00:00
b67131f0c8
Add a Command class; add Entry.getFillText()
...
getFillText() serves to decouple the text displayed in the auto-complete list
via getText() and the text actually filled into the box via getFillText(). This
allows us to display command + args on the list but only fill the command part.
A Command class has been added to provide some structure when extracting the
command name and args. Manually tested and it works.
2016-01-14 14:39:58 +00:00
7a1e6bbe7e
fix merge conflicts
2016-01-13 18:00:04 +00:00
05c7891874
fix NPE
2016-01-13 17:54:33 +00:00
8c9352c484
Make MemberAvatar and MemberTile work without RoomMember objects
2016-01-13 16:55:28 +00:00
c0e5d1d13b
Factor out presence text. Do prep work for displaying 3pid invites on memberlist.
...
Factored out presence to PresenceLabel.
2016-01-13 15:55:28 +00:00
7985413893
Created TextInputDialog
...
In css, created a generic mx_Dialog_title class for all dialogs
2016-01-13 16:32:41 +01:00
1b7d80a8cd
s/getImplicitRoomName/getDefaultRoomName/ # as kegan doesn't like the word 'implicit'
2016-01-13 14:04:00 +00:00
5f763f8ebb
merge develop
2016-01-13 14:03:54 +00:00
69cac307d9
Merge branch 'develop' into kegan/guest-peek-then-join
2016-01-13 13:22:58 +00:00
c9c496f0e5
WIP all new roomsettings
2016-01-13 13:15:13 +00:00
f715662d18
merge in develop, fixing conflicts
2016-01-13 13:06:27 +00:00
3934b42ac8
s/m.room.color_scheme/org.matrix.room.color_scheme/g # to make kegan happier
2016-01-13 13:01:00 +00:00
ec4e0d7687
Implement password reset
...
This adds a link to the login screen with "Forgot your password?". Clicking it
takes you to a form with fields for an email address and a new password. This
makes the same API calls as the Angular SDK.
Manually tested resetting + not clicking link + invalid email and it all seems
to work.
2016-01-12 17:20:16 +00:00
eb955eb371
Add a RoomPreviewBar which asks if you'd like to join a peeked room
2016-01-12 14:11:15 +00:00
cd52549713
s/function/func/ in PropTypes declarations
2016-01-12 13:11:53 +00:00
bd226609d0
fix onclick for all of room name
2016-01-11 18:44:36 +00:00
243b2e4587
Make the scrollpanel update itself correctly on video resize.
...
When we first get video, the video component will resize itself. This will
cause the page to be reflowed, but that doesn't trigger an update on the gemini
scrollbar. We therefore need to force an update on the messagepanel. Implement
this by providing an onResize property on the CallView component.
We need to do the same when we change the maxHeight on the video panel.
The same applies to resizing of the MessageComposer. That was previously
handled with a fugly roomView.forceUpdate() from MessageComposer - make it use
the same mechanism.
Finally: the messageComposer is at least 70 pixels, and up to 100 pixels high -
not 36. Fix the auxPanelMaxHeight calculation - and use a static constant
rather than hardcoding the number to avoid this happening again.
2016-01-11 15:28:59 +00:00
ddd8838b24
linkify topics
2016-01-11 12:46:12 +00:00
6351258b0e
use room.getImplicitRoomName() from matthew/roomsettings2 branch of matrix-js-sdk for the placeholder roomname
2016-01-10 20:01:30 +00:00
0cb6094992
show implicit names as placeholders if available
2016-01-10 18:46:08 +00:00
d39a9a0f18
bring back select-all-on-click
2016-01-10 13:14:12 +00:00
684255044a
switch EditableText to be built on contentEditable rather than switching divs and inputs, so that it can be used for managing multiline content like topics and room names, and use it in RoomHeader/RoomSettings
2016-01-10 12:56:45 +00:00
4f14ead741
idiot - fix bind warnings
2016-01-10 04:22:09 +00:00
ef00a1624d
fix up RoomSettings somewhat and implement room colors
2016-01-08 03:22:38 +00:00
a3df50f4c3
Implement guest account upgrading
2016-01-07 17:23:32 +00:00
c64f36c81b
Merge branch 'develop' into kegan/guest-access
2016-01-07 13:21:06 +00:00
ba51c68844
Merge remote-tracking branch 'origin/notif_sync' into unread_sync
2016-01-07 11:44:50 +00:00
8170288acb
Merge pull request #77 from matrix-org/matthew/dynamic-svg
...
Make SVGs and CSS dynamically recolourable
2016-01-07 11:42:30 +00:00
99abd58f1a
Merge remote-tracking branch 'origin/develop' into notif_sync
2016-01-07 10:41:16 +00:00
287da54fbc
Address PR comments
2016-01-07 10:38:44 +00:00
fd32362aa6
oops, initialise fixups per-object, not per-prototype
2016-01-07 10:18:18 +00:00
0772f50fab
update copyright for 2016
2016-01-07 04:06:52 +00:00
296b626ed9
oops, we actually need to cache the fixups in TintableSvg
2016-01-07 03:59:09 +00:00
0f52c0a514
make TintableSvgs responsible for updating their own tints, and stop storing SVG DOM fragments in Tinter to avoid leaking them
2016-01-07 03:39:00 +00:00
04c7792b51
Use our read receipt to calculate whether rooms are unread.
2016-01-06 18:07:24 +00:00
4e4f8fad23
Merge pull request #79 from matrix-org/rav/dispatcher_leak
...
VideoView: Fix a dispatcher leak
2016-01-06 17:52:13 +00:00
4624e7a485
Address review comments
...
s/onClick/onSelect/
2016-01-06 16:46:29 +00:00
0d0a379cd8
VideoView: Fix a dispatcher leak
...
Make sure we unregister from the dispatcher when the videoview goes
away.
2016-01-06 15:17:58 +00:00
afbb451d4a
Merge branch 'develop' into kegan/guest-access
2016-01-06 13:59:33 +00:00
f499c60b12
sundry PR feedback
2016-01-06 02:29:08 +00:00
509ea7c4f3
factor out tintable SVGs into their own component, and use plain DOM onload rather than react synthetic events
2016-01-06 02:11:07 +00:00
9e8daba8d7
Merge branch 'develop' into matthew/dynamic-svg
2016-01-06 01:11:34 +00:00
75302b1f97
Factor out a separate SearchResultTile
2016-01-05 17:56:59 +00:00
d729dee31d
Make the settings page load for guests. Add checkboxes for guest r/w
2016-01-05 17:34:25 +00:00
a2b7c9ba96
RoomHeader: Make 'undefined' check more explicit
2016-01-05 15:57:58 +00:00
583d35e39f
Merge branch 'develop' into rav/new_search_api
...
Conflicts:
src/components/structures/RoomView.js
2016-01-05 15:38:30 +00:00
a9f7bf63ff
spell out we're doing 3PID invites
2016-01-05 14:24:36 +00:00
a6e735dbde
Merge pull request #76 from matrix-org/kegan/bugfix-read-receipt
...
Null guard getMember
Fixes https://github.com/vector-im/vector-web/issues/566
2016-01-05 11:26:04 +00:00
aa1012b127
oops
2016-01-05 03:59:04 +00:00
9cf49eb62d
oops, forgot this
2016-01-05 03:54:44 +00:00
001dc8612b
support fixing up dynamically loaded SVGs
2016-01-05 03:34:52 +00:00
555abdae30
wire up Tinter.js
2016-01-05 00:46:52 +00:00
e177263d9f
Address review comments
...
Minor fixes post-review
2016-01-04 16:54:27 +00:00
722c7033bc
Merge pull request #73 from matrix-org/rav/on_highlight_click
...
Expose onHighlightClick on the event tiles
2016-01-04 15:23:45 +00:00
75ad96c8ba
Null guard getMember
2016-01-04 10:11:42 +00:00
3009da0b39
move title attributes to the div
2016-01-03 22:34:56 +00:00
4f915d622e
switch SVGs from imgs to objects
2016-01-03 22:30:52 +00:00
441a9540ca
sync CSS classnames with current react component names
2016-01-03 00:11:11 +00:00
bd498b47b3
fix 'this' scoping bug that could never have worked...
2015-12-28 02:36:18 +00:00
b0adb1945f
Expose onHighlightClick on the event tiles
2015-12-24 13:51:14 +00:00
cc72f7ec24
Use new searchRoomEvents and backPaginateRoomEventsSearch methods
...
MatrixClient now exposes higher-level search APIs, so use them.
2015-12-24 13:33:58 +00:00
5d490841bc
Review comments
2015-12-24 10:50:47 +00:00
5286ec170f
Wrangle CSS to get avatar in right place
2015-12-24 09:20:16 +00:00
a279dce027
Get avatar display and uploads working
2015-12-23 16:52:59 +00:00
19bd39b066
More random tweaks
...
- Make onBlur reset the EditText to show that it hasn't submitted it.
- Add the user ID of the logged in user to Advanced.
- Remove remnants of the Save/Cancel buttons.
2015-12-23 16:02:18 +00:00
72b8cf1be2
Refactor ChangePassword to get it working. Add 'Account' section because trying to make ChangePassword divs part of the same table as the display name is nigh impossible. Feels okay though
2015-12-23 15:38:28 +00:00
6295cf2ec9
Merge branch 'develop' into matthew/settings
2015-12-23 14:19:42 +00:00
e657b40a7e
Use ChangeDisplayName for implict display name saving on enter
2015-12-23 14:14:25 +00:00
460f68caef
Move RoomMember[] -> MemberEntry[] conversion somewhere sensible
...
This is required for automatically entering tab-complete mode because
onKeyDown is NOT called in that case, so we need to make sure to have a
membership list hanging around.
2015-12-22 15:38:23 +00:00
a20cabb06f
Merge branch 'develop' into kegan/tab-complete
2015-12-22 15:16:39 +00:00
05d9e1261c
Merge remote-tracking branch 'origin/develop' into notif_sync
2015-12-22 14:47:11 +00:00
e541ddb060
Auto-complete clicked suggestions
2015-12-22 11:14:36 +00:00
0dbb8d5294
Use MemberAvatar to generate image JSX. Split out entries from tab-complete logic
2015-12-22 10:00:30 +00:00
ea2405ab3a
escape double-slash commands
2015-12-22 00:57:57 +00:00
618978d955
add appropriate CSS for the TabCompleteBar
2015-12-22 00:47:04 +00:00
ba63b5dfff
Add image URLs to TabComplete.Entry objects
2015-12-21 17:28:04 +00:00
41d4c1d14e
Add TabComplete.Entry so we can render images AND text(!) - Add peek() option, all broken.
2015-12-21 14:34:25 +00:00
400b5196bb
Add TabCompleteBar. Hook up display to whether we are currently tab completing.
2015-12-21 14:11:34 +00:00
b9ba4475b8
Merge branch 'develop' into matthew/settings
2015-12-21 13:09:33 +00:00
26dc3cc553
Push up instantiation of TabComplete to RoomView
...
RoomView is the parent component which creates MessageComposer AND the status
bar. By making RoomView instantiate TabComplete we can scope instances
correctly rather than relying on singleton behaviour through dispatches. This
also makes communication between status bar and the MessageComposer infinitely
easier since they are now sharing the same TabComplete object.
2015-12-21 10:59:10 +00:00
c6d02b2c26
Move tab-complete logic out from MessageComposer
...
Moved to a `TabComplete` class. Make it more generic (list of strings rather
than RoomMembers) and sort the member list by last_active_ago. Everything still
seems to work.
2015-12-21 10:38:37 +00:00
ff6d9454fd
Merge pull request #63 from matrix-org/rav/paginate_search
...
Pagination for search results
2015-12-21 09:16:42 +00:00
5f6fe74ca8
Highlight status is now taken from the server's unread notif count
2015-12-18 17:51:17 +00:00
fa99c1fc59
make it clear result count is approx
2015-12-18 17:18:08 +00:00
f0ff62166b
Remove bottommost prop - can't DND on the bottom list anymore
2015-12-18 17:13:26 +00:00
a2872deb53
Merge branch 'develop' into kegan/archived-rooms
2015-12-18 16:59:25 +00:00
831aaec457
Merge pull request #57 from matrix-org/matthew/inbound-calls
...
Position the inbound call box correctly
2015-12-18 15:59:18 +00:00
c3bd81b83a
Make rooms the user is banned in be treated as a joined room for position in room list
...
This is so users can still find the room they've been expelled from, rather than
have it drop to the Historical section.
2015-12-18 15:56:27 +00:00
711fdd25af
Improve perf of refreshing room list. Show spinner when loading left rooms.
...
When the JS SDK encounters a new room it will emit a flurry of events for things
like state and room members. Refreshing the room list on each event is bad for
performance. This is okay initially because the room list is only shown after
the first sync, but when getting archived rooms it locks up for 15-30s as it
thrashes. Add a 1s cap to refreshRoomList() which means that it will refresh
*AT MOST* once every second. If it has been >1s since the last refresh it will
immediately refresh. If it has been <1s it will wait the difference.
2015-12-18 15:13:59 +00:00
22635f251d
Call through to syncLeftRooms when the archived header is clicked
2015-12-18 11:55:43 +00:00
4b271a332e
Refactor the search stuff in RoomView
...
* factor out the call to MatrixClient.search to a separate _getSearchBatch (so
that we can reuse it for paginated results in a bit)
* Don't group cross-room searches by room - just display them in timeline
order.
2015-12-18 11:11:41 +00:00
e2ae2dd199
merge stuff from vector
2015-12-18 00:37:56 +00:00
8e4d0c0be7
Merge branch 'develop' into kegan/archived-rooms
2015-12-17 17:07:18 +00:00
498990b376
Merge pull request #59 from matrix-org/kegan/3pid-inv
...
Finish 3PID invites impl
2015-12-17 16:54:29 +00:00
478ca91b4f
s/Conversations/Rooms/ as per https://github.com/vector-im/vector-web/issues/535
2015-12-17 16:27:56 +00:00
17a8eb0109
Display m.room.third_party_invite events. Display sensible text transitions.
2015-12-17 15:48:14 +00:00
5c999fe1ab
stop the incoming call box from scrolling off the screen
2015-12-17 14:56:09 +00:00
bb184c12a1
fix NPE
2015-12-17 11:56:41 +00:00
d979a028a5
position the inbound call box correctly, and fix various issues with when the video preview and callview are shown
2015-12-17 02:49:09 +00:00
e8f82527d1
Listen for room deletions and refresh the room list when it happens
2015-12-16 16:27:46 +00:00
f7aa8be1c1
Add a forget button. Add left rooms to the "historical" tab.
...
Call /forget when the forget button is clicked. Number of shortcomings:
- We need to lazy load the historical list (atm we never get the list of left
rooms; things only go into that list if you leave the room whilst running)
- Once a room is forgotten we need to physically nuke it from the JS SDK.
- Need icon for forget room.
2015-12-16 16:06:29 +00:00
09e0d10d32
Do not show conf user join/parts
2015-12-16 11:54:29 +00:00
28908c2edb
Auto-focus username box
2015-12-15 15:27:56 +00:00
a8d7810bfc
add fullscreen button back
2015-12-15 00:01:47 +00:00
39c628d4a1
implement the 'correct' voip calling design
2015-12-14 23:37:46 +00:00
6ad6ed2a49
factor out room-leaving code into MatrixChat for now, and add a dedicated leave button in to the header bar for now
2015-12-13 13:49:28 +00:00
bf70376d16
hoverover for full name of room
2015-12-12 17:29:53 +00:00
0beafeddb9
Use the 'muted' icon when the mic is muted during a call
2015-12-11 15:01:16 +00:00
af3c43ca76
show result counts
2015-12-11 02:58:59 +00:00
77464c669f
switch to fake tag names for fake tags, and highlight new invites
2015-12-11 00:40:28 +00:00
072130466c
hopefully fix vector-im/vector-web#475
2015-12-08 19:49:16 +00:00
8edfd60b64
Actually use room.name on invites. Fixes #321
2015-12-08 10:21:40 +00:00
08d7c0232a
svgize images
2015-12-06 22:07:49 +00:00
681138678e
Fix bolding
2015-12-04 19:14:14 +00:00
ae615b5c5e
Merge pull request #46 from matrix-org/kegan/ops-level-update
...
Recalculate levels when the member prop is updated.
2015-12-04 16:27:56 +00:00
142ac67799
Add a logic class to determine whether an event affects a room's unread count / status & use it
2015-12-04 16:20:05 +00:00
257dc62a73
Recalculate levels when the member prop is updated.
2015-12-04 16:15:55 +00:00
29b3b237d5
Refresh room list on timeline event even if it doesn't change highlight status since we still want to update the ordering. Fixes #413 .
2015-12-04 14:24:02 +00:00
bb289a4145
Add CustomServerDialog class
2015-12-01 16:49:15 +00:00
673b01267a
Use LoginHeader everywhere
2015-12-01 16:29:58 +00:00
05a6121934
Add default LoginHeader
2015-12-01 16:27:48 +00:00
52f3d7f18b
Add generic LoginFooter. Remove vector reference
2015-12-01 16:12:13 +00:00
636be0c003
Update getComponent paths
2015-12-01 15:45:11 +00:00
726c893663
Merge branch 'develop' into kegan/vector-components
2015-12-01 15:39:15 +00:00
4fe2cc54d6
Merge pull request #42 from matrix-org/kegan/controller-merging4
...
Phase 4 controller merging
2015-12-01 15:15:39 +00:00
784c1b63dc
Move remaining vector molecules to components
2015-12-01 11:19:25 +00:00
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
c67005c306
switch avatar initial layout to work with Open Sans
2015-11-30 17:15:02 +00:00
f9e38e5326
Move and merge RoomList
2015-11-30 16:55:00 +00:00
03485c2fca
Merge branch 'develop' into kegan/controller-merging4
2015-11-30 15:39:14 +00:00
e008b5578d
Move and merge LogoutPrompt
2015-11-30 15:23:16 +00:00
a8fd1b5d7a
rename message components as per RL discussion this morning
2015-11-30 15:19:43 +00:00
80a235adf9
Move and merge MemberList
2015-11-30 15:13:28 +00:00
945a65f4b5
Move Notifier to src/ since it isn't a component.
2015-11-30 15:04:24 +00:00
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
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
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
5ba1ef5203
Move velocity stuff / contextual menu from Vector to React.
2015-11-27 15:37:40 +00:00
1825b0317e
Add components which were previously in vector
2015-11-27 15:02:32 +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
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
Matthew Hodgson