nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
62,970 Commits 258 Branches 582 Tags
056ecbb1380536f3b2959c0c19d4500a72adb3f2
Commit Graph

62970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matthew Hodgson
6690df1203 Merge pull request #3282 from Half-Shot/develop 
Don't overflow directory network options
 2017-02-22 01:13:14 +00:00
Aviral Dasgupta
c21cdf5b02 add .editorconfig 
Signed-off-by: Aviral Dasgupta <me@aviraldg.com>
 2017-02-21 23:38:03 +05:30
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
Will Hunt
37f320c4a4 Don't overflow directory network options 2017-02-21 12:25:29 +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
Matthew Hodgson
629f8caad7 oops, remove unneeded import 2017-02-21 09:50:10 +00:00
Matthew Hodgson
aabf9255d2 anchor the authcache on LoggedInView to prevent it persisting over logouts 2017-02-21 01:03:22 +00:00
Matthew Hodgson
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
Luke Barnard
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
Luke Barnard
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
David Baker
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
Richard van der Hoff
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
Richard van der Hoff
5c87b8045a Merge remote-tracking branch 'origin/master' into develop 2017-02-20 09:14:22 +00:00
Richard van der Hoff
d8c877fe6e Update ISSUE_TEMPLATE.md 2017-02-20 09:14:01 +00:00
Matthew Hodgson
67a7ed1e34 fix spacing of permalinks to info events 2017-02-20 01:49:11 +02:00
Matthew Hodgson
eabe4f5c29 hopefully fix https://github.com/vector-im/riot-web/issues/3270 2017-02-20 01:48:10 +02:00
Matthew Hodgson
8990e770b7 fix colouring in voip dark theme 2017-02-20 01:43:55 +02:00
Matthew Hodgson
f91f5cb65e fix RTE dark theme 2017-02-20 01:27:05 +02:00
Matthew Hodgson
5951e8fb27 don't try to darktheme scalar for now 2017-02-20 01:18:48 +02:00
Matthew Hodgson
be79ccccf6 fix dark theme room join bar 2017-02-20 01:15:54 +02:00
Matthew Hodgson
aba121aab0 fix cursor 2017-02-19 04:13:29 +02:00
Matthew Hodgson
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
Matthew Hodgson
5ac76acc05 limit avatar uploads to images 2017-02-19 02:07:08 +02:00
Matthew Hodgson
c146ddf29b turn on rageshake for desktop 2017-02-18 23:59:45 +02:00
Matthew Hodgson
5469270e41 spell out where the PGP key lives for releases 2017-02-18 23:48:58 +02:00
Matthew Hodgson
457b64037d renormalise ringtone to 66% amplitude 2017-02-18 23:04:38 +02:00
David Baker
e79d38467b Oops, un-hardcode correctly 2017-02-17 19:27:50 +00:00
David Baker
1819ff0939 Un-hardcode home in jenkins.sh 2017-02-17 19:26:21 +00:00
David Baker
a0f572c26e Don't hardcode home dir in jenkins script 2017-02-17 19:18:58 +00:00
David Baker
4f4e9a6c3a Fix block quotes all being on a single line 
Fixes https://github.com/vector-im/riot-web/issues/3154
 2017-02-17 18:06:00 +00:00
David Baker
3fcea0f586 Merge pull request #710 from matrix-org/dbkr/support_kick_ban_reasons 
Support reasons for kick / ban
 2017-02-17 17:39:45 +00:00
David Baker
f51669664c Merge pull request #3250 from vector-im/dbkr/support_kick_ban_reasons 
CSS for ban / kick reason prompt
 2017-02-17 17:39:38 +00:00
David Baker
75f2ba6b19 CSS for ban / kick reason prompt 
For https://github.com/matrix-org/matrix-react-sdk/pull/710
 2017-02-17 17:29:57 +00:00
David Baker
db4b9691cc Support reasons for kick / ban 
Don't ban me for fun, girl
Let me be the one, girl
Ban me for a reason
Let the reason be love.
 2017-02-17 17:27:46 +00:00
David Baker
10534e7df4 Merge pull request #709 from matrix-org/dbkr/show_when_banned 
Show when you've been kicked or banned
 2017-02-17 16:48:59 +00:00
David Baker
e8d5e8c8ab Merge pull request #3246 from vector-im/dbkr/allow_forget_ban 
Allow forgetting rooms you're banned from
 2017-02-17 16:36:19 +00:00
David Baker
b18473ccb2 Handle there being no member event when banned 
Here, and also in MemberEventListSummary where this also broke.
 2017-02-17 16:35:18 +00:00
David Baker
6aa5266029 Merge remote-tracking branch 'origin/develop' into dbkr/allow_forget_ban 2017-02-17 16:19:15 +00:00
David Baker
1f5fdf7945 Get a member object, not the user object 2017-02-17 16:14:51 +00:00