Commit Graph

  • f9b3e40bfa run gen-i18n and prune-i18n Michael Telatynski 2018-06-29 12:54:54 +01:00
  • 322b77b57f don't throw, console.warn + dummy render instead Michael Telatynski 2018-06-29 12:54:36 +01:00
  • c08f31aa76 Merge branch 'master' into develop David Baker 2018-06-29 12:05:20 +01:00
  • 768e206c4a v0.15.6 v0.15.6 David Baker 2018-06-29 12:02:51 +01:00
  • 84fbee085d v0.15.6 David Baker 2018-06-29 12:01:17 +01:00
  • 3126bf6561 Prepare changelog for v0.15.6 David Baker 2018-06-29 11:56:19 +01:00
  • e193b65bc7 Released js-sdk & react-sdk David Baker 2018-06-29 11:54:01 +01:00
  • 00d6ac6c4b Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-29 10:52:40 +00:00
  • 41dee71d38 Merge branch 'master' into develop David Baker 2018-06-29 11:52:20 +01:00
  • 2dc94ac277 v0.12.8 David Baker 2018-06-29 11:40:18 +01:00
  • 66b17d9120 Prepare changelog for v0.12.8 David Baker 2018-06-29 11:39:35 +01:00
  • 30ddc9610a Released js-sdk David Baker 2018-06-29 11:34:56 +01:00
  • a1fcff8bb8 Revert "affix copyButton so that it doesn't get scrolled horizontally" Michael Telatynski 2018-06-25 16:31:43 +01:00
  • 21978b18df when the user switches room, close room settings this is especially annoying if they choose Leave Room which indirectly switches room Michael Telatynski 2018-06-26 17:07:39 +01:00
  • c4b6b458f2 don't fire share dialog when clicking timestamp of event, it was tripping people up and broke search permalinks Michael Telatynski 2018-06-26 16:59:49 +01:00
  • c3766181b5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-29 09:49:19 +00:00
  • 80a9bc3f2a Merge pull request #2029 from matrix-org/luke/fix-connection-lost-message-layout David Baker 2018-06-29 10:49:15 +01:00
  • 15506ab5e8 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-29 09:46:52 +00:00
  • b07a2cb09a Merge pull request #2028 from matrix-org/luke/fix-room-settings-editable-text-resets David Baker 2018-06-29 10:46:48 +01:00
  • 9b9f744a44 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-29 09:44:24 +00:00
  • 1539180cdc Translated using Weblate (Russian) Andrey 2018-06-27 17:54:51 +00:00
  • 053a46a5e0 Merge pull request #2027 from matrix-org/luke/track-uisis-piwik-improved David Baker 2018-06-29 10:44:17 +01:00
  • fcc9479c1d Translated using Weblate (Hungarian) Szimszon 2018-06-27 08:49:00 +00:00
  • ad5f1bf180 Fix layout bug introduced by #2025 Luke Barnard 2018-06-29 09:46:01 +01:00
  • 016e9176f6 Fix room topics/names reseting when UserSetting re-renders Luke Barnard 2018-06-28 18:11:52 +01:00
  • 3846aef8a1 Alter docs, add comments Luke Barnard 2018-06-28 16:06:12 +01:00
  • ab990d8cec Increase grace period to allow time for key sharing Luke Barnard 2018-06-28 15:07:58 +01:00
  • 01dd387970 Track UISIs in bulk Luke Barnard 2018-06-28 15:03:47 +01:00
  • fc841d2dc5 Translated using Weblate (Basque) Osoitz 2018-06-27 08:31:40 +00:00
  • 2e892fa399 Translated using Weblate (French) Kévin C 2018-06-27 21:34:11 +00:00
  • 96877022ac Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-27 16:22:26 +00:00
  • 48f03bfd86 Merge pull request #2026 from matrix-org/dbkr/share_icons David Baker 2018-06-27 17:22:21 +01:00
  • 7bce29db6e Replace share icons David Baker 2018-06-27 17:17:44 +01:00
  • b5266f0f51 Translated using Weblate (German) Krombel 2018-06-27 16:05:26 +00:00
  • d3e90de328 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-27 14:40:25 +00:00
  • 239b973df3 Translated using Weblate (Russian) Andrey 2018-06-27 11:42:29 +00:00
  • 74770acf73 Merge pull request #2025 from matrix-org/luke/fix-status-bar-consent-error David Baker 2018-06-27 15:40:18 +01:00
  • 66002a4c00 Fix status bar element positioning Luke Barnard 2018-06-27 15:19:27 +01:00
  • 8be173cae3 Show nicer error when receiving a consent error after sending a message Luke Barnard 2018-06-27 15:08:56 +01:00
  • 55f4f1723d fix nullguard on EventTile, getComponent never returns falsey, it throws Michael Telatynski 2018-06-27 11:44:11 +01:00
  • 0fe851585f Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-27 10:37:26 +00:00
  • a0871116d8 Merge pull request #2023 from matrix-org/luke/fix-copy-button-position Luke Barnard 2018-06-27 11:37:22 +01:00
  • 6345fcb8f2 Fix incorrectly positioned copy button on <pre> blocks Luke Barnard 2018-06-27 11:31:55 +01:00
  • 6fe889fae2 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-27 09:40:22 +00:00
  • 4c575bb1ca Merge pull request #2018 from matrix-org/luke/fix-piwik-path-reporting Luke Barnard 2018-06-27 10:40:17 +01:00
  • 680b0fdd0e Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-27 09:33:45 +00:00
  • cf24427d12 Merge pull request #2022 from matrix-org/dbkr/update_package_lock Luke Barnard 2018-06-27 10:33:41 +01:00
  • 483edb8211 pathname is not constant Luke Barnard 2018-06-27 10:31:51 +01:00
  • 2c9dd9469e Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-27 09:29:26 +00:00
  • 6fb57c0c66 Merge pull request #2021 from matrix-org/t3chguy/room_sub_list_badge_click David Baker 2018-06-27 10:29:22 +01:00
  • fd40e21175 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-27 09:27:38 +00:00
  • 7ab229cd4d Translated using Weblate (Slovak) Peter Vágner 2018-06-26 20:59:21 +00:00
  • 2bc1679b97 Merge pull request #2020 from matrix-org/t3chguy/improve_linkifier2 David Baker 2018-06-27 10:27:30 +01:00
  • ee729233c8 Update package-lock.json David Baker 2018-06-27 10:17:25 +01:00
  • a6ab51cd73 change GroupInviteTile from RoomSubList css so new :hover won't apply Michael Telatynski 2018-06-27 09:50:32 +01:00
  • 613e83edb4 on roomsublist invite badge click goto first room/group Michael Telatynski 2018-06-27 09:49:58 +01:00
  • b3341e6664 on click roomsublist notif badge, goto first room with notif Michael Telatynski 2018-06-27 09:16:37 +01:00
  • 0c2240a1f2 Translated using Weblate (Hungarian) Szimszon 2018-06-27 08:48:32 +00:00
  • 13d26d0d58 Translated using Weblate (Basque) Osoitz 2018-06-27 08:31:27 +00:00
  • 2782b2ff9d Translated using Weblate (Bulgarian) Slavi Pantaleev 2018-06-27 05:52:45 +00:00
  • 96163d1402 prevent multiple ports (:1234:1234:1234) Michael Telatynski 2018-06-26 23:41:46 +01:00
  • 9f3a121abc optimize linkify-matrix by skipping an intermediary state Michael Telatynski 2018-06-26 23:36:01 +01:00
  • 09b09846cf allow :port specifiers in roomalias,groupid and userid as per spec Michael Telatynski 2018-06-26 23:33:35 +01:00
  • 5c7f2cc32f Translated using Weblate (Slovak) Peter Vágner 2018-06-26 19:57:33 +00:00
  • 12d020909e Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-26 17:26:34 +00:00
  • 67dc8f2a8e Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist David Baker 2018-06-26 18:26:29 +01:00
  • a1b32d865d Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-26 17:23:42 +00:00
  • fddb576c3a Merge pull request #2014 from matrix-org/luke/fix-roomlist-headers-on-resize David Baker 2018-06-26 18:23:38 +01:00
  • 45c31c0b24 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-26 16:46:57 +00:00
  • fc593d7359 Translated using Weblate (Slovak) Peter Vágner 2018-06-26 16:38:22 +00:00
  • f40802e9d8 Merge pull request #2017 from matrix-org/t3chguy/timestamp_share_dialog_stop Michael Telatynski 2018-06-26 17:46:52 +01:00
  • ea016a280b Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-26 16:18:27 +00:00
  • 166ec68a9a Merge pull request #2013 from matrix-org/revert-1980-t3chguy/fix_copy-code-block_hscroll David Baker 2018-06-26 17:18:21 +01:00
  • 0724a033a6 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-26 16:15:25 +00:00
  • d91730d930 Translated using Weblate (Slovak) Peter Vágner 2018-06-26 16:12:22 +00:00
  • 10e39d5a5d Merge pull request #2019 from matrix-org/t3chguy/room_settings_leave_room David Baker 2018-06-26 17:15:19 +01:00
  • a548c83647 when the user switches room, close room settings this is especially annoying if they choose Leave Room which indirectly switches room Michael Telatynski 2018-06-26 17:07:39 +01:00
  • 19e948155c Redact pathnames with origin file:// Luke Barnard 2018-06-26 17:06:12 +01:00
  • 12e5eb5f78 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-06-26 16:00:07 +00:00
  • cef624d6be Translated using Weblate (Slovak) Peter Vágner 2018-06-26 15:52:27 +00:00
  • e1afe2a469 Translated using Weblate (Russian) Andrey 2018-06-25 17:15:53 +00:00
  • b1b140d7aa Translated using Weblate (Czech) Marek Lach 2018-06-26 12:19:40 +00:00
  • 1c6e5e1cc1 Merge pull request #2015 from matrix-org/dbkr/widgets_refactor David Baker 2018-06-26 16:59:58 +01:00
  • 67f803bc5f don't fire share dialog when clicking timestamp of event, it was tripping people up and broke search permalinks Michael Telatynski 2018-06-26 16:59:49 +01:00
  • 4fb4589ebd Translated using Weblate (Slovak) Marek Lach 2018-06-26 12:14:37 +00:00
  • 0ee8d18f5a More code de-duping David Baker 2018-06-26 16:41:44 +01:00
  • c780cd05a8 Change argument order of setRoomWidget David Baker 2018-06-26 16:33:28 +01:00
  • a88297d7a6 More code reuse David Baker 2018-06-26 16:27:17 +01:00
  • 9539a749e5 More refactoring David Baker 2018-06-26 16:03:58 +01:00
  • cb89406d3e Indent David Baker 2018-06-26 15:42:29 +01:00
  • 4a39297e65 PR feedback David Baker 2018-06-26 15:41:43 +01:00
  • c971b685ad Translated using Weblate (German) Krombel 2018-06-26 14:35:43 +00:00
  • 0a6450507e Bits of PR feedback David Baker 2018-06-26 15:21:22 +01:00
  • b6f3b2f594 More code re-use David Baker 2018-06-26 12:28:59 +01:00
  • ca8a4a0c3f Remove unused function David Baker 2018-06-26 12:08:33 +01:00
  • 6cf11a15e6 Move WidgetUtils to utils dir David Baker 2018-06-26 11:59:16 +01:00
  • 0f2c47937c Merge the two different widget utils files David Baker 2018-06-26 11:52:21 +01:00
  • 069080e7ed lint David Baker 2018-06-26 09:41:20 +01:00
  • abd37d141e clear up if statement to make it more readable Michael Telatynski 2018-06-26 07:54:38 +01:00
  • f5519c21b9 Merge branches 'develop' and 't3chguy/hide_empty_sublist' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_empty_sublist Michael Telatynski 2018-06-26 07:51:16 +01:00