Commit Graph

10038 Commits (6299e188a4bcd680087822b59dfa3d6ab9bb30e1)

Author SHA1 Message Date
Luke Barnard ff0254d346 Fix ContextualMenu imports for TagTile and code block copy button 2018-05-14 17:36:57 +01:00
Weblate 9c4b25817c Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 16:27:14 +00:00
Slavi Pantaleev 4ce6093daf Translated using Weblate (Bulgarian)
Currently translated at 99.1% (1165 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-05-14 16:27:13 +00:00
David Baker 7588d4380c Merge branch 'release-v0.12.4' into develop 2018-05-14 17:27:01 +01:00
David Baker ab8f0ed810
Merge pull request #1903 from matrix-org/luke/fix-sticker-picker-position
Quick fix for sticker picker position
2018-05-14 17:26:29 +01:00
Luke Barnard e0236c3d3e Fix issue with sticker picker rendering off-screen
when the RightPanel is collapsed on a small monitor
and the sticker picker is opened.
2018-05-14 17:12:45 +01:00
Kévin C 0591963cc1 Translated using Weblate (French)
Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-14 15:46:17 +00:00
Luke Barnard 3761cd4054 When panels are shown/hidden, hide sticker picker 2018-05-14 16:35:12 +01:00
Weblate 3d17bd63a2 Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 13:31:29 +00:00
Luke Barnard 49a3770e92 Merge branch 'release-v0.12.4' into develop 2018-05-14 14:31:18 +01:00
Richard Lewis dddd1c43cc Remove redundant logging (currently shown on every render when no stickerpicker is present). 2018-05-14 14:23:26 +01:00
Weblate 5a6d80b6d7 Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 13:09:06 +00:00
Richard Lewis 615fc80c92
Merge pull request #1901 from matrix-org/rxl881/stickerpickerLogging
Remove redundant logging (currently shown on every render when no sti…
2018-05-14 14:09:00 +01:00
Richard Lewis 986fb3237d Remove redundant logging (currently shown on every render when no stickerpicker is present). 2018-05-14 13:56:39 +01:00
Luke Barnard 3d176f7105
Merge pull request #1899 from matrix-org/dbkr/dbkr/fix_sticker_size_jumping_2
Fix stickers briefly being 2x the size
2018-05-14 13:53:18 +01:00
David Baker b6e317647a Fix stickers briefly being 2x the size
fixupHeight was the only thing actually fixing the size of the
sticker image to be the size we want it rather than the pixel size
of the image, and this was only getting run after the image loaded,
causing a flash of 2x image.
2018-05-14 13:41:41 +01:00
Jeff Huang f384c465fd Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-05-14 11:51:18 +00:00
Weblate bd91f6cde3 Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 11:00:44 +00:00
Richard Lewis 49c1f1b41f
Merge pull request #1891 from turt2live/travis/widget-postmessage-patches
Send required properties when making requests to widgets over postMessage
2018-05-14 12:00:40 +01:00
Luke Barnard ac297d1e12
Merge pull request #1897 from matrix-org/luke/fix-room-widget-second-load-infini-spinner
Fix room widget second load infini spinner
2018-05-14 11:53:34 +01:00
Luke Barnard cf8077e605 Set loading: false when iFrame finishes loading 2018-05-14 11:42:38 +01:00
Luke Barnard 6345e474f5 Remove unused conditional 2018-05-14 11:38:17 +01:00
Luke Barnard b9f9a914df
Merge pull request #1896 from matrix-org/luke/fix-first-time-sticker-widget
Update widget state when account data changes
2018-05-14 11:27:06 +01:00
Weblate ba6c0b2c85 Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 10:22:11 +00:00
Andrey cc16961b43 Translated using Weblate (Russian)
Currently translated at 99.8% (1173 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-14 10:22:11 +00:00
Luke Barnard 21ec34d4ba
Merge pull request #1882 from matrix-org/t3chguy/m.relates_to
Remove margins when in a ReplyThread to stop them taking so much space
2018-05-14 11:22:06 +01:00
Luke Barnard 98c06315cf Update widget state when account data changes 2018-05-14 11:14:49 +01:00
Szimszon 9cc8905443 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-14 09:27:23 +00:00
Sven Thomsen d5d653e375 Translated using Weblate (German)
Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-05-14 09:21:01 +00:00
Weblate 82f222d67e Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 09:18:47 +00:00
RainSlide cd034d3c2a Translated using Weblate (Chinese (Simplified))
Currently translated at 97.7% (1148 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-05-14 09:18:46 +00:00
Richard Lewis 8e0ad9b039
Merge pull request #1892 from turt2live/travis/widget-screenshots
Add setting to enable widget screenshots (if widgets declare support)
2018-05-14 10:18:41 +01:00
Matthew Hodgson c1000a7cd5 emojioneify the composer
and also fix up the selectedness CSS for pills and emoji
2018-05-14 03:02:12 +01:00
Matthew Hodgson b10f9a9cb7 remove spurious vendor prefixing 2018-05-14 02:54:55 +01:00
Travis Ralston 210fcf0d52 Correctly identify sticker picker widgets
Widgets added to account data have the `type` of "m.widget", meaning we have to look at the `content.type` which will tell us what it is. 

This also fixes a bug where all user widgets become sticker picker widgets under the right conditions.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-13 17:15:35 -06:00
Matthew Hodgson 7ecb4e3b18 remove dead removeMDLinks code 2018-05-13 23:35:39 +01:00
Matthew Hodgson 7405b49b44 unify setState() and onChange()
also make emoji autocomplete work again
also remove the onInputContentChanged prop
also slateify the onInputStateChanged prop
2018-05-13 23:34:00 +01:00
Matthew Hodgson a247ea2f77 delete duplicate propTypes(!!!) 2018-05-13 22:43:20 +01:00
Matthew Hodgson ddfe0691c4 fix insert_mention 2018-05-13 22:41:39 +01:00
Matthew Hodgson dd0726f068 fix navigating history downwards on tall messages; remove obsolete code 2018-05-13 21:17:43 +01:00
Matthew Hodgson 721410b710 Merge branch 'develop' into matthew/slate 2018-05-13 19:50:55 +01:00
Matthew Hodgson 79f7c5d6ab remove // support, as it never worked
if you want to escape a /, do it with \/ or just precede with a space
2018-05-13 03:29:56 +01:00
Matthew Hodgson 4c3588d260 don't lose focus after a / command 2018-05-13 03:26:22 +01:00
Matthew Hodgson e06763cd59 show all slashcommands on / 2018-05-13 03:18:41 +01:00
Matthew Hodgson 5605439e76 autocomplete polishing
* suppress autocomplete when navigating through history
* only search for slashcommands if in the first block of the editor
* handle suffix returns from providers correctly
* fix bugs when pressing ctrl-a, typing and then tab to complete a replacement by collapsing selection to anchor when inserting a completion in the editor
2018-05-13 03:17:14 +01:00
Matthew Hodgson c967ecc4e5 autocomplete polishing
* suppress autocomplete when navigating through history
* only search for slashcommands if in the first block of the editor
* handle suffix returns from providers correctly
* fix SelectionRange typing in the providers
* fix bugs when pressing ctrl-a, typing and then tab to complete a replacement by collapsing selection to anchor when inserting a completion in the editor
* fix https://github.com/vector-im/riot-web/issues/4762
2018-05-13 03:04:40 +01:00
Matthew Hodgson 877a6195ae unbreak history scrolling for pills & emoji 2018-05-13 00:54:01 +01:00
Matthew Hodgson 33eaa84bdf fix NPEs when deleting mentions 2018-05-13 00:48:52 +01:00
Matthew Hodgson c91dcffe82 fix cursor behaviour around pills 2018-05-13 00:40:54 +01:00
Travis Ralston 98da8b3575 Send the widgetId as part of all toWidget requests
Addresses part of https://github.com/vector-im/riot-web/issues/6708

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-12 14:32:12 -06:00