Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 14:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,454 Commits 206 Branches 552 Tags 519 MiB
1c207f3b55
Commit Graph

18454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
1c207f3b55 Revert 2040587826 2019-10-09 11:28:16 +01:00
David Baker
2040587826 Return promises 2019-10-09 10:47:34 +01:00
David Baker
a653fea020 Removed unused lines 
Moved these around to avpid NPEs but they went away and I didn't
notice when merging.
 2019-10-09 10:33:29 +01:00
David Baker
4a56aa16b8 Merge remote-tracking branch 'origin/develop' into dbkr/add_threepid_ui_auth 2019-10-08 19:11:00 +01:00
David Baker
f4a2d216c3 Support UI auth on adding phone numbers 2019-10-08 19:07:39 +01:00
David Baker
0b334c0bbc Support UI Auth on adding email address 2019-10-08 18:56:13 +01:00
Bruno Windels
051fd0fd92
Merge pull request #3528 from matrix-org/bwindels/addemailerror 
Fix:  Unable to verify email address error
 2019-10-08 16:49:51 +00:00
Bruno Windels
8c8b1430e4 fix spelling 2019-10-08 18:39:35 +02:00
Bruno Windels
14bbaae585
Merge pull request #3509 from matrix-org/bwindels/createroomenter 
Fix: submit create room dialog when pressing enter
 2019-10-08 16:36:05 +00:00
J. Ryan Stinnett
f384d4e5c1
Merge pull request #3531 from matrix-org/jryans/cyclic-rageshake 
Allow cyclic objects in console logs
 2019-10-08 14:41:00 +01:00
J. Ryan Stinnett
538c3795d8 Allow cyclic objects in console logs 
This fixes a bug in rageshake handling that would throw an error if you log a
cyclic object, which can be convenient during development.
 2019-10-08 14:29:03 +01:00
Bruno Windels
5bcb4b0fb6
Merge pull request #3530 from matrix-org/bwindels/watchemoticonsetting 
Fix: watch emoticon autoreplace setting
 2019-10-08 12:53:54 +00:00
Bruno Windels
91d593cb71 watch emoticon autoreplace setting 2019-10-08 14:40:10 +02:00
Bruno Windels
15e7559d5b
Merge pull request #3508 from matrix-org/bwindels/redact-all-more-robust 
Make "remove recent messages" more robust
 2019-10-08 06:58:21 +00:00
Bruno Windels
cbeb45abd3 update i18n 2019-10-08 08:56:34 +02:00
Bruno Windels
1ab19be46c also show dialog here 
unsure why this code seems duplicated?
 2019-10-08 08:54:23 +02:00
Bruno Windels
978866ea96 dont assume id server when verifying phone numbers either 2019-10-08 08:54:23 +02:00
Bruno Windels
040bc5e157 show dialog when server says e-mail hasn't been verified yet 
as it's confusing to have nothing happen at all when clicking
continue straight away.
 2019-10-08 08:54:21 +02:00
Bruno Windels
48b8044937 don't try to get id server domain when not asked to bind 2019-10-08 08:52:35 +02:00
Bruno Windels
6bb303c381 add singular translation string 2019-10-08 08:46:13 +02:00
Bruno Windels
80ec77a144 dont rely on timeline linkage to find events to redact 2019-10-08 08:46:13 +02:00
David Baker
c97d1d5b05
Merge pull request #3527 from matrix-org/dbkr/label_submit_button 
Label submit button in UI auth password prompt
 2019-10-07 17:48:51 +01:00
David Baker
1dec534493 Label submit button in UI auth password prompt 
Fixes https://github.com/vector-im/riot-web/issues/10739
 2019-10-07 13:13:30 +01:00
Travis Ralston
9200c55ce0
Merge pull request #3526 from matrix-org/travis/recaptcha-fix 
Null-guard the recaptcha setup
 2019-10-07 13:05:52 +01:00
Travis Ralston
495513028c Appease the linter 2019-10-07 12:46:14 +01:00
Travis Ralston
c547367b62
Merge pull request #3513 from matrix-org/travis/mask-eye 
Use a mask instead of an img for "Show image" eye
 2019-10-07 12:45:22 +01:00
