Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • e6c5775d0e Commit the new file David Baker 2019-08-15 12:16:59 +01:00
  • 54fb1b5302 Unused variables / imports David Baker 2019-08-15 12:07:59 +01:00
  • 75770f7a4a Warn on disconnecting from IS David Baker 2019-08-15 12:04:07 +01:00
  • 86ac316350 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-15 09:52:31 +00:00
  • e301367655 Translated using Weblate (West Flemish) Nathan Follens 2019-08-15 09:29:10 +00:00
  • 91f544c02e Translated using Weblate (Finnish) Tuomas Hietala 2019-08-15 09:40:29 +00:00
  • b50add3715 Translated using Weblate (Dutch) Nathan Follens 2019-08-15 09:30:00 +00:00
  • b1a9fb79f8 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-08-15 04:25:38 +00:00
  • 4afed0fab4 Merge pull request #3313 from matrix-org/t3chguy/fix_jitsi_persisted_breaking_randomly David Baker 2019-08-15 10:52:24 +01:00
  • 6f529852cd Skip forceUpdate in ReplyThread if the redacted event is not relevant Michael Telatynski 2019-08-14 23:27:04 +01:00
  • 4b0a242b16 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-14 22:18:47 +00:00
  • 4833d4cb23 Merge pull request #3312 from matrix-org/t3chguy/cleanup_legacy_verification Michael Telatynski 2019-08-14 23:18:43 +01:00
  • 7b17ea1fa5 Fix Persisted Widgets (Jitsi) randomly closing on room change Michael Telatynski 2019-08-14 23:15:49 +01:00
  • 3d3b938d87 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-14 15:44:18 +00:00
  • 0edeae643b Translated using Weblate (German) dccs 2019-08-14 15:27:36 +00:00
  • 988162e48c Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-08-14 12:26:39 +00:00
  • f69235b884 Merge pull request #3308 from matrix-org/travis/integs/account_set Travis Ralston 2019-08-14 09:44:13 -06:00
  • b77be2d380 Just use MSC1957 Travis Ralston 2019-08-14 09:33:02 -06:00
  • f9199f259d Merge branch 'origin/develop' into Weblate. Weblate 2019-08-14 15:28:43 +00:00
  • 9ed647d280 Remove t3chguy's debug lines Travis Ralston 2019-08-14 09:28:35 -06:00
  • 8b1c90a01e Convert to using im.vector.integration_manager for IM widget Travis Ralston 2019-08-14 08:57:38 -06:00
  • 02a4121401 Mixin for field width Travis Ralston 2019-08-14 08:55:49 -06:00
  • 7a1a245899 Fix i18n Travis Ralston 2019-08-14 08:52:05 -06:00
  • cb5bc580b0 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-14 14:51:59 +00:00
  • 3b908f4a33 Merge pull request #10551 from vector-im/t3chguy/i18n_config_default David Baker 2019-08-14 15:51:54 +01:00
  • beb6ec4327 Merge branch 'develop' into travis/integs/account_set Travis Ralston 2019-08-14 08:45:01 -06:00
  • 8186f1be2e delint Michael Telatynski 2019-08-14 14:08:10 +01:00
  • e8834930f9 Verifying your own device should not ask you to "contact its owner" Michael Telatynski 2019-08-14 13:58:27 +01:00
  • 0fc04f8913 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-14 12:26:38 +00:00
  • 0da5c45564 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-08-14 12:23:16 +00:00
  • 3342aff210 Translated using Weblate (Albanian) Besnik Bleta 2019-08-14 10:05:39 +00:00
  • 088dc7953b Merge pull request #3311 from matrix-org/t3chguy/delint_languageHandler Michael Telatynski 2019-08-14 13:26:33 +01:00
  • e668b2f8bd delint languageHandler Michael Telatynski 2019-08-14 12:29:48 +01:00
  • 46dac869d5 Load config.json before loading language so default can apply Michael Telatynski 2019-08-14 12:29:25 +01:00
  • 7b4d1e754d Merge branch 'origin/develop' into Weblate. Weblate 2019-08-14 09:23:24 +00:00
  • 30681c7150 Merge pull request #3305 from matrix-org/dbkr/disco_is David Baker 2019-08-14 10:23:20 +01:00
  • c74da125b2 i18n David Baker 2019-08-14 10:12:39 +01:00
  • be7956db61 Spell out identity server David Baker 2019-08-14 10:08:43 +01:00
  • 3c3b530e1e Spell out identity server David Baker 2019-08-14 10:08:30 +01:00
  • 85497610e3 Spell out identity server David Baker 2019-08-14 10:08:15 +01:00
  • 0d560108b6 Kill smart quotes David Baker 2019-08-14 10:07:50 +01:00
  • b0420c106e Prepopulate client default on disconnect David Baker 2019-08-14 10:06:05 +01:00
  • 735c6d73d8 Merge remote-tracking branch 'origin/develop' into dbkr/disco_is David Baker 2019-08-14 10:03:32 +01:00
  • a0e2f07cab Merge branch 'origin/develop' into Weblate. Weblate 2019-08-14 08:42:25 +00:00
  • e2c5dc6bac Merge pull request #3300 from matrix-org/dbkr/change_is David Baker 2019-08-14 09:42:20 +01:00
  • 09fce33a8c Merge branch 'develop' into travis/integs/account_set Travis Ralston 2019-08-13 13:02:44 -06:00
  • 191f90199f Merge branch 'origin/develop' into Weblate. Weblate 2019-08-13 19:02:05 +00:00
  • a5cac02910 Merge pull request #3302 from matrix-org/travis/integs/widgets Travis Ralston 2019-08-13 13:02:00 -06:00
  • f88349530a rerun i18n David Baker 2019-08-13 18:41:18 +01:00
  • 7c35107a37 Update 3pids section visibility when id server set / unset David Baker 2019-08-13 18:40:27 +01:00
  • a44d61fb75 add copyright Michael Telatynski 2019-08-13 18:17:42 +01:00
  • 6589e5dab9 Fix showing events which were replied to and then redacted Michael Telatynski 2019-08-13 18:13:47 +01:00
  • c80c8dcf24 prefill id server box with default if there isn't one David Baker 2019-08-13 17:55:10 +01:00
  • 596ff93049 unused import David Baker 2019-08-13 16:38:46 +01:00
  • 2539da0dfa Use fetch instead of browser-request David Baker 2019-08-13 16:37:56 +01:00
  • 31fd36efba use accessiblebutton David Baker 2019-08-13 16:20:30 +01:00
  • d4bbed31d5 Merge branch 'develop' into travis/integs/account_set Travis Ralston 2019-08-13 09:03:50 -06:00
  • 24ac1d1547 Merge branch 'develop' into travis/integs/widgets Travis Ralston 2019-08-13 09:02:52 -06:00
  • 5b93d4b817 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-13 15:00:26 +00:00
  • 5bc9636e28 Translated using Weblate (German) dccs 2019-08-13 10:00:44 +00:00
  • 831da696ad Merge pull request #3301 from matrix-org/travis/integs/base Travis Ralston 2019-08-13 09:00:22 -06:00
  • 7a9246533d Hack to ignore @define-mixin David Baker 2019-08-13 15:40:03 +01:00
  • 050766e7bb selector ordering David Baker 2019-08-13 15:19:39 +01:00
  • 02504b9959 make it work again David Baker 2019-08-13 12:59:34 +01:00
  • e5f913bc11 Merge remote-tracking branch 'origin/develop' into dbkr/change_is David Baker 2019-08-13 12:56:58 +01:00
  • e07c22a78d Make mixin for fields in settings that need to be the same width David Baker 2019-08-13 12:53:14 +01:00
  • 7afaba3bf1 link to doc issue David Baker 2019-08-13 11:05:41 +01:00
  • 860a9dbc82 s/tooltip/tooltipContent/ David Baker 2019-08-13 11:01:04 +01:00
  • c36c3a9b33 other general grammar David Baker 2019-08-13 10:51:26 +01:00
  • 934b711936 write Identity Server out in full to be less confusing David Baker 2019-08-13 10:48:56 +01:00
  • c732ae3aa9 Correct license header David Baker 2019-08-13 10:46:42 +01:00
  • 93ec1b44c1 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-13 08:32:30 +00:00
  • 12eeb20574 Merge pull request #3291 from matrix-org/t3chguy/fix_RoomAvatarEvent David Baker 2019-08-13 09:32:26 +01:00
  • 03d735f4ed Support changing your integration manager in the UI Travis Ralston 2019-08-12 15:35:39 -06:00
  • 3ee91186f1 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-12 20:55:27 +00:00
  • b8fb283391 Merge pull request #3307 from matrix-org/travis/fix-settings-alignment Travis Ralston 2019-08-12 14:55:23 -06:00
  • 438eba1c46 Fix alignment of add email/phone number inputs in settings Travis Ralston 2019-08-12 14:14:17 -06:00
  • e21c12c2c9 Merge remote-tracking branch 'origin/dbkr/change_is' into travis/integs/account_set Travis Ralston 2019-08-12 13:06:36 -06:00
  • ef33adce01 Merge branch 'travis/integs/widgets' into travis/integs/account_set Travis Ralston 2019-08-12 13:02:23 -06:00
  • 60778d843d Merge branch 'travis/integs/base' into travis/integs/account_set Travis Ralston 2019-08-12 13:02:19 -06:00
  • bafb0dbbfc Merge branch 'origin/develop' into Weblate. Weblate 2019-08-12 17:19:17 +00:00
  • d2de260aa7 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-12 17:19:15 +00:00
  • 6ccecaf408 Merge pull request #10543 from vector-im/t3chguy/react16_2 Michael Telatynski 2019-08-12 18:19:13 +01:00
  • e3348c6184 Merge pull request #3306 from matrix-org/t3chguy/react16_2 Michael Telatynski 2019-08-12 18:19:11 +01:00
  • 7145d0e1a6 Hit yarn with a hammer until it works Michael Telatynski 2019-08-12 18:06:37 +01:00
  • 773dd0805b Bump matrix-react-test-utils for React 16 compatibility Michael Telatynski 2019-08-12 17:41:51 +01:00
  • 387fa75da8 Bump matrix-react-test-utils for React 16 compatibility Michael Telatynski 2019-08-12 17:41:36 +01:00
  • 04a52f707e Merge branch 'origin/develop' into Weblate. Weblate 2019-08-12 14:58:00 +00:00
  • bb23374b8a Merge pull request #3304 from matrix-org/t3chguy/un-hardcode-themes-in-settings Michael Telatynski 2019-08-12 15:57:56 +01:00
  • b694a56689 i18n David Baker 2019-08-12 14:48:02 +01:00
  • 0c4b29faa9 Merge remote-tracking branch 'origin/dbkr/change_is' into dbkr/disco_is David Baker 2019-08-12 14:47:40 +01:00
  • 4d33438acb c+p fail David Baker 2019-08-12 14:46:04 +01:00
  • 0b51a5f452 c+p fail David Baker 2019-08-12 14:45:15 +01:00
  • 115e4c0370 Remove IS access token too David Baker 2019-08-12 14:40:11 +01:00
  • ebc84b4445 Merge remote-tracking branch 'origin/dbkr/change_is' into dbkr/disco_is David Baker 2019-08-12 14:39:46 +01:00
  • f358b6162d Remove the access token for the old IS David Baker 2019-08-12 14:38:49 +01:00
  • 384f07adb2 Disconnect from IS button David Baker 2019-08-12 14:36:48 +01:00
  • 7bdac85a2a Break themes out into a separate file Michael Telatynski 2019-08-12 14:24:12 +01:00
  • 8e33b52bd2 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-12 13:19:21 +00:00
  • 691b9145ee Merge pull request #3303 from matrix-org/t3chguy/ModularServerConfig_extend_ServerConfig Michael Telatynski 2019-08-12 14:19:17 +01:00