Michael Telatynski
fd2acb18f3
Merge branches 'develop' and 't3chguy/roomnick' of github.com:matrix-org/matrix-react-sdk into t3chguy/roomnick
2019-02-25 22:24:45 +00:00
Travis Ralston
24099de2a4
Merge branch 'develop' into travis/settings-cleanup-1
2019-02-25 10:56:43 -07:00
Travis Ralston
e0a5eeca75
Merge pull request #2686 from matrix-org/travis/old-room-sorting
...
Support the old room sorting algorithm and SettingsStore watchers
2019-02-25 10:51:10 -07:00
Travis Ralston
4801b25f77
Merge remote-tracking branch 'origin/develop' into travis/settings-cleanup-1
2019-02-25 09:40:50 -07:00
Travis Ralston
c261879ba7
Merge pull request #2690 from matrix-org/t3chguy/share_permalink
...
Change Share Message to Share Permalink if !m.room.message||redacted
2019-02-24 17:37:25 -07:00
Michael Telatynski
f2624beca4
Change Share Message to Share Permalink if !m.room.message||redacted
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-24 02:03:20 +00:00
Michael Telatynski
f16b9d76f4
add roomnick SlashCommand
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-24 01:36:47 +00:00
Michael Telatynski
b02b371250
Allow configuration of whether closing window closes or minimizes to tray
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-24 01:06:53 +00:00
Travis Ralston
b0cc69bca9
Add an option to sort the room list by recents first
...
Fixes https://github.com/vector-im/riot-web/issues/8892
2019-02-22 17:09:07 -07:00
Travis Ralston
bd54a401bc
Sort settings tabs into a logical structure
...
Fixes https://github.com/vector-im/riot-web/issues/8864
2019-02-22 11:33:03 -07:00
Travis Ralston
d6f89f422b
Merge pull request #2679 from matrix-org/travis/settings/field-editable-list
...
Fix AliasSettings and RelatedGroups UX
2019-02-22 09:40:34 -07:00
J. Ryan Stinnett
b6682c0469
Merge pull request #2673 from jryans/username-label
...
Clarify what the username error refers to
2019-02-22 10:17:58 +00:00
Travis Ralston
003d0eb0bf
Show changes to related groups (flair) in the timeline
2019-02-21 17:03:15 -07:00
Travis Ralston
96eeab23af
Convert RelatedGroupSettings to a class component
2019-02-21 16:48:54 -07:00
Travis Ralston
58b9a0675e
Disable main address dropdown when lacking permissions
...
Instead of rendering it as a span with no label.
2019-02-21 16:38:10 -07:00
Travis Ralston
750c9202cc
Make the canonical alias direct manipulation
2019-02-21 16:11:26 -07:00
Travis Ralston
278e48cfc9
Make removing aliases direct manipulation
2019-02-21 15:22:08 -07:00
Travis Ralston
5d2f17c49a
Make adding aliases direct manipulation
2019-02-21 15:22:08 -07:00
Travis Ralston
ade9ee3c18
Merge pull request #2634 from matrix-org/travis/better-room-sorting
...
"Breadcrumb" room sorting algorithm
2019-02-21 08:46:17 -07:00
Bruno Windels
ab9bf4c0e0
Merge pull request #2666 from matrix-org/bwindels/userview
...
Bring back user view
2019-02-21 16:05:03 +01:00
J. Ryan Stinnett
b74107116b
Clarify what the username error refers to
...
Fixes https://github.com/vector-im/riot-web/issues/8839
2019-02-21 15:01:09 +00:00
J. Ryan Stinnett
1671466c46
Regenerate strings
2019-02-21 11:02:58 +00:00
J. Ryan Stinnett
16b9688303
Merge pull request #2669 from matrix-org/jryans/default-server-name
...
Restores support for `default_server_name` which discovers URLs via `.well-known`
2019-02-21 10:38:15 +00:00
J. Ryan Stinnett
d220dd49ef
Clarify that the account is a Matrix account
...
Now that auth flows can show a server name like `example.com` which might
delegate the HS to some other server, it could be confusing to see text like
"Sign in to example.com", especially if `example.com` runs an identity service,
uses SSO, has its own account system, or other things like this.
To clarify that we mean Matrix accounts, all auth flows are updated to talk in
terms of "<verb> your Matrix account on <server>".
Fixes part of
https://github.com/vector-im/riot-web/issues/8763#issuecomment-464823909 .
2019-02-20 17:33:59 +00:00
Bruno Windels
23bcbc50e3
show dialog when failing to load profile info
2019-02-20 12:52:29 +01:00
Travis Ralston
7b732ceb43
Merge branch 'develop' into travis/better-room-sorting
2019-02-19 14:35:14 -07:00
J. Ryan Stinnett
6b46057283
Merge pull request #2663 from jryans/enable-captcha-desktop
...
Allow captchas on Riot desktop builds
2019-02-19 18:20:15 +00:00
J. Ryan Stinnett
3c156218da
Allow captchas on Riot desktop builds
2019-02-19 13:57:31 +00:00
J. Ryan Stinnett
198dee9abd
Rename default theme to light theme
2019-02-19 13:27:35 +00:00
Travis Ralston
da4d1cfed4
Merge branch 'develop' into travis/better-room-sorting
2019-02-15 23:32:15 -07:00
Aaron Raimist
1e01f1b52a
Fix typo "Scisors" -> "Scissors"
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-15 11:26:14 -06:00
J. Ryan Stinnett
df5f0601aa
Merge pull request #2641 from matrix-org/dbkr/remove_welcome_from_topleft
...
Remove 'welcome' from top-left menu
2019-02-14 16:40:39 +00:00
J. Ryan Stinnett
ce68ff1214
Merge pull request #2640 from jryans/help-buoy
...
Update help buoy text and issue links
2019-02-14 16:17:34 +00:00
Travis Ralston
37d1191c72
Add credit for cover photo usage
...
Fixes https://github.com/vector-im/riot-web/issues/8374
2019-02-14 09:04:15 -07:00
David Baker
7845a63506
Remove 'welcome' from top-left menu
...
Tjis is quite confusing as the welcome page is designed for when
you're not logged in, ie. has a sign-in button. There's also no way
to get back into the app so it really looks like it's logged you
out.
Reverts 116367fd69
2019-02-14 15:53:52 +00:00
J. Ryan Stinnett
2a3b05a321
Update help buoy text and issue links
2019-02-14 15:52:13 +00:00
Travis Ralston
9175655c16
Remove old pin unread options
...
They are not forced on, and do nothing.
2019-02-13 13:13:40 -07:00
J. Ryan Stinnett
694a59afb7
Merge pull request #2628 from jryans/adjust-top-left-menu
...
Adjust top left menu items
2019-02-13 17:38:08 +00:00
J. Ryan Stinnett
116367fd69
Add welcome to top left menu for all
2019-02-13 16:13:32 +00:00
J. Ryan Stinnett
22789ada94
Add sign in to top left menu for guests
2019-02-13 16:01:13 +00:00
David Baker
737b85c8f0
Merge pull request #2623 from matrix-org/dbkr/fix_force_turn_flag
...
Security: Force TURN setting was inverted
2019-02-13 15:24:14 +00:00
Matthew Hodgson
3eb5c71b75
rename 'Close Account' back to 'Deactivate Account'.
...
the word close on a red button makes you feel like you're going to close the
settings dialog, not terminate your account...
2019-02-13 12:24:04 +00:00
David Baker
26287067fc
Security: Force TURN setting was inverted
...
In making the settings more positive, we flipped 'disable peer to
peer' but didn't change the caption, so the setting was inverted
from what it was labelled as.
Also, forcing p2p isn't the inverse of forcing turn.
Change the setting to be 'allow p2p' and the label to match.
2019-02-13 11:51:32 +00:00
J. Ryan Stinnett
e401b8f77a
Make default and dark the only theme options
2019-02-13 10:44:01 +00:00
J. Ryan Stinnett
d9bb5991b5
Merge pull request #2609 from matrix-org/anoa/comms_hide
...
Change taking a community off the left-left panel less scary
2019-02-13 09:30:18 +00:00
Bruno Windels
5047d15a3b
Merge pull request #2615 from matrix-org/bwindels/breadcrumbs
...
Labs feature: recent room breadcrumbs
2019-02-13 09:16:40 +01:00
David Baker
2eaba22d63
Better passphase confirm text
2019-02-12 20:14:43 +00:00
Andrew Morgan
d6acfea696
Update i18n
2019-02-12 19:37:39 +00:00
David Baker
2c5da21adb
KeyBackupPanel fixes
...
* Separate out the emoji from the translateable string
* Put back the delete button if you're not using the backup,
otherwise you're stuck unable to use key backup at all if you
lost your recovery secret and the device you set it up on.
2019-02-12 18:06:36 +00:00
David Baker
9ec00f8d9b
Change text in e2e UX to new copy
2019-02-12 16:01:38 +00:00