Commit graph

868 commits

Author SHA1 Message Date
Matthew Hodgson
50aa988a34 fix layout 2015-12-21 12:37:50 +00:00
Matthew Hodgson
fdc94ccf98 ensure even hyperlinks are highlighted 2015-12-21 12:37:50 +00:00
Kegan Dougal
dcea0dd601 Move min-height to RoomList; remove bottommost prop 2015-12-18 17:13:57 +00:00
Kegan Dougal
dc1e2010a6 Merge branch 'develop' into kegan/archived-rooms 2015-12-18 17:00:20 +00:00
Matthew Hodgson
d7b87743f3 Merge pull request #533 from vector-im/matthew/inbound-calls
position the inbound call box correctly
2015-12-18 15:59:05 +00:00
Kegan Dougal
7cc1573f33 Add startAsHidden and showSpinner props to RoomSubList
startAsHidden: Previously we never started in the hidden state and all was well.
But with archived rooms you DO want to start hidden as you haven't fetched the
room list yet. Without this, you need to click twice (close/open) before the
archived room list will load.

showSpinner: If true, will show a spinner iff there are 0 elements being displayed.
Used when fetching the archived room list in RoomList.
2015-12-18 15:17:18 +00:00
Kegan Dougal
f7c4cca675 Add TODO after spending 15 mins trying to figure out the difference between props.collapsed and state.hidden 2015-12-18 13:32:22 +00:00
Kegan Dougal
869c08a790 Add onHeaderClick and alwaysShowHeader props to RoomSubList for archived room clicking 2015-12-18 11:56:22 +00:00
Matthew Hodgson
a7b9e54594 Merge branch 'develop' into matthew/settings 2015-12-18 00:36:46 +00:00
Kegan Dougal
63d0477223 Pass through the starting query params from the URL 2015-12-17 15:01:07 +00:00
Matthew Hodgson
1a90a2c426 position the inbound call box correctly, and fix various issues with when the video preview and callview are shown 2015-12-17 02:53:53 +00:00
Kegsay
856156ef5c Merge pull request #527 from vector-im/kegan/hide-fs-user
Pass a userId rather than a RoomMember to isConferenceUser
2015-12-16 13:56:50 +00:00
Kegan Dougal
c8ca1dd8d0 Pass a userId rather than a RoomMember to isConferenceUser
Because invites do not have RoomMembers because we don't have an m.room.member
event for them, just a user ID, and we want to detect conf users at invite
time.
2015-12-16 11:55:13 +00:00
Matthew Hodgson
d945050de6 fix typing notifs 2015-12-15 15:59:40 +00:00
Matthew Hodgson
d3ecce2d2e add fullscreen button 2015-12-15 00:01:32 +00:00
Matthew Hodgson
a495aecdd8 assets for VoIP and DnD file upload 2015-12-14 23:38:24 +00:00
Matthew Hodgson
c553258aff add dedicated leave button to header 2015-12-13 13:49:54 +00:00
Matthew Hodgson
9c8984b308 fix vertical alignment of voip buttons 2015-12-13 04:14:20 +00:00
Matthew Hodgson
c2061ed439 revert dd08f53756 - do this in JS instead 2015-12-13 04:08:35 +00:00
Matthew Hodgson
96cddc5ca8 fix layout for long room names & topics 2015-12-12 17:30:08 +00:00
Matthew Hodgson
dd08f53756 don't let auxpanel push out the height of the roomview 2015-12-12 17:15:45 +00:00
Matthew Hodgson
056017007a improve look and feel of upload cancel 2015-12-12 16:41:32 +00:00
Richard van der Hoff
c36d1df417 Add a 'muted' icon for voip calls
... because even a crappy one is better than nothing
2015-12-11 15:00:25 +00:00
Matthew Hodgson
762281cd96 fix vertical spacing of roomheader 2015-12-11 03:39:13 +00:00
Matthew Hodgson
898cb399a3 show results 2015-12-11 02:58:47 +00:00
Matthew Hodgson
3fb0c9883b escape key to cancel search box 2015-12-11 02:32:30 +00:00
Matthew Hodgson
f2fb1836df only flash whilst searching 2015-12-11 02:25:51 +00:00
Matthew Hodgson
fea3fed460 animate the search button whilst searching 2015-12-11 02:24:58 +00:00
Matthew Hodgson
4c82d86092 nice green highlights 2015-12-11 01:35:05 +00:00
Matthew Hodgson
1c9d61d731 dedicated search button 2015-12-11 01:19:48 +00:00
Matthew Hodgson
7b702c4594 don't grey out invites randomly 2015-12-11 00:40:40 +00:00
Matthew Hodgson
d6bcf80431 make the settings button more discoverable by having the whole leftRow be a hover target 2015-12-10 19:48:05 +00:00
Matthew Hodgson
8ecf70dda0 show images with unknown height - fixes issue 475 hopefully 2015-12-09 13:24:15 +00:00
Matthew Hodgson
4b8d7a612a make the mx_RoomView_statusAreaBox_line full width as per the ribot design 2015-12-08 19:45:30 +00:00
Matthew Hodgson
b532fd046a actually use SVGs - oops 2015-12-08 10:28:00 +00:00
Kegan Dougal
2f905e13e1 Invoke onFinished so the context menu doesn't hang around 2015-12-07 16:04:46 +00:00
Kegan Dougal
39778330b5 Also allow not_sent messages to be cancelled entirely. 2015-12-07 13:55:10 +00:00
Kegan Dougal
1af1297afc Allow queued events to be cancelled. Make not sent events appear differently to sending events. 2015-12-07 11:38:34 +00:00
Matthew Hodgson
da5c687320 svgize coloured icons 2015-12-06 22:06:21 +00:00
David Baker
25eeaaf1e5 Use UnreadStatus to determine whether an event affects a room;s unread status. Unify rooms going bold with their sort order and don't go bold for m.notify. 2015-12-04 16:24:17 +00:00
Kegan Dougal
ac8fcbb264 Force update the RightPanel when the member in MemberInfo is updated. 2015-12-04 16:16:41 +00:00
David Baker
db5d9e2f6e Merge pull request #465 from vector-im/file_uploads
Move upload bar CSS to new classes
2015-12-03 10:58:03 +00:00
David Baker
547f59b1bc Oops, don't re-add these. 2015-12-03 10:00:29 +00:00
David Baker
2d2386ace5 Move upload bar CSS to new classes, and move into new, temporary place (since there is no new-style structure yet). 2015-12-02 18:19:03 +00:00
Matthew Hodgson
c603c1e37f dezalgo typing notigs on chrome 2015-12-02 17:37:19 +00:00
David Baker
939733b736 Merge branch 'develop' into require-css 2015-12-02 10:26:26 +00:00
Kegan Dougal
0210670e91 Merge branch 'develop' into kegan/vector-references
Conflicts:
	src/component-index.js