Travis Ralston
afaaa6774e Update i18n 2019-10-07 12:43:30 +01:00
Travis Ralston
e841bd5442
Update src/components/views/auth/InteractiveAuthEntryComponents.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-07 12:43:07 +01:00
Travis Ralston
082ebe636e Null-guard the recaptcha setup 
Fixes https://github.com/vector-im/riot-web/issues/11069
 2019-10-07 12:36:20 +01:00
David Baker
7d96517139
Merge pull request #3523 from matrix-org/dbkr/rageshake_limit_once 
Only limit the rageshake log size in one place
 2019-10-07 12:06:30 +01:00
Travis Ralston
b091cf1f6d
Merge pull request #3525 from MichaelKohler/fix-constant-name 
Rename UPPER_CAMEL_CASE to UPPER_SNAKE_CASE in Coding Style
 2019-10-06 09:44:16 -06:00
Michael Kohler
8eb07197cc Rename UPPER_CAMEL_CASE to UPPER_SNAKE_CASE in Coding Style 2019-10-06 13:08:46 +02:00
David Baker
1e8a338e66
Merge pull request #3524 from matrix-org/revert-3521-dbkr/yarn_upgrade_20191004 
Revert "Run yarn upgrade"
 2019-10-04 16:28:41 +01:00
David Baker
40969c60a9
Revert "Run yarn upgrade" 2019-10-04 16:28:13 +01:00
David Baker
07bf5e6f56
Merge pull request #3521 from matrix-org/dbkr/yarn_upgrade_20191004 
Run yarn upgrade
 2019-10-04 15:08:14 +01:00
David Baker
a15c8fd476 Only limit the rageshake log size in one place 
We had two different places in the code that were both trying to
limit to the MAX_LOG_SIZE and doing different things with it.
fetchLogs was keeping each individual file to MAX_LOG_SIZE but then
the outer loop was also discarding the whole file if it would make
the total exceed MAX_LOG_SIZE. This meant that if you ran your client
for a while then refreshed and sent a rageshake, the logic would
omit everything from before the refresh but make sure it included the
tiny amount of useless logging from after the refresh.

This will truncate large files if they would take the whole thing
over the size limit and still include part of them.
 2019-10-04 14:56:46 +01:00
Michael Telatynski
b1b4139163
Merge pull request #3522 from matrix-org/t3chguy/backspace_cider_focus 
Limit Backspace-consuming workaround to just Slate, tidy Keyboard :)
 2019-10-04 11:57:06 +01:00
Michael Telatynski
1ec0bb284a Limit Backspace-consuming workaround to just Slate, tidy Keyboard :) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-04 11:47:33 +01:00
David Baker
eda8434444 run yarn upgrade 2019-10-04 11:09:46 +01:00
David Baker
dc9018dc11 js-sdk develop 2019-10-04 11:07:22 +01:00
Michael Telatynski
fba646d2c5
Merge pull request #3519 from matrix-org/travis/enable-cider 
Enable CIDER composer by default
 2019-10-04 10:50:28 +01:00
RiotRobot
227c9d0e8c Merge branch 'master' into develop 2019-10-04 10:38:41 +01:00
RiotRobot
1a2add1f08 v1.6.2 2019-10-04 10:37:46 +01:00
RiotRobot
e7d0ae1b43 Prepare changelog for v1.6.2 2019-10-04 10:37:45 +01:00
David Baker
ddfcd6cd4e
Merge pull request #3520 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-10-04 10:24:41 +01:00
Weblate
374212f2a2 Merge branch 'origin/develop' into Weblate. 2019-10-04 09:20:38 +00:00
송태섭
9351389049 Translated using Weblate (Korean) 
Currently translated at 100.0% (1823 of 1823 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-10-04 09:20:38 +00:00
Michael Telatynski
06c612ba3d
Merge pull request #3516 from matrix-org/t3chguy/clean_out_useless_errors 
Cull some easily fixable errors which make the console a mess
 2019-10-04 10:20:34 +01:00
David Baker
a79dce1623 Merge remote-tracking branch 'origin/develop' into release-v1.6.2 2019-10-04 10:17:13 +01:00
Michael Telatynski
e200193b0a DRY and fix useCiderComposer being in both labs and preferences 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-04 10:15:00 +01:00