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

Commit Graph

  • 27a94bb250 js-sdk rc.2 RiotRobot 2019-06-18 15:46:23 +01:00
  • ab4142ab5a Merge remote-tracking branch 'origin/develop' into release-v1.2.2 David Baker 2019-06-18 15:25:44 +01:00
  • d52b5ba85d Merge branch 'origin/develop' into Weblate. Weblate 2019-06-18 14:17:26 +00:00
  • 7b514b0573 Merge pull request #3115 from matrix-org/travis/reduce-scalar-calls Travis Ralston 2019-06-18 08:17:21 -06:00
  • b6ca0ea6bf Appease the linter Travis Ralston 2019-06-18 08:01:38 -06:00
  • be37332bb0 Further simplify usage of integrations Travis Ralston 2019-06-18 07:55:43 -06:00
  • f10e7ac224 Fix reference to main window when setting Electron window icon J. Ryan Stinnett 2019-06-18 13:59:13 +01:00
  • 386de1970e Merge branch 'origin/develop' into Weblate. Weblate 2019-06-18 13:09:30 +00:00
  • f7c03acb58 Merge pull request #3117 from matrix-org/bwindels/redactions-blended-echo Bruno Windels 2019-06-18 13:09:25 +00:00
  • c4fc2a8089 remove redundant localecho part from method name Bruno Windels 2019-06-18 14:57:58 +02:00
  • f9188bca92 reduced opacity for pending redactions Bruno Windels 2019-06-18 13:48:51 +02:00
  • 02c9e29937 use renamed method that also takes local redactions into account now Bruno Windels 2019-06-18 13:47:33 +02:00
  • 6e072e300c Merge branch 'origin/develop' into Weblate. Weblate 2019-06-18 09:57:13 +00:00
  • 3cd91feb2a Translated using Weblate (Italian) random 2019-06-18 09:10:05 +00:00
  • ea32d12c77 Translated using Weblate (Esperanto) Tirifto 2019-06-18 09:11:23 +00:00
  • cc155ac049 Merge pull request #3116 from matrix-org/bwindels/feature-guard-arrowup-to-edit Bruno Windels 2019-06-18 09:57:04 +00:00
  • f95f194b6a keep old arrow-up behaviour when editing is not enabled Bruno Windels 2019-06-18 11:49:36 +02:00
  • 592576bf42 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-18 08:59:18 +00:00
  • 32840fc274 Merge pull request #3098 from matrix-org/t3chguy/restore_composer_history Bruno Windels 2019-06-18 08:59:11 +00:00
  • 38d9f9ef8c Merge branch 'origin/develop' into Weblate. Weblate 2019-06-18 08:37:36 +00:00
  • 1729247340 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-06-18 02:58:01 +00:00
  • d8c0f12009 Translated using Weblate (Basque) Osoitz 2019-06-18 04:26:26 +00:00
  • 5e7b4564cf Merge pull request #3114 from matrix-org/dbkr/allow_server_change_if_dead David Baker 2019-06-18 09:37:31 +01:00
  • 1db505c667 comment typo Bruno Windels 2019-06-18 09:50:31 +02:00
  • 3119feaa17 whitespace Bruno Windels 2019-06-18 09:48:25 +02:00
  • 47579f37e8 clarify why its always safe to not append @room at end while parsing Bruno Windels 2019-06-18 08:40:58 +02:00
  • 6b7bcb239b Merge branch 'origin/develop' into Weblate. Weblate 2019-06-18 00:06:20 +00:00
  • 0692775f98 Translated using Weblate (Hungarian) Szimszon 2019-06-17 18:15:13 +00:00
  • b0d340f578 Merge pull request #3109 from matrix-org/t3chguy/upload_all_button Travis Ralston 2019-06-17 18:06:15 -06:00
  • 9e5712594c Translated using Weblate (German) BenjaminVettori 2019-06-16 21:49:05 +00:00
  • d5db0077ed Remove unused imports Travis Ralston 2019-06-17 15:53:11 -06:00
  • 8f6e8c1ec7 Appease the linter Travis Ralston 2019-06-17 15:51:14 -06:00
  • d58ab8e6d0 Remove excessive scalar auth checks in manager util class Travis Ralston 2019-06-17 15:50:09 -06:00
  • 974a11ed20 Defer scalar auth in AppsDrawer to widgets/manager dialog Travis Ralston 2019-06-17 15:39:32 -06:00
  • d2d0cb2e9e Port AppTile (widgets) over to new integration manager dialog props Travis Ralston 2019-06-17 15:34:30 -06:00
  • f699fed720 Defer sticker picker scalar auth to integration manager dialog Travis Ralston 2019-06-17 15:30:24 -06:00
  • ebabc5238d Port integration manager class to new dialog props Travis Ralston 2019-06-17 15:30:01 -06:00
  • a5f296457f Make the Manage Integrations Button defer scalar auth to the manager Travis Ralston 2019-06-17 15:29:19 -06:00
  • 6cc443cd01 spelling Travis Ralston 2019-06-17 15:27:35 -06:00
  • 7c80355ea7 Convert IntegrationsManager to a class Travis Ralston 2019-06-17 13:38:23 -06:00
  • 10f6abfe17 Allow changing server if validation has failed David Baker 2019-06-17 18:47:20 +01:00
  • d9226751dc Merge branch 'origin/develop' into Weblate. Weblate 2019-06-17 17:45:43 +00:00
  • fac6dc25f6 Merge pull request #3112 from matrix-org/dbkr/reenable_register_button David Baker 2019-06-17 18:45:39 +01:00
  • b2ab8e3255 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-17 17:42:55 +00:00
  • 536f78eaf5 Merge pull request #3111 from matrix-org/bwindels/fix-register-layout Bruno Windels 2019-06-17 17:42:52 +00:00
  • a35c9ea585 provide default for missing device labels Bruno Windels 2019-06-17 19:36:52 +02:00
  • 872c1acdea keep mx_Field stretching Bruno Windels 2019-06-17 18:29:03 +02:00
  • 3f6bb0c7ca Use default cursor for disabled submit button David Baker 2019-06-17 16:57:13 +01:00
  • e3bf4a0b8e Re-enable register button on change to working HS David Baker 2019-06-17 16:27:35 +01:00
  • a0b195e709 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-17 08:27:50 +00:00
  • 2eef3d610e Merge pull request #3107 from matrix-org/dbkr/multispinner David Baker 2019-06-17 09:27:45 +01:00
  • 20fd25186c Merge branch 'origin/develop' into Weblate. Weblate 2019-06-17 07:11:32 +00:00
  • 4a0471eba7 Translated using Weblate (German) natowi 2019-06-16 22:14:04 +00:00
  • 8c538f2faf Translated using Weblate (German) BenjaminVettori 2019-06-16 21:50:51 +00:00
  • 94f6907db5 Merge pull request #3110 from z3ntu/canonical_alias Michael Telatynski 2019-06-17 08:11:27 +01:00
  • ac201a8aff Translated using Weblate (Russian) Vitaly Lipatov 2019-06-15 07:53:41 +00:00
  • 34702d7214 Translated using Weblate (German) Travis Ralston 2019-06-15 21:12:48 +00:00
  • 4ffca59456 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-06-15 12:36:37 +00:00
  • c68074f532 Fix display of canonicalAlias in group room info Luca Weiss 2019-06-16 21:52:25 +02:00
  • 2fc2e32e60 Add Upload All button to UploadConfirmDialog Michael Telatynski 2019-06-16 11:43:13 +01:00
  • fbe8d1c89b Switch DeactivateAccountDialog to Field and cleanups Michael Telatynski 2019-06-16 10:42:46 +01:00
  • 3563b83762 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/authentication_password_field Michael Telatynski 2019-06-16 10:31:30 +01:00
  • c90cc096a1 Translated using Weblate (West Flemish) Nathan Follens 2019-06-14 09:42:09 +00:00
  • f1a6651f04 Translated using Weblate (Vietnamese) Le Dang Trung 2019-06-14 08:01:01 +00:00
  • a36013f2e0 Translated using Weblate (Russian) Vitaly Lipatov 2019-06-15 07:40:48 +00:00
  • 36cebd565a Translated using Weblate (Italian) random 2019-06-12 10:19:14 +00:00
  • fefa2ee036 Translated using Weblate (Bulgarian) Slavi Pantaleev 2019-06-14 05:45:35 +00:00
  • 446a4b16ee Translated using Weblate (Basque) Osoitz 2019-06-13 09:15:48 +00:00
  • 03c37821f6 clean up onVerticalArrow Michael Telatynski 2019-06-15 15:10:34 +01:00
  • d9e62b54fc also support deserializing at-room-pill when transferring editor state Bruno Windels 2019-06-14 18:42:30 +02:00
  • 497ba1ecd4 prevent @room pills being applied multiple times when rerendering Bruno Windels 2019-06-14 18:26:01 +02:00
  • 78971f168f create AtRoomPill when autocomplete returns @room Bruno Windels 2019-06-14 18:25:43 +02:00
  • 65d56d1490 transform @room to AtRoomPill while deserializing html to md Bruno Windels 2019-06-14 18:25:02 +02:00
  • 63b11f5001 (de)serialize at-room-pills just like pill-candidate (no html needed) Bruno Windels 2019-06-14 18:24:36 +02:00
  • dfec5058c5 support creating @room pills in partcreator Bruno Windels 2019-06-14 18:24:18 +02:00
  • eb4ff50c3c do parts creation only in PartCreator to not scatter dependencies Bruno Windels 2019-06-14 12:16:34 +02:00
  • 4c036c98ee Fix double-spinner David Baker 2019-06-14 17:21:07 +01:00
  • df17c61fab Merge branch 'origin/develop' into Weblate. Weblate 2019-06-14 16:20:36 +00:00
  • 4ce72fdffa Merge pull request #3106 from matrix-org/dbkr/resurrect_riot_bot David Baker 2019-06-14 17:20:31 +01:00
  • 431de3e698 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-14 15:47:34 +00:00
  • ad1cd085d5 Translated using Weblate (West Flemish) Nathan Follens 2019-06-14 09:31:13 +00:00
  • df7a0c6d45 Translated using Weblate (Dutch) Nathan Follens 2019-06-14 09:30:53 +00:00
  • 638b5c6d31 Merge pull request #3105 from matrix-org/bwindels/edit-emotes Bruno Windels 2019-06-14 15:47:29 +00:00
  • 794b04b89a take the debugging out David Baker 2019-06-14 16:41:30 +01:00
  • 30726d6cf9 Pull out welcome user chat code to a separate function David Baker 2019-06-14 16:29:26 +01:00
  • 929e9dc653 Don't forget to show the homepage if no welcome user David Baker 2019-06-14 16:04:09 +01:00
  • 8fa50b26a6 Fix welcome user David Baker 2019-06-14 15:31:19 +01:00
  • 6a10f0068d Use Alt-UP/DOWN for Composer History instead of random room change Michael Telatynski 2019-06-14 12:26:52 +01:00
  • 876acc0f76 Merge branches 'develop' and 't3chguy/restore_composer_history' of github.com:matrix-org/matrix-react-sdk into t3chguy/restore_composer_history Michael Telatynski 2019-06-14 12:26:05 +01:00
  • 25acd6fdeb Merge branch 'origin/develop' into Weblate. Weblate 2019-06-14 09:23:40 +00:00
  • e4090d6b2e Merge pull request #3104 from matrix-org/t3chguy/mx_Field_flex_1 Bruno Windels 2019-06-14 09:23:36 +00:00
  • 275c750d61 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-14 09:23:06 +00:00
  • a311374985 Translated using Weblate (Vietnamese) Le Dang Trung 2019-06-14 08:03:37 +00:00
  • 15d949b405 Translated using Weblate (Polish) Karol Kosek 2019-06-13 17:54:26 +00:00
  • 18afdf9d07 Translated using Weblate (French) Kévin C 2019-06-14 09:01:09 +00:00
  • 965985619e Translated using Weblate (Bulgarian) Slavi Pantaleev 2019-06-14 05:44:46 +00:00
  • 9b16216931 Translated using Weblate (Basque) Osoitz 2019-06-14 07:30:53 +00:00
  • c2a03893dc Translated using Weblate (Albanian) Besnik Bleta 2019-06-14 08:31:44 +00:00
  • 6ffe910b47 Merge pull request #3099 from matrix-org/t3chguy/MemberInfo_long_mxid Bruno Windels 2019-06-14 09:22:58 +00:00
  • 3cfdd518ee detect emote when sending (and trim "/me " for content) Bruno Windels 2019-06-14 11:02:20 +02:00