Commit Graph

8835 Commits (38c8bc7d9aca9b2241d79b88b01cd5e86cc27a83)

Author SHA1 Message Date
Szimszon 7a324b4104 Translated using Weblate (Hungarian)
Currently translated at 100.0% (980 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-12 09:41:19 +00:00
Osoitz 18098da94a Translated using Weblate (Basque)
Currently translated at 98.8% (969 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-12 09:41:18 +00:00
David Baker 3371506960
Merge pull request #1697 from matrix-org/t3chguy/nvl/rich_quoting
Iterative fixes on Rich Quoting
2018-01-12 09:41:14 +00:00
Michael Telatynski 23bd612730
Focus composer when clicking `Reply` (quote event)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-11 19:29:00 +00:00
Michael Telatynski 192cba2b79
allow text&onSenderProfileClick for tileShape===quote
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-11 19:25:43 +00:00
Richard Lewis 90b7cb3760 Consistent popover size 2018-01-11 13:41:55 +00:00
Richard Lewis 9df4dae975 Used forked version of react-popover 2018-01-11 13:41:20 +00:00
Richard Lewis 1ab71f6f50 Load stickers in AppTile 2018-01-11 13:20:58 +00:00
Richard Lewis 4f3670941d Bind functions 2018-01-11 12:33:02 +00:00
Szimszon 3163673705 Translated using Weblate (Hungarian)
Currently translated at 100.0% (980 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-11 12:30:47 +00:00
Weblate 3b4e233535 Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 12:06:52 +00:00
Andrey 0ad84f4ab5 Translated using Weblate (Russian)
Currently translated at 99.7% (978 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-11 12:06:52 +00:00
Klaus Marx da562e015c Translated using Weblate (German)
Currently translated at 99.2% (973 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-01-11 12:06:51 +00:00
Matthew Hodgson e187ec6a2f
Merge pull request #1696 from matrix-org/t3chguy/fix_missing_negation
Fix missing negation
2018-01-11 12:06:48 +00:00
Michael Telatynski 8ad4da54cb
Fix missing negation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-11 12:04:53 +00:00
Richard Lewis d0c16fa7a1 Convert to ES6 class. 2018-01-11 11:49:46 +00:00
Richard Lewis 78bd25eff0 Sticker popover styling 2018-01-11 11:36:19 +00:00
Kévin C 8f26155c16 Translated using Weblate (French)
Currently translated at 100.0% (980 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-01-11 11:20:03 +00:00
Richard Lewis 2cf9da8c95 Load user stickerpacks 2018-01-11 11:12:46 +00:00
Weblate 52607c4122 Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 11:02:40 +00:00
David Baker b152bd4ab9
Merge pull request #1625 from matrix-org/t3chguy/analytics_info
Add Analytics Info and add Piwik to SdkConfig.DEFAULTS
2018-01-11 11:02:34 +00:00
Weblate b2bc506b36 Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 11:01:08 +00:00
David Baker 84da19c544
Merge pull request #1668 from turt2live/travis/re-register-scalar-token
Attempt to re-register for a scalar token if ours is invalid
2018-01-11 11:01:04 +00:00
Andrey 62ced91356 Translated using Weblate (Russian)
Currently translated at 100.0% (967 of 967 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-11 10:52:04 +00:00
Weblate 8ccc53088f Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 10:49:44 +00:00
Andrey 0ce043ab12 Translated using Weblate (Russian)
Currently translated at 99.5% (963 of 967 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-11 10:49:44 +00:00
David Baker 292a6c5767
Merge pull request #1674 from aidalgol/rebase-dialogs
Normalise dialogs
2018-01-11 10:49:40 +00:00
Kévin C 5e7fab1e15 Translated using Weblate (French)
Currently translated at 100.0% (967 of 967 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-01-11 10:40:12 +00:00
Weblate f845071f91 Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 10:35:01 +00:00
David Baker efb96cdd2a
Merge pull request #1695 from matrix-org/dbkr/send_without_verifying
Add 'send without verifying' to status bar
2018-01-11 10:34:56 +00:00
Weblate 070114d911 Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 10:34:44 +00:00
David Baker 4524e227d2
Merge pull request #1660 from matrix-org/t3chguy/nvl/rich_quoting
Implement Rich Quoting/Replies
2018-01-11 10:34:39 +00:00
Richard Lewis 1a994b88f5 Move widget utility functions in to their own file. 2018-01-11 10:32:37 +00:00
David Baker 57e11cea1c Fix jsdoc 2018-01-11 10:27:15 +00:00
Richard Lewis 52f28d09e0 Stickerpack styling 2018-01-10 20:44:14 +00:00
Richard Lewis 2bb51bafe1 Content placeholder. 2018-01-10 20:29:36 +00:00
Richard Lewis 53b590f55e Add stickers popover. 2018-01-10 20:27:43 +00:00
Michael Telatynski 007715aeaa
Run prune-i18n.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 12:54:00 +00:00
Michael Telatynski 94167e2b8b
Run gen-i18n.js and embed the ellipsis into the base string
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 12:52:20 +00:00
Michael Telatynski f5bad8bb10
Regenerate ESLintIgnore file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 12:50:12 +00:00
Michael Telatynski 1a7dc22a8d
make wantsDateSeparator generic and throw into DateUtils
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 12:06:24 +00:00
Michael Telatynski e45fcf10c7
Refactor DateUtils to ES6
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 12:00:11 +00:00
Michael Telatynski 9e2238e884
remove unused imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 11:56:36 +00:00
Michael Telatynski 1bc9d344ae
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/views/messages/TextualBody.js
2018-01-10 11:54:58 +00:00
Michael Telatynski 454fd23f25
fix typo shsape->shape
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 11:51:48 +00:00
Michael Telatynski a977ab9be4
change handler name to suit convention
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 11:51:23 +00:00
David Baker e2b2818555 Empty to force re-test 2018-01-10 11:03:38 +00:00
David Baker 9dd9a5be4b Wording tweak 2018-01-09 17:59:49 +00:00
David Baker dbb8f878cb Tidy up imports 2018-01-09 17:57:18 +00:00
Richard Lewis 9abb160120 Replace apps button with stickers button in message composer. 2018-01-09 16:02:17 +00:00