Commit Graph

  • 1ae4a1cd5b Merge pull request #4195 from matrix-org/bwindels/alwayshavealabelforcanonaliasevent Bruno Windels 2020-03-11 09:04:14 +00:00
  • 50d1b58d6b Merge branch 'origin/develop' into Weblate. Weblate 2020-03-11 09:03:44 +00:00
  • 8e647e539f Translated using Weblate (Turkish) catborise 2020-03-10 18:37:12 +00:00
  • 58d3ad515f Translated using Weblate (French) Kévin C 2020-03-11 08:36:26 +00:00
  • 73980422e6 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-03-11 06:09:25 +00:00
  • 27db5d68be Merge pull request #4196 from matrix-org/bwindels/verifdialogpromise Bruno Windels 2020-03-11 09:03:31 +00:00
  • 5c582037ce Tweak padding to match Figma Michael Telatynski 2020-03-10 23:11:48 +00:00
  • 78ffb3ddf4 Don't remount main split children on rhs collapse Michael Telatynski 2020-03-10 20:09:40 +00:00
  • d219e989ac Merge branch 'origin/develop' into Weblate. Weblate 2020-03-10 18:03:09 +00:00
  • f22554e99a Merge pull request #4194 from matrix-org/bwindels/enable4sonverify Bruno Windels 2020-03-10 18:03:02 +00:00
  • 91de7fd7b6 also allow passing a promise to a verif request to the verification dialog Bruno Windels 2020-03-10 18:59:45 +01:00
  • 5d7f2f96e7 add fallback label for canonical alias events that dont change anything Bruno Windels 2020-03-10 18:45:51 +01:00
  • 1eb5bdf847 use USK as we'll only have that around when using key sharing Bruno Windels 2020-03-10 18:40:24 +01:00
  • e6e253d13c Merge branch 'origin/develop' into Weblate. Weblate 2020-03-10 17:29:12 +00:00
  • 84f6bf06dd Translated using Weblate (Albanian) Besnik Bleta 2020-03-10 16:13:42 +00:00
  • f33c930c41 Revert "Merge pull request #3892 from krkc/move-read-receipts-to-bottom" Travis Ralston 2020-03-05 17:24:51 -07:00
  • cdb14f38b3 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-10 15:59:49 +00:00
  • a808b05026 Merge pull request #4193 from MarcoZehe/FixExtraneousTabStopOnTree Travis Ralston 2020-03-10 09:59:44 -06:00
  • e34a37102a move i18n strings around as script desires Bruno Windels 2020-03-10 16:56:20 +01:00
  • ab2e3a3465 also enable 4s when accepting a verification request Bruno Windels 2020-03-10 16:54:49 +01:00
  • ddbfe4e1fa enable 4S if needed when trying to verify Bruno Windels 2020-03-10 16:31:40 +01:00
  • 4bb05e8dec Merge branch 'origin/develop' into Weblate. Weblate 2020-03-10 15:30:29 +00:00
  • 9b62cc964b Merge pull request #4191 from matrix-org/travis/remove-v1-identity Travis Ralston 2020-03-10 09:30:24 -06:00
  • 789c52a9e1 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-10 15:27:15 +00:00
  • 32aa897ef8 Merge pull request #12670 from vector-im/travis/fix-docker-version Travis Ralston 2020-03-10 09:27:08 -06:00
  • 3bff5c55cf Remove extraneous tab stop from room tree view. Marco Zehe 2020-03-10 16:24:42 +01:00
  • b7384a9a56 Translated using Weblate (Italian) random 2020-03-09 11:00:51 +00:00
  • 6ec5dfc5f6 Translated using Weblate (Esperanto) Tirifto 2020-03-09 13:46:01 +00:00
  • 9d19f0f34c Merge branch 'origin/develop' into Weblate. Weblate 2020-03-10 12:45:21 +00:00
  • c5e62ec0ef Merge pull request #4187 from matrix-org/bwindels/altaliases Bruno Windels 2020-03-10 12:45:16 +00:00
  • 6eea3d4641 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-10 12:43:20 +00:00
  • db9895f223 Merge pull request #4189 from matrix-org/bwindels/aliasesintimeline Bruno Windels 2020-03-10 12:43:14 +00:00
  • 37e6fff410 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-10 10:04:38 +00:00
  • b64faad4e5 Merge pull request #4190 from matrix-org/jryans/mark-as-read-dark J. Ryan Stinnett 2020-03-10 10:04:32 +00:00
  • b0f71bc990 Fix Docker image version for develop builds Travis Ralston 2020-03-09 19:57:52 -06:00
  • 4cdfda3c7d Remove v1 identity server fallbacks Travis Ralston 2020-03-09 17:05:13 -06:00
  • 1dd7c168cf Merge pull request #38 from vector-im/t3chguy/depr8 Michael Telatynski 2020-03-09 18:00:22 +00:00
  • c541bc0705 Fix mark as read button for dark theme J. Ryan Stinnett 2020-03-09 17:33:39 +00:00
  • 378939bed7 add timeline text descriptions for modifying alt_aliases Bruno Windels 2020-03-09 18:24:48 +01:00
  • 0d8b4ac194 remove timeline tiles for m.room.aliases events Bruno Windels 2020-03-09 18:23:32 +01:00
  • dc8e9cfb10 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-09 16:27:12 +00:00
  • b1ad0b8d77 Merge pull request #4188 from matrix-org/dbkr/remove_version_link David Baker 2020-03-09 16:27:07 +00:00
  • 650d3d0e2d Un-linkify version in settings David Baker 2020-03-09 16:17:25 +00:00
  • f100eeac6f Merge branch 'origin/develop' into Weblate. Weblate 2020-03-09 16:15:45 +00:00
  • 5d9f9db3fa Translated using Weblate (Turkish) catborise 2020-03-09 15:42:18 +00:00
  • bc34dfa60a Translated using Weblate (Esperanto) Tirifto 2020-03-09 14:12:41 +00:00
  • d2cd64d9d3 Merge pull request #4186 from matrix-org/jryans/mjolnir-stop J. Ryan Stinnett 2020-03-09 16:15:32 +00:00
  • 5eaf03c3da update e2e tests to expand local aliases when adding one Bruno Windels 2020-03-09 17:03:50 +01:00
  • 9961f810f1 update i18n Bruno Windels 2020-03-09 16:54:00 +01:00
  • 8ee714f86d show hand cursor over summary Bruno Windels 2020-03-09 16:50:48 +01:00
  • dcbbf31f04 fix lint Bruno Windels 2020-03-09 16:50:34 +01:00
  • f7cb633e3d only load local aliases on mount when you can edit the canonical alias Bruno Windels 2020-03-09 16:43:52 +01:00
  • 053ba1110a make pressing enter not reload riot when editable list is in form Bruno Windels 2020-03-09 16:32:31 +01:00
  • 7079d70f18 hide local aliases by default Bruno Windels 2020-03-09 16:32:13 +01:00
  • 08a31886a7 make domain postfix optional (not needed for alt aliases) Bruno Windels 2020-03-09 16:31:30 +01:00
  • eb539537f2 add recommendations for alt aliases Bruno Windels 2020-03-09 16:31:07 +01:00
  • 38e99f3a68 add editable list for alt aliases Bruno Windels 2020-03-09 16:29:04 +01:00
  • ee9558cb0b change state from domainToAliases to local and alt aliases Bruno Windels 2020-03-09 16:26:43 +01:00
  • c425d7f02f Make Mjolnir stop more robust J. Ryan Stinnett 2020-03-09 15:24:55 +00:00
  • da13b8a9be Merge branch 'origin/develop' into Weblate. Weblate 2020-03-09 13:48:19 +00:00
  • 2377405773 Translated using Weblate (Italian) random 2020-03-09 11:01:06 +00:00
  • 769f1f4e00 Merge pull request #4185 from matrix-org/jryans/sharing-names J. Ryan Stinnett 2020-03-09 13:48:11 +00:00
  • cc083e3014 Merge pull request #45 from vector-im/dbkr/bump_seshat David Baker 2020-03-09 13:47:57 +00:00
  • 892258e340 Bump seshat dependency David Baker 2020-03-09 13:46:08 +00:00
  • 47b1552ccc Fix secret sharing names to match spec J. Ryan Stinnett 2020-03-09 13:35:59 +00:00
  • 3f77d0c70e Merge pull request #44 from vector-im/dbkr/move_deb_control David Baker 2020-03-09 12:43:20 +00:00
  • 5beeb4805c Merge branch 'origin/develop' into Weblate. Weblate 2020-03-09 09:55:44 +00:00
  • 49fe1887df Merge pull request #4172 from matrix-org/foldleft/secret-requests Zoe 2020-03-09 09:55:38 +00:00
  • 81bbc1f5bf Merge branch 'origin/develop' into Weblate. Weblate 2020-03-09 08:35:30 +00:00
  • 0c4aac91a4 Translated using Weblate (Turkish) catborise 2020-03-07 09:24:51 +00:00
  • 291e5152e8 Translated using Weblate (German) @a2sc:matrix.org 2020-03-07 09:43:48 +00:00
  • 0cf5594b97 Translated using Weblate (German) Tentarial 2020-03-07 09:43:12 +00:00
  • b6a0921bff Translated using Weblate (French) Kévin C 2020-03-07 08:25:08 +00:00
  • 0e7428f44c Translated using Weblate (Dutch) Nathan Follens 2020-03-07 23:30:14 +00:00
  • 7cf4b1238d Translated using Weblate (Czech) Stanislav Lukeš 2020-03-08 11:37:56 +00:00
  • 84f7dc9660 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-03-07 02:39:39 +00:00
  • 1e95048018 Merge pull request #4181 from matrix-org/bwindels/bringbacklegacyverififnoxsignkeys Bruno Windels 2020-03-09 08:35:13 +00:00
  • ecdfe24fa8 Translated using Weblate (Turkish) catborise 2020-03-07 09:25:39 +00:00
  • 0688641554 Translated using Weblate (Russian) Walter 2020-03-06 22:30:33 +00:00
  • 38644d9d30 Translated using Weblate (Lithuanian) MamasLT 2020-03-06 17:23:59 +00:00
  • a751dd63fa Translated using Weblate (German) Tentarial 2020-03-07 09:10:10 +00:00
  • 7da915b1b0 Translated using Weblate (Basque) Osoitz 2020-03-06 17:36:43 +00:00
  • f9f87defa4 Only show old room name if it exists Aaron Raimist 2020-03-07 12:36:24 -06:00
  • a1366992bc Remove things that now live in riot-builder David Baker 2020-03-07 16:12:59 +00:00
  • 3f89d545ed Template control file for nightly David Baker 2020-03-07 14:19:04 +00:00
  • cd89fed834 Move deb control stuff into builder David Baker 2020-03-07 12:23:00 +00:00
  • 212c970d91 Translated using Weblate (German) @a2sc:matrix.org 2020-03-07 09:42:22 +00:00
  • f2f8e5e2f6 Translated using Weblate (German) Tentarial 2020-03-07 09:41:31 +00:00
  • 36de51d034 Translated using Weblate (German) @a2sc:matrix.org 2020-03-07 09:41:21 +00:00
  • 47d73e3a64 Translated using Weblate (German) Tentarial 2020-03-07 09:41:16 +00:00
  • 356120f0da Translated using Weblate (German) @a2sc:matrix.org 2020-03-07 09:34:40 +00:00
  • dd0d98b997 Translated using Weblate (German) natowi 2020-03-07 09:24:32 +00:00
  • 69bfabdcf8 Translated using Weblate (German) Krombel 2020-03-07 09:23:52 +00:00
  • c0abae2928 Translated using Weblate (German) Bamstam 2020-03-07 09:16:09 +00:00
  • 832f904cdb Translated using Weblate (German) Tentarial 2020-03-07 09:12:29 +00:00
  • 7850c506b7 When room name is changed, show both the old and new name Aaron Raimist 2020-03-06 22:17:49 -06:00
  • 661508ddf8 Order theme names in the dropdown Travis Ralston 2020-03-06 17:52:16 -07:00
  • 6aeca7b853 UX polish for custom themes Travis Ralston 2020-03-06 17:43:10 -07:00
  • 65d7bb2ef9 Merge branch 'develop' into travis/poc/theme-command Travis Ralston 2020-03-06 17:33:22 -07:00
  • 18f091af46 Merge pull request #43 from vector-im/dbkr/nightly_brand David Baker 2020-03-07 00:00:49 +00:00