Commit Graph

1267 Commits

Author SHA1 Message Date
Matthew Hodgson 292af1e59c improve settings layout and fix FF bugs 2016-01-24 18:14:52 +00:00
Matthew Hodgson d3bc0feb83 fix ugly wrapping bug 2016-01-24 17:54:01 +00:00
Matthew Hodgson 19bfd829d0 add scrollToBottomBar and fix spacing for status bars in general 2016-01-24 01:52:21 +00:00
Matthew Hodgson 759b318bb5 fix safari 2016-01-23 01:24:04 +00:00
Matthew Hodgson dd19d2aaee red bar for highlights even if there's a unreadNotify too 2016-01-22 18:04:54 +00:00
Matthew Hodgson e0ecde6760 put a black badge on unread notifications, and a red one for unread highlights 2016-01-22 17:23:04 +00:00
Matthew Hodgson 5e21059144 Merge pull request #729 from vector-im/matthew/truncateroomlist
truncate room list
2016-01-22 16:09:28 +00:00
Matthew Hodgson 0a32874b39 oops, reset truncate state on hide, not collapse 2016-01-22 16:09:06 +00:00
Kegan Dougal 302c63058b Invoke onShowMoreRooms to allow parents to kick their scrollbars.. 2016-01-22 15:46:58 +00:00
Matthew Hodgson 0ee1892a0b truncate room list 2016-01-22 15:31:42 +00:00
David Baker e11ae99a9f Add vector rules with the appropriate kind, otherwise the room_message rule takes precedence over content / display name rules etc and prevents bings. 2016-01-22 14:12:29 +00:00
manuroe ce45f0b1e6 Push settings: Use a dont_notify rule when 1:1 or group chat rooms are set to OFF 2016-01-22 09:30:31 +01:00
Matthew Hodgson a76167d175 correct layout for truncated lists 2016-01-21 17:38:46 +00:00
manuroe f3064a2994 Put back removing of "When people join or leave a room" settings push rule 2016-01-21 16:37:17 +01:00
manuroe 029cf754ee Added notif settings for "Messages sent by bot" (https://github.com/vector-im/vector-web/issues/692)
In order to do that, the rules definitions have been update to support "dont_notify" hs default push rules
2016-01-21 16:16:44 +01:00
David Baker 1a248c8e5c Merge pull request #710 from vector-im/unread_sync
Use read receipts to calculate unread room status
2016-01-21 13:29:49 +00:00
David Baker b913e72735 Remove member event rule as per SYN-607 2016-01-21 12:01:28 +00:00
David Baker 4d4c6e06ec Merge remote-tracking branch 'origin/develop' into unread_sync 2016-01-21 10:39:35 +00:00
David Baker 2d917910da Merge pull request #556 from vector-im/notif_sync
Use unread count for room highlight state
2016-01-21 10:31:46 +00:00
David Baker a08d00c672 Apply patch to the right branch: update for new count format 2016-01-21 10:20:45 +00:00
Matthew Hodgson bd75234a2f make CSS work on FF 2016-01-21 00:39:26 +00:00
Matthew Hodgson 6573ba8c20 fix up Start Chat behaviour as per Amandine's feedback 2016-01-21 00:16:26 +00:00
Matthew Hodgson f4a2b6ab7e Merge pull request #697 from vector-im/matthew/roompreview
Lots of CSS bugfixes and polishing
2016-01-20 22:32:08 +00:00
Matthew Hodgson 6117e09a3f implement the correct design for memberlist 2016-01-20 22:04:32 +00:00
Matthew Hodgson 1fd60f1e44 revert read marker css 2016-01-20 17:23:33 +00:00
David Baker ac2e69ba28 Use new unread count methods 2016-01-20 17:20:19 +00:00
Matthew Hodgson 48052415b7 usersettings button layout 2016-01-20 17:09:53 +00:00
Matthew Hodgson e87e22a438 rhsbutton 2016-01-20 17:06:13 +00:00
Matthew Hodgson 5b2f921190 Fix bold avatar letters 2016-01-20 17:01:19 +00:00
Matthew Hodgson b830f43371 remove RoomAvatar; stale border-radius; fix aliases table 2016-01-20 16:59:53 +00:00
Matthew Hodgson 6332e3908e roomsettings css fixes 2016-01-20 16:39:14 +00:00
Matthew Hodgson 82742f9f13 oops, fix tinted read up to marker correctly 2016-01-20 16:06:35 +00:00
manuroe 888fde0f53 Fixed call push notifications settings that always stayed OFF 2016-01-20 17:01:09 +01:00
David Baker eb62456007 Update for new unread count format 2016-01-20 15:58:21 +00:00
Matthew Hodgson 60d2d45255 readd in the .mx_EntityTile_power class. don't understand why it was killed :'( 2016-01-20 15:39:42 +00:00
Matthew Hodgson 6ecdb02e81 sanitize avatar border radii 2016-01-20 15:26:48 +00:00
Matthew Hodgson 4d3918109a skin new invite UI CSS 2016-01-20 14:58:27 +00:00
Matthew Hodgson 9a9db53e0a fix tinting of read marker again 2016-01-20 14:58:17 +00:00
Matthew Hodgson 3e8c6a42d3 roomsettings layout tweaks 2016-01-18 19:58:02 +00:00
Matthew Hodgson 3b8e5073b5 improve layout 2016-01-18 19:57:32 +00:00
Matthew Hodgson a775086e81 wording from amandine 2016-01-18 19:57:17 +00:00
Matthew Hodgson d5c291ae62 Merge branch 'kegan/invite-search' into matthew/roompreview 2016-01-18 18:00:58 +00:00
Matthew Hodgson d6f6f32c74 WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now 2016-01-18 17:37:13 +00:00
Kegan Dougal 317e1fb9cd Merge branch 'develop' into kegan/invite-search 2016-01-18 17:33:26 +00:00
manuroe 6182c983ab PushRules settings: Applied review remarks (2/2) 2016-01-18 18:24:53 +01:00
Kegan Dougal ac4b221690 More CSS fun for border bottom 2016-01-18 17:22:02 +00:00
manuroe fdf5b0a4fc Merge branch 'develop' into push-rules-settings
# Conflicts:
#	src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
2016-01-18 18:14:20 +01:00
manuroe 7c0fffa79b PushRules settings: Applied easy review remarks 2016-01-18 18:07:33 +01:00
Kegan Dougal fef02f2fd1 s/MemberTile/EntityTile/ 2016-01-18 16:43:00 +00:00
manuroe bdcf683942 PushRules settings: Create a dedicated rule for "Messages sent to group".
The default fallback rule cannot be used because it matches with too much events.
2016-01-18 16:41:48 +01:00
manuroe ae14210763 PushRules settings: Put keywords in the right position 2016-01-18 16:31:18 +01:00
manuroe 830160f074 PushRules settings: Enabled all radio buttons of the table.
Each rule is described in the code so that if the server does not have it in its default rules or if the user wants to use actions different from the hs one, the code will create a new rule that will override the hs one.
2016-01-18 16:24:06 +01:00
Matthew Hodgson 0ef03c5ca4 Merge pull request #653 from vector-im/matthew/roomsettings2
Finish off RoomSettings (part 2)
2016-01-18 13:39:55 +00:00
Matthew Hodgson 5a1b0a1dab Merge pull request #657 from vector-im/matthew/memberlist
Fix up MemberList and MemberInfo cosmetics a bit
2016-01-18 13:39:42 +00:00
Kegan Dougal 77621fe035 Add missing CSS from #638 2016-01-18 12:06:46 +00:00
Matthew Hodgson 8792be4db2 moar space 2016-01-18 01:25:57 +00:00
Matthew Hodgson 1fef91b82c MemberInfo lipstick 2016-01-18 01:18:11 +00:00
Matthew Hodgson b2a1c89e83 bring back power badges 2016-01-18 00:16:04 +00:00
Matthew Hodgson 40d2018c17 fix checkbox css 2016-01-17 12:26:54 +00:00
Matthew Hodgson a61afa0f31 fix css thinko 2016-01-17 02:46:22 +00:00
Matthew Hodgson 4e7c58e242 fix broken icon 2016-01-17 02:46:15 +00:00
Matthew Hodgson 8771369937 more layout 2016-01-15 20:29:44 +00:00
Matthew Hodgson 394fb2373b more layout tweaks for RoomSettings 2016-01-15 16:50:12 +00:00
Matthew Hodgson eb8064f961 fix cursors for changeavatar 2016-01-15 16:32:39 +00:00
Matthew Hodgson 531aa153bb no more textarea in roomsettings 2016-01-15 16:32:23 +00:00
manuroe d7ffe70d44 PushRules settings: Applied Amandine's review comments 2016-01-15 17:28:57 +01:00
Kegan Dougal 17489ae350 s/MemberAvatar/BaseAvatar/ and rename classes 2016-01-15 16:12:28 +00:00
Matthew Hodgson 762dd69f0a more bottom margin on editable roomheader 2016-01-15 15:48:29 +00:00
manuroe cb8b052dc0 PushRules settings: Show unmanaged rules into an "advanced section" 2016-01-15 16:45:27 +01:00
Matthew Hodgson 1fcb4ba94f droptarget and usersettings and roomsettings layout tweaks 2016-01-15 15:26:00 +00:00
manuroe 2dd2acd4e0 PushRules settings: BF adding a keyword when the keywords rule is OFF 2016-01-15 14:28:50 +01:00
Matthew Hodgson 41ae851df4 fix up user settings CSS somewhat 2016-01-15 12:34:01 +00:00
manuroe c3469b5b51 PushRules settings: coding: separate UI and data management 2016-01-15 11:33:54 +01:00
manuroe 7412fc7f97 PushRules settings: changed wordings 2016-01-15 10:51:42 +01:00
Matthew Hodgson d1f26e3911 camera icon 2016-01-14 17:26:16 +00:00
Matthew Hodgson c1aac1aaca roomsetting icons 2016-01-14 17:25:21 +00:00
Matthew Hodgson f2fa9fe398 Merge branch 'develop' into matthew/roomsettings2 2016-01-14 16:49:48 +00:00
David Baker a65a15e9bb Shift read marker down by 5px 2016-01-14 16:45:13 +00:00
Matthew Hodgson 9ada5f7ddd CSS for tab complete slashcommands 2016-01-14 16:29:03 +00:00
Matthew Hodgson 17e540d372 fix line wrapping of code blocks in multiline msgs 2016-01-14 11:57:07 +00:00
Kegsay db2d7fdbff Merge pull request #622 from vector-im/kegan/3pid-invite-memberlist
CSS for email invite memberlist fix
2016-01-14 10:45:50 +00:00
Kegan Dougal 927ac5fe64 2016 only 2016-01-14 10:45:38 +00:00
manuroe 378f4bb85c PushRules settings: Display keywords in alphabetical order 2016-01-14 11:15:59 +01:00
manuroe 0577edb055 PushRules settings: Added master push rule 2016-01-14 11:03:51 +01:00
Matthew Hodgson 56718650b9 fix comedy double-margin caused by killing off MessageTiles 2016-01-13 17:39:57 +00:00
Matthew Hodgson e3eef45684 fix comedy double-margin caused by killing off MessageTiles 2016-01-13 17:39:49 +00:00
Matthew Hodgson 68f846e129 Merge branch 'develop' into matthew/roomsettings2 2016-01-13 17:33:32 +00:00
Matthew Hodgson f2171c11f0 uncommitted WIP roomsetting CSS 2016-01-13 17:33:03 +00:00
manuroe 629883731e PushRules settings: BF when adding a new keyword with the keywords rule in Off 2016-01-13 17:56:59 +01:00
manuroe 0475bcd9de PushRules settings: BF when changing state of the keywords rule with such a sequence: on -> off -> loud. 2016-01-13 17:10:26 +01:00
Kegan Dougal 1d5e661bd0 Split out css for new PresenceLabel 2016-01-13 15:56:44 +00:00
manuroe ac87830e4e PushRules settings: Applied new wordings: On, Loud, Off 2016-01-13 16:48:22 +01:00
manuroe 7fc5ab3c6e PushRules settings: Use the new TextInputDialog to display keywords list. We earn the focus at the end of the keywords list and the management of enter and esc keys 2016-01-13 16:36:57 +01:00
manuroe c4cb37606b PushRules settings: Added sanity checks on new keywords 2016-01-13 15:47:00 +01:00
manuroe e5b7a47fee PushRules settings: if a newly typed keyword was part of a push rule not managed by the Vector UI, delete the rule and create it compliant with Vector parameters 2016-01-13 12:00:04 +01:00
manuroe 1c03c208e1 PushRules settings: update keywords list hs side 2016-01-13 11:46:13 +01:00
Kegsay 7232659195 Merge pull request #612 from vector-im/kegan/guest-peek-then-join
Add css for room preview bar.
2016-01-13 10:37:13 +00:00
manuroe 10d3076d6b PushRules settings: Display keywords modal dialog 2016-01-13 09:11:56 +01:00
David Baker cae3ab410f Merge pull request #603 from vector-im/read_marker_animate
New CSS for read markers
2016-01-12 17:58:36 +00:00
Kegan Dougal 2bada93fdc CSS for forgot password link 2016-01-12 16:39:29 +00:00
manuroe 9fb8c9f67a PushRules settings: Use a workaround for SYN-590 (Push rule update fails) 2016-01-12 17:33:57 +01:00
manuroe b9080c770d PushRules settings: Fixed triage of matrix content rules into the unique Vector rule 2016-01-12 16:46:27 +01:00
David Baker 977b223929 Hopefully working CSS that doesn't cause the messages to jump about when a read marker disappears. 2016-01-12 14:20:05 +00:00
manuroe 7f95362dd2 PushRules settings: Translate matrix per-word rules into the global Vector rule for a list of keywords 2016-01-12 15:12:58 +01:00
Kegan Dougal f706f75a6e Add css for room preview bar. 2016-01-12 14:11:00 +00:00
Matthew Hodgson fc3f356dc0 GA 2016-01-12 01:23:39 +00:00
manuroe 6d510db2db PPushRules settings: Fixed React warnings 2016-01-11 17:32:37 +01:00
manuroe ee13dd7b6c PushRules settings: Added a dedicated component to display them 2016-01-11 17:24:04 +01:00
Kegsay f898986c73 Merge pull request #594 from vector-im/kegan/guest-access
Enable guest access
2016-01-11 15:21:57 +00:00
David Baker 6cd0aeb607 Revert 4px offset: it ends up in the middle of the line above 2016-01-11 10:56:08 +00:00
David Baker 1e57aa8c78 Make read up to line 2px and position relative so we can shift it up a little 2016-01-11 10:52:29 +00:00
Matthew Hodgson 93c4fc8785 switch EditableText to contentEditable; fix auxPanel layout bug in the general case (not just for video) 2016-01-10 13:04:15 +00:00
Matthew Hodgson d49f8721ce fix leave.svg so that it can be tinted 2016-01-09 00:56:10 +00:00
David Baker c02d9890c5 New CSS for read markers 2016-01-09 00:09:11 +00:00
Matthew Hodgson ccd518cc4c CSS and imagery for fixed up RoomSettings 2016-01-08 03:26:07 +00:00
Kegan Dougal a369c862a0 Hit MatrixClient.peekInRoom on rooms we can only peek into. 2016-01-07 14:57:26 +00:00
Kegan Dougal 1a8a4728cd Enable guest access. Show r/w icons on room directory. 2016-01-07 14:43:12 +00:00
Matthew Hodgson d2635373f0 Merge pull request #585 from vector-im/matthew/dynamic-svg
Make SVGs and CSS dynamically recolourable
2016-01-07 11:41:46 +00:00
David Baker 36e5ac3d7f Add CSS for the green read-up-to marker. 2016-01-07 11:22:41 +00:00
Matthew Hodgson df111223fc copyrights for 2016 2016-01-07 04:17:56 +00:00
David Baker c0f1ae0133 Use Unread to compute unread status of a room (which uses read receipts). 2016-01-06 18:29:27 +00:00
Matthew Hodgson eacadbff40 remove stale onSvgLoad 2016-01-06 02:29:20 +00:00
Matthew Hodgson cb29a04674 use factored out TintableSvg component for dynamic SVGs 2016-01-06 02:11:34 +00:00
Matthew Hodgson bb313d1f3c vertical-align room messages to the bottom of the page 2016-01-05 18:49:47 +00:00
Matthew Hodgson a1bdfaa8a2 vertical-align room messages to the bottom of the page 2016-01-05 18:49:21 +00:00
Matthew Hodgson 1df4f2d556 fix hyperlink position for image downloads 2016-01-05 03:38:53 +00:00
Matthew Hodgson b996022db2 fix up dynamically loaded svgs, and fix bottomleftmenu 2016-01-05 03:34:25 +00:00
Matthew Hodgson bbf08d99cc tinterize more svg 2016-01-05 00:47:26 +00:00
Matthew Hodgson 17b8982c75 move title attributes to the div 2016-01-03 22:35:07 +00:00
Matthew Hodgson 3abdcbf806 switch SVGs from imgs to objects, fixing CSS to make onClicks work 2016-01-03 22:30:14 +00:00
Matthew Hodgson b9a0b82537 shuffle around all the CSS to de-atomify it and make it match the react components 2016-01-03 00:10:17 +00:00
Matthew Hodgson fa4bd09f0c fix room header height 2015-12-28 02:27:47 +00:00
Matthew Hodgson 8dd90980d8 add cancel button for lightbox and pare down pointer-events stuff a bit 2015-12-28 02:15:23 +00:00
Matthew Hodgson e9db7b1dcc doh 2015-12-28 01:41:51 +00:00
Matthew Hodgson 388eb1ff4c use Open Sans, and fix duplication 2015-12-28 01:38:14 +00:00
Matthew Hodgson 0ab8466a3b make tabcomplete items clickable 2015-12-24 15:12:24 +00:00
Kegan Dougal 94609db3a6 Wrangle CSS to get avatar on UserSettings in the right place 2015-12-24 09:21:02 +00:00
Kegan Dougal f9f85ec542 More user settings CSS 2015-12-23 16:53:19 +00:00
Kegan Dougal d3938220cf Duplicate css for applying to mx_EditableText classes so it works with ChangeDisplayName 2015-12-23 14:13:24 +00:00
Kegsay 73d9ef54c3 Merge pull request #384 from vector-im/matthew/settings
WIP experiment of turning UserSettings into a controller-less component
2015-12-23 10:23:39 +00:00
David Baker 755ea0dfb8 Merge remote-tracking branch 'origin/develop' into notif_sync 2015-12-22 14:46:57 +00:00
Matthew Hodgson f681ce5cdb add CSS for TabCompleteBar 2015-12-22 00:47:33 +00:00
Matthew Hodgson ceadfef942 fix missing webkit prefixes for flexbox 2015-12-21 23:20:44 +00:00
Matthew Hodgson f665848c5e speed up search anim 2015-12-21 23:20:10 +00:00
Matthew Hodgson 031b048c07 fix missing webkit prefixes for flexbox 2015-12-21 23:19:53 +00:00
Matthew Hodgson d82c4c5ef3 fix safari flexbox bug 2015-12-21 23:16:44 +00:00
Matthew Hodgson ae02d8d30a Merge branch 'develop' into matthew/settings 2015-12-21 13:10:34 +00:00
Matthew Hodgson 67aff6b9f2 adopt MacOS style chevrons 2015-12-21 12:37:51 +00:00
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
David Baker cb1fabc578 Highlight status is now the room's unread notif count 2015-12-18 17:53:31 +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
Kegan Dougal df86e85492 Move ContextualMenu to React SDK 2015-11-27 15:37:00 +00:00
Kegan Dougal 05c9b44b81 Move velocity stuff to react sdk 2015-11-27 15:34:26 +00:00
Kegan Dougal a5d00c73b2 Move HtmlUtils to react SDK 2015-11-27 15:01:06 +00:00
Kegan Dougal 40b974f22d Move all Event/Message Tiles to React SDK. 2015-11-27 14:35:16 +00:00
Kegan Dougal f969ccb50c Move and merge RoomTile/MemberTile to react SDK. Keep DND stuff in vector as RoomDNDView. 2015-11-27 11:52:29 +00:00
Kegan Dougal b007edca63 Merge and move RoomHeader/RoomSettings into React SDK 2015-11-27 10:42:25 +00:00
Kegan Dougal 3ce29622ed Move and merge MemberInfo to React SDK 2015-11-26 17:49:55 +00:00
Kegan Dougal 1a6afc2ef0 Move and merge UserSelector 2015-11-26 17:38:01 +00:00
Kegan Dougal 6dea8e7256 Move and merge MessageComposer 2015-11-26 17:31:37 +00:00
Kegan Dougal 7595071e6a Move and merge ProgressBar 2015-11-26 17:21:35 +00:00
Kegan Dougal fdad00790e Move and merge Change* components to React SDK. Update references. 2015-11-26 17:11:26 +00:00
Kegan Dougal 9ecf5bed64 Nuke old CallView controller 2015-11-26 16:48:32 +00:00
Kegan Dougal ff9608c914 Move and merge voip molecules. Inject the ConferenceHandler as a prop
This keeps the vector conf logic munge separate from react SDK.
2015-11-26 16:39:58 +00:00
Kegan Dougal 49e5f18f62 Move and merge create_room atoms to react SDK 2015-11-26 15:43:57 +00:00
Kegan Dougal c5b0ea7e9f Move VideoFeed to React SDK 2015-11-26 15:24:32 +00:00
Kegan Dougal 83eae1b64a Move and merge EditableText into React SDK 2015-11-26 15:15:45 +00:00
Kegan Dougal 35ee9c9ddd Move and merge EnableNotificationsButton to react SDK 2015-11-26 15:10:49 +00:00
Kegan Dougal 0a8f5b6223 Move ImageView 2015-11-26 14:51:30 +00:00
Kegan Dougal 3f120c7027 Nuke LogoutButton; nothing used it. 2015-11-26 14:47:11 +00:00
Kegan Dougal 343670c5c4 Move MessageTimestamp 2015-11-26 14:38:48 +00:00
Kegan Dougal f21b6203ed Merge branch 'kegan/controller-merging' into kegan/controller-merging2 2015-11-26 14:31:31 +00:00
Kegan Dougal 8517f9f2bf Missed one 2015-11-26 14:29:26 +00:00
Kegan Dougal 3c12191cb7 Move Spinner 2015-11-26 14:25:20 +00:00
Kegan Dougal ab22ca6a28 Also move the existing login components to the new structure 2015-11-26 14:11:45 +00:00
Kegan Dougal 8898b444af Point things at the right places 2015-11-26 13:48:37 +00:00
Kegan Dougal d079617ce2 Nuke MemberAvatar/RoomAvatar; moved to react SDK 2015-11-26 13:25:56 +00:00
Matthew Hodgson f9040e08ce fix conflicts 2015-11-24 16:05:58 +00:00
Matthew Hodgson fd8864d528 STOP PEOPLE SHOUTING 2015-11-22 22:35:34 +00:00
Matthew Hodgson 841c790337 naughty override to stop RoomList panel scrolling horizontally 2015-11-22 15:47:50 +00:00
Matthew Hodgson 324c3e7dcf override more GFM css 2015-11-22 15:47:10 +00:00
Matthew Hodgson 01641543da only try to syntax highlight html 2015-11-21 12:33:45 +00:00
Matthew Hodgson 9038b984ff fix css link 2015-11-21 12:15:38 +00:00
Matthew Hodgson da97185fcd highlight <code/> blocks via highlight.js 2015-11-21 12:14:56 +00:00
Matthew Hodgson b6e9c1eaab oops, forgot gfm.css 2015-11-20 20:20:30 +00:00
Matthew Hodgson 76c6d6d4d6 add target=_blank onto all HTML links, and apply GFM.css for CSS for markdown 2015-11-20 20:12:23 +00:00
Matthew Hodgson 4c11de787e make h2 layout specific to the list 2015-11-20 20:11:06 +00:00
Matthew Hodgson 96c825b89f wrap whitespace on notices 2015-11-20 20:10:49 +00:00
Matthew Hodgson 29af81e827 Refactor HTML markup stuff into its own class, and whitelist h1 and h2 2015-11-20 18:58:13 +00:00
David Baker 3cf9f5248b Fix the ref we keep to be the react element and make velociraptor correctly track what nodes it had at the start (c.key not c.props.key) 2015-11-20 18:22:38 +00:00
Kegan Dougal 06427d663d Add support for playing gifs on mouse enter/leave 2015-11-20 16:36:58 +00:00
David Baker 2c51a5c199 Bugfix: don't cache the read avatar rect as it's relative to the viewport and it will move when we scroll! 2015-11-20 16:01:51 +00:00
Kegan Dougal 29ee7d2b13 Remove useless logging 2015-11-20 14:34:26 +00:00
Kegan Dougal 2e376b1eb9 Clear the 'screen' to load the main left/middle/right panels, then show the settings after post-reg is done 2015-11-20 14:27:39 +00:00
Kegan Dougal 37254e6243 Add PostRegistration component 2015-11-20 12:02:37 +00:00
Kegan Dougal 1edea2a62c Add a PostRegistration component; hook it up to MatrixChat. 2015-11-20 12:02:23 +00:00
Kegsay 99ccff098c Merge pull request #399 from vector-im/kegan/reg-refactor
Refactor registration
2015-11-20 10:28:26 +00:00
Kegan Dougal 3075c97bae Set busy Spinner 2015-11-20 10:27:21 +00:00
Kegan Dougal f62312fbf3 Remove old registration files. Move CaptchaForm to React SDK. 2015-11-20 10:18:04 +00:00
Matthew Hodgson 02d5154aaf more alt tags 2015-11-19 17:45:03 +00:00
Matthew Hodgson 41eaf18470 add hoverover test for edit button 2015-11-19 17:43:55 +00:00
Kegan Dougal d372018e61 Minor tweaks 2015-11-19 16:47:14 +00:00
Kegan Dougal bb6eeea0d8 Factor out div ID name to avoid tight coupling with logic class. 2015-11-19 16:08:25 +00:00
Kegan Dougal 3cf9f786aa Instantiate Signup.Register in Registration component
This has to be done rather than in MatrixChat because the render() calls
will create new instances otherwise. Pass in all the strings the logic class
requires to the Registration wire component. This isn't the "best" solution
because unloading/reloading the Registration component will lose registration
state which should be persisted. Ideally we'd DI from the top to ensure this
can't happen (as opposed to relying on module globals...)
2015-11-19 15:44:17 +00:00
Kegan Dougal 2d481a6302 Recheck registration state since we may be able to immediately do an HTTP hit if we've been given good QPs 2015-11-19 14:17:18 +00:00
Kegan Dougal e700a5a219 Add TODO on post register logic 2015-11-19 13:58:52 +00:00
Matthew Hodgson f7127ab701 Merge pull request #397 from vector-im/z_indices
Sort out dialog z index so read receipts avatars are behind the dialog background
2015-11-19 13:53:51 +00:00
Kegan Dougal eaafc11064 Factor out Captcha UI 2015-11-19 13:44:11 +00:00
Richard van der Hoff 3a003341ad Merge pull request #387 from vector-im/rav/suppress_unread_on_memberchange
Don't mark rooms as unread on m.room.member changes
2015-11-19 13:22:37 +00:00
David Baker f7fe871fee If read receipts avatar isn't on screen, animate it from the top of the screen. 2015-11-19 11:33:15 +00:00
David Baker 09b0d221df Kill the last getDOMNode() 2015-11-19 11:03:33 +00:00
David Baker ed3d3a9e23 Shift css around a bit so it more closely matches DOM order 2015-11-19 10:49:24 +00:00
David Baker eb1c6b347d Move z-index to the dialog wrapper because that's the shallowest positioned element in the DOM and therefore what creates the first stacking context 2015-11-19 10:46:49 +00:00
Kegan Dougal 5f57cd9559 Merge branch 'develop' into kegan/reg-refactor 2015-11-19 09:50:08 +00:00
David Baker 0dd85d9adf Hidden localstorage option to enable bouncy read receipts :p 2015-11-19 09:44:24 +00:00
Matthew Hodgson 23d45d7f33 fix initials behaviour on FF 2015-11-18 23:46:43 +00:00
Matthew Hodgson 69fdd485e6 general faff to make the new edit button position interact properly with dave's 'click to show all read receipts' 2015-11-18 23:41:38 +00:00
Matthew Hodgson bf3e90bb47 dirty hack to fix the uneven spacing 2015-11-18 23:04:12 +00:00
Matthew Hodgson 68a005bf1f stop edit option from colliding with scrollbar again 2015-11-18 22:24:54 +00:00
Matthew Hodgson 884d0de90b s/React/ReactDOM/ to fix another 0.14 warning 2015-11-18 22:22:19 +00:00
Matthew Hodgson 6e3afcde53 dodgy fudge to put the edit button alongside the read receipts. in future I think we should turn it into a chevron next to the timestamp 2015-11-18 22:19:21 +00:00
Matthew Hodgson d66006893a fix react 0.14 warning from getDOMNode() 2015-11-18 22:10:08 +00:00
Matthew Hodgson 8fed464cf6 and the new voice icon 2015-11-18 21:18:16 +00:00
Matthew Hodgson 08ba0457e8 add a temporary voice call button 2015-11-18 21:17:58 +00:00
Matthew Hodgson 098491e350 avoid hoverover artefacts on avatar initials 2015-11-18 20:56:43 +00:00
Matthew Hodgson 46541a3f2e logout button on splashscreen to avoid wedging users whose server has gone awol 2015-11-18 20:47:14 +00:00
Matthew Hodgson c9fe0b96b7 fix whitespace 2015-11-18 20:46:39 +00:00
Matthew Hodgson 742ae354e5 clicking anywhere in the composer pane should focus on the textarea 2015-11-18 20:15:15 +00:00
Kegan Dougal bc55959fad Load the Recaptcha script if we have a container for it
This is complex enough that the Registration component shouldn't have to
care about it, so it should probably be split into a pure UI component.
2015-11-18 17:46:17 +00:00
Kegan Dougal 5424567a66 Hook up onFormSubmit to make registration (dummy only) work again. 2015-11-18 17:15:20 +00:00
David Baker f0df3f29b9 Show all read avatars on click 2015-11-18 17:12:17 +00:00
Kegan Dougal b4c0625961 Show validation errors 2015-11-18 15:32:44 +00:00
David Baker 1099892784 Merge pull request #379 from vector-im/read_receipts
Read receipts
2015-11-18 14:53:29 +00:00
Richard van der Hoff c42d4f901b Don't mark rooms as unread on m.room.member changes
A quick and hacky fix to issue #169.
2015-11-18 11:01:47 +00:00
Kegan Dougal ed3527e243 Merge branch 'develop' into kegan/reg-refactor 2015-11-17 17:43:22 +00:00
Kegan Dougal 8e8b27c893 Add RegistrationForm UI component and new Registration wire component
Hook it up to MatrixChat instead of the existing logic (this breaks reg). WIP.
2015-11-17 17:40:31 +00:00
David Baker c63dd376d8 Fix member avatar initials (I failed at git conflict merging) 2015-11-17 17:31:03 +00:00
David Baker da55081c68 Add member name to avatars as the title since if displayed without accompanying text (as with read receipts) they can be somewhat unhelpful. May as well have them all the time I think. 2015-11-17 15:59:44 +00:00
David Baker 80c2bd0c7f Remove bouncing, set animation time to be constant (prevents temporary overalpping) and exclude ourselves. 2015-11-17 15:51:00 +00:00
Kegan Dougal 714c96283e Setting defaults from config.json got lost 2015-11-17 15:12:55 +00:00
Kegan Dougal c57fb44c71 Fix path resolution 2015-11-17 13:26:23 +00:00
Kegan Dougal 8602e0665d PR feedback from #355 2015-11-17 10:57:44 +00:00
Kegsay af1e3373ea Merge pull request #355 from vector-im/kegan/login-refactor
Refactor login page
2015-11-17 10:47:56 +00:00
Matthew Hodgson 79e39429b7 add todo 2015-11-17 02:40:19 +00:00
Matthew Hodgson 7b3eea0b58 experiment with trying to turn UserSettings into a controller-less 'wiring component' which wires together a series of smaller components (in this case, so small they're mainly <input/s> 2015-11-17 02:15:55 +00:00
Matthew Hodgson 88c5a5e074 missing copyright 2015-11-17 02:14:06 +00:00
David Baker e23b90abd5 More s/messageWrapper/messagePanel/ 2015-11-16 16:52:07 +00:00
David Baker 7f61a0252f remove logging 2015-11-16 16:45:28 +00:00
David Baker bb59e9276b Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-16 16:33:39 +00:00
David Baker d6b86598e5 Bouncy bouncy! 2015-11-16 16:13:21 +00:00
Matthew Hodgson bf91155e60 implement multiline input 2015-11-15 03:36:10 +00:00
Matthew Hodgson ef181f55d5 make modal dialogs higher in z-index 2015-11-14 00:14:41 +00:00