Commit Graph

  • 1ab6f27535 Stop copy icon repeating weirdly. Jorik Schellekens 2020-05-28 19:37:49 +01:00
  • 14a4c31e58 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-28 18:12:39 +00:00
  • 2740db5874 Translated using Weblate (Albanian) Besnik Bleta 2020-05-28 17:52:19 +00:00
  • ab116e1e63 Merge pull request #4661 from matrix-org/t3chguy/notifier-race Michael Telatynski 2020-05-28 19:12:32 +01:00
  • bc4254574d i18n Michael Telatynski 2020-05-28 19:08:03 +01:00
  • 227fc24d3a delint Michael Telatynski 2020-05-28 19:04:34 +01:00
  • 2530ec8419 Try and fix the Notifier race Michael Telatynski 2020-05-28 19:03:42 +01:00
  • 8b94f3a66a Merge branch 'origin/develop' into Weblate. Weblate 2020-05-28 17:52:09 +00:00
  • 66c7551c2c Translated using Weblate (Albanian) Besnik Bleta 2020-05-28 17:47:01 +00:00
  • ec24350801 Merge pull request #4657 from matrix-org/uhoreg/keytar Hubert Chathi 2020-05-28 13:52:02 -04:00
  • a6683cec67 Get rid of welcome.html's Chat with Riot Bot button Michael Telatynski 2020-05-28 18:49:36 +01:00
  • 4252735db0 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-28 17:30:36 +00:00
  • c68f35060a Merge pull request #13776 from vector-im/t3chguy/toasts3_2 Michael Telatynski 2020-05-28 18:30:31 +01:00
  • cadf5c30ad Merge branch 'origin/develop' into Weblate. Weblate 2020-05-28 17:21:37 +00:00
  • 9c502ea821 Translated using Weblate (Lithuanian) MamasLT 2020-05-28 14:03:55 +00:00
  • ffb829108b Translated using Weblate (Esperanto) Tirifto 2020-05-28 15:17:32 +00:00
  • 0242b6f3f3 Merge pull request #4624 from matrix-org/t3chguy/toasts3_2 Michael Telatynski 2020-05-28 18:21:28 +01:00
  • c4d6367a17 Swap priorities of Desktop Notifications and Update toasts Michael Telatynski 2020-05-28 17:30:43 +01:00
  • 8aaa7825ef Also kill off things that these kept behind Michael Telatynski 2020-05-28 17:12:19 +01:00
  • ec995fb151 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-28 16:05:51 +00:00
  • 154586f452 Translated using Weblate (Lithuanian) MamasLT 2020-05-27 19:59:03 +00:00
  • 40cf610986 Translated using Weblate (Galician) XoseM 2020-05-27 15:09:04 +00:00
  • 0f087f7a5a Merge pull request #13814 from vector-im/travis/cleanup-lockfile Travis Ralston 2020-05-28 10:05:44 -06:00
  • dc4a2191c1 really fix types Hubert Chathi 2020-05-28 12:04:32 -04:00
  • f0cabd55c0 Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling Michael Telatynski 2020-05-28 16:59:27 +01:00
  • 0859827910 fix types Hubert Chathi 2020-05-28 11:56:48 -04:00
  • 03058bacbd Dialog wrap title instead of taking same space as the close/cancel button Michael Telatynski 2020-05-28 16:48:50 +01:00
  • 30120dc0c7 Merge remote-tracking branch 'upstream/develop' into keytar Hubert Chathi 2020-05-28 11:15:36 -04:00
  • 540059a5ed Merge branch 'origin/develop' into Weblate. Weblate 2020-05-28 13:54:15 +00:00
  • 542d81699a Translated using Weblate (Lithuanian) MamasLT 2020-05-27 18:08:46 +00:00
  • 4bee6532e1 Merge pull request #4658 from JorikSchellekens/joriks/appearance-tab-ts Jorik Schellekens 2020-05-28 14:54:05 +01:00
  • 9034889414 Reorder interfaces Jorik Schellekens 2020-05-28 14:43:01 +01:00
  • c9d5ed4d00 i18n Jorik Schellekens 2020-05-28 14:32:20 +01:00
  • af8fb33b83 add line Michael Telatynski 2020-05-28 14:28:14 +01:00
  • 361cc4ab5c Add app-load doc Michael Telatynski 2020-05-28 14:26:51 +01:00
  • 81922231ed Move Appearance tab to ts Jorik Schellekens 2020-05-28 13:55:07 +01:00
  • 73c35ff80e set the client's pickle key if the platform can store one Hubert Chathi 2020-05-28 00:05:45 -04:00
  • 57d2026a40 Modernizr check for subtle crypto as we require it all over the place Michael Telatynski 2020-05-28 00:31:22 +01:00
  • 9e2d80b8c8 Update documentation and auth dict submissions Travis Ralston 2020-05-27 13:16:49 -06:00
  • 81cae66732 Merge branch 'develop' into fix-register-auth-with-new-spec Travis Ralston 2020-05-27 12:02:46 -06:00
  • 0188a0eebb Merge branch 'origin/develop' into Weblate. Weblate 2020-05-27 16:07:17 +00:00
  • 0fd5714e21 Merge pull request #4606 from matrix-org/t3chguy/peeking-races Michael Telatynski 2020-05-27 17:07:12 +01:00
  • 8ffe415f0a Merge branch 'origin/develop' into Weblate. Weblate 2020-05-27 16:05:38 +00:00
  • 46134f5368 Merge pull request #4651 from JorikSchellekens/joriks/fix-encryption-icons-irc Jorik Schellekens 2020-05-27 17:05:32 +01:00
  • db96345538 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-27 16:04:54 +00:00
  • 5c3208d942 Merge pull request #4649 from JorikSchellekens/joriks/fix-sublist-sizing-regression Jorik Schellekens 2020-05-27 17:04:49 +01:00
  • 306645b9f0 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-27 16:04:12 +00:00
  • 4726ebaf9d Translated using Weblate (Slovak) yuuki-san 2020-05-27 09:26:50 +00:00
  • 687cc4e77a Translated using Weblate (Lithuanian) MamasLT 2020-05-27 10:08:23 +00:00
  • 6c323a1991 Translated using Weblate (Italian) random 2020-05-27 13:26:32 +00:00
  • 8b23eb1db3 Translated using Weblate (Galician) XoseM 2020-05-27 14:51:00 +00:00
  • d534ca0e2b Merge pull request #4650 from JorikSchellekens/joriks/fix-irc-codeblocks Jorik Schellekens 2020-05-27 17:03:53 +01:00
  • d33ce95dd0 Merge pull request #91 from vector-im/travis/ipc-renderer Travis Ralston 2020-05-27 10:03:28 -06:00
  • 71108fcf39 delint Michael Telatynski 2020-05-27 17:02:32 +01:00
  • 7486338efa Fix.the.tests. Michael Telatynski 2020-05-27 16:51:04 +01:00
  • 7185ae17b1 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-27 15:04:17 +00:00
  • 332be9b4e1 Merge pull request #13818 from TitanNano/9814 Travis Ralston 2020-05-27 09:04:10 -06:00
  • 061619929e Integrate requested changes from #12142 Jovan Gerodetti 2020-05-27 14:28:50 +02:00
  • 74f798157f Add media queries and mobile viewport Dale Harvey 2020-01-30 11:29:14 +01:00
  • e35c9d5bbf more testing Michael Telatynski 2020-05-27 15:18:43 +01:00
  • cb07fa53f4 test Michael Telatynski 2020-05-27 15:05:40 +01:00
  • 63ac1cb4ab debug some more Michael Telatynski 2020-05-27 14:56:24 +01:00
  • f3dfdbe746 debug Michael Telatynski 2020-05-27 14:36:44 +01:00
  • 91811581bc fix assertNoToasts Michael Telatynski 2020-05-27 14:35:59 +01:00
  • 61066b0c4c test it again Michael Telatynski 2020-05-27 14:27:09 +01:00
  • 627b568588 check if it is a race Michael Telatynski 2020-05-27 13:48:20 +01:00
  • 841ce74ac2 Fix assert vs assert.equal Michael Telatynski 2020-05-27 13:39:00 +01:00
  • faaca43a75 more loggin' Michael Telatynski 2020-05-27 13:35:15 +01:00
  • 37c875b863 improve end to end tests Michael Telatynski 2020-05-27 13:23:49 +01:00
  • d9552c7f5c e2e test toasts v2 Michael Telatynski 2020-05-27 13:10:28 +01:00
  • 7b6d49c416 e2e test toasts Michael Telatynski 2020-05-27 12:57:45 +01:00
  • b7c688d328 test e2e tests workaround Michael Telatynski 2020-05-27 12:40:38 +01:00
  • 48de174576 remove debug Michael Telatynski 2020-05-27 12:20:20 +01:00
  • efa47f1a8e Change out debug Michael Telatynski 2020-05-27 12:02:51 +01:00
  • 3dade4e759 tweak Michael Telatynski 2020-05-27 11:48:48 +01:00
  • 254ed4b1b6 Add debug lined to figure out e2e test failure Michael Telatynski 2020-05-27 11:33:42 +01:00
  • cc68f53fc2 tidy up and delint Michael Telatynski 2020-05-27 10:47:01 +01:00
  • e7d22fa086 Translated using Weblate (Slovak) yuuki-san 2020-05-27 09:43:43 +00:00
  • a2914cff94 Translated using Weblate (Slovak) Microtus62 2020-05-27 09:43:19 +00:00
  • cf50e1a408 i18n Michael Telatynski 2020-05-27 10:31:30 +01:00
  • 2b432b0d82 Remove feature_cross_signing Michael Telatynski 2020-05-27 10:28:25 +01:00
  • b603e3ef18 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-27 09:24:47 +00:00
  • a2a950e00e Translated using Weblate (Slovak) yuuki-san 2020-05-27 09:17:24 +00:00
  • 3f6774560e Translated using Weblate (Japanese) call_xz 2020-05-27 02:53:31 +00:00
  • f4651bf898 Translated using Weblate (Galician) XoseM 2020-05-27 04:19:23 +00:00
  • e79d29b6a3 Translated using Weblate (French) Kévin C 2020-05-27 06:47:00 +00:00
  • 005b1fa080 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-05-27 03:24:21 +00:00
  • 8bac26c5e3 Merge pull request #4648 from matrix-org/dbkr/remove_keyshare_dialog David Baker 2020-05-27 10:24:33 +01:00
  • c17bcda1ba Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:vector-im/riot-web into t3chguy/toasts3_2 Michael Telatynski 2020-05-27 09:58:08 +01:00
  • c492ae97fd Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2 Michael Telatynski 2020-05-27 09:45:38 +01:00
  • 69f4e8e68e Merge branch 'origin/develop' into Weblate. Weblate 2020-05-27 02:06:23 +00:00
  • 515304d32e Merge pull request #4654 from matrix-org/travis/roomlist/badge-updates Travis Ralston 2020-05-26 20:06:17 -06:00
  • 8370fa8bb4 Event.decrypted from the client Travis Ralston 2020-05-26 19:56:56 -06:00
  • bf8a3d4419 Bind to the room instead of the client Travis Ralston 2020-05-26 16:20:51 -06:00
  • a9c54153ee Update badge counts in new room list as needed Travis Ralston 2020-05-25 15:54:02 -06:00
  • b9794ea6e4 Remove webpack-build-notifier from lockfile Travis Ralston 2020-05-26 13:50:31 -06:00
  • 9b46787dd3 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-26 19:49:55 +00:00
  • bca58bed02 Translated using Weblate (Norwegian Bokmål) Imre Kristoffer Eilertsen 2020-05-26 19:44:14 +00:00
  • 6c10cbc903 EventIndex: Use a warning when redactions don't have an event id. poljar 2020-05-26 21:48:10 +02:00
  • 58f0814530 EventIndex: Handle invalid m.room.redaction events correctly. Damir Jelić 2020-05-26 21:27:45 +02:00