OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,020 Commits
201 Branches
540 Tags
288 MiB
Commit Graph

3020 Commits (bced608c48f4c60f95a22d165bd543b474581929)

Author SHA1 Message Date
Luke Barnard 874e32699a Handle icons with width > height 
Icons with width > height will now only assume a max-height of 100% as opposed to a height of 100%. This is so they don't overflow the width of 300px.
 2017-02-02 11:30:14 +00:00
Luke Barnard 4a34bee2dc Use localStorage `mx_team_token` to decide welcome page 2017-02-02 11:12:43 +00:00
Matthew Hodgson b137c82a7a tweak CSS for UnknownDeviceDialog to support scrollable content 2017-02-02 00:25:18 +00:00
Matthew Hodgson 23060a6833 fix ugly blue border on roomtiles 2017-02-01 22:24:23 +00:00
David Baker 0db97b8f5b Merge pull request #3105 from vector-im/rav/fix_jenkins_build 
Fix jenkins build
 2017-02-01 16:28:47 +00:00
Richard van der Hoff 3404521d5d Fix jenkins build 
Do `npm install` on js-sdk rather than `npm run build`, which will hopefully
mean that `browserify` gets installed before we try to run it.

The README says we should use `npm install` for the react-sdk too, so let's do
that, and bring the travis and jenkins builds into sync with the README.
 2017-02-01 16:11:11 +00:00
Luke Barnard 40609d7da3 then->done 2017-02-01 11:39:23 +00:00
Luke Barnard 1f3ab4425a Merge branch 'develop' into matthew/homepages 
Conflicts:
	src/component-index.js
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
 2017-02-01 11:34:24 +00:00
Matthew Hodgson 6369d76a74 poor man's dark theme for MD codeblocks 2017-01-27 18:18:23 +01:00
Luke Barnard 6374526f3c Merge pull request #3081 from vector-im/luke/css-login-support 
Add CSS for a support box in login
 2017-01-27 16:36:53 +00:00
Luke Barnard 78105bb4db Merge pull request #3082 from vector-im/luke/feature-optional-custom-login-logo 
Allow a custom login logo to be displayed on login
 2017-01-27 16:34:39 +00:00
Luke Barnard 87db89b67a Replace inline styles for logos with css 
Also, give .mx_Login_logo a height so that if the image has not loaded yet, it will not change height (thanks @dbkr)
 2017-01-27 16:30:44 +00:00
Luke Barnard 87f7324065 Merge pull request #3080 from vector-im/luke/css-fix-input-field-width 
Fix the width of input fields within login/reg box
 2017-01-27 16:15:00 +00:00
Luke Barnard 02d6a10f67 Allow a custom login logo to be displayed on login 
This is to allow team logos to be shown when a user registers with a team email.
 2017-01-27 16:08:14 +00:00
Luke Barnard 029602fc73 Fix the width of input fields within login/reg box 
This is so they do not expand outside of the login area. (280px = 300px - 2px - 18px, 2px for borders, 18px for padding)
 2017-01-27 16:04:24 +00:00
Luke Barnard 5aa9592c71 Add CSS for a support box in login 
This box can be used to provide useful hints during registration/login.
 2017-01-27 16:02:33 +00:00
David Baker bb70622b55 Merge pull request #3057 from vector-im/luke/fix-avatar-image-background-colour 
Set BaseAvatar_image bg colour = #fff
 2017-01-26 16:34:01 +00:00
