Commit Graph

  • 9bfd88641d Merge branch 'master' into develop RiotRobot 2020-03-30 13:42:15 +01:00
  • e32e9cec06 v2.3.0 RiotRobot 2020-03-30 13:41:02 +01:00
  • af1446e0ff Prepare changelog for v2.3.0 RiotRobot 2020-03-30 13:41:02 +01:00
  • d369695e22 Upgrade matrix-js-sdk to 5.2.0 RiotRobot 2020-03-30 13:31:42 +01:00
  • a2d6f8fec0 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 11:13:06 +00:00
  • e895fed180 Merge pull request #12925 from JorikSchellekens/joriks/review-review Michael Telatynski 2020-03-30 12:13:00 +01:00
  • ba9b7d30dc Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 10:56:25 +00:00
  • b5c45b7d12 Translated using Weblate (Italian) random 2020-03-30 10:16:01 +00:00
  • 117ea5dc76 Merge pull request #4300 from matrix-org/bwindels/fixglobalscrollbars Bruno Windels 2020-03-30 10:56:19 +00:00
  • 6ed81eadbf Some grammar and clarifications. Jorik Schellekens 2020-03-30 11:52:23 +01:00
  • eff9db4273 bring back global style rules for thin scrollbars (also FF now!) Bruno Windels 2020-03-30 12:41:05 +02:00
  • 68ebba1f94 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 09:30:43 +00:00
  • 90b8d87a39 Merge pull request #4297 from matrix-org/t3chguy/kbd11 Michael Telatynski 2020-03-30 10:30:38 +01:00
  • 4b480f0b6d Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 09:30:24 +00:00
  • 057ca35c24 Merge pull request #4298 from matrix-org/t3chguy/Bugreportdialog Michael Telatynski 2020-03-30 10:30:19 +01:00
  • 2035a038aa Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 09:30:02 +00:00
  • 5375f888ea Merge pull request #4293 from matrix-org/t3chguy/fix_scrollbars Michael Telatynski 2020-03-30 10:29:56 +01:00
  • 8ef77fec8a Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 09:22:31 +00:00
  • 403d70897d Merge pull request #4274 from matrix-org/foldleft/reset-refactor Zoe 2020-03-30 10:22:24 +01:00
  • 098df07c67 review feedback Zoe 2020-03-30 10:18:47 +01:00
  • 21a41fa343 Update link to css location. Jorik Schellekens 2020-03-30 10:05:40 +01:00
  • 55c2d98571 Fix Field ctor Michael Telatynski 2020-03-29 23:16:57 +01:00
  • 19aae087e0 Field: make id optional, generate one if not provided Michael Telatynski 2020-03-29 22:59:15 +01:00
  • 167f953ac7 Document Composer:Escape to cancel a reply Michael Telatynski 2020-03-29 20:35:35 +01:00
  • acc41585ab Fix CmdOrCtrl+K for collapsed LHS Michael Telatynski 2020-03-29 20:33:27 +01:00
  • 2a54a8aa85 Escape should cancel a reply Michael Telatynski 2020-03-29 20:33:01 +01:00
  • 2ff16844e5 Make ELS somewhat more accessible Michael Telatynski 2020-03-29 20:12:10 +01:00
  • b2d905ef2c Make FormatButton use AccessibleButtons Michael Telatynski 2020-03-29 20:07:32 +01:00
  • 78e46f0476 Translated using Weblate (Hungarian) Szimszon 2020-03-27 19:11:58 +00:00
  • b7d33a4c9b Translated using Weblate (Esperanto) Tirifto 2020-03-28 12:54:38 +00:00
  • 164854b4f8 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-03-28 02:43:37 +00:00
  • f586aaab35 Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets Michael Telatynski 2020-03-28 00:51:01 +00:00
  • 37619dd127 Show red shield for users that become unverified J. Ryan Stinnett 2020-03-28 00:21:17 +00:00
  • 1e30bdb739 Early proof of concept for SSO UIA Travis Ralston 2020-03-27 14:39:59 -06:00
  • c756eda805 Translated using Weblate (Swedish) Kenneth Larsson 2020-03-26 14:55:30 +00:00
  • 43707a9389 Translated using Weblate (Czech) Stanislav Lukeš 2020-03-26 19:46:07 +00:00
  • 984f9ea4aa Fix fallback auth link to act and look like a link Travis Ralston 2020-03-27 13:44:32 -06:00
  • 5f9358796d Merge branch 'origin/develop' into Weblate. Weblate 2020-03-27 16:15:01 +00:00
  • 39889a6e2b Translated using Weblate (Finnish) Tuomas Hietala 2020-03-27 15:36:21 +00:00
  • 7bdd22ae03 Merge pull request #4291 from matrix-org/bwindels/fixcantdismissdevicetoast J. Ryan Stinnett 2020-03-27 16:14:58 +00:00
  • 71f8a49e60 Translated using Weblate (Basque) Osoitz 2020-03-27 14:55:06 +00:00
  • f90dfa2421 Translated using Weblate (Albanian) Besnik Bleta 2020-03-27 12:03:12 +00:00
  • 29bb7e38fe fix undismissable toasts Bruno Windels 2020-03-27 16:45:46 +01:00
  • 4f3d4426ea lint Zoe 2020-03-27 15:37:59 +00:00
  • fda533ab48 test for shield behaviour Zoe 2020-03-27 15:25:44 +00:00
  • c2be98e3df Merge branch 'poljar/seshat-1.3.1-bump' Damir Jelić 2020-03-27 15:28:40 +01:00
  • 9d0ed6e800 fix copy-pasta error Michael Telatynski 2020-03-27 14:19:43 +00:00
  • de0895b881 i18n Michael Telatynski 2020-03-27 14:06:21 +00:00
  • 6664535a26 change welcome page placeholders Michael Telatynski 2020-03-27 14:05:32 +00:00
  • f4d3cc8ee6 revert stale changes Michael Telatynski 2020-03-27 14:05:14 +00:00
  • db6f88c66a Welcome page, support $ssoUrl and $casUrl placeholders Michael Telatynski 2020-03-27 14:02:32 +00:00
  • 1f0d7923d7 with output type Zoe 2020-03-27 13:51:30 +00:00
  • 5b7e7f49d1 lint Zoe 2020-03-27 13:50:03 +00:00
  • 5d7adef0a2 Factor out shield display rules into one file Zoe 2020-03-27 13:45:21 +00:00
  • 0f2e2ea069 Update shield display rules Zoe 2020-03-27 11:58:54 +00:00
  • 323f4bf1a3 package.json: Bump the required Seshat version. Damir Jelić 2020-03-27 14:16:57 +01:00
  • 548e918437 only auto-sso when disable_custom_urls is true Michael Telatynski 2020-03-27 12:01:10 +00:00
  • a02731f632 Merge branch 'develop' into foldleft/reset-refactor Zoe 2020-03-27 10:50:05 +00:00
  • 5c2c8ac3b0 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-27 10:21:58 +00:00
  • cf4f595f79 Merge pull request #4289 from matrix-org/t3chguy/userInfo_avatar Michael Telatynski 2020-03-27 10:21:53 +00:00
  • b8ebf21713 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-27 10:20:07 +00:00
  • 2278a724aa Merge pull request #4283 from matrix-org/bwindels/cancelverifypanel Bruno Windels 2020-03-27 10:20:02 +00:00
  • 813d214773 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-27 10:19:37 +00:00
  • 528c820a2b Merge pull request #4284 from matrix-org/bwindels/showverifreqinsteadofmember Bruno Windels 2020-03-27 10:19:31 +00:00
  • 9a86a648b6 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-27 10:17:00 +00:00
  • 15f61dca35 Translated using Weblate (French) Kévin C 2020-03-27 09:43:34 +00:00
  • a2737899c1 Merge pull request #4276 from matrix-org/bwindels/transparentscrollbars Bruno Windels 2020-03-27 10:16:53 +00:00
  • 98f9f1e956 i18n Michael Telatynski 2020-03-27 09:59:43 +00:00
  • a974f0fe46 blank out UserInfo avatar when changing between members Michael Telatynski 2020-03-27 09:59:18 +00:00
  • 657addd13e Merge branch 'origin/develop' into Weblate. Weblate 2020-03-27 09:31:21 +00:00
  • b538bfa7da Translated using Weblate (Hungarian) Szimszon 2020-03-26 20:18:17 +00:00
  • 2ec6210ebd Translated using Weblate (Czech) Stanislav Lukeš 2020-03-26 19:50:11 +00:00
  • 538816a626 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-03-27 02:42:44 +00:00
  • bfee6d8319 Translated using Weblate (Albanian) Besnik Bleta 2020-03-26 18:35:19 +00:00
  • 1f12d16b70 Merge pull request #4287 from matrix-org/dbkr/show_backup_key_cached David Baker 2020-03-27 09:31:03 +00:00
  • 7fbfd73e11 Show modal on "instant SSO" Michael Telatynski 2020-03-27 01:17:42 +00:00
  • b489a7c0d5 Allow reacting to stickers Michael Telatynski 2020-03-27 00:50:41 +00:00
  • ccb3283fd3 Show whether backup key is cached David Baker 2020-03-26 18:50:31 +00:00
  • c77fdcf088 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-26 17:12:38 +00:00
  • 1110735df9 Translated using Weblate (Swedish) Kenneth Larsson 2020-03-26 14:58:40 +00:00
  • b21cf5edc6 Translated using Weblate (Basque) Osoitz 2020-03-26 16:45:55 +00:00
  • 2bf4513b44 Merge pull request #4285 from matrix-org/bwindels/renameunverifiedsessiontoast Bruno Windels 2020-03-26 17:12:25 +00:00
  • 491dad3669 Merge pull request #4286 from matrix-org/bwindels/picklastactivedmforverifreq Bruno Windels 2020-03-26 17:05:17 +00:00
  • e3e40ace81 Fix: pick last active DM for verification request Bruno Windels 2020-03-26 17:45:59 +01:00
  • ce77593cf9 rename toast title Bruno Windels 2020-03-26 17:37:44 +01:00
  • abf12a3ddf Show EncryptionPanel straight away when there is an ongoing verification request for a user Bruno Windels 2020-03-26 17:31:31 +01:00
  • a6fbb98252 only show close button when not in a dialog, which already has one Bruno Windels 2020-03-26 17:02:32 +01:00
  • 4f3842d75e pick color similar to chevron for cancel X button Bruno Windels 2020-03-26 16:58:17 +01:00
  • 34b0c1b1e7 fix lint & other cleanup Bruno Windels 2020-03-26 16:54:31 +01:00
  • 9b54d15fcd add cancel button to verification panel Bruno Windels 2020-03-26 16:51:24 +01:00
  • d9fbbe1696 Merge pull request #12861 from mnoorenberghe/patch-1 Travis Ralston 2020-03-26 09:33:11 -06:00
  • f746c70dc6 Merge pull request #12894 from vector-im/dbkr/kill_riotbot David Baker 2020-03-26 15:06:13 +00:00
  • 8fe4070d15 Merge pull request #56 from vector-im/dbkr/kill_riotbot David Baker 2020-03-26 15:05:41 +00:00
  • 4a81c3c844 Remove welcome user from config David Baker 2020-03-26 14:53:44 +00:00
  • a3d09e6d54 Remove welcome user from config David Baker 2020-03-26 14:51:46 +00:00
  • 04849f7f0d incorporated design feedback Zoe 2020-03-26 13:47:32 +00:00
  • 9c392ce8bb Merge branch 'develop' into foldleft/better-errors Zoe 2020-03-26 13:38:50 +00:00
  • 0a83f9c763 v1.5.14-rc.1 v1.5.14-rc.1 RiotRobot 2020-03-26 13:31:03 +00:00
  • f5c5c1b991 Prepare changelog for v1.5.14-rc.1 RiotRobot 2020-03-26 13:31:03 +00:00
  • bfcb46c4fd v1.5.14-rc.1 RiotRobot 2020-03-26 13:28:13 +00:00