Luke Barnard
6a007d01a1
Merge pull request #610 from matrix-org/luke/feature-css-msg-colors
...
Allow [bf]g colors for <font> style attrib
2017-03-03 08:35:32 +00:00
Luke Barnard
f4278b61ea
Update comment
2017-03-02 18:13:01 +00:00
Luke Barnard
0f8ab99158
Have COLOR_REGEX constant
2017-03-02 17:02:00 +00:00
Luke Barnard
e75c21e9f9
Merge pull request #683 from matrix-org/luke/mels-xor
...
MELS: either expanded or summary, not both
2017-03-02 14:08:06 +00:00
David Baker
8be66d0f04
Merge pull request #730 from Half-Shot/hs/video-gif-autoplay
...
Autoplay videos and GIFs if enabled by the user.
2017-03-02 13:41:30 +00:00
Will Hunt
4b5e8d66b8
Fixed styling + removed log line
2017-03-02 13:39:56 +00:00
David Baker
0035a91596
Merge pull request #731 from matrix-org/luke/warn-users-e2e-first-time
...
Warn users about using e2e for the first time
2017-03-02 13:28:15 +00:00
David Baker
95cff17698
Merge pull request #721 from matrix-org/luke/fix-refactor-UnknownDeviceDialog
...
Show UDDialog on UDE during VoIP calls
2017-03-02 13:13:45 +00:00
Luke Barnard
b951713f7f
Remove custom attribs as consumed
2017-03-02 11:39:40 +00:00
Luke Barnard
36795fa192
Use data-mx[-bg]-color instead of stripping style
...
This has the benefit of not needing a spec for custom CSS. Instead we rigourously sanitise the values for custom data attributes that are transformed to CSS equivalents. `data-mx-color` translates to CSS `color` for example.
2017-03-02 11:36:56 +00:00
Luke Barnard
b7bd93c613
var -> const
2017-03-01 15:55:15 +00:00
Luke Barnard
187c91b76a
Adjust warning message
2017-03-01 15:42:05 +00:00
Luke Barnard
6d296a0e7a
Warn users about using e2e for the first time
2017-03-01 15:41:13 +00:00
Luke Barnard
39427839b9
Use ES6 export style
2017-03-01 14:33:25 +00:00
Luke Barnard
f85c452e35
Merge pull request #726 from matrix-org/luke/rts-set-team-token-on-login
...
Notify MatrixChat of teamToken after login
2017-02-28 15:57:22 +00:00
Luke Barnard
a339316ede
Use a "normal" promise in order to .then
2017-02-28 15:40:49 +00:00
Luke Barnard
0ef8e2a8f4
Various fixes
2017-02-28 15:18:00 +00:00
Luke Barnard
48a3d0d595
Refactor to not set team token in bad ways
...
Use the on_logged_in dispatch instead. Call setPage in one place, _onLoggedIn, when deciding which page to view on login. Change some require to import, var to const. Remove onTeamMemberRegistered and just use a nullable argument to onRegistered
2017-02-28 15:05:49 +00:00
Will Hunt
1995c16013
Add a user option to enable autoplaying gifs and videos.
2017-02-27 22:17:43 +00:00
Will Hunt
4509901592
image (gifs) and video messages will autoplay if enabled.
2017-02-27 22:16:56 +00:00
Luke Barnard
7221900497
Refactor remove resend_all_events and cancel_all_events dispatches
2017-02-27 13:39:12 +00:00
Luke Barnard
b3b16d1858
Merge pull request #727 from matrix-org/luke/fix-rrs
...
Fix a couple of issues with RRs
2017-02-27 11:44:34 +00:00
Luke Barnard
5fc828f24c
Allow span, and only allow style attrib
2017-02-27 11:32:57 +00:00
Luke Barnard
886b0a3f13
Sanitise for *, fix style issues
2017-02-27 11:23:37 +00:00
Luke Barnard
5be2c62011
Fix a couple of issues with RRs
...
- Shift to the left _before_ adding an avatar so that there are always `MAX_READ_AVATARS` visible, instead of there being `MAX_READ_AVATARS + 1` avatars displayed following the first "collapse".
- Use `right` instead of `left` so that double-digit remainders don't get overlapped.
2017-02-27 11:16:13 +00:00
Luke Barnard
e1a40a8ef0
Notify MatrixChat of teamToken after login
2017-02-23 16:30:26 +00:00
David Baker
fd3c1ab9e1
Merge pull request #718 from matrix-org/luke/ignore-no-tile-events
...
Do not push a dummy element with a scroll token for invisible events
2017-02-23 10:17:16 +00:00
David Baker
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
David Baker
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
Luke Barnard
8bd42693f7
Fix message composer placeholders
2017-02-23 09:05:26 +00:00
Luke Barnard
b68b0e25c8
Merge Matthew's wording patch
2017-02-22 16:59:45 +00:00
Luke Barnard
f92708fbe6
In practice the MELS-1,2,3 solves nothing, revert it
2017-02-22 16:54:32 +00:00
Luke Barnard
436e6b36f1
Move UDE handling to a its own file, adjust wording
2017-02-22 16:42:14 +00:00
David Baker
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
Luke Barnard
816e0be3a0
Retry->Send anyway
2017-02-22 16:17:49 +00:00
Luke Barnard
9515cf2cf2
Only hangup on call errors, not errors on sendEvent
2017-02-22 16:12:37 +00:00
Luke Barnard
799e5ee0e9
Less jargon
2017-02-22 14:40:07 +00:00
David Baker
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
Luke Barnard
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
Luke Barnard
c13ff254b1
Add "Retry" button to UDE
2017-02-22 10:21:43 +00:00
David Baker
f600121dd5
Merge pull request #713 from aviraldg/add-editorconfig
...
add .editorconfig
2017-02-21 18:06:41 +00:00
Aviral Dasgupta
e0724e7521
add .editorconfig
...
Signed-off-by: Aviral Dasgupta <me@aviraldg.com>
2017-02-21 23:29:55 +05:30
Luke Barnard
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
Kegsay
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
Kegan Dougal
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
Luke Barnard
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
Luke Barnard
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
Matthew Hodgson
05d242cb5c
allow @local:domain style mxids
2017-02-21 14:50:09 +00:00
Luke Barnard
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
Matthew Hodgson
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
