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

Commit Graph

  • d0c98f67fd Merge branch 'origin/develop' into Weblate. Weblate 2019-07-11 14:20:13 +00:00
  • 7c9c94eb27 Translated using Weblate (Basque) Osoitz 2019-07-11 13:58:20 +00:00
  • 111b28971a Merge pull request #3202 from matrix-org/travis/stably-use-stable-apis Travis Ralston 2019-07-11 08:20:08 -06:00
  • 99d1ed5efe s/terms/policies/ David Baker 2019-07-11 14:48:18 +01:00
  • 16201b820a Merge branch 'origin/develop' into Weblate. Weblate 2019-07-11 13:48:01 +00:00
  • 9cb2ebaf07 Merge pull request #3204 from matrix-org/jryans/field-styling-regression J. Ryan Stinnett 2019-07-11 14:47:56 +01:00
  • 18dde859af s/terms/policies/ David Baker 2019-07-11 14:46:20 +01:00
  • 6b815327a0 apparently I was doing array bracket spacing wrong David Baker 2019-07-11 14:44:45 +01:00
  • 3ab5acde9d Add unit test for terms agreement flow David Baker 2019-07-11 14:32:04 +01:00
  • b18acd5978 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-11 12:17:04 +00:00
  • bba167c433 Merge pull request #10308 from vector-im/jryans/upgrade-deps-2 J. Ryan Stinnett 2019-07-11 13:16:59 +01:00
  • a8056a34aa Merge branch 'origin/develop' into Weblate. Weblate 2019-07-11 12:16:55 +00:00
  • 97f9054f9d Merge pull request #3203 from matrix-org/jryans/upgrade-deps-2 J. Ryan Stinnett 2019-07-11 13:16:52 +01:00
  • 5ab958cc9f Fix field styling regression J. Ryan Stinnett 2019-07-11 13:14:20 +01:00
  • 1199554be7 Upgrade dependencies J. Ryan Stinnett 2019-07-11 10:09:15 +01:00
  • c9eac27079 Upgrade dependencies J. Ryan Stinnett 2019-07-11 10:03:50 +01:00
  • 49853a18f9 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-11 10:33:57 +00:00
  • 56b1775209 Merge pull request #3198 from matrix-org/t3chguy/kick Michael Telatynski 2019-07-11 11:33:53 +01:00
  • 9cc6d1439e Merge branch 'origin/develop' into Weblate. Weblate 2019-07-11 10:32:06 +00:00
  • d3a3115298 Merge branch 'master' into develop RiotRobot 2019-07-11 11:31:48 +01:00
  • da5ddb2518 v1.2.4 v1.2.4 RiotRobot 2019-07-11 11:29:11 +01:00
  • 9b7dcf5d88 Prepare changelog for v1.2.4 RiotRobot 2019-07-11 11:29:11 +01:00
  • e5ffb8de4c v1.2.4 RiotRobot 2019-07-11 11:24:52 +01:00
  • ff1a5e0539 Upgrade lodash J. Ryan Stinnett 2019-07-11 11:13:37 +01:00
  • 6ccf88f808 Upgrade to JS SDK 2.1.1 and React SDK 1.3.1 J. Ryan Stinnett 2019-07-11 11:09:56 +01:00
  • 8753c860a8 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-11 10:04:51 +00:00
  • b3b776e028 Translated using Weblate (Hungarian) Szimszon 2019-07-11 09:00:54 +00:00
  • bb1762d265 Merge branch 'master' into develop RiotRobot 2019-07-11 11:04:36 +01:00
  • 1184e05ea7 v1.3.1 RiotRobot 2019-07-11 11:03:47 +01:00
  • fe8cf24267 Prepare changelog for v1.3.1 RiotRobot 2019-07-11 11:03:47 +01:00
  • f77e7fc3e8 Use m.accepted_terms account data David Baker 2019-07-11 10:53:45 +01:00
  • cc1d3aae4b Upgrade lodash J. Ryan Stinnett 2019-07-11 10:52:18 +01:00
  • c34128dae6 Upgrade to JS SDK 2.1.1 J. Ryan Stinnett 2019-07-11 10:40:14 +01:00
  • 8459adb18d Use the state variable for the password when deactivating Travis Ralston 2019-07-10 11:26:09 -06:00
  • c470ad8465 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-11 08:38:22 +00:00
  • 9b3848d083 Merge pull request #3200 from matrix-org/jryans/stylelint-all-files J. Ryan Stinnett 2019-07-11 09:38:18 +01:00
  • ca1e5bb3ae Comment disabled rules J. Ryan Stinnett 2019-07-11 09:30:01 +01:00
  • fc6793fdf8 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-11 08:10:07 +00:00
  • 54b5e85dfa Translated using Weblate (French) Kévin C 2019-07-11 06:57:44 +00:00
  • dd12824a52 Merge pull request #3195 from matrix-org/bwindels/include-orig-in-history Bruno Windels 2019-07-11 08:10:01 +00:00
  • 959f8fd844 Fix tests Michael Telatynski 2019-07-10 21:58:08 +01:00
  • 90212c76a5 Use r0 media endpoints for group tests Travis Ralston 2019-07-10 13:24:47 -06:00
  • 84e4d59a52 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-10 18:10:13 +00:00
  • 1c8226682a Merge pull request #3201 from matrix-org/travis/fix-deactivate Travis Ralston 2019-07-10 12:10:09 -06:00
  • 2a54fe321f Use the state variable for the password when deactivating Travis Ralston 2019-07-10 11:26:09 -06:00
  • 38d6953bf6 Manually fix remaining stylelint issues J. Ryan Stinnett 2019-07-10 16:55:03 +01:00
  • 6c9bf25199 Add stylelint-scss plugin J. Ryan Stinnett 2019-07-09 18:35:57 +01:00
  • dd2079bffc Auto-fix stylelint issues J. Ryan Stinnett 2019-07-09 18:15:10 +01:00
  • 4ebba43873 Run stylelint on all SCSS files J. Ryan Stinnett 2019-07-09 18:09:31 +01:00
  • 90a0f93215 jsdoc-ify comment block David Baker 2019-07-10 16:07:31 +01:00
  • f4be4ab271 Re-add logic for if no integ url is configured David Baker 2019-07-10 15:27:33 +01:00
  • 1dd2f4db3d Merge branch 'origin/develop' into Weblate. Weblate 2019-07-10 14:15:08 +00:00
  • 4e53e522fb Merge pull request #3197 from matrix-org/travis/soft-logout-sso Travis Ralston 2019-07-10 08:15:02 -06:00
  • 0316aa11b7 Rest of terms/policies renaming David Baker 2019-07-10 15:12:05 +01:00
  • ce11eff1b8 Simplify parameter check Travis Ralston 2019-07-10 08:01:32 -06:00
  • 2a73a3a05a Merge branch 'origin/develop' into Weblate. Weblate 2019-07-10 13:52:22 +00:00
  • 7ea8b6d560 Translated using Weblate (French) Kévin C 2019-07-10 08:29:38 +00:00
  • 33a01a4f0b Translated using Weblate (Dutch) Nathan Follens 2019-07-10 11:54:56 +00:00
  • bad1a48112 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-07-10 13:44:59 +00:00
  • 528b927638 Merge pull request #3196 from matrix-org/travis/fix-hover Travis Ralston 2019-07-10 07:52:14 -06:00
  • 8de5c348f3 focus is a bit silly if its starts disabled David Baker 2019-07-10 14:33:20 +01:00
  • 06c0bce053 These can be pure components David Baker 2019-07-10 14:32:37 +01:00
  • 72b1ad37a2 Remove random space David Baker 2019-07-10 14:30:48 +01:00
  • 994f8f849b Remove redundant dict key David Baker 2019-07-10 14:30:31 +01:00
  • c2977ddd8e More de-overloading of 'terms' David Baker 2019-07-10 14:28:45 +01:00
  • 6fafd208a8 add sample terms response David Baker 2019-07-10 14:25:30 +01:00
  • f7750d9df0 right doc, wrong function David Baker 2019-07-10 14:22:50 +01:00
  • 0ec57b58e8 Make 'terms' term less overloaded David Baker 2019-07-10 14:27:29 +01:00
  • 4396e993bf Missed accessToken David Baker 2019-07-10 14:20:36 +01:00
  • a9619b3c7e missed copyright header David Baker 2019-07-10 14:19:14 +01:00
  • be7680c065 update i18n strings David Baker 2019-07-10 14:18:59 +01:00
  • fcf82efc7c Bots isn't a proper noun so no real reason for it to get a capital David Baker 2019-07-10 14:17:42 +01:00
  • 8a7227f971 Typing David Baker 2019-07-10 14:17:15 +01:00
  • 189dd4c7b1 SERVICE_TYPES David Baker 2019-07-10 12:08:26 +01:00
  • fc706e1d47 Missed a file David Baker 2019-07-10 10:50:10 +01:00
  • 8d4356a5b9 Show anything other than ban/invite -> leave as a kick Michael Telatynski 2019-07-10 08:57:00 +01:00
  • 2ca6633fda Update copy as per design Travis Ralston 2019-07-09 23:55:20 -06:00
  • 041379fa3c Don't refuse the soft logout page if the user is soft logged out Travis Ralston 2019-07-09 23:44:14 -06:00
  • 1eb60ef1c4 Support SSO for rehydrating a soft-logged-out session. Travis Ralston 2019-07-08 12:43:16 -06:00
  • 83f697a9a2 lint David Baker 2019-07-09 19:01:22 +01:00
  • d4af8d4993 Use showIntegrationsManager in other places David Baker 2019-07-09 18:56:39 +01:00
  • 54aaabac74 Initial support for ToS dialogs for IS/IM David Baker 2019-07-09 18:51:56 +01:00
  • dd0f4cd9dc Merge branch 'origin/develop' into Weblate. Weblate 2019-07-09 17:43:47 +00:00
  • 6cb148a88a Merge pull request #3190 from matrix-org/travis/soft-logout-design Travis Ralston 2019-07-09 11:43:42 -06:00
  • e05e96bbd1 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-09 17:43:36 +00:00
  • 4c5a7d4787 Merge pull request #3189 from matrix-org/travis/soft-logout-overwrite Travis Ralston 2019-07-09 11:43:31 -06:00
  • 4b1d78e04d Merge branch 'develop' into travis/soft-logout-design Travis Ralston 2019-07-09 11:35:49 -06:00
  • 623b800753 Merge branch 'develop' into travis/soft-logout-overwrite Travis Ralston 2019-07-09 11:35:24 -06:00
  • c539f5c32c Merge branch 'origin/develop' into Weblate. Weblate 2019-07-09 17:32:35 +00:00
  • a33e5f1918 Merge pull request #3188 from matrix-org/travis/soft-logout-non-default-hs Travis Ralston 2019-07-09 11:32:31 -06:00
  • f9491696d9 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-09 17:32:22 +00:00
  • 370fa27de3 Merge pull request #3187 from matrix-org/travis/soft-logout-keys Travis Ralston 2019-07-09 11:32:17 -06:00
  • 0afe4a13a8 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-09 17:31:56 +00:00
  • 7b869f2824 Merge pull request #3182 from matrix-org/travis/soft-logout-rehydrate Travis Ralston 2019-07-09 11:31:51 -06:00
  • 2142826ffd Change highlight colour on dark theme Travis Ralston 2019-07-09 11:29:13 -06:00
  • 11718a982a use originalEvent if present and append it to list Bruno Windels 2019-07-09 17:53:35 +02:00
  • 5666c0db45 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-09 15:05:08 +00:00
  • 31723e9e5b Merge pull request #3194 from matrix-org/bwindels/fix-history-redactions Bruno Windels 2019-07-09 15:05:03 +00:00
  • 7a7af68413 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-09 15:03:26 +00:00
  • 87a67df2d0 Translated using Weblate (Dutch) J. A. Durieux 2019-07-09 10:32:20 +00:00