6447a60e1f
Revert "Merge pull request #2336 from matrix-org/travis/notif-button"
...
This reverts commit 96300b45b7
2019-01-03 15:44:07 -07:00
c11d0bdf0c
Merge pull request #2394 from jryans/key-backup-unverified-creator
...
Show in-room reminder when key backup creating device unverified
2019-01-03 10:27:35 +00:00
0bb35944f9
replace expect.createSpy() with jest.fn()
...
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
2019-01-02 16:59:48 -06:00
c3185a4cdb
breaking changes from expect upgrade
...
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
2019-01-02 16:59:48 -06:00
22167f8538
upgrade expect to 23.6.0
...
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
2019-01-02 16:59:48 -06:00
758e867208
Merge pull request #2389 from christopherjmedlin/consistent-flair-ordering
...
Consistent flair ordering.
2019-01-02 16:35:50 -06:00
402f58225f
Show in-room reminder when key backup creating device unverified
...
If the current device hasn't verified the device that created the account's
current key backup version, then the current device is won't use the key backup.
This change adjusts an existing in-room reminder to do the right thing for this
case by allowing the user to verify the device that created the key backup.
Fixes vector-im/riot-web#7902 .
2019-01-02 15:36:40 -06:00
a3778dc822
Merge pull request #2387 from matrix-org/travis/fix-build
...
Fetch matching e2e-test branch
2018-12-28 20:01:18 -07:00
135a0884c9
Update scripts/fetchdep.sh
...
Co-Authored-By: turt2live <travpc@gmail.com>
2018-12-28 19:42:13 -07:00
1b8a8e9552
Merge pull request #2385 from matrix-org/travis/7838-logging
...
Add some logging for riot-web#7838
2018-12-28 19:16:07 -07:00
384320e29f
Consistently order flairs based on room configuration.
2018-12-24 14:46:36 -08:00
3dab1b817c
Merge pull request #2384 from matrix-org/rav/well_known_in_login_response
...
Handle well-known data in the login response
2018-12-24 10:43:01 +01:00
310f634a0d
Ensure we install the master branch of the e2e tests as a default
2018-12-21 19:24:07 -07:00
df89d973a0
Fetch matching e2e-test branch
2018-12-21 18:48:27 -07:00
f5ff580e35
Add some logging for riot-web#7838
...
See https://github.com/vector-im/riot-web/issues/7838
2018-12-21 14:51:05 -07:00
9c781417ff
Merge remote-tracking branch 'origin/develop' into rav/well_known_in_login_response
2018-12-21 16:52:02 +00:00
991104d156
Handle well-known data in the login response
...
... as per [MSC1730](https://github.com/matrix-org/matrix-doc/pull/1730 ).
2018-12-21 09:51:03 +00:00
2e1e536d5c
Merge pull request #2347 from matrix-org/travis/custom-status
...
Custom status messages
2018-12-19 11:11:15 -07:00
fd94dc686f
Handle errors when fetching commits for changelog
...
It's possible to get errors when fetching commits (for example, if the rate
limit is exceeded), so this will handle the error case and display it instead of
an infinite spinner.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 18:10:21 +00:00
37256d2976
Use primary styling on download / clipboard key actions
...
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
24f0123ded
Convert pass phrase entry to flexbox
...
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
a597ad10b0
Add a few more zxcvbn strings
...
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
9c4ff4048a
Convert show recovery key to flexbox
...
This allows the buttons to fit on a single line and flows a bit better at low
widths.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
a22a9492a0
Remove duplicate CSS file for CreateKeyBackupDialog
...
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
a1347add95
Merge branch 'develop' into travis/custom-status
2018-12-19 10:33:34 -07:00
45f05092ed
Add a comment to describe why we're not using the property we should be
2018-12-19 10:21:43 -07:00
1ca91370f3
Merge pull request #2372 from matrix-org/dbkr/electron_sandbox
...
React-sdk changes to support sandboxed electron
2018-12-19 09:48:05 +00:00
04c9fff6ce
Add a feature flag for custom status messages
2018-12-18 15:11:08 -07:00
d20a934642
Appease the linter
2018-12-18 11:04:16 -07:00
3a8b9ab850
unused import
2018-12-18 17:57:23 +00:00
ef60a34180
Clean up and follow code style
2018-12-18 10:53:37 -07:00
37b3644fd9
React-sdk changes to support sandboxed electron
2018-12-18 17:40:30 +00:00
b036e59021
Enable ESLint rule to require defined components in JSX
...
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-18 17:01:37 +00:00
66f5d0612c
Merge pull request #2363 from matrix-org/travis/fix-group-view
...
Make sure to grab the InlineSpinner object
2018-12-18 07:57:46 -07:00
acc2e98355
Add New Recovery Method dialog
...
Adds a New Recovery Method dialog which is shown when key backup fails because
of a version mismatch / version not found error.
The set up button in the dialog currently only marks a device as verified (via a
verification prompt) instead of the eventual restore and cross-sign flow, since
those pieces don't exist yet.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-18 10:20:12 +00:00
2b14f2af5c
Clean up when new key backup version fails to backup
...
If creating a new key backup version succeeds but backing up to it fails, delete
the version to avoid surprises. In addition, this converts the creation of a new
key backup to async / await style.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-18 10:20:12 +00:00
c6da61f1de
Make sure to grab the InlineSpinner object
2018-12-17 18:47:33 -07:00
1c4621c98e
Link to CONTRIBUTING from JS SDK
...
The JS SDK's CONTRIBUTING file is a bit simpler to read. The Synapse version previously used includes mentions of Python lint tools that don't apply here.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-18 01:24:33 +00:00
d304c35b38
Allow widgets to autoplay media
...
This is useful for e.g. webcam streams in widgets.
Signed-off-by: Willem Mulder <willemmaster@hotmail.com>
2018-12-18 00:43:37 +00:00
7b0766a303
Apply 50% opacity to the checkmark when there is no status
2018-12-14 13:49:35 -07:00
7efd82f713
Disable password managers on the status form
2018-12-14 13:44:40 -07:00
7ed9559ad7
Merge pull request #2351 from matrix-org/travis/fix-username-requirements
...
Standardize errors about localpart structure
2018-12-13 22:09:49 -07:00
576bfedfb5
Remove global flag
...
Regular expression objects are stateful, and the global flag interferes badly with the expression. A valid call can cause it to act like a flip flop instead of a stateless test.
2018-12-13 22:00:06 -07:00
8592e76e12
Standardize errors about localpart structure
...
Fixes https://github.com/vector-im/riot-web/issues/5833
This also includes changing some Jira references that aren't searchable anymore, and a thing to replace the spinner on the SetMxidDialog as per https://github.com/vector-im/riot-web/issues/5833#issuecomment-445323177
2018-12-13 16:45:30 -07:00
bae9996c64
Merge pull request #2352 from matrix-org/travis/fix-notification-bell
...
Fix translation error on notification icon
2018-12-13 16:36:18 -07:00
49769a405d
Fix translation error on notification icon
...
Introduced by https://github.com/matrix-org/matrix-react-sdk/pull/2336
2018-12-13 16:12:56 -07:00
366f343432
Merge pull request #2327 from matrix-org/travis/well-known-improvements
...
Introduce a default_server_name for aesthetics and rework .well-known
2018-12-13 14:55:04 -07:00
5f434cd31c
Don't break the UI when something goes wrong
2018-12-13 14:45:08 -07:00
63658e0441
Add a missing null check
2018-12-13 14:29:12 -07:00
c6f35428d7
Update checkmark icon
2018-12-13 09:37:54 -07:00
Travis Ralston