Commit Graph

  • ed6e4794ce Merge branch 'origin/develop' into Weblate. Weblate 2019-08-20 08:29:51 +00:00
  • 1e7a813394 Translated using Weblate (West Flemish) Nathan Follens 2019-08-19 21:00:37 +00:00
  • 5a195d7f0a Translated using Weblate (French) Kévin C 2019-08-20 08:09:28 +00:00
  • 02faf9e385 Translated using Weblate (Dutch) Nathan Follens 2019-08-19 20:58:17 +00:00
  • f5da870040 Merge pull request #3326 from matrix-org/dbkr/device_name_public David Baker 2019-08-20 09:29:45 +01:00
  • 7cd2fb3718 Appease the linter Travis Ralston 2019-08-19 23:03:01 -06:00
  • 3181829532 Use new InlineTermsAgreement component on IS Discovery section Travis Ralston 2019-08-19 23:00:05 -06:00
  • 417de0cac7 Add an inline terms agreement component Travis Ralston 2019-08-19 22:59:33 -06:00
  • 525b4cad0f Support IS token handling without checking terms Travis Ralston 2019-08-19 22:54:23 -06:00
  • 83af732d05 Rename and export abbreviateIdentityUrl Travis Ralston 2019-08-19 22:53:37 -06:00
  • 974aab1e5a Merge branch 'origin/develop' into Weblate. Weblate 2019-08-19 20:35:53 +00:00
  • 63dcdb4f96 Translated using Weblate (Dutch) Nathan Follens 2019-08-19 17:15:01 +00:00
  • fef3438ef1 Merge pull request #3325 from matrix-org/jryans/tweak-privacy-copy J. Ryan Stinnett 2019-08-19 21:35:49 +01:00
  • f7083ac332 Clarify that device names are publicly visible David Baker 2019-08-19 18:09:37 +01:00
  • 26b960a2d1 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-19 16:51:03 +00:00
  • e7e22b75bc Merge pull request #3320 from matrix-org/travis/is-account-data Travis Ralston 2019-08-19 10:50:58 -06:00
  • 2d4c2b76d9 Merge branch 'develop' into travis/is-account-data Travis Ralston 2019-08-19 10:36:42 -06:00
  • 17d7b79fbf Merge branch 'origin/develop' into Weblate. Weblate 2019-08-19 16:36:02 +00:00
  • 95bd41aac7 Merge pull request #3317 from matrix-org/travis/terms/inline-is-only Travis Ralston 2019-08-19 10:35:58 -06:00
  • 855bf3ad0d Import createClient instead Travis Ralston 2019-08-19 10:25:20 -06:00
  • 32abfbbfc6 Rename functions Travis Ralston 2019-08-19 10:27:57 -06:00
  • ef2f4dd8fc Merge branch 'origin/develop' into Weblate. Weblate 2019-08-19 16:03:01 +00:00
  • 6879ddd34c Merge pull request #3323 from matrix-org/dbkr/add_3pid_without_is David Baker 2019-08-19 17:02:56 +01:00
  • af24270daa Merge branch 'origin/develop' into Weblate. Weblate 2019-08-19 15:05:21 +00:00
  • 0fb619c77e Translated using Weblate (Italian) random 2019-08-19 09:28:07 +00:00
  • fa58fb7fdd Merge pull request #3324 from matrix-org/dbkr/threepid_remove_design David Baker 2019-08-19 16:05:15 +01:00
  • 8a7b43fd1a Tweak Settings padding / margin slightly J. Ryan Stinnett 2019-08-19 15:45:04 +01:00
  • 93af6cfd8d Fix up remove threepid confirmation UX David Baker 2019-08-19 15:37:12 +01:00
  • c1b72fd346 Allow 3pids to be added with no ID server set David Baker 2019-08-19 15:17:14 +01:00
  • f9e223aec7 Merge pull request #3322 from matrix-org/jryans/discovery-without-is J. Ryan Stinnett 2019-08-19 15:02:11 +01:00
  • 5af9bf7b80 Use designed text for new IS field J. Ryan Stinnett 2019-08-19 14:44:53 +01:00
  • 7cc27beb44 Remove custom font size for IM URL J. Ryan Stinnett 2019-08-19 14:34:22 +01:00
  • d4ecb99d11 Show the default IS as a placeholder in Settings J. Ryan Stinnett 2019-08-19 14:20:01 +01:00
  • 07826c5675 Hide 3PID discovery sections when no identity server J. Ryan Stinnett 2019-08-19 14:03:38 +01:00
  • cd26b73386 Merge pull request #3319 from matrix-org/dbkr/allow_pw_reset_no_is David Baker 2019-08-19 11:41:38 +01:00
  • 2a626c3f7c Merge pull request #3318 from matrix-org/dbkr/allow_register_email_no_is David Baker 2019-08-19 11:18:30 +01:00
  • cf1b7ab342 Merge pull request #3321 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2019-08-19 10:19:37 +01:00
  • f69f852c53 Merge pull request #10591 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2019-08-19 10:13:25 +01:00
  • f130335169 Translated using Weblate (Finnish) Tuomas Hietala 2019-08-19 08:23:32 +00:00
  • f32c4de1f5 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-08-19 06:47:47 +00:00
  • 32a402322e Translated using Weblate (Polish) MorbidMind 2019-08-17 12:20:35 +00:00
  • 37a247613e Translated using Weblate (French) Kévin C 2019-08-17 07:59:52 +00:00
  • 72c6707bdb Translated using Weblate (Polish) MorbidMind 2019-08-17 12:16:02 +00:00
  • 51946d2a74 Persist and maintain identity server in account data Travis Ralston 2019-08-16 13:10:41 -06:00
  • 3228062954 Merge branch 'travis/terms/inline-is-only' into travis/is-account-data Travis Ralston 2019-08-16 12:45:40 -06:00
  • d9aa8139bd Merge branch 'origin/develop' into Weblate. Weblate 2019-08-16 18:19:30 +00:00
  • a96df333e9 Merge pull request #3310 from matrix-org/t3chguy/fix_reply_parent_redacted Michael Telatynski 2019-08-16 19:19:25 +01:00
  • dbe5c2cb45 Allow password reset without an ID Server David Baker 2019-08-16 18:11:24 +01:00
  • de3c489fba Fix i18n Travis Ralston 2019-08-16 09:41:23 -06:00
  • 2456912ec7 Merge remote-tracking branch 'origin/develop' into travis/terms/inline-is-only Travis Ralston 2019-08-16 09:41:00 -06:00
  • a87fb7eaa2 also remove from comment David Baker 2019-08-16 15:36:41 +01:00
  • 01c28019ba Merge branch 'origin/develop' into Weblate. Weblate 2019-08-16 14:28:52 +00:00
  • c65ebd5e83 Merge branch 'master' into develop RiotRobot 2019-08-16 15:28:33 +01:00
  • d43ae7ac8e Merge branch 'origin/develop' into Weblate. Weblate 2019-08-16 14:27:57 +00:00
  • ce89428bb9 Merge pull request #10579 from vector-im/jryans/electron-builder-21.2.0 J. Ryan Stinnett 2019-08-16 15:27:53 +01:00
  • 3c4c595f79 remove old serverCaps David Baker 2019-08-16 15:27:11 +01:00
  • 4299cdfeac v1.3.3 v1.3.3 RiotRobot 2019-08-16 15:26:03 +01:00
  • 7a998e7ed7 Prepare changelog for v1.3.3 RiotRobot 2019-08-16 15:26:02 +01:00
  • 8a58ba2374 v1.3.3 RiotRobot 2019-08-16 15:23:11 +01:00
  • aa67a3ba2a Tweak comment about upstream J. Ryan Stinnett 2019-08-16 14:30:47 +01:00
  • 26d70b1bd4 Set SUID bit on chrome-sandbox for Debian J. Ryan Stinnett 2019-08-16 13:34:12 +01:00
  • 41a9db3224 Use new flag in /versions David Baker 2019-08-16 15:07:15 +01:00
  • ba653a30db Merge branch 'origin/develop' into Weblate. Weblate 2019-08-16 13:31:42 +00:00
  • c917463da8 Translated using Weblate (Italian) albanobattistella 2019-08-16 11:39:38 +00:00
  • c90e4ab4a3 Translated using Weblate (Basque) Osoitz 2019-08-16 09:57:15 +00:00
  • 218bee8071 Merge pull request #3316 from matrix-org/travis/terms/inline-im-is Travis Ralston 2019-08-16 07:31:36 -06:00
  • 4d9e626292 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-16 13:31:15 +00:00
  • 8824f7edee Merge pull request #10580 from vector-im/jryans/linux-electron-5-sandbox J. Ryan Stinnett 2019-08-16 14:31:11 +01:00
  • 0617c1cd13 Tweak comment about upstream J. Ryan Stinnett 2019-08-16 14:30:47 +01:00
  • 56674ea708 Set SUID bit on chrome-sandbox for Debian J. Ryan Stinnett 2019-08-16 13:34:12 +01:00
  • 24e59ccedd Upgrade electron-builder to 21.2.0 J. Ryan Stinnett 2019-08-16 11:52:07 +01:00
  • 19c7a4627d fix test David Baker 2019-08-16 12:24:52 +01:00
  • e705d110af Allow registering with email if no ID Server David Baker 2019-08-16 11:57:32 +01:00
  • 0b5e79ed23 Translated using Weblate (West Flemish) Nathan Follens 2019-08-15 09:37:24 +00:00
  • 59fe6c03ae Merge branch 'origin/develop' into Weblate. Weblate 2019-08-16 09:56:44 +00:00
  • 9c12791f37 Translated using Weblate (French) Kévin C 2019-08-15 20:40:01 +00:00
  • ae9039ab2c Translated using Weblate (Basque) Osoitz 2019-08-16 09:46:54 +00:00
  • cde1944cac Merge pull request #3314 from matrix-org/dbkr/warn_if_bound_threepids David Baker 2019-08-16 10:56:39 +01:00
  • 02f8b72533 tfw the linter finds bugs for you Travis Ralston 2019-08-15 16:08:18 -06:00
  • 9860baf0b4 Prompt for terms of service on identity server changes Travis Ralston 2019-08-15 15:59:44 -06:00
  • 0acae22527 Merge branch 'travis/terms/inline-im-is' into travis/terms/inline-is-only Travis Ralston 2019-08-15 14:41:22 -06:00
  • 5fe691cf33 Double equals Travis Ralston 2019-08-15 13:33:02 -06:00
  • e2f013ddb4 Appease the linter Travis Ralston 2019-08-15 13:31:45 -06:00
  • 27504e1578 Prompt for terms of service on integration manager changes Travis Ralston 2019-08-15 13:28:23 -06:00
  • 7d96cc969a use original bug David Baker 2019-08-15 15:39:15 +01:00
  • 316ca978c2 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-15 14:38:38 +00:00
  • ded2297523 Merge pull request #3315 from matrix-org/dbkr/fix_set_im David Baker 2019-08-15 15:38:34 +01:00
  • ea1f80a9c8 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-15 14:16:16 +00:00
  • 002de2c691 Translated using Weblate (West Flemish) Nathan Follens 2019-08-15 10:31:24 +00:00
  • c926e1a89f Translated using Weblate (French) Kévin C 2019-08-15 13:04:12 +00:00
  • 2bdce1229c Translated using Weblate (Dutch) Nathan Follens 2019-08-15 10:19:20 +00:00
  • f3e169775a Merge pull request #3309 from matrix-org/jryans/stun-turn-fallback J. Ryan Stinnett 2019-08-15 15:16:07 +01:00
  • adc3c69022 Update ICE fallback text J. Ryan Stinnett 2019-08-15 15:04:17 +01:00
  • d610bfc5e5 Remove ICE fallback prompt from pre-call path J. Ryan Stinnett 2019-08-15 14:44:50 +01:00
  • 67b830c48d Improve fallback ICE setting label J. Ryan Stinnett 2019-08-15 11:11:46 +01:00
  • d31f556c1f Move ICE fallback prompt to time of placing / answering calls J. Ryan Stinnett 2019-08-14 15:06:06 +01:00
  • 1c6312d999 Store ICE fallback permission in device setting J. Ryan Stinnett 2019-08-14 14:02:25 +01:00
  • c1378f8e0b Prompt for ICE server fallback permission J. Ryan Stinnett 2019-08-13 15:50:36 +01:00
  • 40f693d0fc Fix set integration manager tooltip David Baker 2019-08-15 14:55:59 +01:00
  • 6f07f9157c lint David Baker 2019-08-15 13:10:05 +01:00