Travis Ralston
7f6ce69c3e
Merge branch 'experimental' into travis/develop2
2019-01-17 16:03:45 -07: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
Travis Ralston
731e05cc5d
Merge pull request #2444 from matrix-org/develop
...
Develop->Experimental
2019-01-15 10:39:34 -07:00
J. Ryan Stinnett
e08c70b820
Prune unsupported setting RoomSubList.showEmpty
...
The code reading this setting was previously removed in #2229 .
2019-01-15 10:54:29 -06: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
177d9f245a
Merge pull request #2441 from matrix-org/develop
...
Merge develop -> experimental
2019-01-14 14:45:20 -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
f269b5fbbc
Fix spaceless async in ignored files too
2019-01-09 19:14:30 +00:00
Travis Ralston
8017f0a4a1
Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real
2019-01-03 16:00:23 -07:00
David Baker
f928be6f59
Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental"
...
This reverts commit ad47144355
.
2019-01-03 15:37:03 -07:00
David Baker
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
David Baker
37b3644fd9
React-sdk changes to support sandboxed electron
2018-12-18 17:40:30 +00:00
Bruno Windels
48cfd08ea6
move logout dialog to own component so we can reuse it
2018-12-11 12:42:52 +01:00
J. Ryan Stinnett
a92d2902c4
Add an in-room reminder to set up key recovery
...
This adds an in-room reminder above the message timeline to set up Secure
Message Recovery so that your keys will be backed up. If you try to ignore it,
an additional dialog is shown to confirm.
Fixes vector-im/riot-web#7783 .
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-07 14:13:02 -06:00
Bruno Windels
67e0030ccd
Merge branch 'develop' into experimental
2018-11-26 13:10:29 +01:00
David Baker
d714176fcd
Merge pull request #2169 from matrix-org/dbkr/e2e_backups
...
Online incremental megolm backups (v2)
2018-11-21 18:37:43 +00:00
David Baker
985966f8be
Update async dialog interface to use promises
...
Hopefully makes the syntax a bit nicer. Also uses ES6 async import
rather than require.ensure which is now deprecated. Also also
displays an error if the component fails to load rather than falling
over in a heap, which is nice.
2018-11-21 16:56:44 +00:00
David Baker
8ccaf53d20
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-11-20 18:08:39 +00:00
Bruno Windels
c19b593f5c
Merge branch 'develop' into experimental
2018-11-06 15:28:20 +01:00
Travis Ralston
57b99893e5
Merge pull request #1936 from turt2live/travis/pinned-room-list
...
Add options to pin unread/mentioned rooms to the top of the room list
2018-11-01 08:04:12 -06:00
Bruno Windels
ba83166661
Merge branch 'develop' into experimental
2018-10-31 14:54:22 +01:00
David Baker
8ac62f8c12
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-29 16:20:45 +00:00
Aaron Raimist
49ce4ef117
eslint --fix src/
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 22:50:38 -05:00
Travis Ralston
ef8c9246aa
Maybe fix UserSettings?
2018-10-26 10:07:21 -06:00
Bruno Windels
2c039483c6
Merge branch 'develop' into experimental
2018-10-26 15:33:39 +02:00
Travis Ralston
9cdb527163
Merge branch 'develop' into travis/pinned-room-list
2018-10-25 10:57:08 -06:00
David Baker
b59b8b7fca
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-25 17:42:46 +01:00
Will Hunt
def0b2d8fb
Add developertools option to UserSettings
2018-10-24 18:20:16 +01:00
Bruno Windels
6878ce3c6a
Merge branch 'develop' into bwindels/redesign
2018-10-16 11:57:44 +02:00
Travis Ralston
103ed71eb5
Merge branch 'develop' into travis/pinned-room-list
2018-10-12 14:09:52 -06:00
Peter Vágner
2b394c1869
Address review comments and fix lint errors
2018-10-02 20:32:54 +02:00
David Baker
fa30707eae
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-02 16:59:15 +01:00
Peter Vágner
ded35e43a0
A11y: repurpose more divs into AccessibleButtons.
...
With this more of the
controls that look like buttons can be operated via the keyboard and
navigated to by screen reader users. This includes editor buttons such
as File upload, Audio / Video call, Right pannel hide button, Jump to
the bottom timeline button, and some more buttons found in the user
settings.
Also I have added alt texts to some images that in turn label buttons
which these happen to be packed in and removed some untranslated alt
texts from decorative non-actionable images that might add more
verbosity when talking about screen reader user experience.
2018-10-02 13:55:24 +02:00
Matthew Hodgson
bccfb5dafc
better englishing
2018-10-01 13:27:32 +01:00
Bruno Windels
91ec96c8d3
Merge branch 'develop' into bwindels/redesign
2018-09-21 12:44:44 +02:00
David Baker
292b1f09af
WIP e2e key backups
...
Continues from Matthew's work: adds a feature flag & panel in
user settings to create a backup.
Can't restore a backup yet, nor even continue backing up to the same
backup after a refresh.
2018-09-13 17:11:46 +01:00
David Baker
c03abddd1c
s/terms and conditions/legal/
2018-08-24 11:38:38 +01:00
David Baker
18ed6eb63c
Rener terms & conditions in settings
...
If configured in config file
2018-08-24 11:35:21 +01:00
Bruno Windels
7dc92fe917
Avoid clearing e2e encryption keys, also avoid warning
2018-08-13 17:24:27 +02:00
Bruno Windels
84b74247e6
check if server supports lazy loading before enabling
2018-08-13 16:19:44 +02:00
Bruno Windels
28292c3388
implement PR feedback, move LL dialog to UserSettings
2018-08-13 11:14:30 +02:00
Bruno Windels
308a6b419e
allow a setting controller to validate and revert a change (asynchronously)
2018-08-09 16:56:02 +02:00
Matthew Hodgson
9783b6100d
Merge branch 'develop' into matthew/dharma
2018-07-29 17:03:23 +01:00
Michael Telatynski
37a8e7f2e2
add setting to throw new RoomSubList hide behaviour behind an opt-in
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-30 17:07:28 +01:00
Michael Telatynski
015d433235
fix a way to get stuck in set password/email flow
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-18 18:14:48 +01:00
David Baker
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group
...
Share Dialog
2018-06-15 10:52:27 +01:00
Michael Telatynski
2454540bc0
Merge branch 'develop' into t3chguy/audio_output
2018-06-14 11:03:59 +01:00
Michael Telatynski
d4578783ef
apply pr review feedback
...
fix copyright headers
fix user settings link accessibility
fix typo and add noopener
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 18:46:02 +01:00
Michael Telatynski
7f1ce52dd3
link to ShareDialog from GroupView, RoomView, UserSettings & MemberInfo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:01 +01:00
Michael Telatynski
05357b9f8c
improve comment
2018-05-29 12:07:56 +01:00