Commit Graph

5094 Commits

Author SHA1 Message Date
Matthew Hodgson 8ef3811f28 Merge branch 'develop' into matthew/status 2017-11-01 15:25:50 +00:00
Matthew Hodgson 8f289519e1 fix chevron cosmetics 2017-11-01 15:25:23 +00:00
Matthew Hodgson df58bdd529 use absolute url for og:image 2017-10-31 22:56:57 +00:00
Matthew Hodgson 1b7e42f5e8 add og:image 2017-10-31 22:45:19 +00:00
Richard Lewis 56c6a15ddf
Merge pull request #5458 from vector-im/rxl881/widgetTitleBorder
Add back bottom border to widget title bar
2017-10-31 18:02:32 +00:00
Richard Lewis 04d1a72307 Undo comitted changes to package-lock.json 2017-10-31 18:02:04 +00:00
David Baker 841503f907
Merge pull request #5478 from vector-im/luke/css-header-name-clickable-for-members
Prevent group name looking clickable for non-members
2017-10-31 13:52:19 +00:00
Luke Barnard ba1ad84d59 Prevent group name looking clickable for non-members 2017-10-31 10:56:14 +00:00
Luke Barnard 07a17829ea
Merge pull request #5472 from vector-im/t3chguy/fix_typecheck_warn
Fix instanceof check, was checking against the Package rather than class
2017-10-31 10:29:18 +00:00
Michael Telatynski c39044f397
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/fix_typecheck_warn 2017-10-30 15:27:20 +00:00
Michael Telatynski 71c8dca91a
Fix instanceof check, was checking against the Package rather than class
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-30 15:12:03 +00:00
Matthew Hodgson 5d3caf8157 tweak badges 2017-10-27 23:45:10 +01:00
Matthew Hodgson b87fad991f get rid of hardcoded colour >:( 2017-10-27 22:47:51 +01:00
Richard Lewis 19320c37df Add back bottom border to widget title bar 2017-10-27 19:57:05 +01:00
David Baker 5063fef4f5 Redirect to instructions page if user on mobile 2017-10-27 19:08:35 +01:00
David Baker b9e2b59504 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-10-27 19:01:34 +01:00
Luke Barnard c74e6c3c0c Merge pull request #5455 from vector-im/luke/groups-fix-invite-button
Use correct group store state when rendering "Invite to this community"
2017-10-27 16:10:33 +01:00
Luke Barnard 3dcc397f67 Fix AuxPanel floating in the middle
When there is no RoomView_body to push it to the top of the flex container
2017-10-27 15:40:03 +01:00
Luke Barnard 7bae7fe9e5 Use correct group store state when rendering "Invite to this community"
This required slight rework of how RightPanel uses the group store, and now it knows an unfortunate amount about the group store. Food for thought on stores in general, I think.
2017-10-27 14:33:28 +01:00
Matthew Hodgson 8ad9728bef css for HS userid warnings 2017-10-27 14:23:33 +01:00
Matthew Hodgson d4696345d1 fix more visited state of links 2017-10-27 12:17:04 +01:00
Matthew Hodgson 7e9b63822b fix visited state of links 2017-10-27 11:12:03 +01:00
Matthew Hodgson ce2d40b775 more tweaks from Denis 2017-10-27 10:47:15 +01:00
Matthew Hodgson 3df1808fd0 Merge pull request #5453 from VickyKoblinski/es6-notifications
Leverages ES6 in Notifications
2017-10-27 09:15:22 +01:00
Vicky Koblinski d188fdb9fe Changes requires to imports for consistancy, removes 'use strict' 2017-10-26 21:23:16 -04:00
Vicky Koblinski 7588814ec5 Leverages ES6 and fixes typo 2017-10-26 20:37:15 -04:00
Matthew Hodgson c26aaa8d01 revert previous & fix font size 2017-10-27 01:35:06 +01:00
Matthew Hodgson ca0092469b tweak spacing for login 2017-10-27 01:31:14 +01:00
Matthew Hodgson 3ffebfbf0b fix spacing of login aux buttons 2017-10-27 01:24:11 +01:00
Matthew Hodgson b65ee5f28e tg hoverover 2017-10-27 01:09:46 +01:00
Matthew Hodgson 1798bff8f5 cosmetic fixes & hoverovers 2017-10-27 01:02:43 +01:00
Matthew Hodgson 26d142f893 fix snafu on login submit button 2017-10-27 00:14:12 +01:00
Matthew Hodgson 468f8ccab8 dirty hack to make FF work 2017-10-27 00:02:52 +01:00
Matthew Hodgson 50b348c68e try for slightly prettier redaction 2017-10-26 18:59:05 +01:00
Matthew Hodgson ca74b09867 fix fugly noperm error 2017-10-26 18:27:34 +01:00
Matthew Hodgson b9cf2c6b6c remove 'return to app' test 2017-10-26 18:08:42 +01:00
Matthew Hodgson ad9d78684e tweak emptySubListTip visuals 2017-10-26 18:08:36 +01:00
Matthew Hodgson e5b1ded7e3 fix default colour of loginbox text 2017-10-26 17:31:36 +01:00
Matthew Hodgson a8f2980dcc coc 2017-10-26 17:25:23 +01:00
Matthew Hodgson 8f0f34e761 fix buttons in other skins 2017-10-26 14:42:52 +01:00
Luke Barnard 507cef3ba4 Merge pull request #5437 from vector-im/luke/feature-optionally-mirror-local-video
Re-PR #4412
2017-10-26 09:55:17 +01:00
David Baker ebbb677f2c Update telegram link 2017-10-26 09:53:05 +01:00
Matthew Hodgson 13c1829cd4 fix droptarget 2017-10-26 02:09:56 +01:00
Matthew Hodgson 6212e805d2 spell out fonts 2017-10-26 01:52:57 +01:00
Matthew Hodgson 225c7ee621 Merge branch 'develop' into matthew/status 2017-10-26 01:46:06 +01:00
Matthew Hodgson f86b616769 status homepage 2017-10-26 01:38:07 +01:00
Matthew Hodgson ea19096db3 skin all the buttons 2017-10-25 23:56:31 +01:00
Matthew Hodgson a152eba023 fix panel-divider-color 2017-10-25 22:55:32 +01:00
Matthew Hodgson 953398b486 statusify main chat 2017-10-25 22:48:13 +01:00
Matthew Hodgson 79a9f2168b get rid of hardcoded font 2017-10-25 22:47:55 +01:00