Commit Graph

  • aecfbce55c prepend "/me " to emotes when parsing them to edit Bruno Windels 2019-06-14 11:01:52 +02:00
  • 0b17812b9c allow editing emotes Bruno Windels 2019-06-14 11:01:34 +02:00
  • 8232553e36 Added translation using Weblate (Vietnamese) Le Dang Trung 2019-06-14 08:02:55 +00:00
  • 1090b7d912 Use flex: 1 for mx_Field to replace all the calc(100% - 20px) and more Michael Telatynski 2019-06-13 23:48:47 +01:00
  • 41b995df3c If oldContent matches newContent, skip sending the edit Michael Telatynski 2019-06-13 22:56:32 +01:00
  • 3c4d21c4c4 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-13 17:39:48 +00:00
  • 2a7301fa8f Merge pull request #3102 from matrix-org/dbkr/nonfatal_errors_are_not_fatal David Baker 2019-06-13 18:39:43 +01:00
  • 06a11f4d45 Random blank lines David Baker 2019-06-13 18:31:04 +01:00
  • e884cccabe Allow changing servers on nonfatal errors David Baker 2019-06-13 18:23:33 +01:00
  • 8f4b27d517 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-13 17:22:37 +00:00
  • 357f8b5893 Translated using Weblate (Italian) random 2019-06-12 10:19:14 +00:00
  • acaadaba11 Translated using Weblate (Czech) Stanislav Lukeš 2019-06-11 19:39:30 +00:00
  • abb77de78b Translated using Weblate (Basque) Osoitz 2019-06-13 09:16:26 +00:00
  • 6c5b205324 Translated using Weblate (Albanian) Besnik Bleta 2019-06-12 09:52:18 +00:00
  • 446b20c454 Merge pull request #3101 from matrix-org/dbkr/simplify_email_reg David Baker 2019-06-13 18:22:30 +01:00
  • 81327264f7 Remove unused inhibitlogin param David Baker 2019-06-13 17:44:00 +01:00
  • 48f5cf1523 Merge pull request #2966 from npny/npny/autocomplete-arrow-keys Bruno Windels 2019-06-13 15:38:36 +00:00
  • 048d8d2ec7 Simplify email registration David Baker 2019-06-13 16:24:09 +01:00
  • 3d944b715e Merge pull request #3097 from matrix-org/bwindels/edit-unsent Bruno Windels 2019-06-13 14:00:46 +00:00
  • 8b16f91b3d fix karma tests? Bruno Windels 2019-06-13 14:22:50 +02:00
  • 89cc45892c fix grammar fail Bruno Windels 2019-06-13 13:28:21 +02:00
  • 4fda6c21de Use overflow on MemberInfo name/mxid so that the back button stays Michael Telatynski 2019-06-12 21:58:10 +01:00
  • acb813372c Restore Composer History under shift-up & down Michael Telatynski 2019-06-12 21:32:47 +01:00
  • c6b1bd4d14 Merge pull request #3096 from matrix-org/dbkr/use_server_urls_from_query_please David Baker 2019-06-12 19:19:40 +01:00
  • 1139f68de8 Pass in object of the right type David Baker 2019-06-12 18:11:58 +01:00
  • d40f49e2c2 fix lint Bruno Windels 2019-06-12 19:09:27 +02:00
  • 41e41269dc use EditorStateTransfer to pass on state to newly mounted editor Bruno Windels 2019-06-12 18:52:34 +02:00
  • 10377b42e9 Fix registration with email + non-default HS David Baker 2019-06-12 17:42:09 +01:00
  • e674f39e3b support (de)serializing parts with other dependencies than text Bruno Windels 2019-06-12 18:32:32 +02:00
  • 678fd37549 helper class to preserve editor state between remounting the editor Bruno Windels 2019-06-12 18:29:21 +02:00
  • f981d72083 Merge pull request #3095 from matrix-org/jryans/read-marker-action-bar J. Ryan Stinnett 2019-06-12 17:23:36 +01:00
  • 5280d8469b Add comment J. Ryan Stinnett 2019-06-12 17:23:11 +01:00
  • 4d8809882f Raise action bar above read marker J. Ryan Stinnett 2019-06-12 14:41:45 +01:00
  • c425eb83ca Merge pull request #3094 from matrix-org/dbkr/console_log_more_betterer David Baker 2019-06-12 14:40:45 +01:00
  • 5e775e24fb Console log more helpfully David Baker 2019-06-12 14:04:08 +01:00
  • 9af5aea687 v1.2.2-rc.1 v1.2.2-rc.1 RiotRobot 2019-06-12 12:12:17 +01:00
  • a413621efc Prepare changelog for v1.2.2-rc.1 RiotRobot 2019-06-12 12:12:16 +01:00
  • b751383702 v1.2.2-rc.1 RiotRobot 2019-06-12 12:11:12 +01:00
  • 974da9947c js-sdk & react-sdk rc.1 RiotRobot 2019-06-12 12:10:37 +01:00
  • 3f37fc0cbb v1.2.2-rc.1 RiotRobot 2019-06-12 12:00:15 +01:00
  • 710a77548e Prepare changelog for v1.2.2-rc.1 RiotRobot 2019-06-12 12:00:15 +01:00
  • b2dfd3e84e js-sdk rc.1 RiotRobot 2019-06-12 11:56:30 +01:00
  • d13b3aa16c don't block unsent events from being edited Bruno Windels 2019-06-12 11:20:21 +02:00
  • 413bff084c Merge pull request #3087 from matrix-org/jryans/context-menu-clipping J. Ryan Stinnett 2019-06-12 10:19:47 +01:00
  • f78aeae83a also consider pending events when looking for next/prev event to edit Bruno Windels 2019-06-12 11:19:17 +02:00
  • 3dee682048 Merge pull request #3093 from matrix-org/jryans/is-down-blocks-reg J. Ryan Stinnett 2019-06-12 10:11:16 +01:00
  • d0f78e9d44 stop propagation of click events on un-hiding the spoiler Sorunome 2019-06-11 22:13:47 +02:00
  • eddac4b188 blur spoilers Sorunome 2019-06-11 21:08:45 +02:00
  • b8ed731c89 Allow registration to submit for non-fatal errors J. Ryan Stinnett 2019-06-11 18:01:27 +01:00
  • 3836a3e2e2 Merge pull request #3092 from matrix-org/jryans/full-mxid-default-hs J. Ryan Stinnett 2019-06-11 15:52:21 +01:00
  • 21099052fc Clear the login busy state after .well-known discovery J. Ryan Stinnett 2019-06-11 15:41:47 +01:00
  • f07aff2816 Merge pull request #3091 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2019-06-11 14:16:12 +01:00
  • 3b557c273f Merge branch 'origin/develop' into Weblate. Weblate 2019-06-11 13:06:33 +00:00
  • 8458aa7978 Merge pull request #10012 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2019-06-11 14:06:29 +01:00
  • d5cdfe62d5 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-11 13:03:19 +00:00
  • dfb7c163a0 electron 4.2.4 David Baker 2019-06-11 14:03:05 +01:00
  • 2a028e9294 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-11 12:47:02 +00:00
  • 7fe82ae1e8 Translated using Weblate (Hungarian) Szimszon 2019-06-11 11:38:23 +00:00
  • 892427c7cc Translated using Weblate (French) Kévin C 2019-06-11 10:19:16 +00:00
  • bf09738786 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-06-11 12:24:16 +00:00
  • acb5372b7c Merge pull request #3090 from matrix-org/dbkr/registration_matrixclient_sometimes_isnt_there David Baker 2019-06-11 13:46:56 +01:00
  • 7602d76723 fix test David Baker 2019-06-11 13:16:49 +01:00
  • 504133fa1b Translated using Weblate (Russian) Walter 2019-06-09 18:24:05 +00:00
  • 7a8f2cf8cd Translated using Weblate (Esperanto) Tirifto 2019-06-10 11:20:21 +00:00
  • 9554a39a77 Translated using Weblate (Basque) Osoitz 2019-06-10 06:29:11 +00:00
  • a6c5ac669b Don't show spinner once liveness check has failed David Baker 2019-06-11 12:10:44 +01:00
  • 5eccd14120 Fix registration after fail-fast David Baker 2019-06-11 12:02:14 +01:00
  • 8e32ea5e9f Merge branch 'origin/develop' into Weblate. Weblate 2019-06-11 09:42:32 +00:00
  • e1a1492f6f Merge pull request #3085 from matrix-org/dbkr/one_request_at_a_time_two David Baker 2019-06-11 10:42:27 +01:00
  • c8ff7fd67a Merge branch 'origin/develop' into Weblate. Weblate 2019-06-11 09:40:58 +00:00
  • 553ce13e36 Translated using Weblate (West Flemish) Nathan Follens 2019-06-11 08:29:09 +00:00
  • 2a2f2ef15c Merge pull request #3088 from matrix-org/travis/less-fatal-identity David Baker 2019-06-11 10:40:53 +01:00
  • 7b3d1ad08d Typo David Baker 2019-06-11 10:29:00 +01:00
  • bd3237500f Fix submit disabled condition Travis Ralston 2019-06-10 20:24:06 -06:00
  • aacb942d57 Don't handle identity server failure as fatal, and use the right message Travis Ralston 2019-06-10 19:28:32 -06:00
  • 90c29c9046 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-10 15:53:40 +00:00
  • a47a46bd9f Merge pull request #3084 from matrix-org/jryans/update-action-bar-on-decrypt J. Ryan Stinnett 2019-06-10 16:53:35 +01:00
  • f89a4b688f Align message context menu vertically J. Ryan Stinnett 2019-06-10 16:29:20 +01:00
  • db867d1a58 s/setBusy/busyChanged/ David Baker 2019-06-10 16:27:27 +01:00
  • cb4af9d043 Fix test fail David Baker 2019-06-10 16:18:58 +01:00
  • 0355c91797 Align message context menu to right J. Ryan Stinnett 2019-06-10 16:12:23 +01:00
  • 3126880345 Extend context menu alignment without chevrons J. Ryan Stinnett 2019-06-10 16:07:23 +01:00
  • 3597c7d148 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-10 14:37:54 +00:00
  • a79ee4d048 Merge pull request #3086 from matrix-org/dbkr/fix_exception_on_logout David Baker 2019-06-10 15:37:50 +01:00
  • 4597dcd221 Fix exception on logout David Baker 2019-06-10 15:27:59 +01:00
  • a8a4ca2ed1 Use setBusy interface of js-sdk interactive auth David Baker 2019-06-10 15:22:53 +01:00
  • fab4b2ca0e Merge branch 'origin/develop' into Weblate. Weblate 2019-06-10 12:31:24 +00:00
  • dfc176e440 Translated using Weblate (West Flemish) Nathan Follens 2019-06-08 10:33:04 +00:00
  • d0405da21d Translated using Weblate (Russian) Walter 2019-06-09 18:24:05 +00:00
  • 0658eb15d3 Translated using Weblate (Polish) Karol Kosek 2019-06-07 22:30:49 +00:00
  • 90a2ea94b6 Translated using Weblate (French) Kévin C 2019-06-08 06:56:51 +00:00
  • da39606379 Translated using Weblate (Esperanto) Tirifto 2019-06-10 11:20:21 +00:00
  • 9bd6ca95e7 Translated using Weblate (Dutch) Nathan Follens 2019-06-08 10:32:28 +00:00
  • 1aa46c6bfa Translated using Weblate (Czech) Stanislav Lukeš 2019-06-08 10:10:52 +00:00
  • e21ea18a9a Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-06-08 12:20:08 +00:00
  • 10f662d7a7 Translated using Weblate (Basque) Osoitz 2019-06-09 14:43:12 +00:00
  • 6a0c055891 Translated using Weblate (Albanian) Besnik Bleta 2019-06-08 10:24:38 +00:00
  • f620b712fb Merge pull request #3083 from matrix-org/dbkr/remember_invited_room David Baker 2019-06-10 13:31:12 +01:00
  • 73d2d78c33 Recheck message actions on decrypt J. Ryan Stinnett 2019-06-10 12:49:31 +01:00
  • 2c10557f26 Don't NPE if no third party invite David Baker 2019-06-10 12:32:53 +01:00