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

Commit Graph

  • 7ab665bf31 Merge pull request #3193 from matrix-org/bwindels/replace-server-date Bruno Windels 2019-07-09 15:03:21 +00:00
  • f03187190e Don't try to call bodyToHtml with an empty content Bruno Windels 2019-07-09 15:00:26 +02:00
  • 88b91e24a5 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-09 09:59:33 +00:00
  • 044d1b8130 Translated using Weblate (Polish) Karol Kosek 2019-07-08 19:27:25 +00:00
  • 349afb13f3 Merge pull request #3164 from matrix-org/t3chguy/fix_proptypes_mismatches Michael Telatynski 2019-07-09 10:59:29 +01:00
  • 58d7ed02b7 use method that also takes server aggregations into account for tooltip date Bruno Windels 2019-07-09 11:31:29 +02:00
  • 8ebc03706a Also clear data when the deviceId doesn't match Travis Ralston 2019-07-08 15:35:34 -06:00
  • ab63e8bd04 Remove backwards compat function Travis Ralston 2019-07-08 11:55:00 -06:00
  • d2ab0a5ca7 Move key backup init to componentDidMount Travis Ralston 2019-07-08 11:53:26 -06:00
  • 3e0be640fd Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys Travis Ralston 2019-07-08 11:52:58 -06:00
  • c3383e9315 Move _initLogin to componentDidMount Travis Ralston 2019-07-08 11:51:22 -06:00
  • c8e0b7b96c Merge branch 'origin/develop' into Weblate. Weblate 2019-07-08 15:19:40 +00:00
  • 61a7cc17a0 Translated using Weblate (French) Kévin C 2019-07-08 11:44:46 +00:00
  • 85e7fd4719 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-07-08 13:17:53 +00:00
  • cd803617b8 Merge pull request #3192 from matrix-org/bwindels/preserve-reply-fallback-on-edit Bruno Windels 2019-07-08 15:19:35 +00:00
  • f6e71b2335 turn flag into options object Bruno Windels 2019-07-08 16:55:56 +02:00
  • e601037cd2 don't show reply fallback in edit history Bruno Windels 2019-07-08 15:32:38 +02:00
  • 888e4d1ec2 preserve reply fallback when editing Bruno Windels 2019-07-08 15:25:44 +02:00
  • 2c863aa3ec Merge branch 'origin/develop' into Weblate. Weblate 2019-07-08 10:14:50 +00:00
  • 5f1d6f333c Merge branch 'master' into develop RiotRobot 2019-07-08 11:14:40 +01:00
  • 6546108307 v1.2.3 v1.2.3 RiotRobot 2019-07-08 11:12:04 +01:00
  • 4a33c0af6e Prepare changelog for v1.2.3 RiotRobot 2019-07-08 11:12:03 +01:00
  • a53d7edc7f v1.2.3 RiotRobot 2019-07-08 11:10:31 +01:00
  • 090b2dbd30 Upgrade to JS SDK 2.1.0 and React SDK 1.3.0 RiotRobot 2019-07-08 10:58:13 +01:00
  • 3cf34d819b Merge branch 'origin/develop' into Weblate. Weblate 2019-07-08 09:55:53 +00:00
  • 0347c42798 Merge branch 'master' into develop RiotRobot 2019-07-08 10:53:53 +01:00
  • 61e2d87152 v1.3.0 RiotRobot 2019-07-08 10:53:03 +01:00
  • 6cafcf6408 Prepare changelog for v1.3.0 RiotRobot 2019-07-08 10:53:03 +01:00
  • 33eba0e500 Upgrade to JS SDK 2.1.0 RiotRobot 2019-07-08 10:49:43 +01:00
  • 061bd789cf Merge branch 'origin/develop' into Weblate. Weblate 2019-07-08 09:23:55 +00:00
  • dd27891ee9 Merge pull request #3191 from matrix-org/t3chguy/lightbox_remove_no_pl Michael Telatynski 2019-07-08 10:23:51 +01:00
  • c9f34a5d5a Merge branch 'origin/develop' into Weblate. Weblate 2019-07-08 08:19:31 +00:00
  • 7a482461dd Merge pull request #3180 from matrix-org/bwindels/history-actions Bruno Windels 2019-07-08 08:19:27 +00:00
  • 1af2ca6b36 constistent jsx bracket and indent styling Bruno Windels 2019-07-08 10:12:26 +02:00
  • cf11a3758f set analyticsInfo for dialogs Bruno Windels 2019-07-08 10:12:04 +02:00
  • 0b9ab4e566 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-07-06 13:54:33 +00:00
  • c2905bd33b make things a tad saner Michael Telatynski 2019-07-06 11:16:01 +01:00
  • 89ece266c6 Make id used in EditableItemList unique, namespace mx_EditableItemList_* Michael Telatynski 2019-07-06 11:15:10 +01:00
  • 6b9c6a31f0 Don't show Remove button in ImageView if can't redact, delint ImageView Michael Telatynski 2019-07-06 10:42:14 +01:00
  • eb46774437 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-06 07:53:26 +00:00
  • 040e580cf0 Merge pull request #3183 from matrix-org/t3chguy/editing_while_replying Michael Telatynski 2019-07-06 08:53:22 +01:00
  • f9fe35dba3 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-06 07:53:03 +00:00
  • 000f7e8007 Merge pull request #3103 from matrix-org/t3chguy/edit_skip_if_no_edit Michael Telatynski 2019-07-06 08:52:58 +01:00
  • ae79ce97f3 Dress up the soft logout page to look like the design Travis Ralston 2019-07-04 15:22:25 -06:00
  • ca6563dce4 Merge branch 'travis/soft-logout-rehydrate' into t1 Travis Ralston 2019-07-05 15:03:24 -06:00
  • fca4ebcd72 Overwrite the old session if the new creds are for a different user Travis Ralston 2019-07-05 14:45:34 -06:00
  • 8b417f8a60 Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-overwrite Travis Ralston 2019-07-05 14:37:04 -06:00
  • 1f1a5b2aac Fix React crash when using a non-default homeserver on soft logout Travis Ralston 2019-07-05 14:35:21 -06:00
  • 55b4ef2169 Change soft logout rehydrate text if there's pending key backups Travis Ralston 2019-07-05 13:52:14 -06:00
  • d39b4e9c7c Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys Travis Ralston 2019-07-05 13:41:04 -06:00
  • 89b8ccf471 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-05 16:56:04 +00:00
  • 017fc84862 Merge pull request #3184 from matrix-org/jryans/reactions-send-marks-unread J. Ryan Stinnett 2019-07-05 17:55:59 +01:00
  • 68d501fabf Merge branch 'origin/develop' into Weblate. Weblate 2019-07-05 16:50:22 +00:00
  • cb92e1d4c9 Merge pull request #10260 from vector-im/jryans/upgrade-deps J. Ryan Stinnett 2019-07-05 17:50:19 +01:00
  • 20c4c448ca Merge branch 'origin/develop' into Weblate. Weblate 2019-07-05 16:50:17 +00:00
  • 11e6a81941 Translated using Weblate (Finnish) Tuomas Hietala 2019-07-05 15:35:53 +00:00
  • 480fe44d44 Merge pull request #3179 from matrix-org/jryans/upgrade-deps J. Ryan Stinnett 2019-07-05 17:50:13 +01:00
  • acadd624ef Merge branch 'origin/develop' into Weblate. Weblate 2019-07-05 15:35:11 +00:00
  • 6cd2421929 Translated using Weblate (Italian) random 2019-07-05 15:30:23 +00:00
  • 2bf3739af7 Translated using Weblate (Finnish) Tuomas Hietala 2019-07-05 15:35:05 +00:00
  • 74431fe8b1 Merge pull request #3186 from matrix-org/jryans/reactions-allow-text J. Ryan Stinnett 2019-07-05 16:35:06 +01:00
  • 60a9e39d69 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-05 15:28:16 +00:00
  • 02fc3c9b85 Translated using Weblate (Italian) random 2019-07-05 15:25:16 +00:00
  • 87188e9229 Merge pull request #3185 from matrix-org/jryans/tooltip-target-null J. Ryan Stinnett 2019-07-05 16:28:12 +01:00
  • e94b3c2459 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-05 15:25:02 +00:00
  • 2ce736f5a7 Translated using Weblate (Italian) random 2019-07-05 15:21:28 +00:00
  • b742525fbb Translated using Weblate (Finnish) Tuomas Hietala 2019-07-05 14:00:21 +00:00
  • 9266c797da Merge pull request #3181 from matrix-org/travis/soft-logout-force Travis Ralston 2019-07-05 09:24:56 -06:00
  • eb0e1eade4 Clamp reaction content width to at most 100px J. Ryan Stinnett 2019-07-05 16:17:17 +01:00
  • 2a8f9a81f7 Allow diplayed reaction values to contain anything J. Ryan Stinnett 2019-07-05 15:18:53 +01:00
  • 70334b69ec implement view source for edits Bruno Windels 2019-07-05 16:11:15 +02:00
  • 3c3426d97e Update copyright header J. Ryan Stinnett 2019-07-05 15:08:55 +01:00
  • f4a8314c4f make dom tree similar to eventtile so red lozenge style applies Bruno Windels 2019-07-05 16:05:40 +02:00
  • 0aa1252d01 monitor associated send status for edit history events Bruno Windels 2019-07-05 16:04:34 +02:00
  • 2182248d7c mark events from /relations as locally redacted if any pending redaction Bruno Windels 2019-07-05 16:03:34 +02:00
  • 5496a4dce6 Fix interactive tooltip null target error J. Ryan Stinnett 2019-07-05 15:02:06 +01:00
  • 0ae98a5a4d Track live events in timeline and use for read receipts and read markers J. Ryan Stinnett 2019-07-05 14:37:19 +01:00
  • efc70a8488 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-05 10:50:44 +00:00
  • 1e22b781e4 Translated using Weblate (French) Kévin C 2019-07-05 07:09:54 +00:00
  • f4ad9cc916 Translated using Weblate (Albanian) Besnik Bleta 2019-07-05 09:55:19 +00:00
  • 27c79b9504 Merge pull request #3163 from matrix-org/t3chguy/fix_emoji_shortname_tooltip J. Ryan Stinnett 2019-07-05 11:50:38 +01:00
  • ecc672cccc add comment Michael Telatynski 2019-07-05 08:40:00 +01:00
  • 89d568ce97 Don't allow editing via up-arrow when Replying Michael Telatynski 2019-07-05 08:36:16 +01:00
  • 00973a1ee8 Appease the linter Travis Ralston 2019-07-04 17:00:09 -06:00
  • 03cbd7e8bb Ensure links off the forgot password page land you at soft logout Travis Ralston 2019-07-04 16:51:55 -06:00
  • 93872e6fa5 Ask for the user's password to rehydrate their soft logged out session Travis Ralston 2019-07-04 16:45:40 -06:00
  • 89131be438 Require that users go to the soft logout page if they're soft logged out Travis Ralston 2019-07-04 15:14:00 -06:00
  • 1a3a12eed7 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-04 16:22:24 +00:00
  • a13d063e33 Translated using Weblate (French) Kévin C 2019-07-04 12:31:49 +00:00
  • 5147d66dd6 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-07-04 13:09:13 +00:00
  • f3c6c73329 Merge pull request #3177 from matrix-org/travis/soft-logout-base Travis Ralston 2019-07-04 10:22:18 -06:00
  • 8ea46a8c4d Remove unneeded page types Travis Ralston 2019-07-04 09:59:20 -06:00
  • 5e5bf21281 Remove irrelevant debugging Travis Ralston 2019-07-04 09:59:07 -06:00
  • 8468f7cdc3 support redactions in edit history dialog Bruno Windels 2019-07-04 15:39:36 +02:00
  • 7424c776e5 Upgrade dependencies J. Ryan Stinnett 2019-07-04 15:14:44 +01:00
  • b095042084 Upgrade dependencies J. Ryan Stinnett 2019-07-04 15:08:20 +01:00
  • f19777fcf8 Merge branch 'origin/develop' into Weblate. Weblate 2019-07-04 12:07:17 +00:00
  • 2b5d9961c0 Merge pull request #3178 from matrix-org/dbkr/delint_scalar_auth_client David Baker 2019-07-04 13:07:13 +01:00
  • 7d40ccfdbe De-lint ScalarAuthClient David Baker 2019-07-04 12:59:20 +01:00
  • 375976575b add redact button Bruno Windels 2019-07-04 11:07:22 +02:00