59cc36ca65
don't fetch riot/master by default when installing e2e tests
2019-10-09 17:34:40 +02:00
de21cb24e0
Merge remote-tracking branch 'e2etests/bwindels/use-cider' into bwindels/merge-e2e-tests
2019-10-09 17:12:50 +02:00
5b9bfae320
first attempt at running local e2e tests from CI
2019-10-09 17:03:01 +02:00
cad71913e9
only run riot static server if no riot url has been provided
2019-10-09 16:59:00 +02:00
ae38e0b357
Merge remote-tracking branch 'e2etests/bwindels/bigmerge' into bwindels/merge-e2e-tests
2019-10-09 16:55:32 +02:00
ca86969f92
move everything to subfolder to merge into react-sdk
2019-10-09 16:52:48 +02:00
6cb9ef7e65
remove editorconfig
2019-10-09 16:51:35 +02:00
4635b1319a
Merge pull request #3533 from matrix-org/jryans/null-client-soft-crash
...
Unmount React components before stopping the client
2019-10-08 23:23:40 +01:00
e81df88ec2
Merge pull request #3532 from matrix-org/jryans/join-soft-crash
...
Fix soft crash on room join
2019-10-08 23:22:57 +01:00
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
8c8b1430e4
fix spelling
2019-10-08 18:39:35 +02:00
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
2880ade45c
Unmount React components before stopping the client
...
This fixes an entire class of React soft crashes that can happen when you:
1. Log out, causing the client peg to become `null`
2. Some async process (event handler, timeout, request, etc.) tries to use the
client in a component before it unmounts, triggering a soft crash
3. Several moments later, the app actually unmounts
With this change, we change the app's view and unmount components first and then
after that we stop the client.
Fixes https://github.com/vector-im/riot-web/issues/11078
2019-10-08 17:10:19 +01:00
1dc2ae007f
Fix soft crash on room join
...
This fixes a soft crash that can happen on room join if you keep the right panel
open (which is the default). The `MainSplit` component was not properly testing
for the edge cases of when the resize container would be mounted.
Fixes https://github.com/vector-im/riot-web/issues/10997
2019-10-08 15:43:57 +01:00
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
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
5bcb4b0fb6
Merge pull request #3530 from matrix-org/bwindels/watchemoticonsetting
...
Fix: watch emoticon autoreplace setting
2019-10-08 12:53:54 +00:00
91d593cb71
watch emoticon autoreplace setting
2019-10-08 14:40:10 +02:00
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
cbeb45abd3
update i18n
2019-10-08 08:56:34 +02:00
1ab19be46c
also show dialog here
...
unsure why this code seems duplicated?
2019-10-08 08:54:23 +02:00
978866ea96
dont assume id server when verifying phone numbers either
2019-10-08 08:54:23 +02:00
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
48b8044937
don't try to get id server domain when not asked to bind
2019-10-08 08:52:35 +02:00
6bb303c381
add singular translation string
2019-10-08 08:46:13 +02:00
80ec77a144
dont rely on timeline linkage to find events to redact
2019-10-08 08:46:13 +02:00
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
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
9200c55ce0
Merge pull request #3526 from matrix-org/travis/recaptcha-fix
...
Null-guard the recaptcha setup
2019-10-07 13:05:52 +01:00
495513028c
Appease the linter
2019-10-07 12:46:14 +01:00
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
afaaa6774e
Update i18n
2019-10-07 12:43:30 +01:00
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
082ebe636e
Null-guard the recaptcha setup
...
Fixes https://github.com/vector-im/riot-web/issues/11069
2019-10-07 12:36:20 +01:00
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
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
8eb07197cc
Rename UPPER_CAMEL_CASE to UPPER_SNAKE_CASE in Coding Style
2019-10-06 13:08:46 +02:00
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
40969c60a9
Revert "Run yarn upgrade"
2019-10-04 16:28:13 +01:00
07bf5e6f56
Merge pull request #3521 from matrix-org/dbkr/yarn_upgrade_20191004
...
Run yarn upgrade
2019-10-04 15:08:14 +01:00
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
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
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
eda8434444
run yarn upgrade
2019-10-04 11:09:46 +01:00
dc9018dc11
js-sdk develop
2019-10-04 11:07:22 +01:00
fba646d2c5
Merge pull request #3519 from matrix-org/travis/enable-cider
...
Enable CIDER composer by default
2019-10-04 10:50:28 +01:00
227c9d0e8c
Merge branch 'master' into develop
2019-10-04 10:38:41 +01:00
1a2add1f08
v1.6.2
2019-10-04 10:37:46 +01:00
e7d0ae1b43
Prepare changelog for v1.6.2
2019-10-04 10:37:45 +01:00
5b71cf5d8d
use correct css class for cider composer
2019-10-04 11:33:45 +02:00
Bruno Windels