Commit Graph

  • 1bbb68ce7f Translated using Weblate (Hungarian) Szimszon 2019-09-22 06:48:40 +00:00
  • 7189ab812c Translated using Weblate (Esperanto) Tirifto 2019-09-22 23:44:49 +00:00
  • 133e68191a Merge pull request #3464 from matrix-org/bwindels/createroomdialog-makeover-rebased Bruno Windels 2019-09-23 11:51:53 +00:00
  • 0ab9efc594 Delay IS access tokens J. Ryan Stinnett 2019-09-23 12:28:41 +01:00
  • e98b753c21 Use alternate MSISDN submit URL when returned by HS J. Ryan Stinnett 2019-09-23 12:21:25 +01:00
  • 7d1cb43760 Merge pull request #64 from matrix-org/bwindels/createroomadjustments Bruno Windels 2019-09-23 09:33:12 +00:00
  • 3c7a0f4c49 remove invalid css Bruno Windels 2019-09-23 11:18:28 +02:00
  • 53b28b9de8 i18n Bruno Windels 2019-09-20 17:47:10 +02:00
  • 6a3723c69e dialog styling Bruno Windels 2019-09-20 17:47:02 +02:00
  • 3e0278d41a add validation when clicking Ok in dialog Bruno Windels 2019-09-20 17:46:47 +02:00
  • 6ae4b3e966 add room alias field to dialog Bruno Windels 2019-09-20 17:46:14 +02:00
  • 8a1c1bbec4 implement RoomAliasField component Bruno Windels 2019-09-20 17:45:14 +02:00
  • c5f9ef87ba fixup: detailsOpen state var Bruno Windels 2019-09-20 17:44:07 +02:00
  • 761233c473 add public switch Bruno Windels 2019-09-20 17:43:14 +02:00
  • 4a7ae3ca8e add optional topic field Bruno Windels 2019-09-20 17:41:03 +02:00
  • 157a3388a5 change name to Field, no_federate to switch Bruno Windels 2019-09-20 17:39:46 +02:00
  • 27ed1e94e9 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-22 15:51:47 +00:00
  • 0c187b4459 Merge pull request #10929 from vector-im/t3chguy/don't_log_query_params Michael Telatynski 2019-09-22 16:51:42 +01:00
  • fae47fd3a6 Translated using Weblate (Finnish) Tuomas Hietala 2019-09-20 16:27:44 +00:00
  • 00ad663112 Translated using Weblate (Dutch) Nathan Follens 2019-09-20 19:53:19 +00:00
  • 889b4bebff Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-09-21 02:53:55 +00:00
  • 5315519655 Translated using Weblate (Finnish) Tuomas Hietala 2019-09-20 16:51:35 +00:00
  • 1018dc7ced Don't log query parameters as they may contain secrets Michael Telatynski 2019-09-21 17:44:58 +01:00
  • 03d928bf5d adjust create room dialog name field selector Bruno Windels 2019-09-20 17:22:43 +02:00
  • c0ba5199b9 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-20 13:37:10 +00:00
  • 4904cea196 Translated using Weblate (Korean) 송태섭 2019-09-20 06:03:06 +00:00
  • ae30eafa9c Translated using Weblate (French) Kévin C 2019-09-20 07:48:17 +00:00
  • a351245032 Translated using Weblate (Bulgarian) Slavi Pantaleev 2019-09-20 06:33:57 +00:00
  • 351a3ebd67 Merge pull request #3462 from matrix-org/jryans/msc2290 J. Ryan Stinnett 2019-09-20 14:37:03 +01:00
  • f9a09d271b Use separate MSISDN add and bind flow for supporting HSes J. Ryan Stinnett 2019-09-20 12:45:22 +01:00
  • ff69ad02b9 Use separate email add and bind flow for supporting HSes J. Ryan Stinnett 2019-09-20 11:49:32 +01:00
  • 9e3bb09ef1 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-19 16:51:43 +00:00
  • 6bd089c350 Merge branch 'master' into develop RiotRobot 2019-09-19 17:54:39 +01:00
  • ab3f1f829a v1.3.6 v1.3.6 RiotRobot 2019-09-19 17:51:56 +01:00
  • 6998aa94fd Prepare changelog for v1.3.6 RiotRobot 2019-09-19 17:51:56 +01:00
  • 5feb4f9c89 v1.3.6 RiotRobot 2019-09-19 17:50:59 +01:00
  • 0e406c5440 Merge pull request #10920 from vector-im/dbkr/fix_originmigrator_electron6_2 David Baker 2019-09-19 17:46:57 +01:00
  • 42b756952e Typo David Baker 2019-09-19 17:42:43 +01:00
  • 6464bfe850 Remove the other listener when one fires David Baker 2019-09-19 17:41:08 +01:00
  • 835d7bfb9d Fix origin migrator for SSO logins David Baker 2019-09-19 17:16:57 +01:00
  • 076df930e3 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-19 15:01:39 +00:00
  • 46e0a7cafa Merge pull request #3460 from matrix-org/t3chguy/room_avatar Michael Telatynski 2019-09-19 16:01:35 +01:00
  • 6fa6e0abaf Merge branch 'origin/develop' into Weblate. Weblate 2019-09-19 14:59:54 +00:00
  • 54643d28d4 Merge pull request #3458 from matrix-org/t3chguy/register_disable_no_custom_url_spinner Michael Telatynski 2019-09-19 15:59:49 +01:00
  • 9a1305bf4a Extract separate add / bind methods on AddThreepid J. Ryan Stinnett 2019-09-19 15:50:18 +01:00
  • d5c96b86d4 fix test Michael Telatynski 2019-09-19 10:31:34 +01:00
  • d1fb31a6dc Merge branches 'develop' and 't3chguy/register_disable_no_custom_url_spinner' of github.com:matrix-org/matrix-react-sdk into t3chguy/register_disable_no_custom_url_spinner Michael Telatynski 2019-09-19 10:07:42 +01:00
  • f8b1b36051 Fix copy-paste issue Michael Telatynski 2019-09-19 09:48:35 +01:00
  • 4983378230 Merge branches 'develop' and 't3chguy/room_avatar' of github.com:matrix-org/matrix-react-sdk into t3chguy/room_avatar Michael Telatynski 2019-09-19 09:44:56 +01:00
  • 8769cfb88e Merge branch 'origin/develop' into Weblate. Weblate 2019-09-19 08:27:17 +00:00
  • f356b8a3c9 Merge pull request #3457 from matrix-org/t3chguy/sso_device_name Michael Telatynski 2019-09-19 09:27:13 +01:00
  • 5ecc40d96b Merge branch 'origin/develop' into Weblate. Weblate 2019-09-19 08:26:56 +00:00
  • 7bbe24299d Translated using Weblate (Japanese) shuji narazaki 2019-09-19 02:57:59 +00:00
  • 9392cc7dde Translated using Weblate (Bulgarian) Slavi Pantaleev 2019-09-18 13:48:12 +00:00
  • 1a330374fe Merge pull request #3459 from matrix-org/t3chguy/editing_enable_onPaste Michael Telatynski 2019-09-19 09:26:50 +01:00
  • d40e57ad27 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-18 20:47:24 +00:00
  • e008d7cbeb Merge pull request #10906 from ptman/patch-1 Travis Ralston 2019-09-18 14:47:19 -06:00
  • 2a3c8d350d i18n Michael Telatynski 2019-09-18 18:02:45 +01:00
  • 2632e648b4 Add roomavatar slash command to set avatar of the current room Michael Telatynski 2019-09-18 16:33:56 +01:00
  • 02dfdffc4f Fix failing test due to newly added assumption Michael Telatynski 2019-09-18 14:35:13 +01:00
  • c286f2214f Fix disabled save button on message editor when pasting Michael Telatynski 2019-09-18 14:09:38 +01:00
  • 6209d62f49 Don't show spinner if registration is disabled Michael Telatynski 2019-09-18 13:16:21 +01:00
  • 99b804d567 Change to separate add and bind to guard 3PID account section J. Ryan Stinnett 2019-09-18 13:02:52 +01:00
  • fd218cb8ba Merge branch 'origin/develop' into Weblate. Weblate 2019-09-18 12:00:53 +00:00
  • 020f15ca6f Merge pull request #3456 from matrix-org/t3chguy/delint Michael Telatynski 2019-09-18 13:00:49 +01:00
  • c633df3c15 Use same initial device name rules for SSO login as password login Michael Telatynski 2019-09-18 12:16:41 +01:00
  • 481bc2cb92 Update docs/shortcuts.md Paul Tötterman 2019-09-18 13:32:24 +03:00
  • 2eddda1843 Update docs/shortcuts.md Paul Tötterman 2019-09-18 13:21:23 +03:00
  • 85b85665c3 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-18 08:57:25 +00:00
  • a556fcbb71 Translated using Weblate (Korean) 송태섭 2019-09-18 04:37:40 +00:00
  • 245b8f7ac5 Translated using Weblate (Hungarian) Szimszon 2019-09-18 06:17:31 +00:00
  • 58c333f9c1 Merge pull request #3455 from matrix-org/t3chguy/nvl/fix_phone_numbers David Baker 2019-09-18 09:57:19 +01:00
  • 55c809e839 Document more shortcuts Paul Tötterman 2019-09-18 11:55:44 +03:00
  • e502558f7d Delint Michael Telatynski 2019-09-18 09:27:43 +01:00
  • 54ea85f235 regenerate .eslintignore.errorfiles Michael Telatynski 2019-09-18 09:12:23 +01:00
  • 648527e650 Fix failure to render newly verified phone number and nested forms Michael Telatynski 2019-09-18 08:41:05 +01:00
  • 5d7b51dd24 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-17 22:00:52 +00:00
  • d7a1116880 Merge pull request #3454 from matrix-org/travis/focus Travis Ralston 2019-09-17 16:00:47 -06:00
  • 9f3f88ba00 Focus context menus so screen readers can find them Travis Ralston 2019-09-17 15:41:39 -06:00
  • 8d3b22cece Merge branch 'origin/develop' into Weblate. Weblate 2019-09-17 20:47:50 +00:00
  • 8899f612c3 Translated using Weblate (French) Kévin C 2019-09-17 20:26:25 +00:00
  • df2632d164 Merge pull request #3453 from matrix-org/travis/fix-tests1 Travis Ralston 2019-09-17 14:47:45 -06:00
  • 10b2501785 Upgrade lolex to pull in a clock fix Travis Ralston 2019-09-17 14:37:59 -06:00
  • 99b8193ce7 Use the new ShallowRenderer over ReactTestUtils Travis Ralston 2019-09-17 14:33:32 -06:00
  • 202ae1b715 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-17 17:17:43 +00:00
  • acf474c402 Merge pull request #3450 from matrix-org/matthew/read-marker-timings Matthew Hodgson 2019-09-17 18:17:39 +01:00
  • f50a95d723 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-17 17:09:47 +00:00
  • e8fbd77a61 Merge pull request #10893 from vector-im/travis/bump2 Travis Ralston 2019-09-17 11:09:43 -06:00
  • 43d85521c4 Upgrade to develop dependencies Travis Ralston 2019-09-17 11:05:05 -06:00
  • 2deeb9f8e7 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-17 17:01:51 +00:00
  • 3facb9be82 Merge pull request #3451 from matrix-org/travis/bump2 Travis Ralston 2019-09-17 11:01:47 -06:00
  • 9c474da831 Bump to master commit of react-gemini-scrollbar Travis Ralston 2019-09-17 10:55:49 -06:00
  • 90691ada3c normalise translations Matthew Hodgson 2019-09-17 17:51:03 +01:00
  • 11c7d02a2d Point to develop dependencies and fixed react-gemini-scrollbar Travis Ralston 2019-09-17 10:44:29 -06:00
  • b2f44237b8 dangling comma Matthew Hodgson 2019-09-17 17:36:29 +01:00
  • 832123524d make the lifetimes of the RM configurable Matthew Hodgson 2019-09-17 17:34:30 +01:00
  • e88c5a0da7 Use the same gemini-scrollbar version as the react-sdk Travis Ralston 2019-09-17 09:35:14 -06:00
  • c060e58ea2 Merge branch 'origin/develop' into Weblate. Weblate 2019-09-17 14:44:47 +00:00
  • 26b646613d Translated using Weblate (French) Valere 2019-09-17 13:22:06 +00:00
  • b1618056c0 Merge pull request #3449 from matrix-org/jryans/picker-types-regression J. Ryan Stinnett 2019-09-17 15:44:41 +01:00