Commit Graph

  • 595dc82543 unit test + fixes + comments + simplication for diffDeletion Bruno Windels 2019-07-18 18:09:31 +02:00
  • 190b99b489 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-25 12:16:24 +00:00
  • cef67d5784 Merge pull request #3245 from matrix-org/jryans/tooltip-larger-buffer J. Ryan Stinnett 2019-07-25 13:16:20 +01:00
  • f5fbd30a28 Tweak interactive tooltip buffer area allow for overshoot J. Ryan Stinnett 2019-07-25 12:17:07 +01:00
  • e6fbcfe309 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-25 10:38:30 +00:00
  • 97e8c00986 Translated using Weblate (Hungarian) Szimszon 2019-07-25 06:37:56 +00:00
  • a20abb4190 Translated using Weblate (French) Kévin C 2019-07-25 08:20:25 +00:00
  • 7296fb8fd3 Merge pull request #3243 from matrix-org/jryans/app-perm-url J. Ryan Stinnett 2019-07-25 11:38:24 +01:00
  • 80e27cc0e8 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-24 13:27:48 +00:00
  • a5ac50f90f Merge pull request #3242 from matrix-org/jryans/terms-modal J. Ryan Stinnett 2019-07-24 14:27:43 +01:00
  • 9445a0d386 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-24 09:59:28 +00:00
  • 346c20f49d Translated using Weblate (Swedish) Brian J 2019-07-24 08:33:41 +00:00
  • ac31b4b8f4 Merge pull request #3244 from matrix-org/bwindels/diffhtmledits Bruno Windels 2019-07-24 09:59:23 +00:00
  • 3753e5261d Implement diffing html messages in the edit history Bruno Windels 2019-07-23 09:12:24 +02:00
  • 2d4264c39d Keep widget URL in permission screen to one line J. Ryan Stinnett 2019-07-23 18:06:37 +01:00
  • 846a908bb4 Add missing copyright header J. Ryan Stinnett 2019-07-23 17:52:00 +01:00
  • 42dbdcbbf0 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-23 16:39:01 +00:00
  • 91eee1b45f Translated using Weblate (Polish) Karol Kosek 2019-07-23 16:22:13 +00:00
  • 6a90c125a7 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-07-23 13:32:53 +00:00
  • e73690439f Merge pull request #3239 from matrix-org/bwindels/redirectpastetocomposer Bruno Windels 2019-07-23 16:38:55 +00:00
  • 39d5aa7cf4 Avoid visual glitch when terms appear for IM J. Ryan Stinnett 2019-07-23 15:11:38 +01:00
  • 58fd828944 Merge pull request #3241 from matrix-org/bwindels/dofocuscomposer Bruno Windels 2019-07-23 11:55:44 +00:00
  • f2bcfea0fb Revert "fix lint" Bruno Windels 2019-07-23 11:43:44 +02:00
  • d9d459bc6b Merge branch 'origin/develop' into Weblate. Weblate 2019-07-23 09:32:19 +00:00
  • 2eb8a8879b Merge pull request #3199 from matrix-org/dbkr/terms David Baker 2019-07-23 10:32:11 +01:00
  • 1b0d8510a2 Add note from commit message as a comment David Baker 2019-07-23 10:09:16 +01:00
  • d1c80de9c8 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-23 09:02:11 +00:00
  • 55e2f18d1e Merge pull request #10392 from vector-im/jryans/electron-5 J. Ryan Stinnett 2019-07-23 10:02:05 +01:00
  • 82d7617287 add comments Bruno Windels 2019-07-23 09:44:17 +02:00
  • ceb53dc0bb Revert "remove unnessary manual focussing of composer" Bruno Windels 2019-07-23 09:13:51 +02:00
  • 7d7878245b Strip path component from IM rest url David Baker 2019-07-22 18:54:04 +01:00
  • 88e8fbb39a Upgrade to Electron 5 J. Ryan Stinnett 2019-07-22 14:32:50 +01:00
  • e6009cbe7a Merge branch 'origin/develop' into Weblate. Weblate 2019-07-22 11:56:15 +00:00
  • e3ffdf1dff Merge pull request #3240 from matrix-org/jryans/defer-im-token J. Ryan Stinnett 2019-07-22 12:56:11 +01:00
  • 84bb0eb696 Remove random capital David Baker 2019-07-22 12:25:12 +01:00
  • b664259e2d more syntactic sugar David Baker 2019-07-22 12:23:55 +01:00
  • 11ecb4ca54 s/terms /policies/ David Baker 2019-07-22 12:23:28 +01:00
  • 09c2d899ac Defer IM token until widget is shown and permission granted J. Ryan Stinnett 2019-07-19 19:04:48 +01:00
  • 90559c2c69 Translated using Weblate (Esperanto) Benjamin 2019-07-20 14:18:02 +00:00
  • 00559b38ce Translated using Weblate (Esperanto) Tirifto 2019-07-20 14:17:52 +00:00
  • 99171010c9 Translated using Weblate (Basque) Osoitz 2019-07-20 06:51:45 +00:00
  • 19df115e57 Translated using Weblate (Esperanto) Benjamin 2019-07-20 14:16:47 +00:00
  • b040fbd029 Translated using Weblate (Esperanto) Tirifto 2019-07-20 14:15:52 +00:00
  • 006de4053c Translated using Weblate (Esperanto) Benjamin 2019-07-20 13:26:47 +00:00
  • 023130bb4b Redirect paste to composer when event target can't receive input Bruno Windels 2019-07-19 17:49:04 +02:00
  • 367218ad2a Merge branch 'origin/develop' into Weblate. Weblate 2019-07-19 15:10:08 +00:00
  • 84e2333105 Merge pull request #3226 from matrix-org/bwindels/readmarker-invisble-events Bruno Windels 2019-07-19 15:10:03 +00:00
  • db594aefa0 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-19 14:42:00 +00:00
  • 97d1ec160f Translated using Weblate (Tamil) Murali Ramakrishnan 2019-07-19 09:47:48 +00:00
  • c47b5ac847 Translated using Weblate (Chinese (Traditional)) vzhmla 2019-07-19 11:59:41 +00:00
  • c335c04c75 Merge pull request #3238 from matrix-org/bwindels/diffplainedits Bruno Windels 2019-07-19 14:41:53 +00:00
  • c713172a37 add proptypes Bruno Windels 2019-07-19 16:34:50 +02:00
  • de1c4e0cfe better naming Bruno Windels 2019-07-19 16:34:39 +02:00
  • f305d8ac08 Basic diff visualisation for plain text edits Bruno Windels 2019-07-19 16:09:23 +02:00
  • 3403a4b47b Merge branch 'origin/develop' into Weblate. Weblate 2019-07-19 08:55:01 +00:00
  • 0092272bc4 Translated using Weblate (Polish) Karol Kosek 2019-07-18 18:25:23 +00:00
  • 3ee26b6135 Merge pull request #3237 from matrix-org/bwindels/fixcpfocus Bruno Windels 2019-07-19 08:54:54 +00:00
  • 77f5274cd8 don't focus composer on keydown with modifier Bruno Windels 2019-07-19 09:10:20 +02:00
  • 5179f1884e Merge branch 'origin/develop' into Weblate. Weblate 2019-07-18 16:10:27 +00:00
  • 4fa7302f69 Merge pull request #3224 from matrix-org/bwindels/focus-composer-on-type Bruno Windels 2019-07-18 16:10:23 +00:00
  • e0f9f68b46 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-18 14:58:53 +00:00
  • e71fcc33f9 Merge branch 'master' into develop RiotRobot 2019-07-18 15:58:43 +01:00
  • 7d07642bef v1.3.0 v1.3.0 RiotRobot 2019-07-18 15:56:14 +01:00
  • 096303955e Prepare changelog for v1.3.0 RiotRobot 2019-07-18 15:56:14 +01:00
  • 1bd846454c v1.3.0 RiotRobot 2019-07-18 15:53:39 +01:00
  • 72f3f1afee Upgrade to JS SDK 2.2.0 and React SDK 1.4.0 RiotRobot 2019-07-18 15:53:25 +01:00
  • 0603efc7ee Merge branch 'origin/develop' into Weblate. Weblate 2019-07-18 14:51:40 +00:00
  • 03151418af Merge branch 'master' into develop RiotRobot 2019-07-18 15:51:33 +01:00
  • 3c0c64af8e v1.4.0 RiotRobot 2019-07-18 15:50:46 +01:00
  • 8b0e36e884 Prepare changelog for v1.4.0 RiotRobot 2019-07-18 15:50:45 +01:00
  • 480061bde3 Upgrade JS SDK to v2.2.0 RiotRobot 2019-07-18 15:46:38 +01:00
  • 4a7264cc15 Merge pull request #3236 from matrix-org/jryans/v1.4.0/dontredactfirst J. Ryan Stinnett 2019-07-18 14:40:58 +01:00
  • 1b06b9957a dont show remove button for original event in edit history Bruno Windels 2019-07-18 14:09:29 +02:00
  • 8952b4ac4e Merge branch 'origin/develop' into Weblate. Weblate 2019-07-18 13:35:11 +00:00
  • 6c6300e1cc Merge pull request #3235 from matrix-org/bwindels/dontredactfirst J. Ryan Stinnett 2019-07-18 14:35:07 +01:00
  • 48759fd66d Merge pull request #10365 from vector-im/jryans/v1.3.0/rm-reactions-edits-flags J. Ryan Stinnett 2019-07-18 14:26:34 +01:00
  • 06ce10b351 Remove reactions feature flag from docs and config J. Ryan Stinnett 2019-07-18 10:48:43 +01:00
  • b403828791 Remove edits feature flag from docs and config J. Ryan Stinnett 2019-07-18 10:46:19 +01:00
  • 217065aafc Merge branch 'origin/develop' into Weblate. Weblate 2019-07-18 13:16:37 +00:00
  • 5f38d1d3e9 Translated using Weblate (Tamil) Murali Ramakrishnan 2019-07-18 04:41:17 +00:00
  • f4ee5d0a4b Merge pull request #10363 from vector-im/jryans/rm-reactions-edits-flags J. Ryan Stinnett 2019-07-18 14:16:32 +01:00
  • aca41fe80a dont show remove button for original event in edit history Bruno Windels 2019-07-18 14:09:29 +02:00
  • 8398ec5358 Remove reactions feature flag from docs and config J. Ryan Stinnett 2019-07-18 10:48:43 +01:00
  • 7731f93676 Remove edits feature flag from docs and config J. Ryan Stinnett 2019-07-18 10:46:19 +01:00
  • adc2648b46 Merge pull request #3234 from matrix-org/jryans/v1.4.0/rm-reactions-edits-flags J. Ryan Stinnett 2019-07-18 10:28:57 +01:00
  • 537eb2c88f Remove reactions feature flag J. Ryan Stinnett 2019-07-17 17:00:36 +01:00
  • 25351d552e Remove editing feature flag J. Ryan Stinnett 2019-07-17 16:56:15 +01:00
  • f96d02daf9 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-18 08:59:00 +00:00
  • 2371e8d204 Translated using Weblate (Tamil) Murali Ramakrishnan 2019-07-18 04:43:05 +00:00
  • 76a60c84ac Merge pull request #3233 from matrix-org/jryans/rm-reactions-edits-flags J. Ryan Stinnett 2019-07-18 09:58:55 +01:00
  • 599c49613f Remove reactions feature flag J. Ryan Stinnett 2019-07-17 17:00:36 +01:00
  • 674f33917f Remove editing feature flag J. Ryan Stinnett 2019-07-17 16:56:15 +01:00
  • 03f577bea9 use keydown here, as its a div element Bruno Windels 2019-07-17 17:23:19 +02:00
  • 50c88279a0 remove non-existing keypress handler Bruno Windels 2019-07-17 17:05:56 +02:00
  • 4bde0c08ad make sure we don't break any A or BUTTON keyboard handling Bruno Windels 2019-07-17 16:53:12 +02:00
  • 10a74696b3 hack around React having its own bubbling phase Bruno Windels 2019-07-17 16:50:05 +02:00
  • 3cb2659737 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-17 14:20:11 +00:00
  • b8aae63c83 Merge pull request #3229 from matrix-org/jryans/enable-reactions-edits-default J. Ryan Stinnett 2019-07-17 15:20:07 +01:00
  • 88a0dbe2f1 Merge pull request #3232 from matrix-org/jryans/v1.4.0/enable-reactions-edits-default J. Ryan Stinnett 2019-07-17 15:19:08 +01:00
  • 19b3b41ad6 Continue to next config level after device for features J. Ryan Stinnett 2019-07-17 14:48:14 +01:00