Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • 82ace51f90 Merge branch 'origin/develop' into Weblate. Weblate 2019-11-21 17:43:19 +00:00
  • 1a7d298319 Merge pull request #3654 from matrix-org/dbkr/call_crash_workaround David Baker 2019-11-21 17:43:14 +00:00
  • b239fde32d Workaround for soft-crash with calls on startup David Baker 2019-11-21 17:31:57 +00:00
  • c1aa5f16db Merge branch 'origin/develop' into Weblate. Weblate 2019-11-21 17:29:30 +00:00
  • 53edbc743a Merge pull request #3652 from matrix-org/dbkr/catch_play_failures David Baker 2019-11-21 17:29:25 +00:00
  • 812b0785bf Fix i18n post-merge Travis Ralston 2019-11-21 10:22:31 -07:00
  • 72f0401589 Merge branch 'develop' into jryans/4s-new-key-backup Travis Ralston 2019-11-21 10:22:13 -07:00
  • f75e45a715 reduce margin on e2e icon in room header Bruno Windels 2019-11-21 18:17:55 +01:00
  • 854f27df3f remove obsolete style from message composer for e2e icon as it's now the default size for the e2e iconn Bruno Windels 2019-11-21 18:14:25 +01:00
  • 785f00e6d0 Merge branch 'origin/develop' into Weblate. Weblate 2019-11-21 17:14:05 +00:00
  • 9d5f3ce32d Merge pull request #3650 from matrix-org/travis/widget-integration-copy Travis Ralston 2019-11-21 10:13:59 -07:00
  • f532d625f8 Merge branch 'origin/develop' into Weblate. Weblate 2019-11-21 17:13:52 +00:00
  • 9089744f07 Merge pull request #3651 from matrix-org/travis/widget-encryption-copy Travis Ralston 2019-11-21 10:13:47 -07:00
  • cb0e6ca5d2 dont make e2e icons themable, as they have multiple colors Bruno Windels 2019-11-21 18:13:01 +01:00
  • 3cddcad5de use correct icons with borders Bruno Windels 2019-11-21 18:12:32 +01:00
  • 5d8476185f Catch exceptions when we can't play audio David Baker 2019-11-21 17:00:35 +00:00
  • 8819d5cf0c Merge branch 'origin/develop' into Weblate. Weblate 2019-11-21 16:28:10 +00:00
  • 08e08376a2 Translated using Weblate (Hungarian) Szimszon 2019-11-21 15:19:59 +00:00
  • 834e6819d5 Merge pull request #3649 from matrix-org/dbkr/ignore_media_keys David Baker 2019-11-21 16:28:03 +00:00
  • a55e5f7759 Update copy for widgets not using message encryption Travis Ralston 2019-11-21 09:12:07 -07:00
  • f0fbb20ee5 Detect support for mediaSession David Baker 2019-11-21 16:11:42 +00:00
  • f7f22444e8 Rename section heading for integrations in settings Travis Ralston 2019-11-21 09:03:07 -07:00
  • 5c6ef10c6b Ignore media actions David Baker 2019-11-21 15:55:30 +00:00
  • 41a820acdf Merge branch 'origin/develop' into Weblate. Weblate 2019-11-21 15:11:04 +00:00
  • 6597e0bd42 Merge pull request #3646 from matrix-org/travis/integration-manager-opt Travis Ralston 2019-11-21 08:10:56 -07:00
  • 1e13cbb442 Merge branch 'origin/develop' into Weblate. Weblate 2019-11-21 15:10:35 +00:00
  • 86783e4439 Merge pull request #3645 from matrix-org/travis/widget-menu Travis Ralston 2019-11-21 08:10:28 -07:00
  • f3ac2c2a1e Merge branch 'origin/develop' into Weblate. Weblate 2019-11-21 15:05:12 +00:00
  • 598901b483 Translated using Weblate (Latvian) Edgars Voroboks 2019-11-20 18:58:42 +00:00
  • 87167f42f8 Translated using Weblate (Italian) random 2019-11-21 09:34:39 +00:00
  • d786017d08 Translated using Weblate (Hungarian) Szimszon 2019-11-20 19:02:23 +00:00
  • ad941b96e0 Translated using Weblate (French) Kévin C 2019-11-21 11:17:02 +00:00
  • 670d44ecd8 Translated using Weblate (Finnish) Tuomas Hietala 2019-11-21 11:36:43 +00:00
  • 5670a52469 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-11-21 02:52:36 +00:00
  • 5d612bb370 Merge pull request #3644 from matrix-org/travis/widget-encryption Travis Ralston 2019-11-21 08:04:56 -07:00
  • ed024a0b10 Merge pull request #3647 from matrix-org/bwindels/updateciderdocs Bruno Windels 2019-11-21 13:18:11 +00:00
  • 3242e2da72 Merge pull request #3593 from matrix-org/t3chguy/remove_bluebird Michael Telatynski 2019-11-21 11:22:49 +00:00
  • d3f872bf7a Merge branches 'develop' and 't3chguy/remove_bluebird' of github.com:matrix-org/matrix-react-sdk into t3chguy/remove_bluebird Michael Telatynski 2019-11-21 11:15:32 +00:00
  • d0b53916e3 docs: Add documentation explaining how to enable Seshat support. Damir Jelić 2019-11-21 10:56:25 +01:00
  • 2f2cbade96 electron_app: Remove Seshat from the dependencies. Damir Jelić 2019-11-21 10:51:23 +01:00
  • 04641a0f87 Merge pull request #3638 from matrix-org/dbkr/dedup_theming_code David Baker 2019-11-21 09:44:37 +00:00
  • 8b2ca56283 Merge pull request #11445 from vector-im/dbkr/dedup_theming_code David Baker 2019-11-21 09:44:22 +00:00
  • 8c02893da7 Update CIDER docs now that it is used for main composer as well Bruno Windels 2019-11-21 08:58:13 +00:00
  • 670c14b2e3 Circumvent the linter Travis Ralston 2019-11-20 20:54:21 -07:00
  • a69d818a0d Our linter is seriously picky. Travis Ralston 2019-11-20 20:49:41 -07:00
  • 560c0afae3 Appease the linter Travis Ralston 2019-11-20 20:45:16 -07:00
  • 94fed922cf Intercept cases of disabled/no integration managers Travis Ralston 2019-11-20 20:40:39 -07:00
  • 81c9bdd9f3 It's called an "Integration Manager" (singular) Travis Ralston 2019-11-20 20:14:20 -07:00
  • 3391cc0d90 Add the toggle switch for provisioning Travis Ralston 2019-11-20 20:05:32 -07:00
  • 0a0e952691 Update integration manager copy Travis Ralston 2019-11-20 19:53:52 -07:00
  • b0eb54541c Rip out options to change your integration manager Travis Ralston 2019-11-20 19:50:13 -07:00
  • 66c51704cc Fix indentation Travis Ralston 2019-11-20 19:21:10 -07:00
  • fd12eb28e7 Move many widget options to a context menu Travis Ralston 2019-11-20 19:17:42 -07:00
  • f0066ff622 Merge pull request #3643 from bkil/bkil/fix-tooltip-of-nonmember-emojis Travis Ralston 2019-11-20 18:06:37 -07:00
  • a40194194d ReactionsRowButtonTooltip: fix null dereference if emoji owner left room bkil 2019-11-21 01:50:18 +01:00
  • 62a2c7a51a Re-add encryption warning to widget permission prompt Travis Ralston 2019-11-20 16:26:06 -07:00
  • 2f084113f6 Merge pull request #3642 from matrix-org/t3chguy/pre_jest Michael Telatynski 2019-11-20 22:43:16 +00:00
  • 234e789d48 Merge pull request #11448 from vector-im/t3chguy/pre_jest Michael Telatynski 2019-11-20 22:43:10 +00:00
  • 97abce1ca6 Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants Michael Telatynski 2019-11-20 22:32:12 +00:00
  • fccf9f138e Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants Michael Telatynski 2019-11-20 22:32:11 +00:00
  • fa5475f1c0 v1.5.4-rc.1 v1.5.4-rc.1 RiotRobot 2019-11-20 18:32:56 +00:00
  • 2a564884e7 Prepare changelog for v1.5.4-rc.1 RiotRobot 2019-11-20 18:32:56 +00:00
  • 46a6dbe9b8 v1.5.4-rc.1 RiotRobot 2019-11-20 18:31:59 +00:00
  • f07e3c3b25 react-sdk & js-sdk rc.1 RiotRobot 2019-11-20 18:31:32 +00:00
  • ef475bbdad v1.7.3-rc.1 RiotRobot 2019-11-20 18:29:16 +00:00
  • 318a720e75 Prepare changelog for v1.7.3-rc.1 RiotRobot 2019-11-20 18:29:16 +00:00
  • 966f84115d js-sdk rc.1 RiotRobot 2019-11-20 18:26:29 +00:00
  • e33bfe93b4 Merge pull request #3641 from matrix-org/travis/e2e-icon Travis Ralston 2019-11-20 11:16:54 -07:00
  • 8abc0953d5 Remove the import my IDE should have removed for me Travis Ralston 2019-11-20 11:08:53 -07:00
  • f6394b1251 Remove stray colour correction on composer e2e icon Travis Ralston 2019-11-20 11:03:53 -07:00
  • 93e4de9861 Fix positioning and sizing of e2e icon in the composer Travis Ralston 2019-11-20 11:00:39 -07:00
  • 9bb1feecca Merge pull request #3639 from matrix-org/matthew/nunito-ransom-fix David Baker 2019-11-20 17:58:05 +00:00
  • e6dea37693 Add hidden button for bootstrapping SSSS J. Ryan Stinnett 2019-11-20 17:56:44 +00:00
  • 3409ad97d8 Merge remote-tracking branch 'origin/develop' into matthew/nunito-ransom-fix David Baker 2019-11-20 17:49:26 +00:00
  • 392de5a54f Merge pull request #11444 from vector-im/dbkr/doc_custom_themes David Baker 2019-11-20 17:43:42 +00:00
  • 9ed4a07b28 linewrap David Baker 2019-11-20 17:39:58 +00:00
  • 1c1b8cf6b9 Merge pull request #3630 from matrix-org/travis/widget-permission Travis Ralston 2019-11-20 10:37:51 -07:00
  • c568c15186 In-memory keys need an object J. Ryan Stinnett 2019-11-20 17:35:10 +00:00
  • 1b0b3e1a44 Bump to Electron 7.1.2 David Baker 2019-11-20 17:33:32 +00:00
  • 21781adb9e explain the internal name of custom themes Bruno Windels 2019-11-20 18:27:25 +01:00
  • 758dd4127f upgrade nunito from 3.500 to 3.504 Matthew Hodgson 2019-11-20 16:36:27 +00:00
  • dc3cc37784 backticks to prevent infinitalic David Baker 2019-11-20 16:35:10 +00:00
  • 00241a8d0c Merge pull request #3637 from matrix-org/dbkr/system_dark_mode David Baker 2019-11-20 16:32:37 +00:00
  • 135d5f4cc7 Merge pull request #11442 from vector-im/dbkr/system_dark_mode David Baker 2019-11-20 16:32:32 +00:00
  • e36f4375b0 Bugfix & clearer setting name David Baker 2019-11-20 16:12:14 +00:00
  • b69cee0c67 Remove getBaseTheme David Baker 2019-11-20 15:45:32 +00:00
  • e34c46c893 Dedup theming code David Baker 2019-11-20 15:42:15 +00:00
  • 013e059ffc Add doc for custom themes David Baker 2019-11-20 15:40:44 +00:00
  • 518130c912 add bug link David Baker 2019-11-20 15:37:48 +00:00
  • a744415221 Add hack to work around mystery settings bug David Baker 2019-11-20 15:34:32 +00:00
  • 6121420113 Merge branch 'develop' into t3chguy/remove_bluebird Michael Telatynski 2019-11-20 15:21:23 +00:00
  • 1e6472723a Merge pull request #3636 from matrix-org/jryans/90-chars J. Ryan Stinnett 2019-11-20 15:03:02 +00:00
  • 5e049efc87 Merge pull request #11441 from vector-im/bwindels/fix-roomstatus-e2e-icon Bruno Windels 2019-11-20 14:36:41 +00:00
  • d1554977a8 Merge pull request #3633 from matrix-org/bwindels/fix-roomstatus-e2e-icon Bruno Windels 2019-11-20 14:36:30 +00:00
  • 71f5c8b2b0 Lint David Baker 2019-11-20 13:47:54 +00:00
  • 7294bec1c8 Use new theme API in react-sdk David Baker 2019-11-20 13:43:08 +00:00
  • 5a700b518a Get theme automatically from system setting David Baker 2019-11-20 13:41:06 +00:00
  • 44b212bc4c Merge branch 'poljar/seshat-pr' into develop Damir Jelić 2019-11-20 13:33:03 +01:00
  • 4bd46f9d69 EventIndex: Silence the linter complaining about missing docs. Damir Jelić 2019-11-20 12:47:20 +01:00
  • 0c9f0e52bd preload warning triangle Bruno Windels 2019-11-20 12:42:31 +01:00