Kegan Dougal b16fa4171a Close the dialog box after sending bugs 2017-01-26 13:42:37 +00:00
David Baker 7850f7e505 Fix badge spam: attempt 2 (#3073) 2017-01-26 12:58:29 +00:00
Kegan Dougal 22bb0f9d30 UTC please 2017-01-26 12:17:47 +00:00
Richard van der Hoff f29e0bfe6d Revert "Merge pull request #3067 from vector-im/matthew/fix-badge-spam" 
This reverts commit f9db7f017d, reversing
changes made to 71b149de76.

This caused `number is not defined`
 2017-01-26 12:16:44 +00:00
Kegan Dougal 6a40ad8a20 Fail the request if we clash files 
Rather than make the file names incredibly long (by adding ms),
just 500 it and expect the user to resend.
 2017-01-26 11:57:56 +00:00
David Baker f9db7f017d Merge pull request #3067 from vector-im/matthew/fix-badge-spam 
only recalculate favicon if it changes
 2017-01-26 11:44:11 +00:00
Kegan Dougal aae62ff94e store logs 2017-01-26 11:44:07 +00:00
David Baker 71b149de76 Merge pull request #3064 from vector-im/dbkr/invite_look_up_emails 
CSS tweak for email address lookup
 2017-01-26 11:34:51 +00:00
Kegan Dougal e8c51a0b54 gzip bug reports when storing on disk. Set max payload size 2017-01-26 11:28:38 +00:00
Kegan Dougal 646ace6e59 Merge branch 'develop' into kegan/rageshake-server 2017-01-26 10:48:40 +00:00
David Baker baed5bec46 Don't lint the autogenned file 2017-01-26 10:18:24 +00:00
David Baker 3c91f90dc9 Tweak desktop instructions (#3069) 
to make it clear you need to do all the things in 'building from
source', including the build-react-sdk dance if you're building
develop.
 2017-01-26 09:47:01 +00:00
Matthew Hodgson ba5e7d4013 fix event-encrypting-color in dark theme 2017-01-26 00:54:00 +01:00
Matthew Hodgson 9797c2fb4b fix electron too 2017-01-26 00:31:52 +01:00
Matthew Hodgson 972a391296 only recalculate favicon if it changes 2017-01-26 00:28:22 +01:00
David Baker 4e41accc56 CSS tweak for email address lookup 
CSS tweak for https://github.com/matrix-org/matrix-react-sdk/pull/653
 2017-01-25 18:52:21 +00:00
Kegan Dougal 9d034c77a5 Initial rageshake server 2017-01-25 17:27:07 +00:00
Kegsay c1290fd24d Merge pull request #3061 from vector-im/kegan/rageshake-glue 
Glue the dialog to rageshake: honour sendLogs flag.
 2017-01-25 17:20:51 +00:00
Kegan Dougal 0a9f02abcc Glue the dialog to rageshake: honour sendLogs flag. 2017-01-25 16:51:26 +00:00
Luke Barnard 0021fb37f3 Set BaseAvatar_image bg colour = #fff 2017-01-25 14:27:25 +00:00
David Baker 527c988574 Merge pull request #3049 from vector-im/dbkr/dev_server_no_hash 
Don't use hash-named directory for dev server
 2017-01-25 13:47:25 +00:00
David Baker 1c926941d3 Add --output-chunk-file too 2017-01-25 11:28:59 +00:00
Kegsay 80c1ec0502 Merge pull request #3000 from vector-im/kegan/rageshake 
Implement bug reporting logic
 2017-01-25 10:34:05 +00:00
Kegan Dougal eaff0abfb0 Add link to Chrome issue status for fixing line numbers 2017-01-25 10:28:13 +00:00
David Baker 2ca871a028 Don't use hash-named directory for dev server 
Otherwise Chrome thinks you're working on a new file every time
you refresh and therefore closes source tabs and removes
breakpoints which is very annoying. It also allegedly makes
webpack-dev-server run out of memory because it has to remember
all the different files.
 2017-01-24 18:18:56 +00:00
Kegan Dougal e225d3e370 Preserve ordering of flush()es by not letting subsequent flush()es race 2017-01-24 17:05:01 +00:00
Kegsay 9a933e2ce5 Merge pull request #3045 from vector-im/kegan/rageshake-ui 
Add css for bug report dialog
 2017-01-24 15:47:49 +00:00
Kegan Dougal efbea0e942 Add css for bug report dialog 2017-01-24 14:45:16 +00:00
David Baker 28939d3146 Merge pull request #3043 from vector-im/luke/fix-status-bar-chopped 
Increase the max-height of the expanded status bar
 2017-01-24 14:07:55 +00:00
Luke Barnard 307c4f3dd1 Increase the max-height of the expanded status bar 
This will ensure that errors, unsent messages, etc. will be allowed enough height to display their contents from within the status bar without being chopped.

Fixes #3041
 2017-01-24 14:02:44 +00:00
David Baker 536167a6c8 Merge pull request #3040 from vector-im/rav/fix_test_fail 
Hopefully, fix intermittent test failure
 2017-01-24 13:48:01 +00:00
Richard van der Hoff fe64b04339 More test resilience 
Give the tests more than one chance for the roomview to load.
 2017-01-24 13:35:41 +00:00
David Baker 31878d8a44 Also need eslint-config-google 2017-01-24 13:07:34 +00:00