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 f9db7f017d71b149de76
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
Kegan Dougal
6f3b70dbb0
Use Q promises and isPending to make logic simpler
2017-01-24 12:43:18 +00:00
Richard van der Hoff
597705716b
Hopefully, fix intermittent test failure
...
This seeks to fix the intermittent failure of the "MatrixClient rehydrated from
stored credentials" tests.
The problem appears to be that the 'load_completed' is sometimes taking a while
to come through from the dispatcher - or rather, it is taking a long time to
get *sent* to the dispatcher: the chain of `q().then().catch().done()` in
componentDidMount can take a while to happen.
As a workaround, give the test a few goes when waiting for us to start
syncing. It's not ideal to be poking into the internal state of MatrixChat like
this, but it'll do for now.
2017-01-24 11:26:09 +00:00
David Baker
6db5329d9c
Merge pull request #2971 from vector-im/dbkr/add_searching_known_users
...
CSS for 'searching known users'
2017-01-24 10:51:13 +00:00
Luke Barnard
ea82b90d35
Merge pull request #2981 from vector-im/luke/feature-animated-status-bar
...
Animate status bar max-height and margin-top
2017-01-23 23:08:23 +00:00
Matthew Hodgson
706ffbec3c
add riot logos
2017-01-23 19:01:35 +01:00
Kegan Dougal
f3df86872b
Fix tightlooping when flush()ing without any logs
...
The promise would resolve immediately, nulling out `flushPromise`. This would
then immediately be set from `new Promise((resolve, reject) => {...})` turning
it back into non-null `flushPromise`. The resolve handler was called so the
next `flush()` would see "oh yes, there is a non-null `flushPromise`" then
promptly try to set `flushAgainPromise` which chains off the resolved
`flushPromise` which relied on `flushPromise` being `null`ed out after
`resolve()`, causing the chained `flush()` to see "oh yes, there is a non-null
`flushPromise`" which... ad infinitum.
This PR fixes it by making the nulling out asynchronous but the fact it took
me this long to debug this issue indicates to me that this is a terrible piece
of code. Will re-write.
2017-01-23 17:37:57 +00:00
David Baker
4c3ea13413
Make jenkins run the linter
2017-01-23 15:42:50 +00:00
Richard van der Hoff
c31b65d093
Merge pull request #3032 from vector-im/dbkr/add_eslint_config
...
Add eslint config
2017-01-23 14:57:39 +00:00
David Baker
bc714ba3a0
Add eslint config
...
An early start that gets some linting in place.
2017-01-23 14:22:54 +00:00
Luke Barnard
b7204bf868
Use primary bg color on statusArea
2017-01-23 13:33:39 +00:00
Luke Barnard
c4d246cd72
Merge branch 'develop' into luke/feature-animated-status-bar
2017-01-23 13:31:48 +00:00
Luke Barnard
b582cf0a5f
Remove CSS for StatusBar mid-timeline
2017-01-23 13:30:39 +00:00
David Baker
f025afc297
Merge pull request #3030 from vector-im/luke/fix-typing-avatars-alignment
...
Re-position typing avatars relative to "is typing"
2017-01-23 12:44:47 +00:00
Luke Barnard
57126efe86
Reposition typing avatars relative to "is typing"
2017-01-23 10:24:23 +00:00
Kegan Dougal
2ecf65f057
Keep the logs if no store exists
2017-01-23 09:28:48 +00:00
Matthew Hodgson
d907421ad4
crappy CSS for UnknownDeviceDialog
2017-01-22 01:25:32 +01:00
