ad47144355
Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental
...
Merge develop into experimental
2019-01-03 18:55:56 +00:00
982e037822
Fix merge
2019-01-03 18:05:38 +00:00
7d161de35b
Partial merge of develop to experimental
...
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
2019-01-03 15:02:58 +00: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
00405e7f22
Use Nunito font from the server only
...
There are various versions of Nunito in circulation, and some have errors in
their metrics or smaller supported character sets. To ensure all users get the
expected experience, don't allow local copies of Nunito to be used.
Fixes vector-im/riot-web#7959 .
2018-12-31 12:26:35 -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
097d6fdede
Update room filter focus handling to avoid infinite loop
...
The classes on the search box input were changed without updating the focusing
loop in the room filter which used one of these classes as a boundary condition.
This led to a case that could loop forever.
Regressed by #2267 .
Fixes vector-im/riot-web#7926 .
2018-12-20 23:09:28 +00:00
7affd5fcff
Try fetching more branches for PRs
...
Attempt both the PR author's branch and the PR's target branch. This resolves
issues on experimental where we need riot-web to also be experimental.
2018-12-20 22:58:09 +00:00
418bfbb3dc
Merge pull request #2379 from matrix-org/nadonomy/accent
...
Added colour var to all themes
2018-12-20 17:25:53 +00:00
5723ae6040
Defined $accent-color-alt in all themes
2018-12-20 16:06:02 +00:00
95c739be11
Merge pull request #2378 from matrix-org/nadonomy/colours-and-contrast
...
Colour, contrast & legibility improvements
2018-12-20 14:22:04 +00:00
09bf68b1bd
Improved colours.
2018-12-20 12:46:43 +00:00
42c8d43065
Lint.
2018-12-20 11:35:58 +00:00
9b8f07c19f
Don't override text colour of selected room in room list.
2018-12-20 11:35:43 +00:00
d7473c4f4d
Various colour, contrast and legibility improvements.
2018-12-20 11:35:21 +00:00
6c2d2f60cf
Polished left left panel.
2018-12-20 11:34:20 +00:00
b61aa33e99
Tint input icon.
2018-12-20 11:33:53 +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
ad4991cd8b
Merge pull request #2376 from matrix-org/bwindels/redesignfeedbackdialog
...
Redesign: add feedback dialog & button in tag panel
2018-12-19 12:37:00 +00:00
f7ed1ff046
avoid buttons being deformed in collapsed state
...
unsure what this was doing before,
I suspect the BottomLeftMenu which is gone now.
2018-12-19 12:59:03 +01:00
b3a12867a6
remove extra blank lines
2018-12-19 12:56:08 +01:00
b826b0d998
Add redesign feedback dialog + button in tag panel
2018-12-19 12:27:05 +01:00
8b406eab3b
Merge pull request #2371 from matrix-org/bwindels/rmdot
...
Redesign: add badge with dot to rm button, to see it catches your eye better
2018-12-19 09:49:19 +00: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
c75c482cd0
Merge pull request #2374 from matrix-org/nadonomy/add-icon-fix
...
Fix misaligned (+) icon
2018-12-19 09:34:19 +00:00
e09121556d
Use a more sane SVG.
2018-12-19 09:28:33 +00:00
04c9fff6ce
Add a feature flag for custom status messages
2018-12-18 15:11:08 -07:00
e9ebc05eee
Merge pull request #2373 from matrix-org/nadonomy/gradient-fix
...
Avoid 'transparent black' gradients in left panel
2018-12-18 19:03:35 +00:00
David Baker