Commit Graph

2347 Commits

Author SHA1 Message Date
Hubert Chathi ad79f67ab6 Add missing brackets to call to toUpperCase 2016-12-06 22:36:42 -05:00
David Baker 5fa0f62ccc Fix clicking on notifications
* Dismiss the notification when it's clicked
 * Accept the room object: we need it to view_room
 * Desktop app: Un-minimise when notification clicked
 * Desktop App: Set App User Model ID so notifications work on
   Windows 8!
2016-12-06 13:28:59 +00:00
Mark Haines 9026cc4977 Merge pull request #2659 from vector-im/markjh/attachment_iframe_css
Add css for the iframes for e2e attachments
2016-12-01 13:12:12 +00:00
Richard van der Hoff f202197545 CSS updates for s/block/blacklist for e2e
CSS for https://github.com/matrix-org/matrix-react-sdk/pull/574
2016-11-29 18:49:23 +00:00
Mark Haines 6c21391ff5 Merge branch 'develop' into markjh/attachment_iframe_css 2016-11-28 15:10:49 +00:00
David Baker c786980454 Move getDefaultDeviceName into the Platforms
So we can have a sensible device name on Electron
2016-11-24 16:46:15 +00:00
Richard van der Hoff 8b0390f354 Fix a race which took us to the directory on load sometimes (#2602)
Sometimes window.onload would run before loadApp had finished (specifically, if
the browser had to wait for config.json to load). Avoid the race by moving all
of the onload logic into loadApp.
2016-11-18 17:32:01 +00:00
Richard van der Hoff 646608bf8b Add a cachebuster to /version 2016-11-17 17:31:31 +00:00
Mark Haines be90badc8d Add css for the iframes for e2e attachments 2016-11-17 11:36:46 +00:00
Matthew Hodgson 3155d79a7e chatbot summit stuff 2016-11-17 13:35:36 +02:00
Richard van der Hoff 7577d2eb05 s/var/const/ 2016-11-17 10:51:09 +00:00
Richard van der Hoff 81d70a921d Add a 'View decrypted source' button 2016-11-16 23:10:51 +00:00
David Baker 70d383fb1b Fix changelog dialog to read new version format
Remove the 'vector' from the start of the version (otherwise the
tarballs are called vector-vector-[...].tar.gz). The jenkins
script already creates these files, so update accordingly.
2016-11-13 23:06:57 +00:00
Matthew Hodgson f911f0cfca geektime verbiage tweaks 2016-11-13 20:18:19 +00:00
Matthew Hodgson efabf35613 make room previews more obvious 2016-11-13 14:13:32 +00:00
Matthew Hodgson 3f640139d2 quick and dirty support for custom welcome pages, with an example for geektime techfest 2016-11-13 14:10:33 +00:00
David Baker 8356ad7bfa Merge pull request #2553 from vector-im/dbkr/get_app_version
Support for get_app_version
2016-11-11 17:33:41 +00:00
Richard van der Hoff 69eee7ca0a Merge pull request #2565 from vector-im/luke/fix-add-css-for-mlist-truncation
Add CSS for mlist truncation
2016-11-11 11:01:31 +00:00
Luke Barnard 4f944cf01c Add CSS for mlist truncation
matrix-org/matrix-react-sdk#544
2016-11-10 17:15:30 +00:00
Will Hunt 15c730a22a Add rel="noopener" to context menu links. 2016-11-08 17:08:50 +00:00
Will Hunt cf33ed58c1 Add menu option for `external_url` if present 2016-11-08 16:57:56 +00:00
Luke Barnard b30df2115c Add some CSS for an error popup that appears next to the `Manage Integrations` button if there was a problem contacting Scalar 2016-11-08 10:54:03 +00:00
David Baker 8d46077ac2 Support for get_app_version 2016-11-08 10:47:01 +00:00
David Baker 9a00ec128c many semicolons 2016-11-04 10:46:51 +00:00
David Baker ed9c29d365 Use require so we can import conditionally 2016-11-03 15:45:12 +00:00
David Baker 6869c679ef Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 2016-11-03 14:58:12 +00:00
David Baker cfe63fa274 Better support no-config when loading from file
We should still error if given a 5xx with an empty body.
2016-11-03 14:43:10 +00:00
David Baker 3601b44429 Fix loading with no config from HTTP 2016-11-03 14:17:23 +00:00
David Baker fb3ca441ba Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 2016-11-03 13:32:01 +00:00
David Baker f1b72dfa09 Fix copyright 2016-11-03 11:51:41 +00:00
David Baker 4d0b492ba0 Merge remote-tracking branch 'origin/develop' into dbkr/platform_version 2016-11-03 11:51:23 +00:00
David Baker 3bcb447e03 Fix copyright 2016-11-03 11:48:49 +00:00
David Baker 108af83ae8 Just bind the right function to the button
rather than deciding in onChangelogClicked
2016-11-03 11:43:50 +00:00
David Baker 275a55266b Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 2016-11-02 19:46:02 +00:00
David Baker 18504ca14e Merge pull request #2533 from vector-im/dbkr/platform_notification
Add Notification support to the Web Platform
2016-11-02 19:43:17 +00:00
David Baker 6aba9f8eda Don't always claim we have notif support
Only if the browser has the Notification API
2016-11-02 19:26:07 +00:00
David Baker e8494c3dc7 Split NewVersionBar release notes / changelog
and change the class to use React createClass syntax while I'm at
it, rather than a completely different third style we use nowhere
else in the project.
2016-11-02 19:20:11 +00:00
David Baker caa3cb7d89 Electron support
From https://github.com/vector-im/vector-web/pull/2511 but with
just the actual electron changes
2016-11-02 18:49:28 +00:00
David Baker 19238b9326 Use the defaults if given a blank config file
This allows Vector to load from file:// URIs without breaking if
there is no config file (because we explicitly look for 404s, and
file:// URIs don't return 404s).
2016-11-02 17:57:27 +00:00
David Baker 8c3fed7559 CSS for changelogs 2016-11-02 17:48:47 +00:00
David Baker 17bb47676e Make VectorBasePlatform
For template methods that are only used from within vector (ie. new version
support)
2016-11-02 17:45:35 +00:00
David Baker 757604fd60 Add Notification support to the Web Platform
Except display notification which was already accidentally included in a
previous PR
2016-11-02 17:36:48 +00:00
David Baker 64fdb290eb Move 'new version' support into Platform 2016-11-02 16:02:55 +00:00
David Baker a714edbf2b Implement Platforms
Provide WebPlatform for functionality specific to the web version of vector.
2016-11-02 15:12:51 +00:00
Richard van der Hoff 6396c60645 Put a cachebuster in the names of CSS and JS files
This means that clients can do better caching of assets, as it will mean we are
no longer reliant on etags to ensure that clients get a fresh version.

We inhibit the cachebuster for `npm start`, so that we don't get millions of
copies of the bundles on dev boxes.
2016-10-26 15:20:59 +01:00
Richard van der Hoff 8fe05fdff3 Correct path to components.css
Fix failure to find components.css which was introduced in e1919c5
(https://github.com/vector-im/vector-web/pull/2513)
2016-10-26 15:02:34 +01:00
Richard van der Hoff e1919c5ea3 Don't include two copies of the CSS in the tarball
Aggregate our CSS into build/components.css instead of vector/components.css, so
that it isn't included in the tarball.
2016-10-26 14:43:42 +01:00
Richard van der Hoff e564d34ca8 Merge pull request #2512 from vector-im/dbkr/firefox_roomdir_align
Correct text alignment on room directory search
2016-10-26 10:49:59 +01:00
David Baker 61d7db6eb6 Correct text alignment on room directory search
Seemed to only be broken on firefox
2016-10-26 10:35:46 +01:00
David Baker df94dd7487 Update ChangelogDialog.js 2016-10-25 14:41:02 +01:00
David Baker d04201d069 Replace stage & es2017 with specific plugins
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
2016-10-17 16:28:14 +01:00
David Baker 82de2ca4ec Remove transform-runtime
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
2016-10-17 16:28:14 +01:00
David Baker 5608e97719 Remove babel-polyfill
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
2016-10-17 16:28:13 +01:00
Aviral Dasgupta d6f27add66 Upgrade to babel6 and enable some presets. 2016-10-17 16:28:13 +01:00
David Baker ea09a25563 Revert "Switch to babel 6" 2016-10-14 18:50:22 +01:00
David Baker 40ac80a3e9 Replace stage & es2017 with specific plugins
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
2016-10-14 18:03:22 +01:00
David Baker 5f747e1a90 Remove transform-runtime
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
2016-10-13 10:57:10 +01:00
David Baker 64815b1b0b Remove babel-polyfill
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
2016-10-12 17:23:01 +01:00
David Baker 59120d3019 Merge branch 'babelrc' of https://github.com/aviraldg/vector-web into aviraldg-babelrc 2016-10-12 17:17:10 +01:00
Richard van der Hoff 97cedfc712 Centre images in dialog buttons
Some dialogs put a spinner in the button... need to line them up.
2016-10-11 17:50:49 +01:00
Aviral Dasgupta 42993a78ed Only show quote option if RTE is enabled 2016-10-11 19:07:15 +05:30
David Baker 323bd79d0e Fix join button for 'matrix' networks
Fixes https://github.com/vector-im/vector-web/issues/2435
2016-10-10 11:21:20 +01:00
Matthew Hodgson 60adbffacf try to fix the create room label 2016-10-10 02:38:38 +01:00
David Baker 5e293c0f45 Don't stop paginating if no rooms match
Always show the scrollpanel otherwise we stop paginating if there
are no matching rooms in the first request (as per comment).

Fixes no freenode rooms being shown.
2016-10-05 18:06:43 +01:00
David Baker ea38968be9 Merge pull request #2379 from vector-im/dbkr/join_3p_location
Add native joining of 3p networks to room dir
2016-10-05 14:00:21 +01:00
David Baker c0a4574069 For single instance, allow domain present & match 2016-10-04 15:30:46 +01:00
David Baker de9bf4bb47 Actually use variable 2016-10-04 15:18:07 +01:00
David Baker b80b08f04f Specify width on icons & comment 2016-10-04 11:14:36 +01:00
David Baker 304e5b997a PR Freedback 2016-10-04 11:04:01 +01:00
David Baker 6b4dbfbd62 Change default brand to Riot
& update sample config
2016-10-04 10:23:38 +01:00
David Baker 000ca35727 Don't pop up errors when this API fails for guests 2016-10-03 16:30:57 +01:00
David Baker 776fe2ad70 Different way of getting fields for 3p location
Try to match protocol insance from 'domain' field and use its
fields for all but the last field. Assume the last takes the user
input.
2016-10-03 13:42:55 +01:00
Aviral Dasgupta 9174b32ef1 Upgrade to babel6 and enable some presets. 2016-10-02 17:28:24 +05:30
Richard van der Hoff 602727b7ad Merge pull request #2383 from vector-im/dbkr/sign_in_not_log_in
Use 'Sign In' / 'Sign Out' universally
2016-09-30 11:31:15 +01:00
Richard van der Hoff 56deea9f10 Merge pull request #2382 from vector-im/dbkr/networkdropdown_size_jump
Prevent network dropdown resizing slightly
2016-09-30 10:59:15 +01:00
Richard van der Hoff 8e0be29c13 Merge pull request #2380 from vector-im/dbkr/roomdir_no_results
Room directory: indicate when there are no results
2016-09-30 10:23:23 +01:00
David Baker b71b1b5535 Use more variables 2016-09-30 09:39:30 +01:00
Matthew Hodgson 5b3524f174 better wordwrap on RightPanels 2016-09-29 17:41:34 +01:00
David Baker f9a70a8b04 Use 'Sign In' / 'Sign Out' universally
Rather than a mix of 'sign in/out' and 'log in/out'
2016-09-29 17:40:19 +01:00
David Baker b652ea5024 Prevent network dropdown resizing slightly
Dropdown resized by 2px when opened
2016-09-29 16:49:44 +01:00
David Baker 2a37a0cb19 Room directory: indicate when there are no results
Fixes https://github.com/vector-im/vector-web/issues/2250
2016-09-29 15:45:45 +01:00
David Baker 761600f325 Add native joining of 3p networks to room dir
Use the 3rd party location lookup API to accept third-party locations
in their native form and look up the corresponding portal room for
that location.

Also give the network dropdown some placeholder text.

Fixes https://github.com/vector-im/vector-web/issues/2374
2016-09-29 15:30:54 +01:00
David Baker 65f14c7d21 Stop random rooms appearing when switching network
in the public room directory
2016-09-28 14:18:40 +01:00
David Baker 864ba52bc5 Relative img paths please 2016-09-28 12:03:35 +01:00
David Baker fdb5020c0c Oops, fix undefined variable 2016-09-28 11:56:07 +01:00
David Baker 0db12fcd22 Move method & don't wastefullt create elements
Put did update with the other react interface methods & don't
bother creating the 'current_value' if we throw it away later.
2016-09-28 11:05:14 +01:00
David Baker 5ca391f914 Replace double truth test with something sane
Also typo
2016-09-28 11:04:13 +01:00
David Baker a32abae5a3 Don't use _matrix as default if there isn't one 2016-09-28 10:58:01 +01:00
David Baker 6ff1c30a4b Fix spurious fill requests when switching networks
Ignore responses for old servers too, don't trigger a backfill request
when we re-render before refresh. Also a few more comments.
2016-09-28 10:08:03 +01:00
David Baker 85ea45a64a Room dir: New filtering & 3rd party networks
Changes filtering on 3rd party networks to divide into portal / non portal rooms and not show portal rooms by default. Adds a special '_matrix' network for all rooms that aren't portal rooms.

Also adds ability to query 3rd party directory servers.
2016-09-27 19:39:20 +01:00
David Baker bf58c340bc Oops, missed the ref 2016-09-26 15:30:42 +01:00
David Baker dc0b15bdfa Remove unused variable / function 2016-09-26 14:17:36 +01:00
David Baker 51a5542446 Make tests pass 2016-09-23 18:20:31 +01:00
David Baker 3938abc5dd add webkit vendor prefixed properties
for mavericks safari
2016-09-23 17:18:52 +01:00
David Baker 4961a97ed4 More css:
* Make join button more buttony
 * Fix size of dropdown, allow search box to expand
 * Use flexbox within search box to input can fill the rest of the space
2016-09-23 16:33:28 +01:00
David Baker fb477fad1e Less hardcoded CSS 2016-09-23 15:58:28 +01:00
David Baker a070bccffb Hacky hardcoded css for join button 2016-09-23 15:26:08 +01:00
David Baker 8e1105b12a Oops, wrong function 2016-09-23 15:25:13 +01:00
David Baker 2e77b0a3c7 Use directory search box component 2016-09-23 13:48:44 +01:00
David Baker d9c51832ab Use 2x res logo to work with hidpi displays 2016-09-21 11:09:00 +01:00
David Baker 5011d3b158 Only show version bar if on develop
Or rather, if the version string is in the right format it to work.
2016-09-20 14:33:25 +01:00
David Baker a5ee48d857 Swap out unknown user icons 2016-09-19 16:42:07 +01:00
David Baker 940eaf2b7d The times, they are a changin' 2016-09-19 15:32:39 +01:00
David Baker 855ecbe11d Update twitter / blog 2016-09-19 15:18:49 +01:00
David Baker 1c76870dcf Remove failed commenting 2016-09-19 13:36:04 +01:00
David Baker a99c9f4db2 Keep order of blog / twitter the same 2016-09-19 13:35:31 +01:00
David Baker 7e5373e194 Stick with VectorCo twitter for now 2016-09-19 13:34:49 +01:00
David Baker 560174b99f Keep width on logo 2016-09-19 13:34:01 +01:00
David Baker d2947a637a Better. 2016-09-19 13:31:01 +01:00
David Baker 8e4dcd9b41 Rebrand 2016-09-19 13:29:49 +01:00
Matthew Hodgson 9391dc6c2a aargh 2016-09-19 07:41:32 -04:00
Matthew Hodgson f19044fef2 re-apply new scalar CSS 2016-09-19 06:59:24 -04:00
Kegan Dougal de38a32969 Listen for close_scalar and close the dialog box when received 2016-09-19 10:37:19 +01:00
Kegsay e2fc2b1b09 Revert "improve lipstick and support scalar logout" 2016-09-19 10:16:50 +01:00
Kegsay 1d97272874 Merge pull request #2280 from vector-im/matthew/scalar-lipstick
improve lipstick and support scalar logout
2016-09-19 09:27:07 +01:00
Richard van der Hoff 6cb7ffcd3b Another go at fixing the damn changelog
html_url is in the top-level 'commit' object, not in commit.commit.

Also factor some code out for legibility. Seriously, what's with stuffing
everything into inline functions?
2016-09-18 23:56:55 +01:00
Richard van der Hoff 0ab1dacb1e Merge remote-tracking branch 'origin/pull/2071/head' into rav/fix_changelog_links 2016-09-18 23:33:17 +01:00
Matthew Hodgson af230b5fa8 improve lipstick and support scalar logout 2016-09-18 02:57:15 +01:00
Matthew Hodgson 4720da3f8e Merge pull request #2241 from vector-im/dbkr/paginate_publicrooms
Paginate Room Directory
2016-09-17 15:46:21 +01:00
Matthew Hodgson e2b3fc3519 only show invite button for rooms you're in 2016-09-17 03:02:14 +01:00
Matthew Hodgson ab3c1509c5 switch to 3-digit formatting for counts 2016-09-17 02:39:31 +01:00
Matthew Hodgson 91dd029483 don't let guests invite 2016-09-17 02:05:01 +01:00
David Baker 53fd3f52fa Oops, onChange doesn't catch the enter key 2016-09-16 20:56:14 +01:00
David Baker 3d97061d78 Check if we need to fetch more rooms after filter 2016-09-16 19:59:06 +01:00
David Baker 50f05db29e Don't show loading spinner if just paginating 2016-09-16 19:29:56 +01:00
David Baker 2fdec51a5b Wait a bit before sending filter requests
avoid hammering the server with requests for each keystroke
2016-09-16 18:53:18 +01:00
David Baker 6d332256b5 Ignore results of old requests 2016-09-16 18:48:47 +01:00
David Baker 2b6fbb038a Show headers while loading
& show spinner whilst waiting for filter requests
2016-09-16 18:41:29 +01:00
David Baker a11516a984 Make publicrooms use the new paginating API
Also do filtering on the server

WIP: This breaks the network dropdown
2016-09-16 17:33:28 +01:00
David Baker 135c22c99d Merge pull request #2219 from vector-im/dbkr/directory_network_selector
Directory network selector
2016-09-16 17:09:23 +01:00
Matthew Hodgson 6e2a371017 fix MemberInfo layout 2016-09-16 14:36:26 +01:00
Matthew Hodgson de26d1a8ce Merge pull request #2235 from vector-im/wmwragg/two-state-sublist-headers
Wmwragg/two state sublist headers
2016-09-16 14:08:00 +01:00
wmwragg 7af765976b Notification counts now done correctly, as well as highlights 2016-09-16 13:25:39 +01:00
wmwragg 72e108c4f9 More robust badge positioning 2016-09-16 11:34:16 +01:00
wmwragg e2b695827e Refactor to reuse RoomSubList chevron styling 2016-09-16 11:02:09 +01:00
wmwragg 4b50a8a56e Refactored so the RoomSubList overflow element use RoomSubList CSS 2016-09-16 10:57:55 +01:00
wmwragg 737d1d8843 Changed the overflow tile styling, but there is no collpased state or mention count yet 2016-09-16 10:48:52 +01:00
Matthew Hodgson eea9e366b8 un-revert 5282796d84 as it wasn't to blame 2016-09-16 10:38:54 +01:00
wmwragg 24d0b95cb2 Corrected the tooltip text colour to match the design 2016-09-16 08:15:27 +01:00
wmwragg 77085882fa quick tidy of CSS 2016-09-16 08:08:31 +01:00
wmwragg 9375ebfb75 Fixed broken tooltip positioning again 2016-09-16 08:06:17 +01:00
Matthew Hodgson e2f94c8722 improve scroll cosmetics 2016-09-16 03:26:59 +01:00
Matthew Hodgson b0fd65f442 fix ff rhs scroll 2016-09-16 03:26:45 +01:00
Matthew Hodgson f56a6039e8 fix droptarget margins 2016-09-16 02:54:03 +01:00
Matthew Hodgson c44994c0ee fix tinter for LeftPanel 2016-09-16 02:53:57 +01:00
Matthew Hodgson eeb91374cf highlight my device 2016-09-15 19:42:36 +01:00
David Baker cd4564d3d3 Make the matrix.org section be everything
(ie. every alias on the matrix.org HS, so currently everything, since we don't pull in any other directories)
2016-09-15 18:56:04 +01:00
Matthew Hodgson 1741cc915e revert accidental commit 5282796d84 as folks say everything broke 2016-09-15 17:50:47 +01:00
wmwragg 37fc73b1ea Setting correct initial state 2016-09-15 17:31:15 +01:00
David Baker c1e83da35d Put network list config into config file 2016-09-15 17:20:13 +01:00
wmwragg 5282796d84 Added back the overflow tile and two state room sub lists, rather than the three state currently 2016-09-15 17:17:45 +01:00
Matthew Hodgson 866164c4d9 Merge pull request #2222 from vector-im/wmwragg/correct-incoming-call-positioning
Wmwragg/correct incoming call positioning
2016-09-15 15:59:14 +01:00
wmwragg 5ceb1e641f Placing the incomingCallBox in the sticky element, so it sticks when the header sticks 2016-09-15 15:34:11 +01:00
David Baker f3cbb9fe90 Make the network dropdown work 2016-09-15 15:18:12 +01:00
Matthew Hodgson fe4371bf45 Merge pull request #2211 from vector-im/wmwragg/remove-old-filter
Wmwragg/remove old filter
2016-09-15 15:01:37 +01:00
wmwragg cde3f33db3 Added incomingCallBox to header and removed from roomTile 2016-09-15 14:37:53 +01:00
Matthew Hodgson 82e257b4ea make DM naming consistent 2016-09-15 13:23:17 +01:00
wmwragg 3907da064e Removed no longer used MultiInviteDialog, as it's now been replaced with the ChatInviteDialog 2016-09-15 11:46:35 +01:00
wmwragg f43530e1ef Tweaked font size to match the design spec 2016-09-15 11:39:21 +01:00
wmwragg a1e3ec1d19 Added query to CSS and removed nolonger used SearchableEntityList 2016-09-15 11:30:46 +01:00
David Baker 43b87e1f82 Add network selector that doesn't do anything yet 2016-09-15 11:29:27 +01:00
Matthew Hodgson 2a85b2271c tweak MemberInfo CSS 2016-09-15 02:44:34 +01:00
Matthew Hodgson cb2c2c1b36 basic verification UI 2016-09-15 01:55:59 +01:00
wmwragg efa574c452 The invite group, will no longer be shown when the directory listing is being shown 2016-09-14 17:13:06 +01:00
wmwragg 66ef5213b8 Increased hitbox area to the whole invite section, not just the icon 2016-09-14 14:32:30 +01:00
wmwragg 370612135f The scrollbars are nolonger always visible for the AddressSelector and ChatInviteDialog invite list 2016-09-14 13:55:10 +01:00
Matthew Hodgson ec05d1b9bd improve e2e and scalar settings UI 2016-09-14 02:07:23 +01:00
Matthew Hodgson 089951012b actually, sod it, let's just call it Start chat 2016-09-13 19:42:35 +01:00
Matthew Hodgson c6a9614372 Merge pull request #2181 from vector-im/wmwragg/chat-multi-invite
Wmwragg/chat multi invite
2016-09-13 19:31:05 +01:00
Matthew Hodgson a623430c2b Merge pull request #2182 from vector-im/matthew/right-panel-collapse
shuffle bottomleftmenu around a bit
2016-09-13 19:08:54 +01:00
Matthew Hodgson b247c8a87f rename 'start chat' tooltip 2016-09-13 19:08:43 +01:00
wmwragg 56606c01a0 Added valid but unknown mx user 2016-09-13 17:09:01 +01:00
wmwragg 3fe8b503e5 Fixed over collapse on Safari, and now hide the RHS footer Invite when collapsed 2016-09-13 14:57:58 +01:00
wmwragg bdee2d3b28 Shifting icon to center of collapsed section 2016-09-13 14:44:54 +01:00
wmwragg 15ee2578c5 Tweak to font colour 2016-09-13 14:36:13 +01:00
wmwragg f8c9a28194 Updated to correct invite icon 2016-09-13 14:33:19 +01:00
wmwragg 768f11fe58 Added new Invite button in the RHS footer 2016-09-13 14:27:23 +01:00
wmwragg acdcb21830 Fixed weird margin bug when LHS panel is collapsed 2016-09-13 13:32:50 +01:00
wmwragg 1530568354 Merge branch 'develop' into wmwragg/chat-multi-invite 2016-09-13 12:38:45 +01:00
Matthew Hodgson 7b25f4e069 wip for collapsable RHS 2016-09-13 12:18:09 +01:00
Aviral Dasgupta cbab2c142b Autocomplete restyling 2016-09-13 15:43:59 +05:30
wmwragg f59dbe40ec Added error checking, and UI 2016-09-13 11:03:27 +01:00
Matthew Hodgson 562c3b0e04 fix notif icon 2016-09-13 10:32:40 +01:00
Matthew Hodgson f119a57952 dedicated dialog box for E2E messages 2016-09-12 23:42:43 +01:00
Matthew Hodgson c6fa1e2e21 show e2e icon by default 2016-09-12 20:02:22 +01:00
Matthew Hodgson 0bdc026b05 E2E CSS 2016-09-12 18:50:32 +01:00
Matthew Hodgson 20eb28f052 fix e2e icon placement 2016-09-12 17:38:27 +01:00
wmwragg bfd3ef0e44 Limit the invite area in height 2016-09-12 17:31:49 +01:00
wmwragg abda8c77ad Added styling for unknown addresses 2016-09-12 17:25:38 +01:00
wmwragg 906be376c9 Refactored AddressTile to use string address rather than user object, so it can user email as well mx userId 2016-09-12 16:51:42 +01:00
Matthew Hodgson 695930efa5 e2e icons 2016-09-12 16:50:53 +01:00
wmwragg 2bf177dbcc Refactored the queryList into seperate AddressSelector component 2016-09-12 13:01:08 +01:00
Matthew Hodgson 5775552bab css for e2e look & feel 2016-09-12 01:38:03 +01:00
Matthew Hodgson dd4617a7c6 bring back small avatars for info msgs otherwise the design breaks 2016-09-11 23:01:28 +01:00
Matthew Hodgson 64dedef2c7 fix wordwrap on new panels 2016-09-11 21:55:57 +01:00
Matthew Hodgson 89f8ff4988 Merge branch 'develop' into matthew/notif-panel 2016-09-11 02:37:30 +01:00
Matthew Hodgson 3a8c94de5a CSS for notif & file panel 2016-09-11 02:15:03 +01:00
Matthew Hodgson dd39813cc2 show context menus on hoverover 2016-09-11 02:14:52 +01:00
David Baker e1c32536ff Cursor: pointer on member info create room button 2016-09-09 19:23:12 +01:00
David Baker ab9786cc02 Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms 2016-09-09 16:27:00 +01:00
David Baker 57804f4e02 Support for common rooms in MemberInfo
Renames RoomDNDView to DNDRoomTile which now provides a separate DNDRoomTile component rather than
clobberring RoomTile, so we can use a draggable one where we want a draggable one and a non-draggable
one where we don't want it to be draggable. RoomTile main is still polluted with DND stuff, but is
now optional.

Remove BottomLeftMenuTile because it was no longer used in the bottom left menu. Just include
the equivalent markup directly in the one place we now use it (in MemberTile in react-sdk).
2016-09-09 16:15:45 +01:00
Matthew Hodgson c4421f6bc7 Merge pull request #2139 from vector-im/wmwragg/one-to-one-indicators
Wmwragg/one to one indicators
2016-09-09 15:08:20 +01:00
wmwragg 965d9aaf47 Lowered the Avatar menu background, so the Direct Message indicator is in front of it 2016-09-09 14:56:20 +01:00
wmwragg 2476f87e1d Positional tweaks for the new Direct Message indicator 2016-09-09 14:47:26 +01:00
wmwragg cd36800426 New direct message indicator CSS 2016-09-09 14:42:11 +01:00
wmwragg 18eb9d9330 Made sure the z-index was correct for the new little green men 2016-09-09 14:36:21 +01:00
Matthew Hodgson 7e379e9877 Merge pull request #2136 from vector-im/wmwragg/room-directory-back
Added back the Directory listing button, with new tootlip
2016-09-09 14:08:19 +01:00
wmwragg 09ce3a79ec Added back the Directory listing button, with new tootlip 2016-09-09 12:23:50 +01:00
wmwragg bfa59c6c04 Increased the width of the query list container to take account of scrollbars 2016-09-09 11:42:57 +01:00
Matthew Hodgson e75148e799 Merge branch 'develop' into matthew/notif-panel 2016-09-09 11:20:10 +01:00
Matthew Hodgson 8376f0d75a Merge pull request #2110 from vector-im/wmwragg/one-to-one-chat
Wmwragg/one to one chat
2016-09-09 10:46:01 +01:00
David Baker bf02a21c7d Re-add icons-people (I accidentally deleted it) 2016-09-09 10:30:17 +01:00
wmwragg ac365622b8 Align the RoomTile tooltips with the BottomLeftMenu tooltips 2016-09-09 07:10:12 +01:00
wmwragg 7cb48e0d2d Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters 2016-09-09 06:56:54 +01:00
wmwragg 38ac520e1e Fixed name vertical overflow 2016-09-08 17:19:59 +01:00
Matthew Hodgson 6182ce48c9 fix (c) 2016-09-08 15:27:55 +01:00
David Baker 9e771ddd07 Merge pull request #2111 from vector-im/dbkr/toggle_dm_room
Support toggling DM status of rooms
2016-09-08 14:11:30 +01:00
David Baker 74aef1fdad Comment delay 2016-09-08 13:58:53 +01:00
Matthew Hodgson 8860c9c7fd Merge pull request #2082 from aviraldg/feature-rte-formatbar
Formatting toolbar for RTE message composer.
2016-09-08 13:54:39 +01:00
Matthew Hodgson a8d7d23dd6 implement NotifPanel css 2016-09-08 03:03:10 +01:00
Matthew Hodgson f5ce053f42 hook up the NotifPanel button 2016-09-08 03:02:50 +01:00
Aviral Dasgupta d833c7632d Add strikethrough and <hr> styles 2016-09-08 02:47:31 +05:30
Aviral Dasgupta 22bf6e7969 RTE format bar enhancements 2016-09-07 22:52:37 +05:30
David Baker a1f8116e3b Support toggling DM status of rooms
on context menu
2016-09-07 17:47:47 +01:00
wmwragg 1d32dd72ed Fixed typing error 2016-09-07 17:30:53 +01:00
wmwragg 761552430c Dialog buttons have a pointer cursor now 2016-09-07 17:14:27 +01:00
wmwragg cc720b9797 Design tweaks for alignment 2016-09-07 17:08:24 +01:00
wmwragg 75c81b369f Mouse actions on the queryList added, as well as better queryListElement styling 2016-09-07 16:19:30 +01:00
Matthew Hodgson 7c74b0124b explicit props for RightPanel at last 2016-09-07 15:43:29 +01:00
wmwragg 48501d91d2 Added justification for the AddressTile, when requested 2016-09-07 10:55:31 +01:00
Matthew Hodgson aefef2ba56 FilePanel css 2016-09-07 02:16:09 +01:00
wmwragg ace0e01d86 Tweak on the textarea to prevent the input area jumping a couple of pixels in size between textarea and AddressTile 2016-09-06 17:21:28 +01:00
wmwragg c0ce7663a9 Initial highlighting selected address - styling not final 2016-09-06 16:39:38 +01:00
wmwragg e3d5ca34c8 Circumventing autofill by using a textarea rather than an input type=text 2016-09-06 16:15:36 +01:00
wmwragg 1fb53565ef Added scrolling to queryList 2016-09-06 15:46:09 +01:00
wmwragg a41a8d32b8 Basic address list created, and UX tweaks for interaction 2016-09-06 15:24:37 +01:00
wmwragg 6153e795bf Correct AddressTile and ChatInviteDialog styling 2016-09-06 11:33:56 +01:00
Matthew Hodgson d12498f418 right cursor for roomsettings colours 2016-09-06 11:29:50 +01:00
Matthew Hodgson 1f19ee88c6 make FilePanel work, superficially at least 2016-09-06 01:45:12 +01:00
Matthew Hodgson 24351537d2 we have nothing to hide 2016-09-06 01:19:48 +01:00
wmwragg f6f68bc348 Initial AddressTile added 2016-09-05 17:28:23 +01:00
Aviral Dasgupta d6a324ede7 Formatting toggle, markdown indicator, quoting 2016-09-05 17:39:32 +05:30
wmwragg 7378904f00 Adding back the BottomLeftMenuTile component, as it turns out it's still used in the RightPanel 2016-09-05 12:43:04 +01:00
wmwragg 059f5198e5 Merge branch 'develop' into wmwragg/one-to-one-chat 2016-09-05 12:07:21 +01:00
wmwragg 2acbad36a6 Initial commit of the new ChatInviteDialog 2016-09-05 12:03:43 +01:00
wmwragg 519dd16135 Added the correct styling back for the dialog buttons, that got regressed somewhere 2016-09-05 10:50:58 +01:00
wmwragg fb103cb9e1 Rename the action to make it clearer what it is doing 2016-09-05 10:27:54 +01:00
Richard van der Hoff 5e9a95fdfe Merge pull request #2085 from vector-im/rav/e2e_devices
e2e device CSS
2016-09-05 00:43:52 +01:00
Aviral Dasgupta b8610ab466 RTE formatbar (wip) 2016-09-04 21:03:00 +05:30
Richard van der Hoff ee3fdbee5b e2e device CSS
CSS to make the deviceinfo stuff a little bit closer to the designs
2016-09-04 13:42:33 +01:00
wmwragg 2d827a75a6 Sending the top and left position tweaks with the action 2016-09-04 12:16:01 +01:00
wmwragg 50bb4edd1c Small refactor, to make it clearer whats happening 2016-09-04 08:54:15 +01:00
wmwragg e52f5b5d08 Removed unrequired positional tweak props 2016-09-04 08:49:43 +01:00
wmwragg fd81ce126b Code tidy up 2016-09-04 08:40:43 +01:00
wmwragg 7ae821e2b5 Removed nolonger needed conditional test, as the parent will always exist 2016-09-04 08:39:32 +01:00
wmwragg cb98e2421e Removed the nolonger required methods 2016-09-04 07:56:32 +01:00
wmwragg 5417385c83 Tolltip thweak to not require the passing in of the parent 2016-09-04 07:41:48 +01:00
wmwragg c2d8067523 Testing to see if having the header badges when collapsed is usable 2016-09-03 14:55:35 +01:00
wmwragg 52bd61a2f0 When collapsed a long hover on the header now shows the full tag name and room count 2016-09-03 14:48:10 +01:00
wmwragg aee56a5bd1 z-index tweak for badge, so it does sit aboce the header 2016-09-03 14:47:36 +01:00
wmwragg 7f52fa74a4 Better comments, and syntax tweak 2016-09-03 14:14:11 +01:00
wmwragg d1dd4bd3d8 Updated tooltip styling to be better inline with the design 2016-09-03 13:57:49 +01:00
wmwragg ab9f48cd47 Restyled tooltip to better match the design 2016-09-03 13:44:00 +01:00
Matthew Hodgson c597f05e71 Merge branch 'develop' into matthew/notif-panel 2016-09-03 13:33:37 +01:00
wmwragg 80e6cd6d7c Further tweaks to the tooltip to better handle its position, and simplify it's use 2016-09-03 12:44:09 +01:00
wmwragg cb101b0a3b Allow better updating if the tooltip is designed to stick around, rather than just appearing on hover 2016-09-02 18:50:47 +01:00
wmwragg bf4e3364b4 Tweak of the RoomTooltip to use DOM element for the parent rather than a React component 2016-09-02 18:41:27 +01:00
Remi Rampin d5865421bd Open commits in new window/tab from changelog 2016-09-02 12:22:51 -04:00
Remi Rampin 8578203073 Open HTML commit page for changelog entries 2016-09-02 12:22:15 -04:00
wmwragg d2e2c726eb Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari 2016-09-02 15:45:43 +01:00
Matthew Hodgson 00d53e4824 css for conf join 2016-09-02 15:38:40 +01:00
Matthew Hodgson 4ce80a0837 fix dialog css 2016-09-02 14:39:44 +01:00
Matthew Hodgson b4cf86a362 fix padding-top for unread msgs 2016-09-01 17:00:52 +01:00
wmwragg bf8d7050cc New People icon in place of Directory icon, and placeholder functionality 2016-09-01 16:46:51 +01:00
Matthew Hodgson 49e5fa41ad fix overscroll on view source 2016-09-01 16:06:50 +01:00
Jan Solanti e85674711c Improve readability of the changelog dialog 2016-09-01 15:13:09 +03:00
Matthew Hodgson 7a89328ccb file upload when on call 2016-09-01 00:38:37 +01:00
Matthew Hodgson e77e6c2af0 fix typing notif layout 2016-09-01 00:35:07 +01:00
Matthew Hodgson ad26631874 fix icon layout 2016-09-01 00:33:45 +01:00
Matthew Hodgson cc75eb8b0e fix statusbar height and behaviour during voip calls 2016-09-01 00:14:51 +01:00
Matthew Hodgson 735da3c15e show ongoing audio call in LeftPanel CSS 2016-09-01 00:14:32 +01:00
Matthew Hodgson 56dfdbeb6b call noisy notifs... noisy 2016-09-01 00:14:01 +01:00
Matthew Hodgson eaf47ea05c show ongoing audio call in LeftPanel 2016-09-01 00:13:49 +01:00
Matthew Hodgson 9d72a7cb35 get adding FilePanel 2016-08-31 11:57:45 +01:00
Matthew Hodgson a047f81b84 Merge branch 'develop' into matthew/notif-panel 2016-08-30 23:39:00 +01:00
wmwragg b91a0dd7a5 Increased truncation limit to 10 2016-08-30 12:14:32 +01:00
wmwragg 45a813b795 Fixed historical scetion not scrolling up when clicked if not hidden and stuck 2016-08-30 11:56:16 +01:00
wmwragg 7b7a77bad0 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-30 11:22:31 +01:00
wmwragg ff3ad47be7 Code clean up, and better comments, along with z-index fixes for scrollbar and avatar menu 2016-08-30 10:45:59 +01:00
wmwragg f2e8607433 Over scroll of bottom sticky headers should be fixed, and expansion of hidden stuck headers should now work 2016-08-28 19:14:54 +01:00
Matthew Hodgson b96ab58eb3 merge develop 2016-08-28 18:49:49 +01:00
wmwragg 93fff53e29 Added back the border spacing, as it wasn't the issue 2016-08-28 16:22:56 +01:00
wmwragg 4ae424f37a Removed the 2px border at top of labels to see if that has any effect on bottom stickies overscroll on matthews machine 2016-08-28 14:48:29 +01:00
Matthew Hodgson 36a608952d make /user URLs work 2016-08-28 14:04:25 +01:00
wmwragg 900b4b4cf8 Added a border to the top of the sections to better seperate them when they are stuck together 2016-08-28 13:44:52 +01:00
wmwragg b782e7b9ad Bottom line of the scroll area (well the top line of the bottom left menu) is now tinted same colour as the section headers 2016-08-28 13:22:14 +01:00
wmwragg 8d4268754e Fixed the stickies notification count to limit it to 99+ 2016-08-28 12:03:05 +01:00
Matthew Hodgson 9b8e127e23 switch to using matrix.to for permalinks 2016-08-28 02:11:57 +01:00
Matthew Hodgson 88dba1bf6c CSS for room settings leave button 2016-08-27 23:59:26 +01:00
Matthew Hodgson 8d7daf61b9 fix CSS namespacing 2016-08-27 23:59:15 +01:00
Matthew Hodgson ee1fae8ced fix RoomTagContextMenu so it works on historical rooms 2016-08-27 23:58:35 +01:00
Matthew Hodgson 2199fe5cbf unbreak changelog 2016-08-27 00:06:00 +01:00
Matthew Hodgson 30f774cf9c add whitespace padding to composer RHS 2016-08-27 00:00:09 +01:00
Matthew Hodgson be9aa44ca8 fix NPE checking tag order 2016-08-26 23:49:07 +01:00
wmwragg dc4459083f Fixed the LHS panel not collapsing but most of the content doing so 2016-08-26 16:22:59 +01:00
Matthew Hodgson 2f375e4f67 DIE ZALGO 2016-08-26 16:08:56 +01:00
Matthew Hodgson 879c325b83 DIE ZALGO 2016-08-26 16:08:15 +01:00
wmwragg 7ad3f4a577 Better comments 2016-08-26 15:53:31 +01:00
wmwragg 5b9d3b119f Click on stuck header scrolls to that header, collapses expands for none stuck header 2016-08-26 15:08:47 +01:00
wmwragg 5467fd89d8 Getting click to not collapse expand when header stuck 2016-08-26 14:35:40 +01:00
wmwragg d2937c2aed Setting correct heights and widths for label and container 2016-08-26 11:02:12 +01:00
wmwragg a0236a9b76 Code tidy-up and better name for label container class 2016-08-26 09:57:02 +01:00
Matthew Hodgson c6d4eb7fd3 try to make the changelog commit links suck less 2016-08-26 00:40:21 +01:00
wmwragg 4cb1f8a226 Initial pass at sticky headers for the LHS panel section labels 2016-08-25 19:46:15 +01:00
Richard van der Hoff 042a6b58c4 Remove redundant whatwg import
This has been rewritten to use browser-request rather than whatwg, so remove
the import, which was causing the build to fail on npm 2. (It worked, for the
wrong reasons, on npm 3.)
2016-08-25 12:14:49 +01:00
Matthew Hodgson 3934e37f77 Merge pull request #1972 from aviraldg/feature-changelog
add fancy changelog dialog
2016-08-24 18:02:00 +01:00
Matthew Hodgson 2ee4fa484e Merge pull request #1978 from aviraldg/feature-autocomplete-improvements
Update autocomplete design
2016-08-24 14:48:06 +01:00
wmwragg 3ea62eb73a Added event/info message avatars back in 2016-08-23 15:57:53 +01:00
Matthew Hodgson 2fae966884 notification panel WIP 2016-08-23 14:28:10 +01:00
Matthew Hodgson f888ec6e81 notification panel WIP 2016-08-23 14:27:58 +01:00
wmwragg d2e8201d79 Making sure that the sub list count always stays up to date, including when people read the outstanding notifications 2016-08-23 13:24:02 +01:00
wmwragg 65d7d01dfa Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-23 12:49:43 +01:00
wmwragg 2cf2df20f6 Added updating of count when room tile notification state changed 2016-08-23 12:40:15 +01:00
wmwragg ee73bc3aa4 Refactor of the badge logic, and also added no badges when zero notifications 2016-08-23 11:35:03 +01:00
wmwragg d3fa680373 Added all the notification states to the sub list count logic 2016-08-23 11:14:45 +01:00
wmwragg ef9d6d45b6 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-23 10:54:05 +01:00
wmwragg a980864886 Initial sub list notifications count. Still needs propagation of muting/unmuting etc. events from room tile up to sub list 2016-08-23 10:47:17 +01:00
wmwragg ca4d506391 Header wording for capped truncation count updated 2016-08-22 22:47:00 +01:00
Aviral Dasgupta 554c33a883 Extract autocomplete styling to CSS 2016-08-23 00:36:01 +05:30
Aviral Dasgupta 56813eb11e remove whatwg-fetch and use browser-request 2016-08-22 23:59:32 +05:30
wmwragg 4d5e3bc22b Initial tag section header badge 2016-08-22 17:25:43 +01:00
wmwragg ff55a951c9 Number of rooms added to header of sections 2016-08-22 17:02:52 +01:00
wmwragg 895172d498 Added catch to help get the Historical and any other weird sections into a sound state, so the states can then change correctly from then on 2016-08-22 16:42:08 +01:00
wmwragg 71f73d8df2 Collapsing and truncation initial state and onClick event logic 2016-08-22 15:50:36 +01:00
wmwragg 97daca4b31 Initial restyle of the sub lists and room lists 2016-08-22 14:10:06 +01:00
wmwragg e9eafc3380 Further tweak 2016-08-22 11:15:49 +01:00
wmwragg 600a1cae79 Read avatars position tweaked, now that the spacing has changed 2016-08-22 11:13:42 +01:00
wmwragg 0b1fc1b925 Avatar and Sender Profile alignment, along with reducing the distance between initial messages and the previous one 2016-08-22 10:45:00 +01:00
wmwragg bdaa9faea0 Added the font-size back in, as the textarea gets overidden otherwise 2016-08-19 18:03:12 +01:00
wmwragg dbadb07adf Moved the font-size into the .mx_MessageComposer_input so that it sets the size for RTE as well as normal composer 2016-08-19 17:57:24 +01:00
wmwragg 4a2c899d05 Merge branch 'develop' into wmwragg/chat-message-presentation 2016-08-19 17:22:26 +01:00
wmwragg 85084f5fd7 Fixed spacing on multiline messages 2016-08-19 16:46:15 +01:00
wmwragg 78692c83a6 Removal of the mini avatars for action (info) messages 2016-08-19 16:37:45 +01:00
wmwragg 173e6011e8 Alignment tweak to the readAvatars 2016-08-19 11:12:06 +01:00
wmwragg 9e542ba232 Alignment adjustment so that the readAvatars sit in the center of the top line in a new message 2016-08-19 10:58:51 +01:00
wmwragg 5005675561 Some CSS tidy-up, and fix for readAvatars when the message is not classed as a continuation, but is an info message 2016-08-18 22:50:40 +01:00
wmwragg 29759ca71e Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message 2016-08-18 21:54:07 +01:00
Aviral Dasgupta be28a96d8d add fancy changelog dialog 2016-08-18 22:53:47 +05:30
Matthew Hodgson 9b5e5c9acb squidge video icon a bit 2016-08-18 16:48:28 +01:00
David Baker fbbbd44dc3 Merge pull request #1982 from vector-im/dbkr/make_notif_silder_work
Make the notification slider work
2016-08-18 15:24:14 +01:00
David Baker 0bb3eaaf67 Use constants 2016-08-18 13:46:47 +01:00
David Baker e48d68a449 PR feedback 2016-08-18 13:11:57 +01:00
wmwragg 67175c5a72 Positional tweaks, and font standardisation, so all browser now use ttf, so sizing is the same across all browsers 2016-08-18 11:15:42 +01:00
David Baker 6b0aeefc66 RoomNotifs.js moved to react-sdk
Since it's now used in RoomTile. Remove the vector prefix since it's no longer really a 'vector' thing
2016-08-17 18:29:38 +01:00
Aviral Dasgupta 9a7f5388d9 Update autocomplete design 2016-08-17 17:27:01 +05:30
wmwragg d1649771cc Images now slighlty set in so they don't appear under the context button, and give a margin to the right of the image 2016-08-16 17:41:54 +01:00
wmwragg 08e5f61b10 Image button now has cursor set to pointer 2016-08-16 17:41:09 +01:00
wmwragg 012f085f33 alignment tweaks and persistent highlight when meni clicked, plus menu button no longer an input item 2016-08-16 17:33:37 +01:00
wmwragg 9f570152e5 Altered message composer size to match that of the message timeline messages 2016-08-16 16:20:38 +01:00
wmwragg 3099ef68a9 Added linked message styling 2016-08-16 16:17:15 +01:00
wmwragg f0bac3a3b0 Design tweaks 2016-08-16 16:03:10 +01:00
David Baker cd0ed879e3 Make the slider work
Still WIP though: need to make vector work with the 'contains display name' rule being an override
2016-08-16 15:54:28 +01:00
wmwragg 95418089f3 Updating timestamp format 2016-08-16 15:01:25 +01:00
wmwragg 650a0f1c1f Added context button, and initial highlighting and readReceipts positioning 2016-08-16 11:58:52 +01:00
wmwragg 757e885abc Initial reposition of the read avatars 2016-08-16 10:59:04 +01:00
wmwragg 2c8e7782c5 Initial reposition of the timestamp 2016-08-16 10:26:14 +01:00
Matthew Hodgson d3eccc1d6f add rel='noopener' wherever we do target='_blank' because https://mathiasbynens.github.io/rel-noopener/ 2016-08-15 21:38:21 +01:00
David Baker a17df609f3 Read all 4 different notif states
Can't yet set loud / mute
2016-08-12 15:19:34 +01:00
David Baker 0afdf5d8e4 Merge pull request #1959 from vector-im/rav/device_display_name
Make up a device display name
2016-08-12 11:48:12 +01:00
Richard van der Hoff 17733a66f9 rename MatrixChat defaultDeviceDisplayName prop 2016-08-12 11:40:25 +01:00
Richard van der Hoff 3a819a29b7 Make up a device display name
Pass a default device name into react-sdk
2016-08-12 11:01:39 +01:00
David Baker 5e43f2752a Don't show border on composer when not in RTE mode
This breaks the opacity animation (so remove the transition) but the extra border was making the border on the composer too thick.
2016-08-11 16:30:53 +01:00
David Baker 0cb14ba5ec Don't force scrollbar on multi-invite 2016-08-11 15:11:31 +01:00
Matthew Hodgson d65477891e Merge pull request #1941 from vector-im/wmwragg/room-tag-menu
Wmwragg/room tag menu
2016-08-11 09:00:48 -05:00
Richard van der Hoff bb1854814c Merge pull request #1951 from vector-im/dbkr/dont_redirect_email_verify
Don't redirect to mobile app if verifying 3pid
2016-08-11 12:50:06 +01:00
Richard van der Hoff 9e15bda803 comment typo 2016-08-11 12:49:57 +01:00
David Baker e7ac66ad04 Don't redirect to mobile app if verifying 3pid
Fixes https://github.com/vector-im/vector-web/issues/1933
2016-08-11 12:44:49 +01:00
David Baker 7286aeb013 Merge pull request #1942 from vector-im/dbkr/multi_invite
Basic CSS for multi-invite dialog
2016-08-11 12:34:13 +01:00
David Baker 5a17d8b450 Merge pull request #1946 from vector-im/rav/rav/refactor_token_login
Support for refactored login token handling
2016-08-11 10:52:32 +01:00
David Baker 43e3662e60 Merge pull request #1935 from aviraldg/fix-emoji
Various fixes and improvements to emojification.
2016-08-11 10:22:46 +01:00
Aviral Dasgupta 19d5063814 Merge branch 'develop' into fix-emoji 2016-08-11 14:51:17 +05:30
Richard van der Hoff c2cb4dff4c Support for refactored login token handling
loginToken handling is now done by the session loader, so we need to pass in
the queryparams to MatrixChat.

Also, MatrixChat no longer automatically reloads the page to drop the
querystring, so we have to do that ourselves (doing it in index.js allows
tokenlogin to be tested).
2016-08-11 01:55:51 +01:00
wmwragg 28343aaa33 Aignment tweak for the room tag menu so the icons better align 2016-08-10 17:44:49 +01:00
David Baker 3f615c6664 Basic CSS for multi-invite dialog 2016-08-10 17:12:20 +01:00
wmwragg 804b17fbf1 Teaks to the CSS for the new ellipsis icon, and resizing the avatar back to 24px from 25px, as needs to be even number for the Text letter to align vertically 2016-08-10 17:00:06 +01:00
wmwragg 9798e14733 Menu colour now changeable, and leave room item hooked up. Some additional CSS tweaks to fit current design changes 2016-08-10 16:35:22 +01:00
wmwragg f8fa19ed47 Room tag menu dohickey on the avatar on hover 2016-08-10 15:04:02 +01:00
wmwragg ff13782ab5 Added set icons 2016-08-10 12:06:03 +01:00
wmwragg b1dd7efed8 Fixed weird lightening of fonts on a refresh of page on safari 2016-08-10 11:51:23 +01:00
wmwragg 699a58e0b3 Fix for historic and new undefined order issues 2016-08-10 11:39:10 +01:00
Richard van der Hoff afc889ff4d Some tests of the application load process 2016-08-10 00:15:04 +01:00
wmwragg 1c812b340d Initial pass at handling room tags that don't have an order element, but need one manual ordering 2016-08-09 19:20:27 +01:00
Aviral Dasgupta bd9f5d3e06 Various fixes and improvements to emojification.
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Fix emoji spacing
2016-08-09 21:44:09 +05:30
wmwragg cf8164bcc3 New icons 2016-08-08 18:11:18 +01:00
wmwragg 33612b7076 New dekete icon and ignoring olm.js 2016-08-08 17:11:08 +01:00
wmwragg 5a97786cc6 Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now 2016-08-08 16:55:02 +01:00
Matthew Hodgson ee2329d236 make scrollbars bigger on hoverover 2016-08-07 21:35:41 +01:00
Matthew Hodgson 66f80b2239 let MemberInfo scroll if you have loads of E2E devices 2016-08-07 20:50:56 +01:00
wmwragg 72ba708bfe Menu separator styling 2016-08-05 16:35:59 +01:00
wmwragg b3459be707 Initial RoomTagContextMenu wired in 2016-08-05 15:49:03 +01:00
David Baker bf46c3cfab Merge remote-tracking branch 'origin/develop' into matthew/scalar 2016-08-05 15:37:38 +01:00
wmwragg 7880734d77 Merge branch 'develop' into wmwragg/room-tag-menu 2016-08-05 15:26:42 +01:00
wmwragg 5ce1aba493 Created initial RoomTagContextMenu component 2016-08-05 15:23:07 +01:00
wmwragg b99e7598f9 notification menu now has cickable radio buttons 2016-08-04 17:05:19 +01:00
wmwragg b9e06bcf66 Moved mute state to mentions only 2016-08-04 16:17:47 +01:00
Matthew Hodgson eb108c7866 Merge branch 'develop' into matthew/scalar 2016-08-04 13:41:04 +01:00
Richard van der Hoff a190862ed3 Merge pull request #1919 from vector-im/dbkr/deactivate_account
CSS for deactivate account dialog
2016-08-04 10:32:41 +01:00
Matthew Hodgson 34a31a71fd increase weight of unread rooms as it's the only way to tell if you have unread messages, and the weight difference is currently too subtle 2016-08-03 22:54:01 +01:00
Matthew Hodgson 7774756ed1 fix lightbox on chrome 52: https://github.com/vector-im/vector-web/issues/1706 2016-08-03 17:19:36 +01:00
Matthew Hodgson ee9f78d156 slightly better volume labels 2016-08-03 15:49:32 +01:00
Matthew Hodgson 70754db27a Merge pull request #1900 from vector-im/wmwragg/mention-state-menu
Wmwragg/mention state menu
2016-08-03 15:22:49 +01:00
wmwragg 16f8143f3e synced prefix flex with flex 2016-08-03 14:45:31 +01:00
wmwragg be1f014294 Speech bubble tail shifted slightly, as the badge is now larger 2016-08-03 14:22:47 +01:00
wmwragg f53f9af1c5 Badge width fixed, and hover state for badge now only on badge itself. 2016-08-03 14:11:17 +01:00
David Baker 58b1d62976 CSS for deactivate account dialog
(Inc some generic CSS for error & danger fields)
2016-08-03 11:38:19 +01:00
wmwragg 8e0f7f18a0 Design update to match the new Zeplin designs 2016-08-03 11:21:00 +01:00
wmwragg ee8572559f Fixed small collapsed state hover issue with badges 2016-08-02 15:45:11 +01:00
wmwragg f640be90ad Container height shrunk, so it doesn't bump the avatars when collapsed. Also search box gutters fixed 2016-08-02 15:00:47 +01:00
wmwragg 472acd4792 New design for long names 2016-08-02 14:46:31 +01:00
Will Hunt 8c7aede0cc Style UnknownBody with ``white-space: pre-wrap;`` 2016-08-02 11:13:46 +01:00
Matthew Hodgson 2829d95705 Merge pull request #1912 from vector-im/wmwragg/button-updates
Wmwragg/button updates
2016-08-01 20:37:15 +01:00
Matthew Hodgson 28057fd086 improve upgrade-to-app warning on mobile app 2016-08-01 18:36:08 +01:00
wmwragg 2e3ad3206c New video call icon 2016-08-01 16:46:13 +01:00
wmwragg 4f94cf5dfb New voice and video call icons 2016-08-01 16:44:58 +01:00
Matthew Hodgson 51e8c28ab6 Merge pull request #1828 from vector-im/wmwragg/button-updates
Wmwragg/button updates
2016-08-01 15:42:33 +01:00
David Baker 0f73228d55 Merge pull request #1909 from vector-im/rav/devices_panel
CSS for device management UI
2016-08-01 14:28:08 +01:00
Richard van der Hoff 645db7fa2f CSS for device management UI 2016-08-01 13:46:14 +01:00
Richard van der Hoff 0d4f35bed1 Fix a warning from RoomSubList
`selectedRoom` is *not* required, and we often don't have one, so get warnings.
2016-08-01 13:44:04 +01:00
Richard van der Hoff 3860488bb5 Fix notifications warning layout
For some reason, Chrome doesn't seem to make the central div in the
notifications warning wide enough, so it ends up wrapping. Fix this by making
the central div expand across the available space, instead of letting the
container for the close button do it.

Fixes https://github.com/vector-im/vector-web/issues/1687
2016-08-01 10:31:58 +01:00
wmwragg ef5ea46830 Consistent collapsed height across browsers 2016-08-01 09:53:57 +01:00
wmwragg 4a7d2901ac Positional tweaks for the name, badge and context menu, to better match design in both normal and collapsed states 2016-07-30 12:52:14 +01:00
wmwragg f382946138 Merge up from develop 2016-07-30 12:07:34 +01:00
wmwragg bb93a59cfb fixed unread hightlight font weight for room name 2016-07-29 13:49:28 +01:00
wmwragg 0ad84fd7b0 Better comments 2016-07-29 10:59:54 +01:00
wmwragg 87bddcd8ce Preliminary fix for showing muted state when collapsed - keep faded avatar, but don't show the mute icon 2016-07-29 10:50:50 +01:00
wmwragg 18701a2dae CSS tweaks to get the collapsed mute state properly working 2016-07-29 10:01:42 +01:00
wmwragg 2f65064688 CSS bugfix to stop incorrect letter spaceing on room names 2016-07-28 17:44:17 +01:00
wmwragg 2f08f2441f CSS tweaks for muted dohickey positioning 2016-07-28 17:41:01 +01:00
wmwragg 6c4c0bf57a Initial feature set complete, but the state and CSS need to be simplified 2016-07-28 17:35:25 +01:00
wmwragg 55a10ee275 Mute state handled corrcectly 2016-07-28 17:25:28 +01:00
wmwragg 49545ce0c2 Leaving the fail promise section blank as a todo, with explanitary comment 2016-07-28 15:29:57 +01:00
wmwragg b87058508e When a use clicks the state they want, after the change has been made it pasues breifly before closing, so that the user can see their state change has taken place. 2016-07-28 15:28:05 +01:00
wmwragg 6329e274ab Extra polish to get styling looking like the design 2016-07-28 14:20:24 +01:00
wmwragg b5fdaac947 Final spacing tweaks to get it aligned with the design 2016-07-27 18:06:47 +01:00
wmwragg 22bf74dc65 Tweaks to get icons to line up better, still need to space labels correctly 2016-07-27 18:01:43 +01:00
wmwragg d376df478a Initial context menu with all it's elements 2016-07-27 17:43:35 +01:00
wmwragg 53f4da1d30 Refactor so that chevron and menu can be positioned independantly 2016-07-27 16:09:26 +01:00
wmwragg 074bbc7149 Added the two additiona states that don't yet exist on the backend, as faded and disabled options 2016-07-27 12:25:44 +01:00
Richard van der Hoff 4b33164ab6 Remove relayoutOnUpdate prop on gemini-scrollbar
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
2016-07-27 11:41:27 +01:00
wmwragg dab707a893 Additional refactor to further modularise the context menus 2016-07-27 11:26:36 +01:00
wmwragg 5cf164fcc1 Re-modularised the context menus 2016-07-27 10:40:57 +01:00
wmwragg 37a7ce809a Added two new icons for notifications states 2016-07-27 10:40:19 +01:00
wmwragg 15f9f5dbe8 Doing the state change via onClick events rather than radio buttons, as they were causeing untraceable react errros for some reason 2016-07-26 17:24:45 +01:00
wmwragg 187818aaa0 Radio buttons now added, and only none guests can modify notfication state 2016-07-26 10:34:03 +01:00
wmwragg 30b1e7078f Contextual menu restyling 2016-07-25 18:04:16 +01:00
wmwragg 791980cd1f Menu context dohickey now sticks when menu shown 2016-07-25 17:19:06 +01:00
wmwragg 6c19504c8b Merge branch 'wmwragg/mention-state-indicator-round-3' into wmwragg/mention-state-menu
# resolved Conflicts:
#	src/skins/vector/css/vector-web/views/rooms/RoomTooltip.css
2016-07-25 16:45:25 +01:00
wmwragg 497ebce88a Corrected vertical alignment of membership button 2016-07-25 13:16:51 +01:00
wmwragg 2768cd2010 Initial unstyled mentions state notifier context menu 2016-07-22 17:30:09 +01:00
wmwragg 204e42494a The default props doesn't seem to be working, hardcoded 'LABEL' for now. OnClick closes menu 2016-07-22 16:11:42 +01:00
wmwragg 72b4a86eed Tweaked the tooltip to be better aligned. Also added the fading of the room name if too long 2016-07-22 14:59:02 +01:00
wmwragg ce5311191f Tweaked tooltip z-index 2016-07-22 11:30:41 +01:00
wmwragg 7eff6d968e Tweak to z-index as the tooltip was occasionally getting occluded. 2016-07-22 11:16:04 +01:00
wmwragg 24e021b91f Badge dohickey shown on name hover and badge hover 2016-07-21 18:19:52 +01:00
wmwragg e988f5ca3b Badge visual tweaks 2016-07-21 17:54:33 +01:00
wmwragg 633a3f4867 New component for testing 2016-07-21 17:44:05 +01:00
wmwragg df163d8cb7 Clean up of the CSS, and refactor to better match current code 2016-07-21 14:33:27 +01:00
wmwragg 73bb317925 Slight tweak to the name padding so there is a little less space above and below the name 2016-07-21 12:19:11 +01:00
wmwragg ad74d264a3 Selected room highlight teaked to better fit previous design 2016-07-21 11:37:40 +01:00
wmwragg e9db975d7d Redone assets, with lighter weight to match design 2016-07-21 10:25:42 +01:00
wmwragg f3586a79c2 Final CSS tweaks for the hover and collapsed states 2016-07-20 17:10:23 +01:00
wmwragg 882d09bf85 Initial reworking of the RoomTile CSS 2016-07-20 12:46:44 +01:00
Matthew Hodgson 25eb2e2daf Merge pull request #1822 from vector-im/wmwragg/spinner-fix
Wmwragg/spinner fix
2016-07-19 12:54:15 +01:00
Matthew Hodgson d8d9912f2d Merge pull request #1823 from vector-im/wmwragg/mention-state-indicator
Wmwragg/mention state indicator
2016-07-19 12:19:36 +01:00
wmwragg 8a28da1986 Fixed white space issues 2016-07-19 12:13:29 +01:00
wmwragg 384425582a Fixed wonky white space 2016-07-19 11:47:32 +01:00
wmwragg b87b356722 Added fixed SCG assets 2016-07-19 11:43:15 +01:00
Matthew Hodgson 6ae0dda9d3 give FF higher billing 2016-07-18 18:26:03 +01:00
Matthew Hodgson 6c680ff424 improve spacing 2016-07-18 18:25:50 +01:00
Matthew Hodgson c6b455f470 improve spacing 2016-07-18 18:24:30 +01:00
wmwragg f6d7052928 Oixel tweak so that it work properly in firefox 2016-07-18 16:38:29 +01:00
wmwragg 2ee1a9c440 Explanatory text about specificity 2016-07-18 16:20:44 +01:00
wmwragg 8fd12d530d Added the hightlight badge restyling 2016-07-18 14:57:03 +01:00
wmwragg 3f7bd48c0a Made the collapsed badge smaller than the uncollapsed one, basically the same size as it was originally 2016-07-18 14:27:14 +01:00
wmwragg 28108476bd Added an overide for the view source so that it behaves correctly with the new Modal. Also tweaked the spinner overide 2016-07-18 10:31:17 +01:00
Matthew Hodgson 722cedc92e CSS for generic user settings at last 2016-07-18 01:33:43 +01:00
Matthew Hodgson f182e32e3d typo 2016-07-18 01:33:36 +01:00
wmwragg 3cfcc13387 Initial fix for Dialog Spinners 2016-07-17 21:20:11 +01:00
wmwragg 953bb64e0b Some quick initial tweaks to the badge icon 2016-07-17 21:18:47 +01:00
Matthew Hodgson 54f4443428 fix single emoji sizing 2016-07-17 18:30:06 +01:00
Matthew Hodgson 1e963a6c3a Revert "Presentation for inline link" 2016-07-15 16:54:27 +01:00
Matthew Hodgson 348f133e77 add mx_EventTile_body class for the body span in events, and fix the naming scheme of '.emoji-body' 2016-07-15 15:03:42 +01:00
Matthew Hodgson cd865bbe8f Merge pull request #1806 from vector-im/wmwragg/modal-restyle
Wmwragg/modal restyle
2016-07-15 15:01:01 +01:00
wmwragg e668d7685d Fixed light box colour, reset back to black. 2016-07-15 14:54:15 +01:00
Matthew Hodgson 6607bee91a Merge pull request #1799 from ribot/feature-inline-link-preview
Presentation for inline link
2016-07-15 13:51:54 +01:00
wmwragg 3a89a5af0b Increasing the specificity of the CSS so that primary input submit buttons are styled correctly 2016-07-15 12:33:56 +01:00
Stefan Pearson 35e3621ae7 removes overflow comments 2016-07-15 12:21:05 +01:00
wmwragg 040ef73886 Simple refactor of the primary indicator, now it's a class. Also added a global selector to remove the ugly firefox dotted line highlight 2016-07-15 11:22:10 +01:00
David Baker 74c9ac0872 Merge pull request #1798 from vector-im/dbkr/offline_user_colour
CSS for offline user colours
2016-07-14 18:29:28 +01:00
wmwragg adbad509f4 Updated to highlight the primary button in the dialog, i.e. the first one 2016-07-14 17:59:06 +01:00
David Baker 15a97a653f CSS for offline user colours 2016-07-14 17:43:43 +01:00
Stefan Pearson 9fb97a6b10 presentation for inline link 2016-07-14 17:08:25 +01:00
wmwragg 579f210cfc Initial Modal dialog restyling 2016-07-14 16:55:41 +01:00
wmwragg 2fb1e156ed Modal background restyled 2016-07-14 15:41:23 +01:00
wmwragg 707ddc61bf Mergeing up from develop 2016-07-14 12:43:25 +01:00
wmwragg 09e861637f Simplification of the css 2016-07-14 12:04:31 +01:00
wmwragg 1f43f904d5 Search icon updated in header, and all icons spacing and positioning teaked 2016-07-14 11:33:07 +01:00
wmwragg e1779ca8bc Deleteing .DS_Store files before adding to gitignore 2016-07-14 10:41:41 +01:00
wmwragg a4dc844338 Added truetype font fallback for browsers that don't support WOFF2 format, i.e. safari 2016-07-14 10:24:16 +01:00
wmwragg 0a4af647c8 Header and footer buttons updated to new versions 2016-07-13 17:46:07 +01:00
wmwragg 503bf541c7 Tweak to the close button css to keep the close button inline with the search box 2016-07-13 14:34:20 +01:00
wmwragg 1fbc249de5 Updated Filter room icon 2016-07-13 14:23:46 +01:00
wmwragg 959dcd0c49 Updated BottomLeftMenu buttons to the new ones 2016-07-13 14:10:44 +01:00
wmwragg ef4f2f10d9 Updated that RightPanel members icon, highlight and numbers 2016-07-13 13:56:59 +01:00
Aviral Dasgupta 74f459f8a4 feat: bump emoji-body font-size down to 48px 2016-07-12 20:37:51 +05:30
Aviral Dasgupta 49dd93ffab feat: large emoji support 2016-07-05 04:04:34 +05:30
David Baker 7174879ac9 Merge pull request #1717 from aviraldg/feature-autocomplete
Autocomplete
2016-07-04 18:16:22 +01:00
Matthew Hodgson 486adb717b Merge pull request #1670 from Half-Shot/patch-1
#1664 Set a maximum height for codeblocks
2016-06-24 19:16:50 +01:00
Richard van der Hoff 2ca9d87b95 CSS for device blocking
A bunch of updates to the device info:

* format as a table
* make the buttons green, because the old way was super confusing
* instead make the status indicator red/orange/green.
2016-06-23 17:32:33 +01:00
David Baker 4bc4292ceb Rooms may not have aliases 2016-06-23 11:12:25 +01:00
David Baker 5f477b313b Unused variable 2016-06-23 10:20:11 +01:00
David Baker d45e44d01c Fix joining rooms by typing the alias
Fixes regression introduced by https://github.com/vector-im/vector-web/pull/1680
2016-06-23 10:11:46 +01:00
Richard van der Hoff c12839dc7b Merge pull request #1680 from vector-im/dbkr/delete_alias
Add ability to delete an alias from room directory
2016-06-22 17:25:27 +01:00
David Baker c35c9f7c3a PR feedback 2016-06-22 16:20:06 +01:00
David Baker ff5c7072d7 Mark the room as private (unlisted) too
Also clean up RoomDirectory a bit and just pass the room object around rather than the name / alias, so now we don't have to look up the room by ID again.
2016-06-22 14:52:55 +01:00
Matthew Hodgson eca453ee5a reposition Login spinner 2016-06-21 19:49:55 +01:00
David Baker ad2541299f Add ability to delete an alias from room directory
Hidden behind shift-click for now, but we're going to need to do this a lot to moderate the public room list.
2016-06-21 16:47:40 +01:00
Aviral Dasgupta dc840fdf48 updated selection styling 2016-06-21 19:02:18 +05:30
Aviral Dasgupta 510bb5785e Merge branch 'develop' into feature-autocomplete 2016-06-21 04:09:23 +05:30
Aviral Dasgupta 034c045b37 Styling for autocomplete 2016-06-20 13:53:18 +05:30
Matthew Hodgson 4dfb0e9a90 Merge branch 'develop' into matthew/scalar 2016-06-19 22:40:58 +01:00
Matthew Hodgson 654429dbdb improve wording on 'search room names' 2016-06-18 21:12:32 +01:00
Will Hunt c7d0214aaa #1664 Set a maximum height for codeblocks 2016-06-18 12:21:34 +01:00
David Baker 895fb63d5d Merge pull request #1661 from vector-im/rav/unverify_device
CSS for unverify button
2016-06-17 17:00:26 +01:00
Richard van der Hoff 95a0bc92d6 CSS for unverify button
(supports change in react-sdk)
2016-06-17 16:25:39 +01:00
Matthew Hodgson a90492e393 fix CSS 2016-06-17 16:14:14 +01:00
Aviral Dasgupta ec7067e7bd Autocomplete style 2016-06-17 04:58:39 +05:30
Richard van der Hoff 4cfcdfa040 Merge pull request #1639 from vector-im/dbkr/fix_peeking
Update for react-sdk dbkr/fix_peeking branch
2016-06-16 11:13:29 +01:00
David Baker e507339324 Merge pull request #1553 from aviraldg/feature-rte
Rich Text Editor
2016-06-14 15:27:35 +01:00
David Baker 3547bd8d00 Update for react-sdk dbkr/fix_peeking branch
With the react-sdk update, this does nothing functionally since the room ID would just
have been ignored, but update this to correctly supply only one of ID/alias.
2016-06-14 13:02:34 +01:00
Pedro Ferreira eb37032d8a Markdown: styles for bold/italics 2016-06-12 01:04:22 +02:00
Aviral Dasgupta f6ed21559a RTE mode switch styling & cleanup 2016-06-11 15:54:43 +05:30
David Baker d7504aeda5 Switch to new view_room 2016-06-10 15:13:41 +01:00
Aviral Dasgupta b2459b2dc6 Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte 2016-06-10 04:43:06 +05:30
Aviral Dasgupta 819e06e2cd MessageComposer styling for Draft 2016-06-10 04:41:59 +05:30
David Baker a030e46c69 Use join_room_by_alias in RoomDirectory
This still doesn't actually cause the room to be joined by alias though, so still need to fix that
2016-06-09 17:13:02 +01:00
David Baker f61cfbc542 Fix RoomDirectory to join by alias whenever possible. 2016-06-09 16:41:01 +01:00
Richard van der Hoff c4b7571c45 Merge pull request #1612 from vector-im/dbkr/optional_config
Make the config optional
2016-06-09 10:40:58 +01:00
Richard van der Hoff 4dd477e064 index.js: fix comment typo
Fix dave's typo for him
2016-06-09 10:38:51 +01:00
David Baker f595f6f141 This check shouldn't be here with the || 2016-06-09 10:25:49 +01:00
David Baker 24602119c5 This doesn't actually need to be global
(because the rendering isn't in a render method here)
2016-06-09 09:59:37 +01:00
David Baker 3040d0a474 Comment typo 2016-06-09 09:57:44 +01:00
David Baker e4ea00ca23 Return here, else we'll call resolve too 2016-06-09 09:56:57 +01:00
David Baker 4fc311da90 Style fix 2016-06-09 09:56:11 +01:00
Richard van der Hoff 7894e52529 Merge pull request #1610 from vector-im/rav/device_verification
CSS support for device verification
2016-06-08 21:37:35 +01:00
David Baker f6aa9a7ea4 Make the config optional
Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.
2016-06-08 18:46:21 +01:00
Richard van der Hoff 5f29729e82 Make unverified encrypted events red and verified ones green 2016-06-08 17:03:54 +01:00
Richard van der Hoff e24851456a CSS for the MemberDeviceInfo view 2016-06-08 17:03:28 +01:00
David Baker 1e40fd750f Don't use SdkConfig
instead take brand from a prop
2016-06-08 14:55:47 +01:00
Richard van der Hoff ed1554f4af index.js: fix wording in android popup 2016-06-07 22:01:56 +01:00
David Baker c6cf5febd5 Merge pull request #1516 from vith/static-config-json
serve config.json statically instead of bundling it
2016-06-06 19:15:35 +01:00
David Baker f9aaf7d903 Use the SdkConfig interface
rather than pulling in config.json directly.

json-loader appears to still be necessary due to some horrendous json dependency in the depths of sanitize-html.
2016-06-06 19:13:30 +01:00
Matthew Hodgson a2e73cceee Merge branch 'develop' into matthew/scalar 2016-06-06 10:24:39 +01:00
Matthew Hodgson d976046e6a set email branding whenever emails are added from vector 2016-06-02 13:15:13 +01:00
Aviral Dasgupta 12157edd62 Style selection color 2016-05-28 12:20:21 +05:30
Aviral Dasgupta 7e563b89c7 initial version of rich text editor 2016-05-27 10:17:01 +05:30
Jason Papakostas 6a6118e136 serve config.json statically instead of bundling it
issue #1344
2016-05-24 19:08:09 -05:00
Matthew Hodgson bede9a814b remove spurious top border; fix #1472 2016-05-24 00:30:36 +01:00
Matthew Hodgson d70842c3c7 fix padding of badges 2016-05-24 00:29:48 +01:00
Matthew Hodgson a288c5b85d fix padding of badges 2016-05-20 12:21:45 +01:00
Matthew Hodgson c4d408d095 CSS for IntegrationsManager 2016-05-18 17:02:39 +01:00
Matthew Hodgson ac24d6707f Add integs mgt 2016-05-18 15:02:03 +01:00
Matthew Hodgson e5835d2731 typo 2016-05-18 15:01:36 +01:00
Matthew Hodgson d8c32db14b typos 2016-05-17 20:24:01 +01:00
Matthew Hodgson 2b3606d44d switch to lozenges, and improve overlap behaviour 2016-05-17 19:52:56 +01:00
Matthew Hodgson 5feb31911a better collapsed look & feel 2016-05-17 11:19:04 +01:00
Matthew Hodgson 9483e42508 switch from dots to per-room badges 2016-05-17 11:14:30 +01:00
Matthew Hodgson e640f65640 add close button to room search filter 2016-05-16 23:36:52 +01:00
Matthew Hodgson 8a9c85c97d fix wording 2016-05-16 23:00:17 +01:00
Kegan Dougal bc166f19b7 Fix NPE when loading the Settings page which infini-spinnered 2016-05-16 16:04:06 +01:00
Matthew Hodgson 8fb521c83c 302 android to play store 2016-05-13 17:14:01 +01:00
Matthew Hodgson d9077584cd Merge branch 'dbkr/email_notifs' into develop 2016-05-13 15:16:35 +01:00
Matthew Hodgson 8467d5d760 302 to iTunes if you don't have the app installed 2016-05-11 01:48:02 +02:00
Matthew Hodgson 9cd8f7c7f3 Merge pull request #1469 from vector-im/dbkr/email_notifs
Add option to enable email notifications
2016-05-10 16:39:50 +02:00
Matthew Hodgson c64f71a3cb refine memberlist cosmetics 2016-05-05 00:35:47 +01:00
Matthew Hodgson af9838408b s/devices/notification targets/ 2016-05-04 11:58:37 +01:00
Matthew Hodgson 974a187e74 fix annoying bug where URL previews with very long lines (e.g. vector permalinks) would get clipped 2016-05-03 17:49:42 +01:00
David Baker efe1c767f0 Un-inline onChange 2016-05-03 11:36:44 +01:00
David Baker a72d0c5b7f Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs 2016-04-21 10:17:15 +01:00
David Baker 3cb092051e Merge branch 'develop' into dbkr/email_notifs 2016-04-21 10:11:55 +01:00
Richard van der Hoff 02f58ef9e3 Don't relayout scrollpanels every time something changes
Gemini's habit of reflowing everything everytime anything changes at all makes
for an unresponsive app. Turn it off everywhere we use gemini.
2016-04-20 12:29:32 +01:00
Richard van der Hoff a0b460b084 Include react-addons-perf for non-production builds
This makes it possible to gather a few performance stats
2016-04-19 15:01:24 +01:00
Matthew Hodgson aeb438dc62 fix tbody & keying warnings 2016-04-17 17:44:04 +01:00
Matthew Hodgson 10a053019d fix thinkos - thanks @richvdh for posthoc review 2016-04-17 17:35:17 +01:00
Matthew Hodgson 58c431abc2 fix spinner layout bouncing when changing notifs
all-important s/done/then/ on pushRulesPromise to ensure that the refresh completes before relaying-out the page
s/Loud/Highlight & sound/
2016-04-17 14:00:20 +01:00
Matthew Hodgson d512e25cca persist search filter over being hidden 2016-04-17 00:28:33 +01:00
Matthew Hodgson 65d9333104 pointer on roomsublist 2016-04-16 23:49:21 +01:00
Matthew Hodgson fbd974df55 fix bottomleft bug in chrome canary 2016-04-16 23:49:16 +01:00
Matthew Hodgson fdf83a5ad5 fix tooltip offset 2016-04-15 22:24:20 +01:00
Matthew Hodgson c98e06e1aa add cancelButton to simpleHeader 2016-04-15 22:16:06 +01:00
Matthew Hodgson b58265a69c fix comedy FontAwesome bug 2016-04-15 21:48:09 +01:00
Matthew Hodgson 37fbad0dbe fix LeftPanel width in FF 2016-04-15 21:37:52 +01:00
Matthew Hodgson 756da03b9a fix wrapping of RoomTile when selected 2016-04-15 20:50:22 +01:00
Matthew Hodgson 48e082e124 Merge pull request #1402 from vector-im/matthew/design_tweaks
Matthew/design tweaks
2016-04-15 18:48:30 +01:00
Matthew Hodgson c606912a8d fix topic font size 2016-04-15 18:45:52 +01:00
Matthew Hodgson 7cd24e7dbd commented out fading for RoomDirectory 2016-04-15 18:29:57 +01:00
Matthew Hodgson c7d717f0a4 fix RightPanel 2016-04-15 18:29:49 +01:00
Matthew Hodgson cf3cdaccf3 fix up UserSettings a bit 2016-04-15 18:23:47 +01:00
Matthew Hodgson d0d4760ddc align highlight with droptarget RHS 2016-04-15 18:09:10 +01:00
Matthew Hodgson 51bc18aef0 prettier icon 2016-04-15 18:05:57 +01:00
Matthew Hodgson 26d12bebe4 wire up searchbox filtering, and some minor overall tweaks 2016-04-15 17:54:48 +01:00
Matthew Hodgson 90ae024a4e tidy up rightpanel and searchbox 2016-04-15 15:53:27 +01:00
Richard van der Hoff eab206c3bd Improve handling of notification rules we can't parse
* An absent rule is the same as a rule with 'enabled == false', and is not
necessarily 'OFF' (particularly in the case of the bot rule, which is
inverted).

* If we don't understand the rule, then don't tick any of the radio buttons,
and instead show it in the 'external' section.
2016-04-15 12:42:03 +01:00
Matthew Hodgson 72745b05dc forgotten CSS 2016-04-15 10:49:25 +01:00
Matthew Hodgson f8d5101dbc add lost SVGs and implement SearchBox skeleton 2016-04-15 02:23:12 +01:00
Matthew Hodgson cc1e30c963 dinkier topic 2016-04-15 01:42:44 +01:00
Richard van der Hoff 121fe34180 Improve parsing of keyword notification rules
For notification rules, the absence of a value on a 'highlight' tweak means
that the highlight should happen; this was previously confusing us.

Use the action parser from NotificationUtils to simplify the code.

Fixes https://github.com/vector-im/vector-web/issues/1330
2016-04-14 22:45:00 +01:00
Richard van der Hoff 5450223cc7 More notifications fixes
Fix another thing I broke during the refactor
2016-04-14 22:31:40 +01:00
Matthew Hodgson 25b5c14527 fix new bottomleft menu 2016-04-14 22:26:48 +01:00
Matthew Hodgson 6bc4c87ce4 update to new bottomleftmenu. update header and composer heights 2016-04-14 21:43:49 +01:00
Richard van der Hoff 0f0c3d0ca1 Merge branch 'rav/more_refactor_notifications' into develop 2016-04-14 21:27:34 +01:00
Matthew Hodgson 96c4a24d3d skin RoomSubList chevrons, horizontal rules and selected room 2016-04-14 21:10:55 +01:00
Richard van der Hoff c6b501811f Move more stuff out of Notifications.js 2016-04-14 19:54:03 +01:00
Richard van der Hoff 0996a0b140 Fixes to refactored notifications
A few things I managed to break in the recent refactor
2016-04-14 19:54:03 +01:00
Matthew Hodgson 8557a3b70e fix vertical alignment within status bar 2016-04-14 19:15:35 +01:00
Matthew Hodgson 8b6cf1fc41 change badge look & feel; change status bar sizing 2016-04-14 19:11:58 +01:00
Matthew Hodgson 4eb762d52b spell out that images are clickable 2016-04-14 18:16:03 +01:00
Matthew Hodgson 4d221c6099 spell out that images are clickable 2016-04-14 18:15:51 +01:00
Richard van der Hoff b6d5849bec Merge pull request #1386 from vector-im/rav/refactor_notifications
Start Notifications component refactor
2016-04-14 14:29:11 +01:00
Richard van der Hoff 035b15f330 Moar debug for ff session restore issue 2016-04-13 22:18:26 +01:00
Richard van der Hoff 77355cbeb4 Add some debug to help with FF restore bug
(https://github.com/vector-im/vector-web/issues/1354)
2016-04-13 21:01:24 +01:00
Richard van der Hoff ff5dff45f5 Start Notifications component refactor
Factor some things out of the mega Notifications component, and add a dummy
unit test to show willing
2016-04-13 18:44:41 +01:00
Matthew Hodgson 50f94eb040 stop guests rom trying to blunder into non-guest rooms 2016-04-13 13:33:23 +01:00
David Baker 5794c30def Devices should be below 'advanced' 2016-04-13 11:35:53 +01:00
Matthew Hodgson b5248c06a7 fix https://github.com/vector-im/vector-web/issues/987 for once and for all 2016-04-13 00:34:32 +01:00
Matthew Hodgson 18bd1058d3 Merge pull request #1376 from vector-im/matthew/fadable
make the UI fadable to help with decluttering
2016-04-12 18:04:47 +01:00
Matthew Hodgson b18fcf7f9e spinner on saving room settings 2016-04-12 18:02:31 +01:00
Matthew Hodgson 05e963d1e2 make the UI fadable to help with decluttering 2016-04-12 17:17:08 +01:00
David Baker 5d9c8f3726 Support config for email notifs
Add support to notif settings for adding an email pusher, only for the first email address for now.
2016-04-12 16:19:20 +01:00
David Baker be55882f46 Merge pull request #1374 from vector-im/dbkr/get_pushers
Get and display a user's pushers in settings
2016-04-12 14:41:45 +01:00
David Baker 356a4a4392 Typo and use CSS rather than <i> 2016-04-12 14:10:17 +01:00
Matthew Hodgson 34bdd40953 timestamps are permalinks 2016-04-12 13:34:10 +01:00
David Baker c5524851f3 Comment future possibility for deleting pushers 2016-04-12 13:22:58 +01:00
David Baker cff1c3010b Get & display pushers in settings
Really this is so (in a subsequent PR) we can show whether a user has an email pusher, but we can basically display the list of pushers for free, so adding this too.
2016-04-12 13:18:57 +01:00
Matthew Hodgson 46572ae793 click on group call thumbnail should return you to the group call, not the 1:1 2016-04-12 02:27:35 +01:00
Matthew Hodgson b1ba69fd00 fix lightbox overscroll 2016-04-12 00:35:00 +01:00
Matthew Hodgson 8c619fedeb Merge pull request #1343 from vector-im/matthew/preview_urls
URL previewing support
2016-04-11 23:55:18 +01:00
Matthew Hodgson efd01d6929 move localstorage crap entirely to TextualBody 2016-04-11 23:54:00 +01:00
Matthew Hodgson a1b78f93fe Fix wrap on view source 2016-04-10 14:18:57 +01:00
Matthew Hodgson cdc89c0623 add the concept of eventTileOps for managing widget visibility based on vdh's PR feedback 2016-04-08 21:42:42 +01:00