Commit Graph

  • 7f7e7221c5 Translated using Weblate (Hungarian) Szimszon 2019-05-15 19:29:45 +00:00
  • 3d86431f14 Translated using Weblate (Hindi) Akarshan Biswas 2019-05-16 07:47:13 +00:00
  • 0e369bd12e Merge pull request #2977 from matrix-org/jryans/encrypted-reactions J. Ryan Stinnett 2019-05-16 09:45:09 +01:00
  • 33885cb864 Use getRelation helper J. Ryan Stinnett 2019-05-15 13:46:32 +01:00
  • 6f22acc3c6 Merge pull request #2979 from aaronraimist/imageview-tooltip Travis Ralston 2019-05-15 21:14:20 -06:00
  • c38b5cabb1 Allow the strings to be translated Aaron Raimist 2019-05-15 22:11:47 -05:00
  • bfd37d8089 Add tooltips to rotate and close buttons in ImageView (#9686) Aaron Raimist 2019-05-15 22:05:54 -05:00
  • 3123b429f7 Increase timeout for yarn install in Docker builds Travis Ralston 2019-05-15 15:12:33 -06:00
  • 60a13652df Merge pull request #2965 from matrix-org/travis/wk/tooltip Travis Ralston 2019-05-15 14:13:44 -06:00
  • 6e3b06f364 Human de-linting Travis Ralston 2019-05-15 13:55:50 -06:00
  • 897e1735b5 Merge pull request #2978 from matrix-org/bwindels/message-edit-editor3 Bruno Windels 2019-05-15 17:20:40 +00:00
  • 085f2d199d focus editor after clicking edit Bruno Windels 2019-05-15 17:17:35 +01:00
  • 2994d99378 Merge branch 'develop' into hs/custom-notif-sounds Will Hunt 2019-05-15 16:09:55 +01:00
  • d73f547f55 reapply pills, link preview, code highlighting, ... after edit Bruno Windels 2019-05-15 15:55:03 +01:00
  • 6366371c0d add * to fallback messages for edits Bruno Windels 2019-05-15 15:54:05 +01:00
  • b081a3156f dont show edit button for messages that are not your own Bruno Windels 2019-05-15 15:53:49 +01:00
  • 52c4d7b6b0 fixup edit icon Bruno Windels 2019-05-15 15:53:02 +01:00
  • d752de0972 Improve UX Will Hunt 2019-05-15 15:52:42 +01:00
  • 76570beb3c Merge pull request #2973 from matrix-org/bwindels/message-edit-editor2 Bruno Windels 2019-05-15 14:11:52 +00:00
  • 05a2cb1020 Merge branch 'master' into develop David Baker 2019-05-15 14:40:16 +01:00
  • 5aa88abacc v1.1.2 v1.1.2 David Baker 2019-05-15 14:36:52 +01:00
  • e749420196 Prepare changelog for v1.1.2 David Baker 2019-05-15 14:36:51 +01:00
  • 8ac5957186 v1.1.2 David Baker 2019-05-15 14:34:59 +01:00
  • d0def4a80f react-sdk 1.1.2 David Baker 2019-05-15 14:34:13 +01:00
  • 39b8d8957d Merge branch 'master' into develop David Baker 2019-05-15 14:31:30 +01:00
  • 4e3c39cd60 v1.1.2 David Baker 2019-05-15 14:30:21 +01:00
  • 77384497b0 Prepare changelog for v1.1.2 David Baker 2019-05-15 14:30:20 +01:00
  • f09d98291c Merge pull request #2976 from matrix-org/dbkr/gif_autoplay-2 David Baker 2019-05-15 14:27:03 +01:00
  • cfe917e489 Merge pull request #2975 from matrix-org/dbkr/fix_sso_2 David Baker 2019-05-15 14:26:55 +01:00
  • ef5ac27ddc Add comment about thumbnailing for GIFs J. Ryan Stinnett 2019-05-14 13:55:38 +01:00
  • 6ea590cf1f Always thumbnail for GIFs J. Ryan Stinnett 2019-05-13 18:28:57 +01:00
  • 3ea187a524 Save content.info as a local for readability J. Ryan Stinnett 2019-05-13 18:00:52 +01:00
  • 0cde4bf2cd lint David Baker 2019-05-15 14:00:37 +01:00
  • 00508367f6 Fix Single Sign-on David Baker 2019-05-15 13:47:48 +01:00
  • b4d2463d17 Merge pull request #2974 from matrix-org/dbkr/fix_sso David Baker 2019-05-15 14:12:05 +01:00
  • fc636c6cb9 lint David Baker 2019-05-15 14:00:37 +01:00
  • da1bff1c5d Fix Single Sign-on David Baker 2019-05-15 13:47:48 +01:00
  • 5805a88ab9 adjust to js-sdk changes of marking original event as replaced Bruno Windels 2019-05-15 11:49:43 +01:00
  • e4b4da4f8d Translated using Weblate (Swedish) Kenneth Larsson 2019-04-08 19:50:53 +00:00
  • 6f63df5694 Translated using Weblate (Hungarian) Szimszon 2019-04-08 19:26:46 +00:00
  • b55b41257a Translated using Weblate (German) natowi 2019-04-08 13:46:15 +00:00
  • 129cb8ea29 Translated using Weblate (French) Kévin C 2019-04-08 12:44:19 +00:00
  • 8a94d00edc Translated using Weblate (Dutch) Nathan Follens 2019-04-08 16:17:02 +00:00
  • 40d9bc7b34 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-04-10 00:37:51 +00:00
  • 6f393b5d91 Translated using Weblate (Bulgarian) Slavi Pantaleev 2019-04-09 06:44:03 +00:00
  • aa361a251b Translated using Weblate (Basque) Osoitz 2019-04-10 16:51:58 +00:00
  • 5a6be9a665 Add message editing to sample also J. Ryan Stinnett 2019-05-15 11:12:12 +01:00
  • 734221cc3f Merge pull request #9728 from vector-im/bwindels/message-edit-editor Bruno Windels 2019-05-15 09:23:34 +00:00
  • edc100163f Merge pull request #2952 from matrix-org/bwindels/message-edit-editor Bruno Windels 2019-05-15 09:23:01 +00:00
  • 22533ba2d4 use theme var for bg color Bruno Windels 2019-05-15 10:12:16 +01:00
  • 6b932d58e6 remove cruft from edit icon Bruno Windels 2019-05-15 10:10:29 +01:00
  • f5e7dd5164 add description of new labs feature for message editing Bruno Windels 2019-05-15 10:00:47 +01:00
  • d83e278f6b PR feedback, cleanup Bruno Windels 2019-05-15 09:46:08 +01:00
  • 1421e8e06b Tweak reply arrow and hover color J. Ryan Stinnett 2019-05-15 09:12:53 +01:00
  • 22cc33eb15 Do a simple .well-known lookup for default_server_name for mobile guide Travis Ralston 2019-05-14 17:57:04 -06:00
  • 559416dcae Show most homeserver options on the mobile guide Travis Ralston 2019-05-14 16:59:02 -06:00
  • 9b40913838 Merge pull request #2957 from matrix-org/t3chguy/invite_perms Michael Telatynski 2019-05-14 23:15:59 +01:00
  • fd07b5c476 use scss variable for grey Michael Telatynski 2019-05-14 23:03:02 +01:00
  • 9b5830bb08 Restore use of full mxid login Travis Ralston 2019-05-14 15:01:22 -06:00
  • 079bdd44a4 Update il8n Will Hunt 2019-05-14 21:07:29 +01:00
  • 277c4ab809 Merge branch 'develop' into hs/custom-notif-sounds Will Hunt 2019-05-14 21:07:03 +01:00
  • 46132a2463 Merge branch 'hs/custom-notif-sounds' of github.com:Half-Shot/matrix-react-sdk into hs/custom-notif-sounds Will Hunt 2019-05-14 21:05:55 +01:00
  • 626cb46915 Cleanup interface buttons Will Hunt 2019-05-14 21:05:22 +01:00
  • 68a7550080 Flag the validated config as the default config Travis Ralston 2019-05-14 13:05:26 -06:00
  • 34719b9a2e Only expose the fallback_hs_url if the homeserver is the default HS Travis Ralston 2019-05-14 13:10:02 -06:00
  • bb16357636 Flag all generated configs as non-default by default Travis Ralston 2019-05-14 13:06:56 -06:00
  • 7f5589c01b Clarify comment on is_url and hs_url handling Travis Ralston 2019-05-14 12:53:13 -06:00
  • 4c1ac38dd4 Merge branch 'develop' into travis/feature/wellknown2 Travis Ralston 2019-05-14 10:53:01 -06:00
  • 92c67cdcab Merge pull request #2963 from matrix-org/travis/permalink-without-room Travis Ralston 2019-05-14 10:28:26 -06:00
  • a2e0dc2f7e Tweak message action bar position J. Ryan Stinnett 2019-05-14 16:51:50 +01:00
  • dc21faa240 send edit also in n.new_content field Bruno Windels 2019-05-14 16:32:08 +01:00
  • fd31e793d1 fix lint Bruno Windels 2019-05-14 15:49:53 +01:00
  • 0b18ff52c5 pass feature flag to js-sdk Bruno Windels 2019-05-14 15:41:55 +01:00
  • 45991bc3de replace original event if there have been previous edits Bruno Windels 2019-05-14 15:20:52 +01:00
  • 15df72e629 reload events when event gets replaced in the timeline Bruno Windels 2019-05-14 15:20:34 +01:00
  • e2388afb51 consistent naming between serialize and deserialize modules Bruno Windels 2019-05-14 10:53:42 +01:00
  • 036cb02c0e add feature flag Bruno Windels 2019-05-14 10:51:04 +01:00
  • 759a4a54ef send the actual m.replace event from composer content Bruno Windels 2019-05-14 10:37:57 +01:00
  • 34dbe5f314 add newline parts for text messages as well Bruno Windels 2019-05-14 10:37:40 +01:00
  • 3abdf6b100 also serialize to text and method to tell us if we need html for model Bruno Windels 2019-05-14 10:37:16 +01:00
  • 2fbe73e658 draft of formatting Bruno Windels 2019-05-13 18:20:32 +01:00
  • eaf43d7277 correctly parse BRs Bruno Windels 2019-05-13 18:20:21 +01:00
  • c98e716cbd some pill styling Bruno Windels 2019-05-13 17:56:30 +01:00
  • c44fed4bea even less logging Bruno Windels 2019-05-13 17:51:20 +01:00
  • a3b02cf0cc make logging quiet Bruno Windels 2019-05-13 17:45:54 +01:00
  • 4ff37ca046 don't show model for now Bruno Windels 2019-05-13 17:45:35 +01:00
  • 9e0816c51c find caret offset and calculate editor text in same tree-walking algo Bruno Windels 2019-05-13 16:42:00 +01:00
  • 7ebb6ce621 WIP commit, newlines sort of working Bruno Windels 2019-05-13 15:21:57 +01:00
  • 9f597c7ec0 no comment nodes without react,so can bring this back to simpler version Bruno Windels 2019-05-10 14:25:13 +02:00
  • 7a85dd4e61 after completion, set caret in next part at start Bruno Windels 2019-05-10 14:24:50 +02:00
  • 2c3453d307 put caret after replaced part if no caretOffset is given by autocomplete Bruno Windels 2019-05-09 20:37:45 +02:00
  • 1a577eed11 take non-editable parts into account for new caret position Bruno Windels 2019-05-09 19:55:24 +02:00
  • 8d97c0033e catch this for now as caret behaviour is still a bit flaky Bruno Windels 2019-05-09 16:55:35 +02:00
  • 580a89875a fix autocompl. not always appearing/being updated when there is no part Bruno Windels 2019-05-09 16:54:58 +02:00
  • bc14d4f58f comment Bruno Windels 2019-05-09 16:07:10 +02:00
  • 22587da5ff close autocomplete on enter Bruno Windels 2019-05-09 16:07:00 +02:00
  • ffff66a92d handle Escape properly Bruno Windels 2019-05-09 15:59:48 +02:00
  • 64b171198c rerender through callback instead of after modifying model Bruno Windels 2019-05-09 15:58:32 +02:00
  • aa1b4bb91e keep auto complete code close to each other Bruno Windels 2019-05-09 15:43:10 +02:00
  • 5e6367ab57 basic support for non-editable parts Bruno Windels 2019-05-09 15:42:10 +02:00