Commit Graph

  • 3aee0b56ae Merge pull request #1994 from matrix-org/t3chguy/fix_group_tile_overflow Luke Barnard 2018-06-22 11:41:13 +01:00
  • 6252f5b818 Merge remote-tracking branch 'origin/develop' into dbkr/jitsi_makewidget David Baker 2018-06-22 11:31:54 +01:00
  • 9d68c9e1a1 Logging & comment fix David Baker 2018-06-22 11:24:30 +01:00
  • 8eeff746d3 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-22 09:56:22 +00:00
  • 88ecaced82 Merge pull request #1992 from matrix-org/t3chguy/focus_rte_after_when_uploadingFile Michael Telatynski 2018-06-22 10:56:17 +01:00
  • a470f250b5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-22 09:39:00 +00:00
  • 5b8e453484 Merge pull request #1991 from matrix-org/t3chguy/delint_MImageBody Luke Barnard 2018-06-22 10:38:56 +01:00
  • fe3b9dbed2 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-22 09:35:34 +00:00
  • f15b877a55 Merge pull request #1977 from matrix-org/t3chguy/ctrl-k_tab Luke Barnard 2018-06-22 10:35:28 +01:00
  • 4ef8defd90 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-22 09:34:10 +00:00
  • 9265f0d032 Merge pull request #1990 from matrix-org/t3chguy/no_displayname Luke Barnard 2018-06-22 10:34:04 +01:00
  • 3b2349b28c Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-22 09:24:10 +00:00
  • 8b257f2f50 Merge pull request #1989 from matrix-org/t3chguy/right_click_tagpanel_contextmenu Luke Barnard 2018-06-22 10:23:58 +01:00
  • ca2937cd65 Translated using Weblate (Italian) random 2018-06-21 15:38:16 +00:00
  • 6642292d1e Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-21 13:07:59 +00:00
  • 26aec4364d Merge pull request #2000 from matrix-org/t3chguy/deduplicate_address_picker Michael Telatynski 2018-06-21 14:07:52 +01:00
  • f32da97a3a delint and run generate-eslint-error-ignore-file Michael Telatynski 2018-06-21 14:04:08 +01:00
  • 58be44ad9e factor out conditional LanguageSelector as functional component and reuse in Login, ForgotPassword and Registration views Michael Telatynski 2018-06-21 13:51:39 +01:00
  • be612998bd invert boolean operation for readability and add comment Michael Telatynski 2018-06-21 12:14:16 +01:00
  • 0737965079 s/userList/selectedList/ & s/queryList/suggestedList/ Michael Telatynski 2018-06-21 12:13:27 +01:00
  • dd421b92cd Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-21 11:00:21 +00:00
  • e148eb1a93 Merge pull request #2002 from matrix-org/t3chguy/fix_ChatCreateOrReuseDialog_onCancel Luke Barnard 2018-06-21 12:00:15 +01:00
  • 0fabed5570 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-21 10:42:59 +00:00
  • a0207fb7fd Merge pull request #1982 from matrix-org/t3chguy/nvl/fix_set_password-email_flow Michael Telatynski 2018-06-21 11:42:53 +01:00
  • 2428eb12af delint ChatCreateOrReuseDialog Michael Telatynski 2018-06-21 11:37:06 +01:00
  • 5b3a462247 Merge pull request #6889 from vector-im/t3chguy/status_theme Luke Barnard 2018-06-21 11:27:49 +01:00
  • cb6c41ae66 Translated using Weblate (Bulgarian) Slavi Pantaleev 2018-06-21 09:49:59 +00:00
  • ee6fc5859c v0.15.6-rc.1 v0.15.6-rc.1 David Baker 2018-06-21 10:20:26 +01:00
  • f13bf59a82 Prepare changelog for v0.15.6-rc.1 David Baker 2018-06-21 10:20:26 +01:00
  • f9868b6100 v0.15.6-rc.1 David Baker 2018-06-21 10:18:45 +01:00
  • 0c38f9aa40 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-21 09:13:31 +00:00
  • d4e3301dd9 Translated using Weblate (Czech) Marek Lach 2018-06-20 17:21:38 +00:00
  • df58715a17 Merge pull request #1998 from matrix-org/t3chguy/fix_commands Luke Barnard 2018-06-21 10:13:23 +01:00
  • f9e7af6e90 js & react sdk rc.1 David Baker 2018-06-21 10:09:01 +01:00
  • 2b8bc8a800 v0.12.8-rc.1 David Baker 2018-06-21 10:06:53 +01:00
  • f3d54a49b6 Prepare changelog for v0.12.8-rc.1 David Baker 2018-06-21 10:06:52 +01:00
  • b18c95cdb5 js-sdk rc.1 David Baker 2018-06-21 10:03:35 +01:00
  • fd252ded60 take into account the addressType also Michael Telatynski 2018-06-21 00:47:21 +01:00
  • 4040e3f5cf delint Michael Telatynski 2018-06-21 00:37:37 +01:00
  • bce87829b6 hide already chosen results from AddressPickerDialog Michael Telatynski 2018-06-21 00:33:24 +01:00
  • 28ef65c4aa Translated using Weblate (Slovak) Marek Lach 2018-06-20 13:21:24 +00:00
  • 4508da5666 only override contextmenu if closeMenu is provided Michael Telatynski 2018-06-20 18:03:15 +01:00
  • 7cd8a5a2b2 allow chaining right click contextmenus Michael Telatynski 2018-06-20 18:01:37 +01:00
  • 884fa3b913 use existing command hashmap over linear array search Michael Telatynski 2018-06-20 17:25:23 +01:00
  • 7d9d17145c change so that if someone enters invalid command with args we strict match Michael Telatynski 2018-06-20 17:21:06 +01:00
  • f5b12bd66a slash got consumed in the consolidation Michael Telatynski 2018-06-20 17:09:49 +01:00
  • 4dba23b81d Merge pull request #1997 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2018-06-20 14:06:05 +01:00
  • 9030435ba4 Merge pull request #6915 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2018-06-20 14:04:38 +01:00
  • 14cf2327b4 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-20 12:56:37 +00:00
  • a6d9c25b70 Merge pull request #1988 from matrix-org/t3chguy/refactor_slashcommands David Baker 2018-06-20 13:56:29 +01:00
  • 47cfe7a877 Translated using Weblate (Galician) Miguel Branco 2018-06-18 15:36:14 +00:00
  • a182174fba Translated using Weblate (Bengali (India)) Sandipan Banerjee 2018-06-17 22:30:46 +00:00
  • 8a4f6f0048 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop Weblate 2018-06-20 09:13:31 +00:00
  • 86abf8bf50 Merge pull request #1996 from matrix-org/dbkr/unlabs_replies David Baker 2018-06-20 10:10:24 +01:00
  • e5a509bb91 i18n & prunei18n David Baker 2018-06-20 10:04:03 +01:00
  • 2e2c347ef7 Merge remote-tracking branch 'origin/develop' into dbkr/unlabs_replies David Baker 2018-06-20 10:03:05 +01:00
  • 0011f23125 Translated using Weblate (Galician) Miguel Branco 2018-06-18 21:04:42 +00:00
  • 0e8b4ac2ad i18n & prunei18n David Baker 2018-06-20 10:01:09 +01:00
  • e67dae704a Take replies out of labs! David Baker 2018-06-20 09:57:11 +01:00
  • ef91fce621 Translated using Weblate (Polish) Paweł Kozioł 2018-06-19 20:21:14 +00:00
  • 5cc15b2e03 add additional classes which protect the text from overflowing Michael Telatynski 2018-06-19 19:11:22 +01:00
  • 287745f8c6 delint, remove unused imports and fix flow annotations Michael Telatynski 2018-06-19 12:06:13 +01:00
  • c1e608f1a8 show permalinks to communities as Pills Michael Telatynski 2018-06-19 11:53:17 +01:00
  • b79cd205a0 Support autocompleting Communities Michael Telatynski 2018-06-19 11:52:48 +01:00
  • 72f50a8c61 rewrite group permalinks in <a hrefs> also Michael Telatynski 2018-06-19 11:51:06 +01:00
  • 6200c147a6 Upload File confirmation modal steals focus, send it back to composer Michael Telatynski 2018-06-19 08:41:24 +01:00
  • fffb8379d8 delint MImageBody, fixes anonymous class and hyphenated style keys which made react cry Michael Telatynski 2018-06-19 08:37:11 +01:00
  • 9fa7cb8635 delint Michael Telatynski 2018-06-19 07:57:28 +01:00
  • baf0d37983 un-break having no displayname user settings Michael Telatynski 2018-06-19 07:56:04 +01:00
  • 29ea4025d4 trigger TagTile context menu on right click Michael Telatynski 2018-06-18 22:13:20 +01:00
  • 5293fcc768 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-18 18:44:08 +00:00
  • 1352abf317 Merge pull request #1987 from matrix-org/luke/fix-matrix-to-regex Michael Telatynski 2018-06-18 19:44:03 +01:00
  • 9de6bf4f5a once command has a space, strict match instead of fuzzy match Michael Telatynski 2018-06-18 17:37:55 +01:00
  • 107802fa29 simplify arrow func Michael Telatynski 2018-06-18 19:32:12 +01:00
  • 85ddc0651b consolidate the two locations commands are defined, as it was a MESS Michael Telatynski 2018-06-18 19:31:40 +01:00
  • 56507c1f4b Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-18 18:33:09 +00:00
  • e79738de8a Merge branch 't3chguy/improve_command_provider' into develop Michael Telatynski 2018-06-18 19:32:54 +01:00
  • 9107744da7 simplify arrow func Michael Telatynski 2018-06-18 19:32:12 +01:00
  • 5bf3e5b00a consolidate the two locations commands are defined, as it was a MESS Michael Telatynski 2018-06-18 19:31:40 +01:00
  • f2e4e515c1 delint EditableText Michael Telatynski 2018-06-18 18:21:16 +01:00
  • 3449a60d32 fix onBlur breaking the SetEmail field (setting it back empty :() Michael Telatynski 2018-06-18 18:17:10 +01:00
  • 015d433235 fix a way to get stuck in set password/email flow Michael Telatynski 2018-06-18 18:14:48 +01:00
  • 6301c04590 Merge branch 'develop' into t3chguy/ctrl-k_tab Michael Telatynski 2018-06-18 18:01:41 +01:00
  • 9f9dbda7f7 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-18 16:55:07 +00:00
  • 0383937e0d Translated using Weblate (Galician) Miguel Branco 2018-06-18 15:32:05 +00:00
  • 51560c516d Merge pull request #1986 from matrix-org/luke/fix-matrix-to-regex Michael Telatynski 2018-06-18 17:54:59 +01:00
  • d6f0f77561 Fix MATRIXTO_URL_PATTERN RegExp groups Luke Barnard 2018-06-18 17:45:47 +01:00
  • bea52eccf8 Remove unused import, constant Luke Barnard 2018-06-18 17:40:48 +01:00
  • a8520335ef once command has a space, strict match instead of fuzzy match Michael Telatynski 2018-06-18 17:37:55 +01:00
  • 55a6a4dd8f Translated using Weblate (Galician) Miguel Branco 2018-06-18 15:28:27 +00:00
  • 0933640922 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-18 15:08:48 +00:00
  • 03bec1b515 Translated using Weblate (Galician) Miguel Branco 2018-06-18 13:59:04 +00:00
  • ad76f1bce6 Merge pull request #1984 from matrix-org/dbkr/fix_stickers Luke Barnard 2018-06-18 16:08:36 +01:00
  • e1e60cb147 delint CallHandler David Baker 2018-06-18 16:00:42 +01:00
  • 276c7a9c4d Fix blank sticker picker David Baker 2018-06-18 15:24:34 +01:00
  • 35966415a6 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-18 12:56:07 +00:00
  • 499bb5cfb4 Merge pull request #1972 from matrix-org/t3chguy/media_fixes David Baker 2018-06-18 13:56:00 +01:00
  • bfad84a4d6 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-18 12:53:25 +00:00
  • e7aa2ae009 Merge pull request #1978 from matrix-org/t3chguy/right_click_contextmenu David Baker 2018-06-18 13:53:20 +01:00
  • a8a8e358c6 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-18 12:48:44 +00:00