Commit Graph

  • 34dab73150 Fix riot-desktop manual update check getting stuck on Downloading... Michael Telatynski 2020-06-07 13:18:34 +01:00
  • c2ecef12f2 Fix riot-desktop manual update check getting stuck on Downloading... Michael Telatynski 2020-06-07 13:18:33 +01:00
  • 4521e9feb1 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering Tulir Asokan 2020-06-07 15:12:30 +03:00
  • 59cefb6ac8 Merge pull request #13943 from vector-im/dependabot/npm_and_yarn/websocket-extensions-0.1.4 Travis Ralston 2020-06-06 10:50:48 -06:00
  • e8ebf886e4 Bump websocket-extensions from 0.1.3 to 0.1.4 dependabot[bot] 2020-06-06 13:56:59 +00:00
  • 9b928b5a5d Handle remaining cases for room updates in new room list Travis Ralston 2020-06-05 20:12:32 -06:00
  • 0bb1eefdea Remove view_room listener as it isn't needed Travis Ralston 2020-06-05 19:47:15 -06:00
  • 021d6d626e Merge branch 'develop' into travis/room-list/css-layout Travis Ralston 2020-06-05 19:44:09 -06:00
  • 6548748d7c Introduce sticky rooms to the new room list Travis Ralston 2020-06-05 18:44:05 -06:00
  • 09ba491afd Merge branch 'origin/develop' into Weblate. Weblate 2020-06-05 22:54:27 +00:00
  • e809f280f5 Merge pull request #4719 from matrix-org/t3chguy/emoji-ligatures Michael Telatynski 2020-06-05 23:54:21 +01:00
  • 0c32daa162 label ZWJ as such Michael Telatynski 2020-06-05 23:34:04 +01:00
  • 69ea635398 Allow searching the emoji picker using other emoji Michael Telatynski 2020-06-05 23:19:00 +01:00
  • 2806c8c18b Fix temporary class Travis Ralston 2020-06-05 14:13:28 -06:00
  • 829bf3c774 Add another TODO comment Travis Ralston 2020-06-05 14:11:04 -06:00
  • 1d8833e9f8 Selected state, cleanup, and profile display Travis Ralston 2020-06-05 14:08:20 -06:00
  • ea6b0a60ab Merge branch 'develop' into travis/room-list/css-layout Travis Ralston 2020-06-05 13:19:00 -06:00
  • 46c31d190e Merge branch 'origin/develop' into Weblate. Weblate 2020-06-05 19:18:05 +00:00
  • ee3d2c51d8 Merge pull request #4697 from matrix-org/travis/room-list/scrolling-resize Travis Ralston 2020-06-05 13:17:59 -06:00
  • e93a41c5fb Minor clarity Travis Ralston 2020-06-05 13:14:44 -06:00
  • 303a7f0bd0 Merge pull request #98 from vector-im/t3chguy/remember-updates Michael Telatynski 2020-06-05 19:21:37 +01:00
  • 861c90c3d8 delint Michael Telatynski 2020-06-05 18:41:29 +01:00
  • 799ccc6197 Electron recall latest downloaded update for when the user manually checks for updates Michael Telatynski 2020-06-05 18:36:10 +01:00
  • 8b09d7052a Merge branch 'origin/develop' into Weblate. Weblate 2020-06-05 17:27:06 +00:00
  • 68e59a3655 Merge pull request #4696 from aaronraimist/empty-formatbar Travis Ralston 2020-06-05 11:27:00 -06:00
  • ed7f0fd95f This promise doesn't exist anymore David Baker 2020-06-05 18:08:25 +01:00
  • 51038b0c02 Replace math hacks with temporary placeholder Travis Ralston 2020-06-05 11:03:18 -06:00
  • 7c59e39710 Sort out what we wait for after login David Baker 2020-06-05 17:52:09 +01:00
  • 42215c5ed8 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-05 16:07:18 +00:00
  • efa12b8c2f Merge pull request #4687 from matrix-org/travis/split-left-panel Travis Ralston 2020-06-05 10:07:13 -06:00
  • 68e555a0c6 Support accounts with cross signing but no SSSS David Baker 2020-06-05 16:40:20 +01:00
  • 6875ffe0d5 Reset matrix-react-sdk back to develop branch RiotRobot 2020-06-05 16:03:24 +01:00
  • befc7589cd Reset matrix-js-sdk back to develop branch RiotRobot 2020-06-05 16:03:09 +01:00
  • ca632fd2da Merge branch 'master' into develop RiotRobot 2020-06-05 16:02:34 +01:00
  • b82a893a79 Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases David Baker 2020-06-05 16:00:43 +01:00
  • 3b28ebecef v1.6.4 v1.6.4 RiotRobot 2020-06-05 15:57:45 +01:00
  • 758e2d6bfd Prepare changelog for v1.6.4 RiotRobot 2020-06-05 15:57:45 +01:00
  • 21dd4c99f3 Upgrade matrix-react-sdk to 2.7.1 RiotRobot 2020-06-05 15:53:38 +01:00
  • 45fb8adc5d Upgrade matrix-js-sdk to 6.2.1 RiotRobot 2020-06-05 15:52:31 +01:00
  • 5217e36ee3 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-05 14:49:41 +00:00
  • 475ba61671 Give the show more button some real CSS Travis Ralston 2020-06-05 08:48:23 -06:00
  • d54308a8c6 Reset matrix-js-sdk back to develop branch RiotRobot 2020-06-05 15:48:06 +01:00
  • 1d6141cf73 Merge branch 'master' into develop RiotRobot 2020-06-05 15:47:23 +01:00
  • c8366b7a47 v2.7.1 RiotRobot 2020-06-05 15:43:24 +01:00
  • 94059b8524 Prepare changelog for v2.7.1 RiotRobot 2020-06-05 15:43:23 +01:00
  • 6752c2832e Add missing var Travis Ralston 2020-06-05 08:40:32 -06:00
  • 211ad66fea Fix i18n Travis Ralston 2020-06-05 08:39:38 -06:00
  • b31a8d494b Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout Travis Ralston 2020-06-05 08:39:19 -06:00
  • 68623b43b1 Merge branch 'release-v2.7.1' of github.com:matrix-org/matrix-react-sdk into release-v2.7.1 RiotRobot 2020-06-05 15:35:34 +01:00
  • b49d437ee8 Merge pull request #4716 from matrix-org/t3chguy/1.6.4/r3 Michael Telatynski 2020-06-05 15:33:50 +01:00
  • 93ed062900 Fix exceptions from Tooltip David Baker 2020-06-04 17:54:18 +01:00
  • 1ca51ced9c Reset matrix-js-sdk back to develop branch RiotRobot 2020-06-05 15:17:55 +01:00
  • 50bb0b3694 Merge branch 'master' into develop RiotRobot 2020-06-05 15:17:09 +01:00
  • e78fa602c0 Upgrade matrix-js-sdk to 6.2.1 RiotRobot 2020-06-05 15:13:55 +01:00
  • edb8b671f3 v1.6.4 RiotRobot 2020-06-05 15:13:36 +01:00
  • 2f0b6ee984 Prepare changelog for v1.6.4 RiotRobot 2020-06-05 15:13:36 +01:00
  • ece9040247 Upgrade matrix-js-sdk to 6.2.1 RiotRobot 2020-06-05 15:13:04 +01:00
  • 455b915143 Merge pull request #4715 from matrix-org/t3chguy/1.6.4/r2 Michael Telatynski 2020-06-05 11:34:06 +01:00
  • 04e6112dfb Merge pull request #4714 from matrix-org/t3chguy/1.6.4/r1 Michael Telatynski 2020-06-05 11:31:42 +01:00
  • ab9284fced Fix not being able to dismiss new login toasts Travis Ralston 2020-06-04 13:47:43 -06:00
  • 0dc788eaa7 Fix compact layout regression Michael Telatynski 2020-06-05 10:53:00 +01:00
  • 8cd90e3d98 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-05 10:03:09 +00:00
  • 0a1080de5a Translated using Weblate (Lithuanian) MamasLT 2020-06-04 21:20:26 +00:00
  • f221e06068 Merge pull request #4712 from matrix-org/t3chguy/compact-mode Michael Telatynski 2020-06-05 11:02:59 +01:00
  • f4f23dba04 Fix compact layout regression Michael Telatynski 2020-06-05 10:53:00 +01:00
  • 1f11298aa3 Annotate hacky math Travis Ralston 2020-06-04 21:45:32 -06:00
  • e90e70bd77 Misc cleanup Travis Ralston 2020-06-04 21:43:33 -06:00
  • 0694637b06 Remove debug Travis Ralston 2020-06-04 21:38:06 -06:00
  • f347019cf8 Remove obviously questionable color choices Travis Ralston 2020-06-04 21:37:10 -06:00
  • 0c15b2bdb6 Simple structuring of the room list itself Travis Ralston 2020-06-04 21:21:04 -06:00
  • 4c1bc50649 Initial styling for new room list Travis Ralston 2020-06-04 16:34:04 -06:00
  • 02c131e3ff Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout Travis Ralston 2020-06-04 16:40:55 -06:00
  • be3510ae69 Merge branch 'travis/split-left-panel' into travis/room-list/css-layout Travis Ralston 2020-06-04 16:40:49 -06:00
  • 434f6ea4d4 Remove legacy sublist sizing Travis Ralston 2020-06-04 16:36:14 -06:00
  • dc01607ad9 Merge branch 'develop' into travis/split-left-panel Travis Ralston 2020-06-04 15:09:51 -06:00
  • 6fd24e837c Merge branch 'origin/develop' into Weblate. Weblate 2020-06-04 21:07:24 +00:00
  • 02cdc8a201 Merge pull request #4710 from matrix-org/matthew/fix-safari-emoji Matthew Hodgson 2020-06-04 22:07:18 +01:00
  • c171bdfec7 fix emoji in safari Matthew Hodgson 2020-06-04 22:01:16 +01:00
  • 2bf74c0229 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-04 20:12:26 +00:00
  • 3fff46b0c7 Merge pull request #4709 from matrix-org/travis/later Travis Ralston 2020-06-04 14:12:21 -06:00
  • dc23dd637c Revert "Add a warning for dismissing invalid toasts" Travis Ralston 2020-06-04 13:53:09 -06:00
  • 3674b6446e Add a warning for dismissing invalid toasts Travis Ralston 2020-06-04 13:53:09 -06:00
  • c667ea69af Fix not being able to dismiss new login toasts Travis Ralston 2020-06-04 13:47:43 -06:00
  • f3011f00f7 Remove debug Jorik Schellekens 2020-06-04 19:43:35 +01:00
  • f72e331d99 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-04 18:30:01 +00:00
  • ddc9c67a8b Merge pull request #4708 from matrix-org/dbkr/bind_tooltip_render David Baker 2020-06-04 19:29:56 +01:00
  • bba6767608 Update displayed min and max Jorik Schellekens 2020-06-04 18:00:22 +01:00
  • 5e569d75b6 Fix exceptions from Tooltip David Baker 2020-06-04 17:54:18 +01:00
  • 2ec47ecc74 Use different setting flag print expected values Jorik Schellekens 2020-06-04 17:50:56 +01:00
  • 73ba31a438 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-04 16:41:21 +00:00
  • 88c325afa4 Merge pull request #4707 from tulir/patch-1 Michael Telatynski 2020-06-04 17:41:15 +01:00
  • 2fe56276f2 css for vis Travis Ralston 2020-06-04 10:07:41 -06:00
  • 46b282142f Stop removing variation selector from quick reactions Tulir Asokan 2020-06-04 18:58:13 +03:00
  • a3fdd643d7 Add hacky math support Travis Ralston 2020-06-04 09:57:16 -06:00
  • f6504d67ba Use 10px instead Jorik Schellekens 2020-06-04 16:23:28 +01:00
  • cdf2d70aea Merge branch 'develop' into travis/room-list/scrolling-resize Travis Ralston 2020-06-04 09:19:54 -06:00
  • 83df79aab9 Try variable resizing Travis Ralston 2020-06-04 09:19:03 -06:00
  • 5dfe5ac135 Searching: More docs and a bit of simplification. Damir Jelić 2020-06-04 16:57:28 +02:00
  • bf13032d5b Searching: Fix a lint issue and expand some docs. Damir Jelić 2020-06-04 15:51:06 +02:00
  • 94d4aa17ee Searching: Remove some debug logs. Damir Jelić 2020-06-04 15:35:18 +02:00