Commit Graph

  • 05889ebcd2 Translated using Weblate (French) Kévin C 2019-08-31 08:22:12 +00:00
  • b88b18ea13 Translated using Weblate (Bulgarian) Slavi Pantaleev 2019-08-31 08:37:32 +00:00
  • 030501b4f4 Translated using Weblate (Albanian) Besnik Bleta 2019-08-31 10:10:33 +00:00
  • 517c7cba76 Merge pull request #3365 from matrix-org/t3chguy/react16_7 Michael Telatynski 2019-09-01 22:46:43 +01:00
  • 97fa01f327 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-01 15:31:38 +00:00
  • f97b632c65 Merge pull request #6146 from rugk/patch-1 Travis Ralston 2019-09-01 09:31:34 -06:00
  • 658c5b42be Update README.md rugk 2019-09-01 13:41:21 +02:00
  • 141651d825 Translated using Weblate (Korean) 송태섭 2019-08-31 09:28:39 +00:00
  • 915a585dfa Translated using Weblate (Korean) 송태섭 2019-08-29 15:27:04 +00:00
  • 2bfffa76b5 Appease the linter Travis Ralston 2019-08-30 15:54:00 -06:00
  • d47fb799a5 Disable MSISDN registration if the homeserver doesn't support it Travis Ralston 2019-08-30 15:50:51 -06:00
  • 8ff0883c22 Add a dialog when inviting via slash command without IS J. Ryan Stinnett 2019-08-30 18:29:07 +01:00
  • 3bdc07edce Merge branch 'origin/develop' into Weblate. Weblate 2019-08-30 16:03:32 +00:00
  • 63be16beff Merge pull request #3366 from matrix-org/bwindels/cider-user-pill-text-fallback Bruno Windels 2019-08-30 16:03:28 +00:00
  • afd2ed03f0 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-30 16:03:18 +00:00
  • 3be32022f7 Merge pull request #3364 from matrix-org/bwindels/cider-ime-partii Bruno Windels 2019-08-30 16:03:14 +00:00
  • d37f51d7d7 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-30 16:03:04 +00:00
  • 6204b81434 Translated using Weblate (Korean) 송태섭 2019-08-30 15:32:22 +00:00
  • ec0d048cf0 Merge pull request #3361 from matrix-org/bwindels/autocomplete-colon Bruno Windels 2019-08-30 16:02:58 +00:00
  • 78c45cda59 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-30 15:16:41 +00:00
  • bed248843c Translated using Weblate (Norwegian Bokmål) vargtas 2019-08-30 11:11:53 +00:00
  • 78dc8ef5da Translated using Weblate (Korean) 송태섭 2019-08-30 09:19:38 +00:00
  • 889d9e1a35 Translated using Weblate (Hungarian) Szimszon 2019-08-30 14:56:50 +00:00
  • e7d4a692b5 Translated using Weblate (French) Kévin C 2019-08-30 10:53:45 +00:00
  • 88b129caeb Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-08-30 12:23:07 +00:00
  • e0cbe25425 Translated using Weblate (Albanian) Besnik Bleta 2019-08-30 10:29:22 +00:00
  • de0719151f Merge pull request #3351 from matrix-org/t3chguy/pl_control_e2e Michael Telatynski 2019-08-30 16:16:30 +01:00
  • 00a06af419 Hide the E2EE PL selector if room is already encrypted Michael Telatynski 2019-08-30 10:57:46 +01:00
  • 8967871b23 Merge branches 'develop' and 't3chguy/pl_control_e2e' of github.com:matrix-org/matrix-react-sdk into t3chguy/pl_control_e2e Michael Telatynski 2019-08-30 10:56:47 +01:00
  • b16f983a1f put display name in user pill text fallback instead of mxid Bruno Windels 2019-08-30 11:51:29 +02:00
  • 42ba5f6f0a force model update after composition finishes Bruno Windels 2019-08-30 11:25:17 +02:00
  • abf111ecbd Migrate away from React.createClass for non-auth structures. React 16 :D Michael Telatynski 2019-08-30 10:34:59 +01:00
  • 2e1fb4533c Migrate away from React.createClass for auth and views/auth. React 16 :D Michael Telatynski 2019-08-30 10:27:51 +01:00
  • c7677a4e2e Merge branch 'origin/develop' into Weblate. Weblate 2019-08-30 09:19:35 +00:00
  • 0ad1e5647f Translated using Weblate (Korean) 송태섭 2019-08-30 09:19:33 +00:00
  • 0d20cea6b6 Translated using Weblate (Korean) 송태섭 2019-08-30 08:22:29 +00:00
  • e0f536c5f1 Translated using Weblate (German) dccs 2019-08-30 08:34:45 +00:00
  • 27fdef557d Merge pull request #3359 from matrix-org/jryans/features-without-is J. Ryan Stinnett 2019-08-30 10:19:28 +01:00
  • 9078c54be9 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-30 08:18:02 +00:00
  • 364f248c37 Translated using Weblate (Norwegian Bokmål) vargtas 2019-08-29 20:21:15 +00:00
  • bba5492829 Translated using Weblate (Korean) 송태섭 2019-08-29 23:39:20 +00:00
  • c785a8e315 Translated using Weblate (Hungarian) Szimszon 2019-08-29 19:47:43 +00:00
  • 4779880a94 Merge pull request #3362 from matrix-org/bwindels/cider-no-enter-autocomplete Bruno Windels 2019-08-30 08:17:47 +00:00
  • a16cfb0125 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-29 19:24:10 +00:00
  • 7dd6471059 Merge pull request #3018 from Sorunome/soru/spoilers Travis Ralston 2019-08-29 13:24:06 -06:00
  • c144edfcac dont capture enter to close autocomplete Bruno Windels 2019-08-29 18:39:35 +02:00
  • 655957bdd0 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-29 16:31:32 +00:00
  • 5105140902 Merge pull request #3358 from matrix-org/bwindels/cider-paste-images Bruno Windels 2019-08-29 16:31:28 +00:00
  • 0a2e1e7c89 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-29 16:31:09 +00:00
  • dc292d332d Merge pull request #3357 from matrix-org/bwindels/cider-ime Bruno Windels 2019-08-29 16:31:05 +00:00
  • ebde169899 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-29 16:24:33 +00:00
  • b32880413c Translated using Weblate (Korean) 송태섭 2019-08-29 15:25:11 +00:00
  • c1d7ad40c5 Merge pull request #3356 from matrix-org/bwindels/cider-paste-newlines Bruno Windels 2019-08-29 16:24:27 +00:00
  • 4ae130bd27 add license header, descriptive comment and change to class Sorunome 2019-08-29 18:13:52 +02:00
  • be79cdddb0 apply autocomplete changes to mock to fix editor unit tests Bruno Windels 2019-08-29 18:00:38 +02:00
  • c9572250be only append colon to user-pill when at start of composer Bruno Windels 2019-08-29 17:47:14 +02:00
  • 2ff2ff0e75 support autocomplete replacing text with multiple parts Bruno Windels 2019-08-29 17:43:18 +02:00
  • c1352dd6bb Merge branch 'origin/develop' into Weblate. Weblate 2019-08-29 14:56:47 +00:00
  • 435c14d822 Merge pull request #10692 from vector-im/dependabot/npm_and_yarn/eslint-utils-1.4.2 Travis Ralston 2019-08-29 08:56:44 -06:00
  • f0884b8e47 Bump eslint-utils from 1.4.0 to 1.4.2 dependabot[bot] 2019-08-29 14:47:34 +00:00
  • cef191a27d Merge branch 'origin/develop' into Weblate. Weblate 2019-08-29 14:33:45 +00:00
  • d84e9ee135 Translated using Weblate (Russian) Walter 2019-08-29 10:56:32 +00:00
  • 30126e73fb Translated using Weblate (French) Kévin C 2019-08-29 09:08:13 +00:00
  • b45dc78613 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-08-29 07:30:48 +00:00
  • 5f660c247b Translated using Weblate (Albanian) Besnik Bleta 2019-08-29 09:14:35 +00:00
  • eb22ddfea9 Merge pull request #3360 from matrix-org/dependabot/npm_and_yarn/eslint-utils-1.4.2 Travis Ralston 2019-08-29 08:33:37 -06:00
  • 166fb696c2 Allow connecting to an IS from address picker J. Ryan Stinnett 2019-08-29 15:20:14 +01:00
  • 752eb17893 Remove subtext in room invite dialog J. Ryan Stinnett 2019-08-28 15:12:00 +01:00
  • 8ff2c42f39 Bump eslint-utils from 1.4.0 to 1.4.2 dependabot[bot] 2019-08-29 14:23:57 +00:00
  • fe7ac11abc New composer: support pasting files Bruno Windels 2019-08-29 16:19:05 +02:00
  • 891ccf0f4c don't update model while doing IME composition Bruno Windels 2019-08-29 13:56:21 +02:00
  • 80523f5dbe still convert \n to NewlinePart when pasting/dropping Bruno Windels 2019-08-29 12:51:33 +02:00
  • e531b29307 don't ignore BR elements when converting to editor dom to text Bruno Windels 2019-08-29 12:50:23 +02:00
  • fe9ae46ffb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into soru/spoilers Sorunome 2019-08-28 20:23:24 +02:00
  • f7266a9a44 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-28 17:36:07 +00:00
  • 599fccd9ce Merge pull request #3343 from matrix-org/jryans/hide-is-field-during-auth J. Ryan Stinnett 2019-08-28 18:36:02 +01:00
  • a3abde5883 Merge pull request #55 from matrix-org/jryans/hide-is-field-during-auth J. Ryan Stinnett 2019-08-28 18:35:57 +01:00
  • 66b5f580d6 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-28 16:49:33 +00:00
  • 838e115b72 Merge pull request #3338 from matrix-org/t3chguy/fix_jitsi_persisted_breaking_randomly Travis Ralston 2019-08-28 10:49:29 -06:00
  • f2c3943b65 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-28 16:44:54 +00:00
  • a8c5b02464 Merge pull request #3352 from matrix-org/t3chguy/pl_room_upgrade Michael Telatynski 2019-08-28 17:44:50 +01:00
  • 435f5de4f3 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-28 16:44:35 +00:00
  • 7ef087db86 Merge pull request #3354 from matrix-org/t3chguy/avatar_change_cursor_perms Michael Telatynski 2019-08-28 17:44:31 +01:00
  • 5b3a651b7b Merge branch 'origin/develop' into Weblate. Weblate 2019-08-28 16:17:21 +00:00
  • f119ac4b22 Merge pull request #3349 from matrix-org/bwindels/tab-complete-name Bruno Windels 2019-08-28 16:17:16 +00:00
  • eddaece43e add visual bell color to theme + choose better value for dark mode Bruno Windels 2019-08-28 18:00:57 +02:00
  • 29f96e659a remove leftover code Bruno Windels 2019-08-28 17:53:03 +02:00
  • 927c0b42e7 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-28 14:59:51 +00:00
  • 665e3f44e1 Merge pull request #3355 from matrix-org/dbkr/email_help_text_update David Baker 2019-08-28 10:59:47 -04:00
  • aa9c0b24fe re-run i18n David Baker 2019-08-28 10:37:57 -04:00
  • c749b6355f Update email help text David Baker 2019-08-28 10:34:50 -04:00
  • 85efb71a23 add visual bell when no replacements are available Bruno Windels 2019-08-28 15:53:16 +02:00
  • c44fbb73d0 fix bug when replacing range starting at end of previous part Bruno Windels 2019-08-28 15:52:39 +02:00
  • 591fa3d8c5 Don't use cursor: pointer on roomsettings avatar if you can't change it Michael Telatynski 2019-08-28 14:46:47 +01:00
  • 478675b480 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-28 13:18:40 +00:00
  • 549e2e4589 Translated using Weblate (Italian) random 2019-08-28 08:54:25 +00:00
  • ab3f169125 Translated using Weblate (French) Kévin C 2019-08-28 07:36:19 +00:00
  • e6f166c2ac Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-08-28 03:24:24 +00:00
  • 86fcaa2af0 Merge pull request #3350 from matrix-org/dbkr/dont_infinite_loop_on_server_change David Baker 2019-08-28 09:18:35 -04:00
  • f70f983c8c Expose upgrade room permissions in room settings and fix command Michael Telatynski 2019-08-28 12:00:37 +01:00