8f6e8c1ec7
Appease the linter
2019-06-17 15:51:14 -06:00
a5f296457f
Make the Manage Integrations Button defer scalar auth to the manager
...
This moves the responsibility of creating a URL to open from the button (and other components) to the integrations manager dialog itself.
By doing this, we also cut down on scalar API calls because we don't pick up on account information until the user opens the dialog.
2019-06-17 15:29:28 -06:00
7c80355ea7
Convert IntegrationsManager to a class
2019-06-17 15:26:58 -06:00
20b57b855b
Add license info for Twemoji
...
Fixes https://github.com/vector-im/riot-web/issues/9930
2019-06-06 14:20:13 +01:00
635b1ff612
Merge pull request #2928 from Half-Shot/hs/custom-notif-sounds
...
Custom notification sounds for rooms
2019-06-03 14:31:38 -06:00
300095f50f
Remove labs flag for custom notif sounds
2019-06-03 17:35:15 +01:00
7f0282a2e8
Convert breadcrumbs from labs to real setting
...
Fixes https://github.com/vector-im/riot-web/issues/9391
2019-06-03 00:15:33 -06:00
9369e964fa
Merge remote-tracking branch 'upstream/develop' into hs/custom-notif-sounds
2019-05-31 10:44:30 +01:00
0d47222132
Add LB setting to new user settings
...
Put under labs out of concern for https://github.com/vector-im/riot-meta/issues/66
2019-05-30 19:57:17 -06:00
d0deffac3d
Move checkmark to the front of key backup message
2019-05-22 15:19:42 +01:00
d3f06763b3
Merge branch 'develop' into matthew/twemoji
2019-05-20 16:38:44 +01:00
dc72641264
replace emojione with twemoji. completely untested & debugged & unoptimised
2019-05-19 15:23:43 +01:00
45cdf880b1
Change setting style
2019-05-17 17:43:08 +01:00
d752de0972
Improve UX
2019-05-15 15:52:42 +01:00
626cb46915
Cleanup interface buttons
2019-05-14 21:05:22 +01:00
64a384477e
Resolve issues
2019-05-12 17:14:21 +01:00
efc93abb50
Merge branch 'develop' into hs/custom-notif-sounds
2019-05-07 20:04:29 +01:00
a7a50351d1
Merge pull request #2798 from matrix-org/travis/tombstone-notif
...
Support changing options for .m.rule.tombstone push rule
2019-05-02 09:47:41 -06:00
0f2cd6ea73
Stick behind a feature flag
2019-04-21 18:01:26 +01:00
776210c135
Use settings store
2019-04-19 22:31:51 +01:00
d33df45c5e
Linting
2019-04-19 22:06:56 +01:00
63ab7736ca
Add a fancy room tab and uploader
2019-04-19 16:27:30 +01:00
2054d53782
Tweaked wording after discussing with @lampholder
2019-04-15 15:10:48 +01:00
bded275f6a
Clarify messaging when key backup exists but is unused
...
This makes the key backup panel much more explicit about the case where an
existing backup does exist, but this device just isn't using it. You can join
the device to the backup and restore from it by going through the restore
workflow.
Fixes https://github.com/vector-im/riot-web/issues/9446
2019-04-15 15:10:48 +01:00
9a59b0d390
Clarify that use backup means restore
...
"Use key backup" feels like it's telling me I haven't set it up at all. This
changes to "Restore ..." which seems more reassuring.
Fixes https://github.com/vector-im/riot-web/issues/9438
2019-04-15 15:10:48 +01:00
c0cf6a35c6
Merge pull request #2919 from jryans/key-backup-this-device
...
Fix key backup status when missing device
2019-04-15 12:44:08 +01:00
e8d141fc3c
Merge pull request #2908 from matrix-org/travis/upgrades/linkback
...
Add a link in room settings to get at the tombstoned room if it exists
2019-04-12 10:21:39 -06:00
5ee9de04c3
Fix key backup status when missing device
...
We might not have the device in `sig.device`, so we have to check for it's
existence first. This fixes the "Unable to load key backup status" message that
is incorrectly triggering.
Fixes https://github.com/vector-im/riot-web/issues/9442
2019-04-12 16:23:54 +01:00
ec01f6ffb1
Change wording for old room link
2019-04-11 10:40:25 -06:00
64423e1f7d
let -> const
2019-04-10 15:34:06 -06:00
15e8ce7a7f
Add a link in room settings to get at the tombstoned room if it exists
...
Fixes https://github.com/vector-im/riot-web/issues/8542
2019-04-10 15:00:02 -06:00
b8ffd0fca2
Merge pull request #2889 from matrix-org/anoa/one_space
...
Remove duplicate space in credits
2019-04-10 12:13:39 -06:00
35a20143ba
Merge pull request #2897 from matrix-org/travis/upgrades/touchups
...
Fix room upgrade warnings popping up in upgraded rooms
2019-04-09 09:06:17 -06:00
0f1ebf8095
Factor out this device check & reorder conditionals
2019-04-09 13:47:25 +01:00
7c1943ef4e
Key backup: Handle case where your onw sig is invalid
...
Sometimes life is just like that
2019-04-09 13:22:35 +01:00
4beecb50c9
Fix room upgrade warnings popping up in upgraded rooms
...
Rooms which are already upgraded shouldn't be asked to upgrade. Additionally, this fixes a bug where the room upgrade dialog would stay open even after upgrading the room.
2019-04-08 15:39:36 -06:00
77515f0b58
Remove duplicate space in credits
2019-04-08 14:40:08 +01:00
db834b315a
Merge pull request #2828 from jryans/notification-labels
...
Clarify devices affected by notification settings
2019-03-26 17:43:19 +00:00
f8dce875f2
Clarify devices affected by notification settings
...
This clarifies that the notification settings only apply to the current device.
This also tries to apply the spirit of
https://github.com/matrix-org/matrix-react-sdk/pull/1995 (authored by @aidalgol)
which wanted to remove "web" from the label, since there's also a desktop
client.
2019-03-26 17:39:07 +00:00
dbc4735b06
Merge pull request #2825 from YaoiFangirl420/develop
...
Add <code> blocks around homeserver and identity server urls
2019-03-26 09:35:56 +00:00
f2b64a8e7f
Add <code> blocks around homeserver and identity server urls
...
To make the urls visually distinct from the surrounding non-url text
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com >
2019-03-24 02:05:04 -07:00
50614fa7fb
Attach an onChange listener to the room's blacklist devices option
...
Fixes https://github.com/vector-im/riot-web/issues/9235
The global option in user settings is unaffected by this bug. Users who have previously set the per-room flag without success can simply refresh the page and the change will be picked up. The bug here is that the current session would not update accordingly, however.
Introduced in https://github.com/matrix-org/matrix-react-sdk/pull/2523
2019-03-22 14:22:20 -06:00
27c9b24cab
Appease more of the linter
2019-03-15 16:44:27 -06:00
92b851b26c
Update text for room version upgrades in settings
2019-03-15 15:49:18 -06:00
e5059fdf0f
Don't show Matrix-namespaced push rules which the server doesn't declare
...
So that users can't change push rules they don't have. Similar to the behaviour in https://github.com/matrix-org/matrix-js-sdk/pull/860
2019-03-15 14:14:00 -06:00
8d8445429c
Show options for .m.rule.tombstone push rules
...
Part of vector-im/riot-web#8447
2019-03-15 14:13:15 -06:00
788041a774
Warn that members won't be invited to the new room in room settings
2019-03-14 17:33:34 -06:00
d4dbba3938
Convert uncontrolled Field usages to controlled
...
As part of adding validation to Field, the logic is simpler to follow if we can
assume that all usages of Field use it as a controlled component, instead of
supporting both controlled and uncontrolled.
This converts the uncontrolled usages to controlled.
2019-03-12 16:17:21 +00:00
cff3c94858
Fix indentation in PhoneNumbers.js
2019-03-12 15:39:30 +00:00
e1f9482107
Merge pull request #2757 from matrix-org/anoa/accept_all_invites
...
Ability to bulk accept all invites (and fix rejecting all invites)
2019-03-08 14:55:59 -07:00
Travis Ralston