Commit Graph

  • 90c7535a69 Export VIEWS from MatrixChat for riot-web tests Travis Ralston 2020-01-13 17:51:17 -07:00
  • 1e70af00a3 Fix GroupView test Travis Ralston 2020-01-13 17:28:24 -07:00
  • 813b14018e Fix CI build steps for new environment. Travis Ralston 2020-01-13 13:36:35 -07:00
  • 14501b748b lint again David Baker 2020-01-13 21:58:26 +00:00
  • 9a1be1a24d Don't try to set crypto options without crypto enabled David Baker 2020-01-13 21:54:14 +00:00
  • 612df68082 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-13 21:33:07 +00:00
  • ce85204937 Translated using Weblate (Japanese) call_xz 2020-01-13 12:50:52 +00:00
  • eeee736e9f Translated using Weblate (Hungarian) Szimszon 2020-01-13 13:22:03 +00:00
  • 9cedfeb007 Merge pull request #3825 from aaronraimist/lock J. Ryan Stinnett 2020-01-13 21:32:58 +00:00
  • bf6798e109 Appease the linter Travis Ralston 2020-01-13 13:28:33 -07:00
  • 19777cfafc Merge pull request #3838 from matrix-org/dbkr/padlocks_behind_labs_flag David Baker 2020-01-13 19:27:50 +00:00
  • f73d2bae1f Merge branch 'develop' into travis/sourcemaps Travis Ralston 2020-01-13 11:21:51 -07:00
  • 5fd27a10bb Merge branch 'develop' into travis/sourcemaps Travis Ralston 2020-01-13 11:19:41 -07:00
  • 528777049a Merge pull request #3827 from matrix-org/travis/sm-e2e-tests Travis Ralston 2020-01-13 11:15:46 -07:00
  • e47240d838 Lint Eastwood David Baker 2020-01-13 17:56:40 +00:00
  • d53016e8fc Room padlock decorations only if cross-signing is enabled David Baker 2020-01-13 17:53:49 +00:00
  • 76fe87c941 Don't error on unverifie/unknownd devices. David Baker 2020-01-13 17:41:58 +00:00
  • 6ce5377747 Merge pull request #11792 from Eothred/develop J. Ryan Stinnett 2020-01-13 17:12:29 +00:00
  • 619cd57bc6 fix the blog url Matthew Hodgson 2020-01-13 16:50:46 +00:00
  • 397637d59d used classnames module Zoe 2020-01-13 15:07:34 +00:00
  • a56bf5398d lint Zoe 2020-01-13 14:54:39 +00:00
  • 0bd2ecd798 lint Zoe 2020-01-13 14:51:10 +00:00
  • e43174c636 Show padlock in room headers for invite-only rooms Zoe 2020-01-13 14:49:23 +00:00
  • 59ea865e8e Added missing semicolon. Christopher 2020-01-13 14:29:42 +00:00
  • d426847f4f Merge branch 'master' into develop RiotRobot 2020-01-13 13:22:11 +00:00
  • 2574841bf4 v1.5.7 v1.5.7 RiotRobot 2020-01-13 13:14:12 +00:00
  • fd6b6dc597 Prepare changelog for v1.5.7 RiotRobot 2020-01-13 13:14:12 +00:00
  • 54a88a94b7 v1.5.7 RiotRobot 2020-01-13 13:12:56 +00:00
  • 057f78fadc released react-sdk & js-dk RiotRobot 2020-01-13 13:12:29 +00:00
  • 389e1194ff Merge branch 'master' into develop RiotRobot 2020-01-13 13:09:56 +00:00
  • 8091cadc46 v1.7.6 RiotRobot 2020-01-13 13:06:31 +00:00
  • d38c358235 Prepare changelog for v1.7.6 RiotRobot 2020-01-13 13:06:30 +00:00
  • 9a3ca28978 js-sdk 3.0.0 RiotRobot 2020-01-13 13:01:36 +00:00
  • 280253d58a Merge pull request #3834 from matrix-org/dbkr/community-user-list-fire_rel David Baker 2020-01-13 12:42:03 +00:00
  • b4f210d68f Merge pull request #11830 from vector-im/dbkr/feature-presence-indicator_rel David Baker 2020-01-13 12:41:56 +00:00
  • 415c8679f9 Merge pull request #3833 from matrix-org/dbkr/feature-presence-indicator_rel David Baker 2020-01-13 12:41:51 +00:00
  • 66b55495bb Fix right panel buttons highlighting Michael Telatynski 2020-01-05 20:30:01 +00:00
  • 8fc85797a7 Guard against missing members in avatars J. Ryan Stinnett 2020-01-13 12:29:03 +00:00
  • 2471b803e8 Enable and document presence in room list feature flag J. Ryan Stinnett 2020-01-13 11:53:43 +00:00
  • dd652f6af3 Merge pull request #3832 from matrix-org/jryans/community-user-list-fire J. Ryan Stinnett 2020-01-13 12:38:24 +00:00
  • 63e5c44c63 Add feature flag around the presence indicator in room list J. Ryan Stinnett 2020-01-13 11:48:51 +00:00
  • 77b479d50c Guard against missing members in avatars J. Ryan Stinnett 2020-01-13 12:29:03 +00:00
  • 9e8358dc24 Merge pull request #11829 from vector-im/jryans/feature-presence-indicator J. Ryan Stinnett 2020-01-13 12:25:10 +00:00
  • 56a7b6c33e Merge pull request #3831 from matrix-org/jryans/feature-presence-indicator J. Ryan Stinnett 2020-01-13 12:25:00 +00:00
  • edd08c279c Merge pull request #3821 from matrix-org/zip/11226-padlock-icons Zoe 2020-01-13 12:20:32 +00:00
  • 9c686bf501 Fix right panel buttons highlighting Michael Telatynski 2020-01-05 20:30:01 +00:00
  • 878c5b5b52 removed unnecessary lint rule Zoe 2020-01-13 12:11:19 +00:00
  • 12267159f2 Enable and document presence in room list feature flag J. Ryan Stinnett 2020-01-13 11:53:43 +00:00
  • 2168e7ec0c Add feature flag around the presence indicator in room list J. Ryan Stinnett 2020-01-13 11:48:51 +00:00
  • 422d4cd73a small simplification in code as .getContent() will always return an object Zoe 2020-01-13 11:18:24 +00:00
  • 0e65d2ecfa Merge pull request #11774 from daleharvey/service-worker J. Ryan Stinnett 2020-01-13 10:06:35 +00:00
  • 3105a7c96a Merge pull request #3830 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2020-01-13 09:43:34 +00:00
  • 1b1a8594c0 Merge pull request #11826 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2020-01-13 09:41:02 +00:00
  • b3d3f3b09f Translated using Weblate (Turkish) catborise 2020-01-10 16:56:10 +00:00
  • 0065895b9c Translated using Weblate (Russian) Alexey Murz Korepov 2020-01-12 04:50:36 +00:00
  • e1cb7b4f08 Translated using Weblate (Bulgarian) Slavi Pantaleev 2020-01-10 12:15:00 +00:00
  • 6266f21a08 Translated using Weblate (Basque) Osoitz 2020-01-12 09:05:58 +00:00
  • c370b28694 #11378. Added cut/copy and pasting user pills from editor. Christopher 2020-01-12 16:19:24 +00:00
  • 2fdaf65244 Translated using Weblate (Turkish) catborise 2020-01-10 17:07:10 +00:00
  • 1cb0e39dcc Translated using Weblate (Lithuanian) MamasLT 2020-01-09 22:16:36 +00:00
  • a41484cb35 Add stub service worker so users can install on desktop with Chrome Dale Harvey 2020-01-04 19:48:08 +00:00
  • 54c69b4630 this is what we call fast iteration Zoe 2020-01-10 17:46:14 +00:00
  • 1b75909cad Update src/components/views/rooms/RoomTile.js Z. E. Cat 2020-01-10 17:36:33 +00:00
  • fbabe79647 use getContent() instead Zoe 2020-01-10 17:35:57 +00:00
  • fb587cc62c Update src/components/views/rooms/RoomTile.js Z. E. Cat 2020-01-10 17:33:37 +00:00
  • bebfd60daf Very fastidiously check for null/undefined Zoe 2020-01-10 17:22:09 +00:00
  • e66f2a6c3f Revert ES6ification of end-to-end tests and add instructions for Windows Travis Ralston 2020-01-10 10:13:41 -07:00
  • df1fd4db72 suppress private icon if the room is a DM Zoe 2020-01-10 16:49:07 +00:00
  • 808785c2f8 lint Zoe 2020-01-10 16:43:36 +00:00
  • 5551b207c1 Actually, this task was about join rules, not encryption ones. Oops. Zoe 2020-01-10 16:33:08 +00:00
  • cb250c9b10 Use existing available props data to determine whether a room is encrypted, thereby allowing a state update to properly rerender the tile Zoe 2020-01-10 13:09:16 +00:00
  • 1222e10c89 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-10 11:25:47 +00:00
  • 7f116c1bed Translated using Weblate (Lithuanian) MamasLT 2020-01-09 22:03:28 +00:00
  • abf4a88c66 Translated using Weblate (Hungarian) Szimszon 2020-01-10 08:43:51 +00:00
  • a02ecca775 Translated using Weblate (French) Kévin C 2020-01-10 06:44:11 +00:00
  • 8f292eb6a4 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-01-10 03:05:44 +00:00
  • 4a78faae4c Merge pull request #3826 from matrix-org/dbkr/roomview_listener_leak David Baker 2020-01-10 11:25:36 +00:00
  • 63942d5200 Fix listener leak on RoomView David Baker 2020-01-10 11:12:52 +00:00
  • 6cf5b3f1a2 Emoji verification: Change name of 🔒 to lock Aaron Raimist 2020-01-09 21:56:17 -06:00
  • 9f04f94c65 Enable e2e and Riot tests, removing Karma Travis Ralston 2020-01-09 17:55:57 -07:00
  • 3591f802a8 Merge pull request #3824 from matrix-org/travis/sm-misc Travis Ralston 2020-01-09 17:47:32 -07:00
  • 4b65cdf3f2 Regenerate i18n Travis Ralston 2020-01-09 17:40:57 -07:00
  • 4c3703a5ea Merge pull request #3823 from matrix-org/travis/sm-fix-tests Travis Ralston 2020-01-09 17:38:21 -07:00
  • d7dd67f69e Remove subtly irrelevant package Travis Ralston 2020-01-09 17:28:32 -07:00
  • aa38946166 Actually define some tests in TextualBody's test Travis Ralston 2020-01-09 17:24:13 -07:00
  • 4bc5ada50e Fix test bootstrap for new skinning approach Travis Ralston 2020-01-09 17:23:46 -07:00
  • 54f3288dea Fix imports for tests Travis Ralston 2020-01-09 17:23:27 -07:00
  • 4dfbce3108 Fix languageHandler's use of $webapp languages.json for Jest Travis Ralston 2020-01-09 17:22:50 -07:00
  • ffd037dfa8 Fix resolution of files for Jest Travis Ralston 2020-01-09 17:22:21 -07:00
  • 0e8af15b9c Add webcrypto dep back Travis Ralston 2020-01-09 17:15:13 -07:00
  • 5f51432987 Convert babel config to a different babel config Travis Ralston 2020-01-09 17:14:50 -07:00
  • 23eb6cbeb3 Upgrade Jest and babel-jest to match js-sdk Travis Ralston 2020-01-09 16:17:27 -07:00
  • a8c8406ac4 Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps Travis Ralston 2020-01-09 16:00:13 -07:00
  • a27f2d8379 Merge pull request #3817 from matrix-org/travis/sourcemaps-develop Travis Ralston 2020-01-09 14:59:22 -07:00
  • 135c84251c Fix more imports post-merge Travis Ralston 2020-01-09 14:16:32 -07:00
  • dc914774fb Delete files that were conflicting in the merge and deleted on develop Travis Ralston 2020-01-07 16:11:00 -07:00
  • a6376461d0 Use yarn's updated lockfile Travis Ralston 2020-01-07 15:55:29 -07:00
  • 19f78d4d97 Fix class construction in MemberList Travis Ralston 2020-01-07 15:55:02 -07:00
  • 727ce892de Fix remaining RoomView conflict Travis Ralston 2020-01-07 15:54:51 -07:00
  • 3e5cc9550b Fix import merge conflicts, removing any that aren't needed anymore Travis Ralston 2020-01-09 14:15:38 -07:00