OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,736 Commits
219 Branches
561 Tags
468 MiB
Commit Graph

3736 Commits (4a8173c064e89c3f88ab3b7a8291a83147c061c1)

Author SHA1 Message Date
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
David Baker 9c5fb00da4 Fix syntax 2017-03-01 18:33:45 +00:00
David Baker ef5d2bca91 Get errorText from error in stageUpdated 2017-03-01 16:59:25 +00:00
David Baker c9ef879afa PR feedback: Move the email token request here 2017-03-01 16:04:15 +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
David Baker dd33624454 Merge remote-tracking branch 'origin/develop' into dbkr/register_ui_auth 
(This ended up mostly being merged by hand as git made a complete
mess of the merge)
 2017-03-01 10:45:17 +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
David Baker c22db1db5f Fix race when signup is completed elsewhere 
as commented
 2017-02-27 18:22:26 +00:00
David Baker e5853a6571 Put back server picker for registration 
* Also fix bug where you couldn't picxk a different server if
   you were already registered as a guest (because it still sent
   the access token which the new server rejected)
 * Propagate errors from UI auth back to registration so it goes
   back to the registration screen
 2017-02-27 17:24:28 +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
David Baker 454aa0757a Poll for authentication completion 
on registration (both for email validation and completion of the
whole auth session).
 2017-02-24 17:24:10 +00:00
David Baker 76b381b849 Spurious newline 2017-02-24 12:01:06 +00:00
David Baker 51467506f8 Port registration over to use InteractiveAuth 
These changes are moved over from the dbkr/msisdn_signin branch
 2017-02-24 11:41:23 +00:00
Luke Barnard e1a40a8ef0 Notify MatrixChat of teamToken after login 2017-02-23 16:30:26 +00:00
Luke Barnard 439bde309e General ChatInviteDialog optimisations 
- Use avatar initial instead of "R" or "?"
- Use Fuse.js to do case-insensitive fuzzy search. This allows for better sorting of results as well as search based on weighted keys (so userId has a high weight when the input starts with "@").
- Added debounce of 200ms to prevent analysis on every key stroke. Fuse seems to degrade performance vs. simple, non-fuzzy, unsorted matching, but the debounce should prevent too much computation.
- Move the selection to the top when the query is changed. There's no point in staying mid-way through the items at that point.
 2017-02-23 12:12:25 +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 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