Commit Graph

  • 9ea0402f02 Translated using Weblate (Hungarian) Szimszon 2019-09-09 15:14:31 +00:00
  • c6f3ca20c0 Merge pull request #3407 from matrix-org/t3chguy/fix_custom_pl_levels_hidden_error Michael Telatynski 2019-09-09 17:50:58 +01:00
  • 9c5c64021d Merge branch 'origin/develop' into Weblate. Weblate 2019-09-09 15:10:25 +00:00
  • e98827eaa7 Translated using Weblate (Korean) 송태섭 2019-09-09 14:39:25 +00:00
  • dcde3c042d Translated using Weblate (Hungarian) Szimszon 2019-09-09 14:54:44 +00:00
  • e0ea0db013 Merge pull request #3409 from matrix-org/bwindels/redact-recent Bruno Windels 2019-09-09 15:10:20 +00:00
  • 3edf345b02 PR feedback Bruno Windels 2019-09-09 16:19:10 +02:00
  • 043a8d35e6 Move the rest of the IS/email supported logic to AddressPickerDialog Michael Telatynski 2019-09-09 15:03:00 +01:00
  • f205ddbc8f add redact recent messages button in member info Bruno Windels 2019-09-09 15:10:50 +02:00
  • 194cd0a460 Fix identity server text in AddressPickerDialog Michael Telatynski 2019-09-09 13:53:56 +01:00
  • 9c488426cc add i18n Michael Telatynski 2019-09-09 12:51:30 +01:00
  • 088f9e4cc5 Catch error from changing room power level requirements and show modal Michael Telatynski 2019-09-09 12:50:05 +01:00
  • 4494f1c265 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-09 11:28:23 +00:00
  • a03b224ff7 Merge pull request #3394 from matrix-org/jryans/bound-3pids-warning J. Ryan Stinnett 2019-09-09 12:28:19 +01:00
  • 360216941e Merge pull request #3401 from matrix-org/jryans/bound-3pids-text J. Ryan Stinnett 2019-09-09 12:28:03 +01:00
  • 7b30e03202 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-09 09:28:04 +00:00
  • 24f1ec8abb Merge pull request #3398 from matrix-org/jryans/is-input-tweak J. Ryan Stinnett 2019-09-09 10:28:00 +01:00
  • c3adddb5ac Change to paragraphs outside the strings J. Ryan Stinnett 2019-09-09 10:27:02 +01:00
  • ef2ff31a46 Fix replying from search results for this and all rooms Michael Telatynski 2019-09-09 09:34:08 +01:00
  • 4d37c8dbf7 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-09 08:06:55 +00:00
  • 1422b1d73e Merge pull request #3403 from matrix-org/bwindels/cider-italics Bruno Windels 2019-09-09 08:06:51 +00:00
  • e29184ae1d Support secret per-room hidden read receipts Travis Ralston 2019-09-06 13:02:18 -06:00
  • 034c35b07e Switch to React 16.9 Michael Telatynski 2019-09-06 19:19:06 +01:00
  • 9abcfd49da Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 17:49:15 +00:00
  • d8dbe28015 Merge pull request #3404 from matrix-org/t3chguy/react16_10 Michael Telatynski 2019-09-06 18:49:11 +01:00
  • e6d6c9ce6f Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 17:46:30 +00:00
  • 6dbc9ee893 Merge pull request #3405 from matrix-org/t3chguy/react16_11 Michael Telatynski 2019-09-06 18:46:24 +01:00
  • b243004a6c Switch to createReactClass: *everything else*. React 16 :D Michael Telatynski 2019-09-06 18:37:43 +01:00
  • d5db67be38 Switch to createReactClass: views/elements & views/groups. React 16 :D Michael Telatynski 2019-09-06 18:35:52 +01:00
  • 2cb95a1d12 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 17:18:35 +00:00
  • 13258132e7 Merge pull request #3400 from matrix-org/t3chguy/react16_9 Michael Telatynski 2019-09-06 18:18:32 +01:00
  • 48247e66be use underscore for italics so it doesn't collide with bold when toggling Bruno Windels 2019-09-06 17:50:23 +02:00
  • 49f3c9f6c5 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 14:42:20 +00:00
  • fe482258ac Merge pull request #3402 from matrix-org/bwindels/cider-toggle-inline-formatting Bruno Windels 2019-09-06 14:42:16 +00:00
  • 5bce922259 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 14:28:27 +00:00
  • 14fff3be9a Merge pull request #3399 from matrix-org/bwindels/fix-formatbar-edit-position Bruno Windels 2019-09-06 14:28:23 +00:00
  • 26bd694c6a support toggling inline formatting Bruno Windels 2019-09-06 16:25:06 +02:00
  • 3ad88604cc Stregthen bound 3PID warning dialog J. Ryan Stinnett 2019-09-06 13:43:21 +01:00
  • 70ff2bc9cd Switch to createReactClass: views/rooms and test/components. React 16 :D Michael Telatynski 2019-09-06 15:04:46 +01:00
  • 4e98721ba9 take bounding box for positioning calculation Bruno Windels 2019-09-06 15:56:46 +02:00
  • 870659d6da Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 13:54:55 +00:00
  • 322cb15ab3 Translated using Weblate (Russian) Walter 2019-09-06 11:10:09 +00:00
  • 1c3abeeb22 Translated using Weblate (Korean) 송태섭 2019-09-06 12:54:18 +00:00
  • 2ec94a4913 Translated using Weblate (Hungarian) Szimszon 2019-09-06 12:51:41 +00:00
  • 7759a9f20e Merge pull request #3397 from matrix-org/t3chguy/react16_8 Michael Telatynski 2019-09-06 14:54:50 +01:00
  • 5fddb20d86 Stop setting IS input field on account change J. Ryan Stinnett 2019-09-06 14:27:20 +01:00
  • 4db8ef4d89 Correct case of propTypes property in ES6 React Components. React 16 Michael Telatynski 2019-09-06 14:27:33 +01:00
  • 11a5fca702 Remove logs J. Ryan Stinnett 2019-09-06 13:44:44 +01:00
  • df03477907 Show change warning only when different from current J. Ryan Stinnett 2019-09-06 11:18:25 +01:00
  • 19fff51b01 Rework handling for terms CORS error J. Ryan Stinnett 2019-09-06 11:11:54 +01:00
  • 31027ba864 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 10:05:24 +00:00
  • 4201515863 Translated using Weblate (French) Kévin C 2019-09-06 09:31:48 +00:00
  • 79d488b52a Translated using Weblate (Albanian) Besnik Bleta 2019-09-06 09:55:25 +00:00
  • 4876f4c469 Merge pull request #3396 from matrix-org/bwindels/fix-formatbar-merge-error Bruno Windels 2019-09-06 10:05:19 +00:00
  • dd1c01068f fix rename that didn't make it through rebasing Bruno Windels 2019-09-06 11:58:27 +02:00
  • 2ff592c542 Use existing modal promises J. Ryan Stinnett 2019-09-06 10:48:24 +01:00
  • 48f844fb92 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 09:28:22 +00:00
  • 5014b606db Merge pull request #3391 from matrix-org/bwindels/cider-format-history Bruno Windels 2019-09-06 09:28:18 +00:00
  • 5916b48f41 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 09:22:41 +00:00
  • df4762871a Merge pull request #3392 from matrix-org/bwindels/cider-paste-plain Bruno Windels 2019-09-06 09:22:37 +00:00
  • 69d6ff26fa Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 09:22:14 +00:00
  • 6b104f6344 Merge pull request #3393 from matrix-org/bwindels/cider-fix-lastcaret Bruno Windels 2019-09-06 09:22:10 +00:00
  • 9dac91a70d ensure step before formatting is persisted in undo history Bruno Windels 2019-09-05 15:34:42 +02:00
  • 79d120b9d2 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 09:12:46 +00:00
  • 8820546f49 Merge pull request #3390 from matrix-org/bwindels/selection-color Bruno Windels 2019-09-06 09:12:42 +00:00
  • 0252c7ae37 force pasting as plain text in new composer Bruno Windels 2019-09-05 16:22:42 +02:00
  • 8cfe178913 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 09:09:50 +00:00
  • 556ccf45dc Merge pull request #3389 from matrix-org/bwindels/cider-format-shortcuts Bruno Windels 2019-09-06 09:09:47 +00:00
  • 2596281a7c update last caret from update callback instead of input event Bruno Windels 2019-09-06 11:09:01 +02:00
  • f4938f9d11 dont format empty ranges Bruno Windels 2019-09-05 15:17:33 +02:00
  • 06143ba7a1 show keyboard shortcuts in format button tooltip Bruno Windels 2019-09-05 15:09:37 +02:00
  • bdcea6f21e add shortcuts for formatting Bruno Windels 2019-09-05 15:07:12 +02:00
  • db288f9c95 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 08:52:05 +00:00
  • de787c798c Merge pull request #3387 from matrix-org/bwindels/cider-formatbar-tooltips Bruno Windels 2019-09-06 08:52:00 +00:00
  • 042822c90a copyright is solely assigned to matrix foundation now, copy paste error Bruno Windels 2019-09-06 10:37:28 +02:00
  • d6a493a2b1 fixup: language strings moved Bruno Windels 2019-09-05 13:27:33 +02:00
  • b4b9c7d072 Add tooltip for format buttons Bruno Windels 2019-09-05 13:22:42 +02:00
  • da29057fd8 move format bar to own component Bruno Windels 2019-09-05 12:10:45 +02:00
  • f53af6ecdb Merge branch 'origin/develop' into Weblate. Weblate 2019-09-06 08:38:07 +00:00
  • 11b324e063 Translated using Weblate (Korean) 송태섭 2019-09-06 00:22:26 +00:00
  • 5c3ac21fa9 Translated using Weblate (Italian) random 2019-09-05 14:34:35 +00:00
  • 9c3d801c3c Translated using Weblate (French) Kévin C 2019-09-05 14:38:51 +00:00
  • 50acdf9a86 Translated using Weblate (Bulgarian) Slavi Pantaleev 2019-09-06 07:28:25 +00:00
  • 02681d50b9 Merge pull request #3386 from matrix-org/bwindels/cider-formatbar Bruno Windels 2019-09-06 08:38:01 +00:00
  • 92c0c1a4e2 add comment about positioning the format bar Bruno Windels 2019-09-06 10:28:53 +02:00
  • d2949babcd copyright is solely assigned to matrix foundation now, copy paste error Bruno Windels 2019-09-06 10:28:20 +02:00
  • af35cdc2ea Support sending hidden read receipts Travis Ralston 2019-09-05 20:30:19 -06:00
  • d5552e4a17 Add bound 3PID warning when changing IS as well J. Ryan Stinnett 2019-09-05 17:51:27 +01:00
  • 124b7135cd make sure the update callback gets a caret when calling reset Bruno Windels 2019-09-05 17:54:08 +02:00
  • decf23f1fc Merge branch 'origin/develop' into Weblate. Weblate 2019-09-05 14:02:19 +00:00
  • 4a32be529a Translated using Weblate (Hungarian) Szimszon 2019-09-05 13:21:05 +00:00
  • 46ee52a406 Merge pull request #3388 from matrix-org/jryans/bound-3pids-warning J. Ryan Stinnett 2019-09-05 15:02:15 +01:00
  • 39bbf9af24 remove accent color as selection color Bruno Windels 2019-09-05 15:19:28 +02:00
  • 2374ab8d3a Merge branch 'origin/develop' into Weblate. Weblate 2019-09-05 13:17:01 +00:00
  • fd98db635d Translated using Weblate (Korean) 송태섭 2019-09-04 03:20:22 +00:00
  • 9f6cd5feaa Translated using Weblate (Hungarian) Szimszon 2019-09-03 19:36:28 +00:00
  • e5e551103c Translated using Weblate (German) jadiof 2019-09-04 02:48:33 +00:00
  • 7dde3776f7 Translated using Weblate (French) Kévin C 2019-09-04 09:14:03 +00:00
  • 09e9d44c96 Translated using Weblate (Finnish) Tuomas Hietala 2019-09-03 20:40:56 +00:00
  • ba583d9ce6 Translated using Weblate (Basque) Osoitz 2019-09-03 19:56:59 +00:00