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

Commit Graph

  • 80b44f0292 Always calculate the category of a room Travis Ralston 2020-03-04 12:05:47 -07:00
  • b06a82ee80 Use textForEvent to determine if an event is worth rendering Travis Ralston 2020-03-04 11:44:12 -07:00
  • 3842bce74d Fix SSO for new approach Travis Ralston 2020-03-04 11:41:16 -07:00
  • 4dbbf2bb15 Add a windows signing script David Baker 2020-03-04 16:55:12 +00:00
  • 8a964dbff0 avoid ref by getting count in setter callback Bruno Windels 2020-03-04 17:19:06 +01:00
  • afc7273d10 use pendingUpdateCount rather, so we don't show multiple spinners Bruno Windels 2020-03-04 16:58:04 +01:00
  • 29af8add5d only show verify button if user has uploaded cross-signing keys Bruno Windels 2020-03-04 16:10:06 +01:00
  • 4396d85d1f Share secrets with another device on request Zoe 2020-03-02 16:28:10 +00:00
  • 0e042f66c5 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-04 14:54:40 +00:00
  • 5da13ea253 Merge pull request #4173 from matrix-org/jryans/chrome-compose-flicker J. Ryan Stinnett 2020-03-04 14:54:34 +00:00
  • 918ef13528 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-04 14:43:33 +00:00
  • c8cd9b4437 Translated using Weblate (Dutch) J. A. Durieux 2020-03-04 14:07:04 +00:00
  • 847f92b86c Merge pull request #4167 from matrix-org/bwindels/scrolldocs Bruno Windels 2020-03-04 14:43:28 +00:00
  • 7ad8eeb906 Fix composer touch bar flickering on keypress in Chrome J. Ryan Stinnett 2020-03-04 14:35:01 +00:00
  • 3ffce87d3a Merge branch 'origin/develop' into Weblate. Weblate 2020-03-04 13:08:34 +00:00
  • 207677f1af Translated using Weblate (West Flemish) Nathan Follens 2020-03-04 11:16:54 +00:00
  • d67d640ef9 Translated using Weblate (French) Kévin C 2020-03-04 09:49:09 +00:00
  • 60e5b5f94e Translated using Weblate (Dutch) Nathan Follens 2020-03-04 11:16:23 +00:00
  • 959a6e91a0 Translated using Weblate (Albanian) Besnik Bleta 2020-03-04 11:56:23 +00:00
  • 872a7a74fb Reset matrix-react-sdk back to develop branch RiotRobot 2020-03-04 13:07:59 +00:00
  • 4548831ac5 Reset matrix-js-sdk back to develop branch RiotRobot 2020-03-04 13:07:45 +00:00
  • d88f9ed2c0 Merge branch 'master' into develop RiotRobot 2020-03-04 13:06:43 +00:00
  • 6e68c106f7 v1.5.12 v1.5.12 RiotRobot 2020-03-04 12:58:03 +00:00
  • 2507073c20 Prepare changelog for v1.5.12 RiotRobot 2020-03-04 12:58:03 +00:00
  • 096831c9df v1.5.12 RiotRobot 2020-03-04 12:01:38 +00:00
  • c26396d693 Upgrade matrix-react-sdk to 2.2.1 RiotRobot 2020-03-04 12:01:31 +00:00
  • b52b0f525f Log packages when checking version RiotRobot 2020-03-04 12:00:37 +00:00
  • f0c6f1a10b Merge branch 'origin/develop' into Weblate. Weblate 2020-03-04 11:58:40 +00:00
  • 845656064e Reset matrix-js-sdk back to develop branch RiotRobot 2020-03-04 11:58:00 +00:00
  • b7d9f24625 Log packages when checking version RiotRobot 2020-03-04 11:53:01 +00:00
  • 2aae6276f7 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-04 11:41:48 +00:00
  • 141989a51f Translated using Weblate (Dutch) Nathan Follens 2020-03-03 23:18:29 +00:00
  • 1d4f77dacc Merge branch 'master' into develop RiotRobot 2020-03-04 11:40:35 +00:00
  • ce879b95cf v2.2.1 RiotRobot 2020-03-04 11:30:35 +00:00
  • cdcf042f6b Prepare changelog for v2.2.1 RiotRobot 2020-03-04 11:30:35 +00:00
  • fa79bc93ce Use bash for release script J. Ryan Stinnett 2020-03-02 17:48:38 +00:00
  • 6068ab1446 Merge pull request #4171 from matrix-org/jryans/relative-scrolling-release J. Ryan Stinnett 2020-03-04 10:28:05 +00:00
  • 070b430702 also use relative scrolling when eh ... doing relative scrolling Bruno Windels 2020-03-03 15:44:59 +01:00
  • 462c3411b2 add comment how offset from bottom is calculated Bruno Windels 2020-03-03 15:42:44 +01:00
  • 91aa8d4a3a use relative scrolling to compensate when changing height Bruno Windels 2020-03-03 15:42:22 +01:00
  • aedd44addc Merge pull request #4169 from matrix-org/travis/sso-register J. Ryan Stinnett 2020-03-04 10:18:50 +00:00
  • 93c696f15e Appease the linter Travis Ralston 2020-03-03 23:26:20 -07:00
  • 3cff6d7239 Appease the linter Travis Ralston 2020-03-03 23:26:20 -07:00
  • e83a4ddbe5 i18n Travis Ralston 2020-03-03 23:23:12 -07:00
  • e265c92b6e Redirect registration requests to Login when the server supports SSO Travis Ralston 2020-03-03 23:19:36 -07:00
  • bcfe1fcac5 Wire up 'create account' to the SSO button when SSO is used Travis Ralston 2020-03-03 23:23:53 -07:00
  • a12786c171 i18n Travis Ralston 2020-03-03 23:23:12 -07:00
  • 04c54dc5a0 Redirect registration requests to Login when the server supports SSO Travis Ralston 2020-03-03 23:19:36 -07:00
  • 8234b4d656 Wire up 'create account' to the SSO button when SSO is used Travis Ralston 2020-03-03 23:11:29 -07:00
  • 6637787366 Merge pull request #37 from vector-im/t3chguy/sso Michael Telatynski 2020-03-03 22:28:05 +00:00
  • 43f445d8f7 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-03 22:27:53 +00:00
  • 39ee5d77bd Merge branch 'origin/develop' into Weblate. Weblate 2020-03-03 22:27:52 +00:00
  • f08d034f84 Merge pull request #4158 from matrix-org/t3chguy/sso Michael Telatynski 2020-03-03 22:27:48 +00:00
  • 48c8f16a4c Merge pull request #12590 from vector-im/t3chguy/sso Michael Telatynski 2020-03-03 22:27:46 +00:00
  • 846170b371 Revert "Fix downloading files in electron not being sent into browser" Travis Ralston 2020-03-03 13:33:07 -07:00
  • adc329c67f Revert "Upgrade to Electron 8.0.2" J. Ryan Stinnett 2020-02-26 13:44:07 +00:00
  • 2a5438d636 Revert "Remove will-navigate comment after Electron fix" J. Ryan Stinnett 2020-02-28 11:42:08 +00:00
  • 706834939f Revert "Remove will-navigate as we expect it to be broken like pre-8.0.2" Michael Telatynski 2020-03-02 11:09:06 +00:00
  • 863d66cc08 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-03 18:03:40 +00:00
  • ffde56d804 Merge pull request #4165 from matrix-org/jryans/lock-auth-success J. Ryan Stinnett 2020-03-03 18:03:34 +00:00
  • 191dcaab82 Explain why not busy is ignored J. Ryan Stinnett 2020-03-03 17:41:28 +00:00
  • f5777be897 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-03 17:29:45 +00:00
  • 13b4ffb94a Translated using Weblate (Dutch) Remi Reuvekamp 2020-03-03 16:25:48 +00:00
  • a50e4f624c Merge pull request #4149 from matrix-org/travis/fix-directory-results Travis Ralston 2020-03-03 10:29:37 -07:00
  • 5d6690f74b document scrollpanel and bacat scrolling Bruno Windels 2020-03-03 17:59:02 +01:00
  • 4e347daa53 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-03 15:07:47 +00:00
  • 72af620d92 Merge pull request #4166 from matrix-org/bwindels/relativescrolling Bruno Windels 2020-03-03 15:07:42 +00:00
  • 3e39cebb8f also use relative scrolling when eh ... doing relative scrolling Bruno Windels 2020-03-03 15:44:59 +01:00
  • 223956a206 add comment how offset from bottom is calculated Bruno Windels 2020-03-03 15:42:44 +01:00
  • f9d2d45b24 use relative scrolling to compensate when changing height Bruno Windels 2020-03-03 15:42:22 +01:00
  • 59c4e36ba8 Lock interactive auth as busy until state change J. Ryan Stinnett 2020-03-03 14:40:21 +00:00
  • e34bad1809 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-03 14:23:00 +00:00
  • 357ebb5289 Translated using Weblate (Hungarian) Szimszon 2020-03-03 13:13:45 +00:00
  • b23eaa1ce7 Merge pull request #4163 from matrix-org/t3chguy/double_download Michael Telatynski 2020-03-03 14:22:54 +00:00
  • c0b68ccd53 only automatically download in usercontent if user requested it Michael Telatynski 2020-03-03 13:23:33 +00:00
  • b6e2a48538 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-03 11:46:03 +00:00
  • 7430277e13 Translated using Weblate (French) Kévin C 2020-03-03 11:20:43 +00:00
  • ca274dde4a Merge pull request #4162 from matrix-org/t3chguy/double_download Michael Telatynski 2020-03-03 11:45:57 +00:00
  • 0e65d54af2 Fix having to decrypt & download in two steps Michael Telatynski 2020-03-03 11:03:40 +00:00
  • 88e51bd458 Merge pull request #39 from vector-im/dbkr/remove_win_certificate David Baker 2020-03-03 10:45:21 +00:00
  • 88f351d5ca Keep sign in button disabled on success J. Ryan Stinnett 2020-03-03 10:40:58 +00:00
  • 5816a07617 Remove the certificate config for windows David Baker 2020-03-03 10:40:53 +00:00
  • afe68efa5c Merge branch 'origin/develop' into Weblate. Weblate 2020-03-03 10:20:56 +00:00
  • 96f125ebdc Translated using Weblate (Polish) Karol Kosek 2020-03-02 20:44:01 +00:00
  • 7b477d04bf Merge pull request #4161 from matrix-org/jryans/release-bash J. Ryan Stinnett 2020-03-03 10:20:49 +00:00
  • 15a9a3f704 update to electron 8.0.3 for VoiceOver fixes Michael Telatynski 2020-03-03 10:02:56 +00:00
  • c91a39097d Migrate from deprecated BrowserWindow::isMenuBarAutoHide() Michael Telatynski 2020-03-03 10:00:09 +00:00
  • d95f843cd0 Don't group blank membership changes Travis Ralston 2020-03-02 17:52:20 -07:00
  • df9710907c Add en_US string Mark Striemer 2020-03-02 15:45:16 -06:00
  • 4525ead1df Translated using Weblate (Norwegian Nynorsk) tctovsli 2020-03-01 20:20:15 +00:00
  • 1f42f33102 Translated using Weblate (Norwegian Bokmål) tctovsli 2020-03-01 20:16:18 +00:00
  • 0e3e1f3a9d Translated using Weblate (Norwegian Bokmål) forteller 2020-03-01 20:13:59 +00:00
  • 4399af4189 Translated using Weblate (Hungarian) Szimszon 2020-02-28 18:57:46 +00:00
  • 2514f11471 Translated using Weblate (German) Tentarial 2020-02-29 10:24:36 +00:00
  • 0546c74b3b Translated using Weblate (Czech) Michal Stanke 2020-02-29 21:45:26 +00:00
  • 340b6bf0d2 Translated using Weblate (Chinese (Simplified)) ctr 2020-03-01 19:39:58 +00:00
  • bb6afd7c30 backport riot-desktop implementation into riot-web Michael Telatynski 2020-03-02 20:16:41 +00:00
  • 09ed0e781a Update copy for SSO modal Michael Telatynski 2020-03-02 20:04:31 +00:00
  • 07348a65ad Include a mark as read X under the scroll to unread button Mark Striemer 2020-03-02 13:59:14 -06:00
  • a7fdbe9eca Merge branch 'origin/develop' into Weblate. Weblate 2020-03-02 19:56:05 +00:00