8737112a8c
Merge pull request #715 from matrix-org/luke/mels-scrolling-fix
...
MELS: check scroll on load + use mels-1,-2,... key
2017-02-23 10:12:26 +00:00
0a76e0f621
Merge pull request #723 from matrix-org/luke/fix-e2e-input-placeholder
...
Fix message composer placeholders
2017-02-23 10:09:07 +00:00
8bd42693f7
Fix message composer placeholders
2017-02-23 09:05:26 +00:00
b41787c335
Initial work on improving invite dialog
2017-02-23 09:03:20 +00:00
b68b0e25c8
Merge Matthew's wording patch
2017-02-22 16:59:45 +00:00
f92708fbe6
In practice the MELS-1,2,3 solves nothing, revert it
2017-02-22 16:54:32 +00:00
436e6b36f1
Move UDE handling to a its own file, adjust wording
2017-02-22 16:42:14 +00:00
2b91b0d9c4
Merge pull request #720 from matrix-org/luke/clarify-e2e-input-box
...
Clarify non-e2e vs. e2e /w composers placeholder
2017-02-22 16:20:26 +00:00
816e0be3a0
Retry->Send anyway
2017-02-22 16:17:49 +00:00
9515cf2cf2
Only hangup on call errors, not errors on sendEvent
2017-02-22 16:12:37 +00:00
799e5ee0e9
Less jargon
2017-02-22 14:40:07 +00:00
e9318f5c02
Merge pull request #722 from matrix-org/luke/fix-status-bar-tab-complete
...
Fix status bar expanded on tab-complete
2017-02-22 14:33:29 +00:00
f230b0a3c0
Fix status bar expanded on tab-complete
...
This had regressed when `_getSize` was introduced. It didn't consider tab completing.
2017-02-22 14:03:30 +00:00
c13ff254b1
Add "Retry" button to UDE
2017-02-22 10:21:43 +00:00
6690df1203
Merge pull request #3282 from Half-Shot/develop
...
Don't overflow directory network options
2017-02-22 01:13:14 +00:00
c21cdf5b02
add .editorconfig
...
Signed-off-by: Aviral Dasgupta <me@aviraldg.com >
2017-02-21 23:38:03 +05:30
f600121dd5
Merge pull request #713 from aviraldg/add-editorconfig
...
add .editorconfig
2017-02-21 18:06:41 +00:00
e0724e7521
add .editorconfig
...
Signed-off-by: Aviral Dasgupta <me@aviraldg.com >
2017-02-21 23:29:55 +05:30
878e31eba2
Show UDDialog on m.call.invite failure
...
Requires https://github.com/matrix-org/matrix-js-sdk/pull/378
Also, refactored UDDialog creation into its own dispatch event, because there will be other parts of the code that will want to spawn one.
2017-02-21 17:22:22 +00:00
7cbd5a7f07
Merge pull request #719 from matrix-org/kegan/db-name
...
Change the name of the database
2017-02-21 17:18:41 +00:00
658c34abf3
Change the name of the database
...
Full name is now `matrix-js-sdk:riot-web-sync`.
2017-02-21 15:44:57 +00:00
fd146a732b
Clarify non-e2e vs. e2e /w composers placeholder
...
For E2E rooms, display "Send an encrypted message…" otherwise display "Send a plaintext message…" as the placeholder for the input box in [old] message composer.
2017-02-21 15:33:44 +00:00
581c8c138e
Do not push a dummy element with a scroll token for invisible events
...
If an event does not `wantTile`, do not add a dummy element with a scroll token, as this can be unperformant with 1000s of events.
2017-02-21 15:01:18 +00:00
05d242cb5c
allow @local:domain style mxids
2017-02-21 14:50:09 +00:00
995e59b973
Merge pull request #716 from matrix-org/luke/feature-default-hs
...
Allow setting the default HS from the query parameter
2017-02-21 14:43:36 +00:00
37f320c4a4
Don't overflow directory network options
2017-02-21 12:25:29 +00:00
454dc8e7b8
Merge pull request #717 from matrix-org/matthew/auth-cache
...
first cut of improving UX for deleting devices.
2017-02-21 09:51:00 +00:00
629f8caad7
oops, remove unneeded import
2017-02-21 09:50:10 +00:00
aabf9255d2
anchor the authcache on LoggedInView to prevent it persisting over logouts
2017-02-21 01:03:22 +00:00
6af0b9618a
first cut of improving UX for deleting devices.
...
This adds a 5 minute auth cache to speed up the process of deleting
old devices. It has the following nastinesses (mainly due to being
written on a flight whilst juggling kids):
* the auth cache is done as context attached to MatrixChat.
one could argue that it should be per-client instead, but we don't
yet have multiple clients.
* the auth cache is only maintained currently in DevicesPanelEntry
(i.e. set & invalidated). One could argue that it might be better
maintained in InteractiveAuth.js or a dedicated cache object
abstraction, but given the only use I can think of is when managing
devices, perhaps this is good enough for now.
2017-02-21 00:19:49 +00:00
9eef3c53a3
Allow setting the default HS from the query parameter
...
Fixes https://github.com/vector-im/riot-web/issues/3207
2017-02-20 16:53:26 +00:00
6fead66f89
MELS: check scroll on load + use mels-1,-2,... key
...
To fix https://github.com/vector-im/riot-web/issues/2916 , force the checking of scroll position by calling _onWidgetLoad (might need renaming...) when a MELS is expanded/contracted.
Also use an keying scheme for MELS that doesn't depend on the events contained, but rather a simple incrementing index based on the order of the MELS as it appears amongst all MELS.
2017-02-20 10:59:11 +00:00
feb8115d24
Desktop instructions: npm run build, not dist
...
Clarify that you only need to run build rather than dist to run
the electron app.
Hopefully satisfies: https://github.com/vector-im/riot-web/pull/3237
2017-02-20 10:32:14 +00:00
7d07e7f958
Merge pull request #711 from matrix-org/dbkr/fix_commonmark_quote_multiline
...
Fix block quotes all being on a single line
2017-02-20 09:19:41 +00:00
5c87b8045a
Merge remote-tracking branch 'origin/master' into develop
2017-02-20 09:14:22 +00:00
d8c877fe6e
Update ISSUE_TEMPLATE.md
2017-02-20 09:14:01 +00:00
67a7ed1e34
fix spacing of permalinks to info events
2017-02-20 01:49:11 +02:00
eabe4f5c29
hopefully fix https://github.com/vector-im/riot-web/issues/3270
2017-02-20 01:48:10 +02:00
8990e770b7
fix colouring in voip dark theme
2017-02-20 01:43:55 +02:00
f91f5cb65e
fix RTE dark theme
2017-02-20 01:27:05 +02:00
5951e8fb27
don't try to darktheme scalar for now
2017-02-20 01:18:48 +02:00
be79ccccf6
fix dark theme room join bar
2017-02-20 01:15:54 +02:00
aba121aab0
fix cursor
2017-02-19 04:13:29 +02:00
2db53c2284
whitelist data & mxc URIs on img tags: readds PR #333 now that punkave/sanitize-html#137 has landed
2017-02-19 03:04:42 +02:00
5ac76acc05
limit avatar uploads to images
2017-02-19 02:07:08 +02:00
c146ddf29b
turn on rageshake for desktop
2017-02-18 23:59:45 +02:00
5469270e41
spell out where the PGP key lives for releases
2017-02-18 23:48:58 +02:00
457b64037d
renormalise ringtone to 66% amplitude
2017-02-18 23:04:38 +02:00
e79d38467b
Oops, un-hardcode correctly
2017-02-17 19:27:50 +00:00
1819ff0939
Un-hardcode home in jenkins.sh
2017-02-17 19:26:21 +00:00
David Baker
Luke Barnard
Matthew Hodgson
Aviral Dasgupta
Kegsay
Kegan Dougal
Matthew Hodgson
Luke Barnard
Will Hunt
David Baker
Richard van der Hoff
Richard van der Hoff