OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,752 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

3752 Commits (2f08340ff0ee2bf767998fbe6d8e2bfee7187752)

Author SHA1 Message Date
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 b41787c335 Initial work on improving invite dialog 2017-02-23 09:03:20 +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
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
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
Matthew Hodgson 8990e770b7 fix colouring in voip dark theme 2017-02-20 01:43:55 +02:00
Matthew Hodgson 5ac76acc05 limit avatar uploads to images 2017-02-19 02:07:08 +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 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 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 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 1f5fdf7945 Get a member object, not the user object 2017-02-17 16:14:51 +00:00
David Baker a3aea6ba2d Swap rejoin / forget 2017-02-17 16:11:20 +00:00
David Baker 9f9de46b10 Add onForgetClick proptype 2017-02-17 16:09:25 +00:00
Kegsay 5abcb91e0d Merge pull request #708 from matrix-org/kegan/clear-cache 
Add a 'Clear Cache' button
 2017-02-17 15:51:08 +00:00
David Baker de4773ba93 Show when you've been kicked or banned 
Update the room state when you've been kicked or banned, and show
a message in the preview bar, including the reason.
 2017-02-17 15:50:30 +00:00
Kegan Dougal 8d6c3cd3f4 Review comments 2017-02-17 15:37:49 +00:00
Kegan Dougal 0a31efa0b7 Add a 'Clear Cache' button 
This deletes the IndexedDB database and reloads the page.

This solely exists as a get-out clause for users in case the indexedDB instance
gets corrupted. Hopefully we won't ever need to point users to it.
 2017-02-17 15:16:28 +00:00
David Baker 775834b707 Merge pull request #707 from matrix-org/dbkr/update_on_room_name 
Update the room view on room name change
 2017-02-17 15:10:36 +00:00
David Baker a3746ea1b6 Merge remote-tracking branch 'origin/develop' into dbkr/update_on_room_name 2017-02-17 14:41:54 +00:00
Richard van der Hoff 97722af3d6 Merge pull request #698 from matrix-org/dbkr/add_unban_button 
Add a button to un-ban users in RoomSettings
 2017-02-17 12:46:00 +00:00
Kegsay cc11b3eadc Merge pull request #687 from matrix-org/kegan/indexeddb 
Use IndexedDBStore from the JS-SDK
 2017-02-17 11:59:44 +00:00
David Baker b2344ceb74 Update the room view on room name change 2017-02-17 11:44:56 +00:00