Commit Graph

  • 47c6023b1a Merge branch 'origin/develop' into Weblate. Weblate 2019-12-11 17:50:53 +00:00
  • 7230d51cca Merge pull request #3703 from matrix-org/travis/right-panel-v2 Travis Ralston 2019-12-11 10:50:45 -07:00
  • e4134a485b Merge branch 'origin/develop' into Weblate. Weblate 2019-12-11 17:50:43 +00:00
  • eb671c3724 Translated using Weblate (Hungarian) Szimszon 2019-12-11 15:16:20 +00:00
  • 53692c0938 Translated using Weblate (French) Kévin C 2019-12-11 12:56:00 +00:00
  • 24ea1424c5 Translated using Weblate (Albanian) Besnik Bleta 2019-12-11 13:02:52 +00:00
  • 633aa59e6c Merge pull request #3716 from matrix-org/travis/mjolnir-render Travis Ralston 2019-12-11 10:50:27 -07:00
  • dff36277c4 Sign natively on Windows David Baker 2019-12-11 17:34:19 +00:00
  • 2a90f287c6 Added translation using Weblate (Mongolian) David Baker 2019-12-11 17:29:57 +00:00
  • 8cbc9baddd Add testing flow for new key backups with SSSS J. Ryan Stinnett 2019-12-11 16:32:47 +00:00
  • 65c8c8b52a Merge branch 'origin/develop' into Weblate. Weblate 2019-12-11 15:57:29 +00:00
  • 0930424406 Further attempt to flip to develop J. Ryan Stinnett 2019-12-11 15:56:54 +00:00
  • 66f7600969 Add accessSecretStorage helper with common flow setup J. Ryan Stinnett 2019-12-11 15:05:03 +00:00
  • c5099b9b96 Re-add the secret storage key cache J. Ryan Stinnett 2019-12-11 14:28:02 +00:00
  • 6d77144e2a Merge branch 'origin/develop' into Weblate. Weblate 2019-12-11 11:32:49 +00:00
  • 2a91a6d08c Merge pull request #3718 from matrix-org/travis/wrap-encryption J. Ryan Stinnett 2019-12-11 11:32:43 +00:00
  • 00c694d691 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-11 11:04:44 +00:00
  • c2cd97fab3 Merge pull request #3640 from matrix-org/jryans/4s-new-key-backup J. Ryan Stinnett 2019-12-11 11:04:36 +00:00
  • 73cc855826 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-11 10:39:17 +00:00
  • 9dbd6e815f Translated using Weblate (French) Kévin C 2019-12-11 09:43:06 +00:00
  • 108293dcba Flip back to develop J. Ryan Stinnett 2019-12-11 10:39:04 +00:00
  • 4ae5559a59 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-11 10:37:51 +00:00
  • df3517d7bf Translated using Weblate (Mongolian) Ganzo DG 2019-12-11 05:08:23 +00:00
  • dd9eda8f97 Flip back to develop J. Ryan Stinnett 2019-12-11 10:37:36 +00:00
  • eb42793ad5 Remove bluebird transform as regular dep J. Ryan Stinnett 2019-12-11 10:36:24 +00:00
  • fae819dfe5 Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup J. Ryan Stinnett 2019-12-11 10:05:20 +00:00
  • 4b9afe78c2 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-11 09:36:54 +00:00
  • af890cd517 Translated using Weblate (Hungarian) Szimszon 2019-12-10 20:44:40 +00:00
  • a4dc8c650e Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-12-11 05:52:08 +00:00
  • cb50f5ff5f Merge pull request #3715 from matrix-org/t3chguy/fix_roomlist_context_menu_regression Michael Telatynski 2019-12-11 09:36:45 +00:00
  • a30ad77d10 Added translation using Weblate (Mongolian) Ganzo DG 2019-12-11 05:05:08 +00:00
  • db91465c56 Wrap the await call for unknown device lookups Travis Ralston 2019-12-10 22:00:08 -07:00
  • 754634ef31 Merge pull request #11 from vector-im/dbkr/lint David Baker 2019-12-10 18:16:27 +00:00
  • dcaa6a886b Merge pull request #10 from vector-im/dbkr/electron_api_updates David Baker 2019-12-10 18:16:00 +00:00
  • 47d9fc6c83 Merge remote-tracking branch 'origin/master' into dbkr/electron_api_updates David Baker 2019-12-10 18:15:12 +00:00
  • 36f741ebf7 Merge pull request #9 from vector-im/dbkr/asar David Baker 2019-12-10 18:14:55 +00:00
  • 14a919cf9b Fix the linting errors David Baker 2019-12-10 18:10:15 +00:00
  • a13c0e0be5 Electron API updates David Baker 2019-12-10 18:02:20 +00:00
  • 680caed505 Remove unnecessary logging David Baker 2019-12-10 17:56:50 +00:00
  • ddfa28723b Merge branch 'origin/develop' into Weblate. Weblate 2019-12-10 17:43:44 +00:00
  • c1b1f98201 Merge pull request #3712 from matrix-org/t3chguy/react16_refs Michael Telatynski 2019-12-10 17:43:37 +00:00
  • 8d3529787a Search for the webapp resources on startup David Baker 2019-12-10 17:40:17 +00:00
  • 4c431dd88a Merge branch 'origin/develop' into Weblate. Weblate 2019-12-10 17:19:57 +00:00
  • adc96514e7 Translated using Weblate (Italian) random 2019-12-09 14:42:54 +00:00
  • 77da7afdc0 Translated using Weblate (German) Tentarial 2019-12-09 17:11:26 +00:00
  • 03e0f6f8c5 Translated using Weblate (German) Krombel 2019-12-09 17:06:57 +00:00
  • b6d0308a54 Merge pull request #3706 from matrix-org/travis/dm-copy Travis Ralston 2019-12-10 10:19:47 -07:00
  • c8c344804e Remove special case RHS resizer logic Travis Ralston 2019-12-10 10:01:45 -07:00
  • b93cadf4d1 Reset the right panel when changing rooms/groups Travis Ralston 2019-12-10 09:58:44 -07:00
  • 4956e83228 Remove secret storage key cache for now J. Ryan Stinnett 2019-12-10 16:53:15 +00:00
  • 80c120b93b Cross-signing storage now handled in JS SDK J. Ryan Stinnett 2019-12-10 16:47:18 +00:00
  • 8322676df7 Oops, don't remove the aftersign script David Baker 2019-12-10 16:04:16 +00:00
  • 672b846364 Pack the webapp into an asar David Baker 2019-12-10 15:54:17 +00:00
  • 2cfc96cca7 Merge pull request #8 from vector-im/dbkr/scripts David Baker 2019-12-10 15:23:48 +00:00
  • cb41f2d66d Sanitise scripts David Baker 2019-12-10 15:01:04 +00:00
  • bc73f0ba7f Merge pull request #6 from vector-im/dbkr/exit_after_importkey David Baker 2019-12-10 14:58:14 +00:00
  • b8f0ef30d2 Exit after importing key David Baker 2019-12-10 14:50:57 +00:00
  • 2e9146ab78 Merge pull request #5 from vector-im/dbkr/mkdirp David Baker 2019-12-10 14:44:15 +00:00
  • c30c0e126d Merge branch 'master' into dbkr/mkdirp David Baker 2019-12-10 14:43:57 +00:00
  • 9f3633299a Merge pull request #4 from vector-im/dbkr/explicit_node David Baker 2019-12-10 14:43:26 +00:00
  • faecf171e0 Use portable mkdirp David Baker 2019-12-10 14:38:09 +00:00
  • e361292b96 Add explicit 'node' to scripts David Baker 2019-12-10 14:33:41 +00:00
  • 4548713c19 Appease the linter Travis Ralston 2019-12-09 20:38:56 -07:00
  • f529a6c7a2 Render policy room event updates in the timeline Travis Ralston 2019-12-09 20:36:00 -07:00
  • 44adda3547 Add right-click context menu to GroupInviteTile.js Michael Telatynski 2019-12-10 00:14:36 +00:00
  • 5c92f8ab25 Fix RoomTile right click context menu Michael Telatynski 2019-12-10 00:08:45 +00:00
  • 52c20db963 Fix chevron offset for toRightOf Michael Telatynski 2019-12-09 23:58:09 +00:00
  • 196d8fcd90 Merge pull request #3714 from matrix-org/t3chguy/fix_mab_regression Michael Telatynski 2019-12-09 23:53:28 +00:00
  • 056f33db37 Merge pull request #3 from vector-im/dbkr/yarnruncheck David Baker 2019-12-09 20:04:17 +00:00
  • fbe8652fb1 Check properly David Baker 2019-12-09 17:57:45 +00:00
  • 26587b6775 Merge pull request #2 from vector-im/dbkr/rimraf David Baker 2019-12-09 17:21:48 +00:00
  • 611e130ac7 Add rimraf David Baker 2019-12-09 17:20:32 +00:00
  • 26eff8d372 Merge pull request #11631 from vector-im/dbkr/remove_origin_migrator David Baker 2019-12-09 15:18:20 +00:00
  • 685c1ba276 Revert accidental commit David Baker 2019-12-09 15:02:00 +00:00
  • 04402b325a Remove more origin migrator bits David Baker 2019-12-09 15:01:10 +00:00
  • bd57ff793f Remove rest of the origin migrator David Baker 2019-12-09 14:54:36 +00:00
  • 4cad44a54f Merge pull request #1 from vector-im/dbkr/make_it_work David Baker 2019-12-09 14:50:01 +00:00
  • 2691d1a611 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_mab_regression Michael Telatynski 2019-12-09 14:13:11 +00:00
  • 69eeabd99e Fix accessibility to the reaction picker (not of it though) Michael Telatynski 2019-12-09 14:12:30 +00:00
  • ff17e753e1 Riot has a capital David Baker 2019-12-09 14:00:10 +00:00
  • 51227abd2a PUB_KEY_URL David Baker 2019-12-09 13:59:38 +00:00
  • ecbaf144b2 Remove build resource config David Baker 2019-12-09 13:58:18 +00:00
  • 6225e402cc i18n'ed all over the plaace Half-Shot 2019-12-09 13:54:21 +00:00
  • cd73162957 Merge branch 'develop' into t3chguy/react16_refs Michael Telatynski 2019-12-09 13:47:06 +00:00
  • f079c2fdd2 Merge pull request #3709 from matrix-org/t3chguy/what-input Michael Telatynski 2019-12-09 13:45:59 +00:00
  • 33284302b9 try & explain better David Baker 2019-12-09 13:44:42 +00:00
  • b1788fb4b5 Merge pull request #3708 from matrix-org/t3chguy/search_accessible_radios Michael Telatynski 2019-12-09 13:43:32 +00:00
  • 21647cf596 Merge pull request #3707 from matrix-org/t3chguy/improve_a11y_reactions_row_button Michael Telatynski 2019-12-09 13:43:06 +00:00
  • 36ad71e291 Merge pull request #3710 from matrix-org/t3chguy/edited_a11y_btn Michael Telatynski 2019-12-09 13:42:27 +00:00
  • 6874f5cdb1 Remove separate platform build commands David Baker 2019-12-09 13:38:14 +00:00
  • 7ee5f7ba38 Add feature flag Half-Shot 2019-12-09 13:28:43 +00:00
  • d9943754f7 Remove status as it's no longer part of the MSC Half-Shot 2019-12-09 13:28:16 +00:00
  • 529ffe4513 Merge branch 'master' into dbkr/make_it_work David Baker 2019-12-09 13:25:41 +00:00
  • ce21ce8bbe Lint Will Hunt 2019-12-05 00:28:29 +00:00
  • 9f2ccdf913 Add support for displaying avatars and links in bridge info Half-Shot 2019-12-04 15:02:36 +00:00
  • 2bc6e2e332 Add the one string I bothered to i18n Half-Shot 2019-12-02 17:27:38 +00:00
  • 626ab17ed3 Styling Half-Shot 2019-12-02 17:27:31 +00:00
  • 7c35b16f4d Add bridge tab button Half-Shot 2019-12-02 17:27:23 +00:00
  • 0d537ecbb3 Add bridge info tab Half-Shot 2019-12-02 17:27:12 +00:00
  • 52e7532789 Add electron-package script (copied verbatim) David Baker 2019-12-09 12:50:45 +00:00