PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
14059 commits 1 branch 0 tags 338 MiB
Commit graph

858 commits

Author SHA1 Message Date
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
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
Bruno Windels
b467bfdced mention it only shows up after refresh (actually rerender) 2019-02-12 12:49:22 +01:00
Bruno Windels
03c491416e put breadcrumbs behind feature flag 2019-02-12 11:41:24 +01:00
David Baker
1cf0a6a049 Add legacy verification button on wait 
Add a way to bail out of interactive verification from the screen
where you're waiting for the other person to accept.
 2019-02-11 12:08:10 +00:00
David Baker
742af81224
Merge pull request #2594 from matrix-org/dbkr/dont_verify_restore 
Prompt to restore backup rather than verify
 2019-02-08 17:49:04 +00:00
David Baker
09bf8099e0
Merge pull request #2599 from matrix-org/dbkr/unlabs_keybackup_sas 
Remove key backup & sas from labs
 2019-02-08 17:41:54 +00:00
David Baker
cedefcfb33 re-run i18n 2019-02-08 17:24:15 +00:00
David Baker
f99c56fedb
Merge pull request #2597 from matrix-org/jryans/add-welcome-page 
SDK support for welcome page
 2019-02-08 17:17:22 +00:00
David Baker
2cd25e0077
Merge pull request #2596 from matrix-org/dbkr/emoji_sas 
Change SAS to decimal / emoji
 2019-02-08 16:46:43 +00:00
David Baker
9b4a6cf442 Make prettier 2019-02-08 16:27:25 +00:00
Travis Ralston
8cdfdd2e24 Merge branch 'develop' into travis/render-join-rules 2019-02-08 09:24:07 -07:00
Travis Ralston
85cfd48744 join rules -> join rule 2019-02-08 09:15:12 -07:00
David Baker
ae16cc36aa Change SAS to decimal / emoji 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/837
 2019-02-08 14:57:36 +00:00
Bruno Windels
3c5fb61350 Merge branch 'develop' into bwindels/customtags-featureflag 2019-02-08 12:12:43 +00:00
Bruno Windels
00a1ca503c
Merge pull request #2588 from matrix-org/bwindels/removellfeatureflag 
remove ll feature flag, it's time!
 2019-02-08 12:02:58 +00:00
David Baker
ac98da4a8a Prompt to restore backup rather than verify 
Direct the user to restore the backup in order to both get the keys
out of the backup and start putting them in.

Also hide the advanced key backup stuff in a diclosure.
 2019-02-08 11:51:22 +00:00
Bruno Windels
2bcb54e749 remove strings from removed code 2019-02-08 09:29:11 +00:00
Travis Ralston
5d4406cbab Render join rules and guest access changes in the timeline 
Fixes https://github.com/vector-im/riot-web/issues/8435
 2019-02-07 12:14:58 -07:00