mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-27 05:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
12364 commits 208 branches 547 tags 609 MiB
Commit graph

12364 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
f6d15d652b Prepare changelog for v0.14.8 2019-01-22 11:26:28 +00:00
David Baker
5cdc8486d3 Released js-sdk 2019-01-22 11:14:00 +00:00
David Baker
f18930be32
Merge pull request #2467 from matrix-org/dbkr/fix_direct_chat_button_release 
Fix settings direct chat
 2019-01-21 16:27:57 +00:00
David Baker
4248a20885 Fix settings direct chat 
We were expecting this function to return a string user ID, but it
returned a user object

Make it return a user ID and add jsdoc to say what it returns.

Fixes https://github.com/vector-im/riot-web/issues/8180
 2019-01-21 16:05:24 +00:00
David Baker
fcd234f286 v0.14.8-rc.1 2019-01-17 10:54:53 +00:00
David Baker
df273e0712 Prepare changelog for v0.14.8-rc.1 2019-01-17 10:54:52 +00:00
David Baker
0eac643ac6 js-sdk rc.1 2019-01-17 10:50:07 +00:00
David Baker
8c3cff40b4
Merge pull request #2450 from matrix-org/dbkr/users_may_not_exist 
Change wording of 'invite anyway' setting
 2019-01-16 15:31:14 +00:00
David Baker
55889d5491 Change wording of 'invite anyway' setting 
https://github.com/vector-im/riot-web/issues/7922
 2019-01-16 15:07:30 +00:00
David Baker
82e043638e
Merge pull request #2449 from matrix-org/dbkr/fix_lint_develop 
Minimal lint-fixes to make develop CI build
 2019-01-16 14:01:15 +00:00
David Baker
4da4e0c37a Iminimal lint-fixes to make develop CI build 2019-01-16 13:57:18 +00:00
Travis Ralston
66a6f9d322
Merge pull request #2438 from Half-Shot/hs/trim-back-lines 
Limit line length in the room directory
 2019-01-15 12:01:58 -07:00
Travis Ralston
ee65332eb3
Merge pull request #2443 from matrix-org/travis/fix-settings 
Fix setting label for unknown invites
 2019-01-15 10:24:56 -07:00
Travis Ralston
6f62158f94 Fix setting label for unknown invites 
Fixes https://github.com/vector-im/riot-web/issues/8126
 2019-01-15 09:52:06 -07:00
Travis Ralston
a3240358f1
Merge pull request #2434 from matrix-org/travis/invite-better 
Give a route for retrying invites for users which may not exist
 2019-01-14 07:52:08 -07:00
Will Hunt
cb5ad8d6f9 Limit the length of topics and names in the RoomDirectory 2019-01-13 14:47:08 +00:00
Travis Ralston
a05c0f9214 Rephrase everything to be "invite anyways" rather than "retry" 
Also handle profile errors better
 2019-01-11 15:46:03 -07:00
Travis Ralston
c351ee3d30 Appease the linter 2019-01-10 21:54:07 -07:00
Travis Ralston
5333114d7b Give a route for retrying invites for users which may not exist 
Fixes https://github.com/vector-im/riot-web/issues/7922

This supports the current style of errors (M_NOT_FOUND) as well as the errors presented by MSC1797: https://github.com/matrix-org/matrix-doc/pull/1797
 2019-01-10 21:43:21 -07:00
David Baker
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
Stephen Solka
0bb35944f9 replace expect.createSpy() with jest.fn() 
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
 2019-01-02 16:59:48 -06:00
Stephen Solka
c3185a4cdb breaking changes from expect upgrade 
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
 2019-01-02 16:59:48 -06:00
Stephen Solka
22167f8538 upgrade expect to 23.6.0 
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
 2019-01-02 16:59:48 -06:00
J. Ryan Stinnett
758e867208
Merge pull request #2389 from christopherjmedlin/consistent-flair-ordering 
Consistent flair ordering.
 2019-01-02 16:35:50 -06:00
J. Ryan Stinnett
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
Travis Ralston
a3778dc822
Merge pull request #2387 from matrix-org/travis/fix-build 
Fetch matching e2e-test branch
 2018-12-28 20:01:18 -07:00
J. Ryan Stinnett
135a0884c9
Update scripts/fetchdep.sh 
Co-Authored-By: turt2live <travpc@gmail.com>
 2018-12-28 19:42:13 -07:00
Travis Ralston
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
Christopher Medlin
384320e29f Consistently order flairs based on room configuration. 2018-12-24 14:46:36 -08:00
Richard van der Hoff
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
Travis Ralston
310f634a0d Ensure we install the master branch of the e2e tests as a default 2018-12-21 19:24:07 -07:00
Travis Ralston
df89d973a0 Fetch matching e2e-test branch 2018-12-21 18:48:27 -07:00
Travis Ralston
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
Richard van der Hoff
9c781417ff Merge remote-tracking branch 'origin/develop' into rav/well_known_in_login_response 2018-12-21 16:52:02 +00:00
Richard van der Hoff
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
Travis Ralston
2e1e536d5c
Merge pull request #2347 from matrix-org/travis/custom-status 
Custom status messages
 2018-12-19 11:11:15 -07:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
24f0123ded Convert pass phrase entry to flexbox 
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
 2018-12-19 17:46:37 +00:00
J. Ryan Stinnett
a597ad10b0 Add a few more zxcvbn strings 
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
 2018-12-19 17:46:37 +00:00
J. Ryan Stinnett
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
J. Ryan Stinnett
a22a9492a0 Remove duplicate CSS file for CreateKeyBackupDialog 
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
 2018-12-19 17:46:37 +00:00
Travis Ralston
a1347add95 Merge branch 'develop' into travis/custom-status 2018-12-19 10:33:34 -07:00
Travis Ralston
45f05092ed Add a comment to describe why we're not using the property we should be 2018-12-19 10:21:43 -07:00
David Baker
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
Travis Ralston
04c9fff6ce Add a feature flag for custom status messages 2018-12-18 15:11:08 -07:00
Travis Ralston
d20a934642 Appease the linter 2018-12-18 11:04:16 -07:00
David Baker
3a8b9ab850 unused import 2018-12-18 17:57:23 +00:00
Travis Ralston
ef60a34180 Clean up and follow code style 2018-12-18 10:53:37 -07:00
David Baker
37b3644fd9 React-sdk changes to support sandboxed electron 2018-12-18 17:40:30 +00:00