2015-12-02 09:37:28 +00:00
Matthew Hodgson
cba27a7488 erm, surely we need to actually run reskindex after all that? 2015-12-02 01:37:26 +00:00
Matthew Hodgson
349a88d640 stop clobbering our font colours 2015-12-01 21:44:22 +00:00
David Baker
95e71a531e Merge branch 'develop' into kegan/vector-references
Update having merged skindexing PR
2015-12-01 18:31:13 +00:00
David Baker
d2c6e2195e Merge pull request #447 from vector-im/skindex-nextgen
Update skindexing for new world order
2015-12-01 18:12:47 +00:00
David Baker
a63bf7cb35 Merge branch 'develop' into skindex-nextgen 2015-12-01 18:10:57 +00:00
David Baker
7ff5e42f3e Run the CSS through webpack so we can pull in CSS files from modules with require rather than symlinking into the node_module directory which is breaking people on different npm versions. 2015-12-01 18:05:43 +00:00
Matthew Hodgson
2c12b9128b highlight binged rooms more clearly 2015-12-01 16:57:49 +00:00
Kegan Dougal
e21d435d84 Remove debug logging 2015-12-01 16:57:40 +00:00
Kegan Dougal
a2b28b826c Add CustomServerDialog for vector 2015-12-01 16:48:51 +00:00
Kegan Dougal
8d31f72f83 Add VectorLoginHeader 2015-12-01 16:27:23 +00:00
Kegan Dougal
e304a1925d Add VectorLoginFooter with vector references 2015-12-01 16:12:38 +00:00
David Baker
c281fe785a Merge branch 'develop' into skindex-nextgen 2015-12-01 15:53:11 +00:00
Kegan Dougal
8083e7f118 Move vector-only components to src/components. 2015-12-01 15:45:38 +00:00
David Baker
5098c7d16f Merge branch 'develop' into skindex-nextgen 2015-12-01 15:44:45 +00:00
Kegan Dougal
e07c03a7bb Merge branch 'develop' into kegan/vector-components 2015-12-01 15:39:02 +00:00
Kegsay
e7f6e09def Merge pull request #448 from vector-im/kegan/controller-merging4
Phase 4 controller merging
2015-12-01 15:34:25 +00:00
Matthew Hodgson
075d2b508d fix highlights on markdown 2015-12-01 13:13:51 +00:00
Kegan Dougal
e55e2bdd0d Remove unused class 2015-12-01 11:22:19 +00:00
Kegan Dougal
2a025201b1 Move remaining vector molecules to be components in vector (for now) 2015-12-01 11:19:54 +00:00
Matthew Hodgson
f89dcacf07 fix bottomleftmenu layout a bit 2015-12-01 11:11:32 +00:00
Matthew Hodgson
99f47b8601 match design spacing correctly 2015-12-01 11:07:12 +00:00
Matthew Hodgson
1896ab67d1 fix room avatar offset 2015-12-01 11:05:11 +00:00
Kegan Dougal
8f5f71ec80 Move MatrixChat to react-sdk. Move all login stuff to react SDK.
Removed Modulator stuff.
2015-11-30 18:10:09 +00:00
David Baker
021056cfd1 Move copyright header 2015-11-30 18:00:54 +00:00
David Baker
6a4038daeb Add 'replaces' tag to mark that the RoomDNDView is a RoomTile 2015-11-30 17:56:55 +00:00
David Baker
cadfbcbed3 Merge branch 'develop' into skindex-nextgen 2015-11-30 17:56:40 +00:00
David Baker
6f646260aa WIP of component indexing update 2015-11-30 17:31:32 +00:00
Matthew Hodgson
badfdb5e3e actually, seems FF is happy with this again now 2015-11-30 17:24:38 +00:00
Matthew Hodgson
2345624d31 switch to Open Sans, juggling font-size appropriately (as Open Sans is physically larger for the same point size as Myriad Pro, irritatingly), and fix some really weird baseline CSS bugs in read receipts that were introduced. Hopefully this doesn't re-introduce the intermittent baseline offset bug for the initials on Chrome & FF 2015-11-30 17:17:09 +00:00
Kegan Dougal
ddc4f30bb6 Remove RoomView and port it to react-sdk. Move Resend.js to react-sdk 2015-11-30 17:16:31 +00:00
Kegan Dougal
4e7aa78ed7 Move RoomList to react-sdk. Inject a ConferenceHandler. 2015-11-30 16:56:05 +00:00
Kegan Dougal
e792ebb837 Move and merge UserSettings to react-sdk 2015-11-30 15:53:13 +00:00
Matthew Hodgson
4409f07c2e oops, don't try to delete nonexistent tags when moving a room from conversations to favs or similar 2015-11-30 15:49:27 +00:00
Kegan Dougal
b89bd35cad Merge branch 'develop' into kegan/controller-merging4 2015-11-30 15:42:32 +00:00
Matthew Hodgson
7636645efc rename message components as per RL discussion this morning 2015-11-30 15:25:21 +00:00
Kegan Dougal
bd906cbc69 Move and merge LogoutPrompt to react-sdk 2015-11-30 15:23:37 +00:00
Kegan Dougal
cb30cbb09a Remove MemberList and put it in react-sdk 2015-11-30 15:14:04 +00:00
Kegan Dougal
2b37e5334a Remove Notifier and put it in react-sdk 2015-11-30 15:05:00 +00:00
Matthew Hodgson
f947400131 Open Sans 2015-11-30 14:17:33 +00:00
Kegan Dougal
fd4d7eba12 Remove ErrorDialog and QuestionDialog to react-sdk 2015-11-30 14:11:28 +00:00
Matthew Hodgson
8a00e71139 remove spurious Vector layer Avatar helper class 2015-11-30 13:56:53 +00:00
Kegan Dougal
83b3702769 Merge branch 'develop' into kegan/controller-merging4 2015-11-30 10:56:14 +00:00
Kegan Dougal
450b2d4d67 Move CreateRoom to react-sdk 2015-11-30 10:55:52 +00:00
Matthew Hodgson
cd040ae0dd fix zalgo properly! remove ugly regexp hacks for detecting combining diacritics and instead set the right font ordering, as Arial combines nicely with Myriad Pro whilst Helvetica doesn't. (Myriad Pro itself has no combining diacritic characters) 2015-11-30 01:13:59 +00:00
Matthew Hodgson
9a64dc27fc improve layout for search results, fix syntax highlighting quirks in sublime, and don't crash on zero results 2015-11-29 13:32:13 +00:00
Matthew Hodgson
af6bd53d38 revert 23d45d7f33 and apply a better fix which works for both chrome & FF 2015-11-29 13:18:37 +00:00
Matthew Hodgson
01f0e61d6e fix search ordering; add room labels; hide input areas if searching 2015-11-29 04:41:17 +00:00
Matthew Hodgson
fc02331cd3 fix CSS for search timestamps 2015-11-29 03:20:19 +00:00
Matthew Hodgson
e43edee9bb call highlighted search terms highlights, and uphold them if provided by synapse 2015-11-29 03:19:51 +00:00
Matthew Hodgson
8de94d45b1 swim like a salmon and manually update skindex for a generic TextualMessage type 2015-11-28 21:11:37 +00:00
Matthew Hodgson
9e97160c85 fix inline <code/> blocks 2015-11-27 16:20:37 +00:00
Kegan Dougal
07001ae35e Remove unused files 2015-11-27 16:11:58 +00:00
Kegan Dougal
0ef7c8d16d Use the right name 2015-11-27 15:43:16 +00:00