mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 00:41:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
15429 commits 219 branches 562 tags 474 MiB
Commit graph

292 commits

Author SHA1 Message Date
J. Ryan Stinnett
45cdf880b1 Change setting style 2019-05-17 17:43:08 +01:00
Travis Ralston
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
J. Ryan Stinnett
2054d53782 Tweaked wording after discussing with @lampholder 2019-04-15 15:10:48 +01:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
Travis Ralston
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
J. Ryan Stinnett
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
Travis Ralston
ec01f6ffb1 Change wording for old room link 2019-04-11 10:40:25 -06:00
Travis Ralston
64423e1f7d let -> const 2019-04-10 15:34:06 -06:00
Travis Ralston
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
Travis Ralston
b8ffd0fca2
Merge pull request #2889 from matrix-org/anoa/one_space 
Remove duplicate space in credits
 2019-04-10 12:13:39 -06:00
Travis Ralston
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
David Baker
0f1ebf8095 Factor out this device check & reorder conditionals 2019-04-09 13:47:25 +01:00
David Baker
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
Travis Ralston
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
Andrew Morgan
77515f0b58 Remove duplicate space in credits 2019-04-08 14:40:08 +01:00
J. Ryan Stinnett
db834b315a
Merge pull request #2828 from jryans/notification-labels 
Clarify devices affected by notification settings
 2019-03-26 17:43:19 +00:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
YaoiFangirl420
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
Travis Ralston
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
Travis Ralston
27c9b24cab Appease more of the linter 2019-03-15 16:44:27 -06:00
Travis Ralston
92b851b26c Update text for room version upgrades in settings 2019-03-15 15:49:18 -06:00
Travis Ralston
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
Travis Ralston
8d8445429c Show options for .m.rule.tombstone push rules 
Part of vector-im/riot-web#8447
 2019-03-15 14:13:15 -06:00
Travis Ralston
788041a774 Warn that members won't be invited to the new room in room settings 2019-03-14 17:33:34 -06:00
J. Ryan Stinnett
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
J. Ryan Stinnett
cff3c94858 Fix indentation in PhoneNumbers.js 2019-03-12 15:39:30 +00:00
Travis Ralston
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
Andrew Morgan
71261fc7a7 Add 2500 as default delay 2019-03-07 11:12:16 +00:00
Andrew Morgan
c5198418b0 Use retry_after_ms instead of hardcoded delay 2019-03-06 15:37:06 +00:00
Andrew Morgan
0f14d89257 Ability to bulk accept all invites 2019-03-06 14:06:53 +00:00
J. Ryan Stinnett
13957bb5e7 Move country dropdown inside field in Settings 
This updates the Settings phone input to match the new styling used on auth
flows.

Fixes https://github.com/vector-im/riot-web/issues/9049
 2019-03-06 11:26:05 +00:00
J. Ryan Stinnett
5120ff83be Enable show prefix for phone input in Settings 
This fixes an unrelated bug where the currently selected country's prefix number
wasn't being displayed. Since other country dropdown's show the prefix, and this
is also for phone numbers, it seems good to also show it here as well.
 2019-03-06 11:22:29 +00:00
David Baker
c1056025ed
Merge pull request #2748 from matrix-org/dbkr/shameless_plugging 
Support linking to hosting providers
 2019-03-05 18:22:02 +00:00
David Baker
0244990731 Add utm_campaign to the hosting links 
According to where in the app the link was clicked
 2019-03-05 16:42:22 +00:00
David Baker
b68a71b294 Lint 2019-03-05 16:20:18 +00:00
David Baker
57d8f6d8a2 Support linking to hosting providers 
From link in app config
 2019-03-05 16:12:02 +00:00
Travis Ralston
879fa22416 Merge branch 'develop' into travis/encryption-warning 2019-03-04 23:14:30 -07:00
David Baker
a6a3716576
Merge pull request #2739 from matrix-org/dbkr/devices_toggle_update 
Fix media device selectors not updating
 2019-03-04 14:49:50 +00:00
David Baker
c7b019830d Fix media device selectors not updating 
Missed a setState

Fixes https://github.com/vector-im/riot-web/issues/9036
 2019-03-04 14:35:41 +00:00
Travis Ralston
71630af201 Patch users not existing when opening settings 
Fixes https://github.com/vector-im/riot-web/issues/9022
 2019-03-02 10:59:53 -07:00
Travis Ralston
5a4676ac66
Merge pull request #2725 from matrix-org/travis/settings/pl-dropdowns 
Convert PowerSelector to use mxField instead
 2019-03-01 09:03:16 -07:00
Travis Ralston
f9d6d42781
Merge pull request #2726 from matrix-org/travis/settings/save-feedback 
Don't re-enable the save button after saving profiles
 2019-03-01 09:02:54 -07:00
Travis Ralston
7d207ca2c3 speeling 2019-02-28 20:45:31 -07:00
Travis Ralston
9402e81835 Get confirmation before enabling encryption 
Fixes https://github.com/vector-im/riot-web/issues/8843
 2019-02-28 20:39:07 -07:00
Travis Ralston
12d939b36f Support multiple email pushers and remove the legacy UserSettingsStore 
Fixes https://github.com/vector-im/riot-web/issues/5496
Fixes https://github.com/vector-im/riot-web/issues/8424
 2019-02-28 19:57:45 -07:00
Travis Ralston
b84b11d3bd Don't re-enable the save button after saving profiles 
Fixes https://github.com/vector-im/riot-web/issues/8569
 2019-02-28 19:13:28 -07:00
Travis Ralston
a41df7ab68 Convert PowerSelector to use mxField instead 2019-02-28 19:00:57 -07:00