manuroe
33edeccb43
Merge branch 'develop' into push-rules-settings
...
# Conflicts:
# src/component-index.js
# src/components/views/rooms/RoomSettings.js
2016-01-18 18:00:41 +01:00
Kegan Dougal
165adde0c8
Use EntityTile for 3PID entities rather than munging MemberTile
2016-01-18 16:55:51 +00:00
Kegan Dougal
c758c0f84f
Add invite button JSX
2016-01-18 16:47:31 +00:00
Kegan Dougal
71009d81b6
Factor out common code between MemberTile and UserTile into EntityTile. Use EntityTile.
2016-01-18 15:19:49 +00:00
David Baker
cc3d27bd4b
Merge pull request #98 from matrix-org/message_composer_arrows_keys
...
Fix history scrolling with multiline input
2016-01-18 14:25:57 +00:00
David Baker
880ae0f3fa
Fix typo
2016-01-18 14:25:23 +00:00
Matthew Hodgson
51648b9bf0
merge develop
2016-01-18 14:02:19 +00:00
Matthew Hodgson
17fdfa0c8f
incorporate kegan PR feedback
2016-01-18 14:00:47 +00:00
Matthew Hodgson
aa412bed0f
reindent promises as per dave's PR feedback
2016-01-18 13:38:40 +00:00
Matthew Hodgson
d0eedb4faa
merge develop
2016-01-18 13:34:09 +00:00
Kegan Dougal
fd99b260f4
Merge branch 'develop' into kegan/invite-search
2016-01-18 12:07:36 +00:00
Kegan Dougal
2a64d0feb3
Merge branch 'develop' into matthew/roomsettings2
2016-01-18 10:49:45 +00:00
Kegsay
6e42d00727
Merge pull request #95 from matrix-org/kegan/base-avatar
...
Factor out common Avatar code
2016-01-18 10:18:04 +00:00
Matthew Hodgson
8f83621c4c
hide Mod button for muted users
2016-01-18 01:40:19 +00:00
Matthew Hodgson
6e3245a3b0
make linkify userid jump to memberinfo
2016-01-18 01:26:15 +00:00
Matthew Hodgson
8e1ab8e6b4
vaguely skin MemberInfo correctly
2016-01-18 01:18:02 +00:00
Matthew Hodgson
a768b7fe4b
bring back power badges
2016-01-18 00:16:31 +00:00
Matthew Hodgson
f3aeda7af9
merge develop
2016-01-17 23:31:21 +00:00
Matthew Hodgson
1467aacfa4
support saving tag changes (untested)
2016-01-17 12:27:21 +00:00
Matthew Hodgson
06e1674f23
UI for tag management
2016-01-17 05:13:16 +00:00
Matthew Hodgson
5b5bd9aef1
remove create_room for now. lots of stupid bugfixes across the board.
2016-01-17 03:59:31 +00:00
Matthew Hodgson
82a159d651
make roomsettings actually work, including alias editing. (using staged UX rather than direct manipulation). loads of tweaks and fixes across the board
2016-01-17 02:48:55 +00:00
David Baker
52de322789
Change history scolling so it doesn't interfere with moving between lines, even when those lines are wrapped rather than hard line breaks.
2016-01-15 18:31:07 +00:00
Kegan Dougal
d6c7631dcc
Show User avatar URLs
2016-01-15 17:31:32 +00:00
Kegan Dougal
4d47d9875b
Merge branch 'kegan/base-avatar' into kegan/invite-search
2016-01-15 17:19:34 +00:00
Matthew Hodgson
90184235bb
improve RoomSettings layout
2016-01-15 16:33:50 +00:00
Matthew Hodgson
f476150591
fix changeavatar to avoid duplicate click on label
2016-01-15 16:33:34 +00:00
Kegan Dougal
d8d79722ac
Make RoomAvatar use BaseAvatar
2016-01-15 16:13:25 +00:00
Matthew Hodgson
0caf5e0cdc
manage permissions on whether people can actually edit name, topic, avatar etc or not
2016-01-15 15:51:40 +00:00
Matthew Hodgson
57e62bf0ba
remove change avatar from here as it's now in the header
2016-01-15 15:50:38 +00:00
Matthew Hodgson
aefecfc645
tweak roomheader layout when editing
2016-01-15 15:23:41 +00:00
David Baker
2638ee974e
Add warning on inviting a user if sharing history with new users.
...
Fixes https://github.com/vector-im/vector-web/issues/60
2016-01-15 15:18:55 +00:00
Matthew Hodgson
4a2c2d9656
fix broken merge and revert some of 243b2e45 and document evil magic numbers
2016-01-15 14:22:17 +00:00
Kegan Dougal
aea833ec87
Display User objects in search results
2016-01-15 10:31:31 +00:00
Kegan Dougal
266aee2c6b
Factor out data model -> Entity logic to Entities.js
2016-01-15 09:58:48 +00:00
manuroe
f868f7813b
Room settings: Added notifications mute checkbox
2016-01-14 19:06:48 +01:00
Kegan Dougal
83a458938e
Unbreak things
2016-01-14 17:41:04 +00:00
Kegan Dougal
69d8e50eeb
Merge branch 'develop' into kegan/invite-search
2016-01-14 17:34:52 +00:00
Kegan Dougal
d5deb283bf
Add a SearchableEntityList and use it for invite box
...
It all even works, though only for RoomMembers currently.
2016-01-14 17:27:06 +00:00
Matthew Hodgson
e4671205d8
right imagery
2016-01-14 17:24:57 +00:00
Matthew Hodgson
d767e72469
hide hoverover for 3pids
2016-01-14 17:02:56 +00:00
Matthew Hodgson
4430e16707
apply CSS to slashcommand autocompletes
2016-01-14 16:29:49 +00:00
Matthew Hodgson
ffaea371ac
Merge branch 'kegan/slash-command-tab-complete' into matthew/roomsettings2
2016-01-14 16:02:29 +00:00
Kegan Dougal
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
Matthew Hodgson
7a1e6bbe7e
fix merge conflicts
2016-01-13 18:00:04 +00:00
Matthew Hodgson
05c7891874
fix NPE
2016-01-13 17:54:33 +00:00
Kegan Dougal
8c9352c484
Make MemberAvatar and MemberTile work without RoomMember objects
2016-01-13 16:55:28 +00:00
Kegan Dougal
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
Matthew Hodgson
1b7d80a8cd
s/getImplicitRoomName/getDefaultRoomName/ # as kegan doesn't like the word 'implicit'
2016-01-13 14:04:00 +00:00
Matthew Hodgson
5f763f8ebb
merge develop
2016-01-13 14:03:54 +00:00
Kegan Dougal
69cac307d9
Merge branch 'develop' into kegan/guest-peek-then-join
2016-01-13 13:22:58 +00:00
Matthew Hodgson
c9c496f0e5
WIP all new roomsettings
2016-01-13 13:15:13 +00:00
Matthew Hodgson
f715662d18
merge in develop, fixing conflicts
2016-01-13 13:06:27 +00:00
Matthew Hodgson
3934b42ac8
s/m.room.color_scheme/org.matrix.room.color_scheme/g # to make kegan happier
2016-01-13 13:01:00 +00:00
Kegan Dougal
eb955eb371
Add a RoomPreviewBar which asks if you'd like to join a peeked room
2016-01-12 14:11:15 +00:00
Richard van der Hoff
cd52549713
s/function/func/ in PropTypes declarations
2016-01-12 13:11:53 +00:00
Matthew Hodgson
bd226609d0
fix onclick for all of room name
2016-01-11 18:44:36 +00:00
Richard van der Hoff
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
Matthew Hodgson
ddd8838b24
linkify topics
2016-01-11 12:46:12 +00:00
Matthew Hodgson
6351258b0e
use room.getImplicitRoomName() from matthew/roomsettings2 branch of matrix-js-sdk for the placeholder roomname
2016-01-10 20:01:30 +00:00
Matthew Hodgson
0cb6094992
show implicit names as placeholders if available
2016-01-10 18:46:08 +00:00
Matthew Hodgson
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
Matthew Hodgson
4f14ead741
idiot - fix bind warnings
2016-01-10 04:22:09 +00:00
Matthew Hodgson
ef00a1624d
fix up RoomSettings somewhat and implement room colors
2016-01-08 03:22:38 +00:00
Kegan Dougal
c64f36c81b
Merge branch 'develop' into kegan/guest-access
2016-01-07 13:21:06 +00:00
David Baker
ba51c68844
Merge remote-tracking branch 'origin/notif_sync' into unread_sync
2016-01-07 11:44:50 +00:00
Matthew Hodgson
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
David Baker
99abd58f1a
Merge remote-tracking branch 'origin/develop' into notif_sync
2016-01-07 10:41:16 +00:00
David Baker
287da54fbc
Address PR comments
2016-01-07 10:38:44 +00:00
Matthew Hodgson
0772f50fab
update copyright for 2016
2016-01-07 04:06:52 +00:00
David Baker
04c7792b51
Use our read receipt to calculate whether rooms are unread.
2016-01-06 18:07:24 +00:00
Richard van der Hoff
4624e7a485
Address review comments
...
s/onClick/onSelect/
2016-01-06 16:46:29 +00:00
Kegan Dougal
afbb451d4a
Merge branch 'develop' into kegan/guest-access
2016-01-06 13:59:33 +00:00
Matthew Hodgson
f499c60b12
sundry PR feedback
2016-01-06 02:29:08 +00:00
Matthew Hodgson
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
Matthew Hodgson
9e8daba8d7
Merge branch 'develop' into matthew/dynamic-svg
2016-01-06 01:11:34 +00:00
Richard van der Hoff
75302b1f97
Factor out a separate SearchResultTile
2016-01-05 17:56:59 +00:00
Kegan Dougal
d729dee31d
Make the settings page load for guests. Add checkboxes for guest r/w
2016-01-05 17:34:25 +00:00
Richard van der Hoff
a2b7c9ba96
RoomHeader: Make 'undefined' check more explicit
2016-01-05 15:57:58 +00:00
Richard van der Hoff
583d35e39f
Merge branch 'develop' into rav/new_search_api
...
Conflicts:
src/components/structures/RoomView.js
2016-01-05 15:38:30 +00:00
Matthew Hodgson
a9f7bf63ff
spell out we're doing 3PID invites
2016-01-05 14:24:36 +00:00
Kegsay
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
Matthew Hodgson
001dc8612b
support fixing up dynamically loaded SVGs
2016-01-05 03:34:52 +00:00
Matthew Hodgson
555abdae30
wire up Tinter.js
2016-01-05 00:46:52 +00:00
Richard van der Hoff
e177263d9f
Address review comments
...
Minor fixes post-review
2016-01-04 16:54:27 +00:00
Kegan Dougal
75ad96c8ba
Null guard getMember
2016-01-04 10:11:42 +00:00
Matthew Hodgson
3009da0b39
move title attributes to the div
2016-01-03 22:34:56 +00:00
Matthew Hodgson
4f915d622e
switch SVGs from imgs to objects
2016-01-03 22:30:52 +00:00
Richard van der Hoff
b0adb1945f
Expose onHighlightClick on the event tiles
2015-12-24 13:51:14 +00:00
Richard van der Hoff
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
Kegan Dougal
6295cf2ec9
Merge branch 'develop' into matthew/settings
2015-12-23 14:19:42 +00:00
Kegan Dougal
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
Kegan Dougal
a20cabb06f
Merge branch 'develop' into kegan/tab-complete
2015-12-22 15:16:39 +00:00
David Baker
05d9e1261c
Merge remote-tracking branch 'origin/develop' into notif_sync
2015-12-22 14:47:11 +00:00
Kegan Dougal
e541ddb060
Auto-complete clicked suggestions
2015-12-22 11:14:36 +00:00
Kegan Dougal
0dbb8d5294
Use MemberAvatar to generate image JSX. Split out entries from tab-complete logic
2015-12-22 10:00:30 +00:00
Matthew Hodgson
ea2405ab3a
escape double-slash commands
2015-12-22 00:57:57 +00:00
Matthew Hodgson
618978d955
add appropriate CSS for the TabCompleteBar
2015-12-22 00:47:04 +00:00
Kegan Dougal
ba63b5dfff
Add image URLs to TabComplete.Entry objects
2015-12-21 17:28:04 +00:00
Kegan Dougal
41d4c1d14e
Add TabComplete.Entry so we can render images AND text(!) - Add peek() option, all broken.
2015-12-21 14:34:25 +00:00
Kegan Dougal
400b5196bb
Add TabCompleteBar. Hook up display to whether we are currently tab completing.
2015-12-21 14:11:34 +00:00
Matthew Hodgson
b9ba4475b8
Merge branch 'develop' into matthew/settings
2015-12-21 13:09:33 +00:00
Kegan Dougal
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
Kegan Dougal
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
Richard van der Hoff
ff6d9454fd
Merge pull request #63 from matrix-org/rav/paginate_search
...
Pagination for search results
2015-12-21 09:16:42 +00:00
David Baker
5f6fe74ca8
Highlight status is now taken from the server's unread notif count
2015-12-18 17:51:17 +00:00
Matthew Hodgson
fa99c1fc59
make it clear result count is approx
2015-12-18 17:18:08 +00:00
Kegan Dougal
f0ff62166b
Remove bottommost prop - can't DND on the bottom list anymore
2015-12-18 17:13:26 +00:00
Kegan Dougal
a2872deb53
Merge branch 'develop' into kegan/archived-rooms
2015-12-18 16:59:25 +00:00
Matthew Hodgson
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
Kegan Dougal
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
Kegan Dougal
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
Kegan Dougal
22635f251d
Call through to syncLeftRooms when the archived header is clicked
2015-12-18 11:55:43 +00:00
Richard van der Hoff
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
Matthew Hodgson
e2ae2dd199
merge stuff from vector
2015-12-18 00:37:56 +00:00
Kegan Dougal
8e4d0c0be7
Merge branch 'develop' into kegan/archived-rooms
2015-12-17 17:07:18 +00:00
Kegsay
498990b376
Merge pull request #59 from matrix-org/kegan/3pid-inv
...
Finish 3PID invites impl
2015-12-17 16:54:29 +00:00
Matthew Hodgson
478ca91b4f
s/Conversations/Rooms/ as per https://github.com/vector-im/vector-web/issues/535
2015-12-17 16:27:56 +00:00
Kegan Dougal
17a8eb0109
Display m.room.third_party_invite events. Display sensible text transitions.
2015-12-17 15:48:14 +00:00
Matthew Hodgson
5c999fe1ab
stop the incoming call box from scrolling off the screen
2015-12-17 14:56:09 +00:00
Matthew Hodgson
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
Kegan Dougal
e8f82527d1
Listen for room deletions and refresh the room list when it happens
2015-12-16 16:27:46 +00:00
Kegan Dougal
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
Kegan Dougal
09e0d10d32
Do not show conf user join/parts
2015-12-16 11:54:29 +00:00
Matthew Hodgson
a8d7810bfc
add fullscreen button back
2015-12-15 00:01:47 +00:00
Matthew Hodgson
39c628d4a1
implement the 'correct' voip calling design
2015-12-14 23:37:46 +00:00
Matthew Hodgson
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
Matthew Hodgson
bf70376d16
hoverover for full name of room
2015-12-12 17:29:53 +00:00
Richard van der Hoff
0beafeddb9
Use the 'muted' icon when the mic is muted during a call
2015-12-11 15:01:16 +00:00
Matthew Hodgson
af3c43ca76
show result counts
2015-12-11 02:58:59 +00:00
Matthew Hodgson
77464c669f
switch to fake tag names for fake tags, and highlight new invites
2015-12-11 00:40:28 +00:00
Kegan Dougal
8edfd60b64
Actually use room.name on invites. Fixes #321
2015-12-08 10:21:40 +00:00
Matthew Hodgson
08d7c0232a
svgize images
2015-12-06 22:07:49 +00:00
David Baker
681138678e
Fix bolding
2015-12-04 19:14:14 +00:00
Kegsay
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
David Baker
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
Kegan Dougal
257dc62a73
Recalculate levels when the member prop is updated.
2015-12-04 16:15:55 +00:00
David Baker
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
Kegan Dougal
673b01267a
Use LoginHeader everywhere
2015-12-01 16:29:58 +00:00
Kegan Dougal
636be0c003
Update getComponent paths
2015-12-01 15:45:11 +00:00
Kegan Dougal
784c1b63dc
Move remaining vector molecules to components
2015-12-01 11:19:25 +00:00
Kegan Dougal
f9e38e5326
Move and merge RoomList
2015-11-30 16:55:00 +00:00
Kegan Dougal
03485c2fca
Merge branch 'develop' into kegan/controller-merging4
2015-11-30 15:39:14 +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
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
Matthew Hodgson
28b85bb226
remove unnecessary zalgo hacks
2015-11-30 01:12:41 +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
