Commit Graph

62531 Commits

Author SHA1 Message Date
Richard Lewis baf472b4a3 Only show snapshot button when apps are maximised. 2017-12-19 17:16:38 +00:00
Richard Lewis 08bcfc5c4e Make sure that capabilities array is initialised. 2017-12-19 17:15:06 +00:00
Richard Lewis 536d4efc40 Fix comments. 2017-12-19 17:11:36 +00:00
Richard Lewis 8e5c3f01b4 License and linting fixes. 2017-12-19 17:08:17 +00:00
Richard Lewis 774774c365 Remove unused dep. 2017-12-19 17:06:08 +00:00
Weblate 97116bb268 Merge remote-tracking branch 'origin/develop' into develop 2017-12-19 17:04:51 +00:00
Richard Lewis cf47b919d5 Merge pull request #5849 from vector-im/rxl881/snapshot
Screenshot UI
2017-12-19 17:04:46 +00:00
Weblate 1379f64068 Merge remote-tracking branch 'origin/develop' into develop 2017-12-19 15:39:24 +00:00
Tirifto af2feb5e58 Translated using Weblate (Esperanto)
Currently translated at 99.3% (952 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2017-12-19 15:39:23 +00:00
Richard Lewis b5f6d97fa2 Ignore postmessage requests with api field set. 2017-12-19 15:39:13 +00:00
Weblate 7dd85533e8 Merge remote-tracking branch 'origin/develop' into develop 2017-12-19 13:23:21 +00:00
Richard Lewis af99ac3293 Merge pull request #5855 from vector-im/t3chguy/nvl/fix_electron_config
add missing config.json entry such that scalar-staging widgets work
2017-12-19 13:23:15 +00:00
Michael Telatynski 843505f6a9 add missing config.json entry such that scalar-staging widgets work
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-19 12:03:48 +00:00
Weblate e332433f8b Merge remote-tracking branch 'origin/develop' into develop 2017-12-18 22:49:30 +00:00
Matthew Hodgson fa14bc9b8d don't gutwrench 2017-12-18 22:49:23 +00:00
Weblate 15701ccff6 Merge remote-tracking branch 'origin/develop' into develop 2017-12-18 22:47:36 +00:00
Matthew Hodgson e65c67ca15 fix https://github.com/vector-im/riot-web/issues/5841 2017-12-18 22:47:28 +00:00
Weblate 7b04d8a05f Merge remote-tracking branch 'origin/develop' into develop 2017-12-18 22:46:52 +00:00
IMIN 21bca7e2d3 Translated using Weblate (Korean)
Currently translated at 67.7% (649 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/

.(could not connect media)
2017-12-18 22:46:52 +00:00
Michael Telatynski b91bd52edd Merge pull request #1658 from pafcu/annotate-t
Add option to also output untranslated string
2017-12-18 22:46:48 +00:00
Weblate 707cb47e10 Merge remote-tracking branch 'origin/develop' into develop 2017-12-18 21:44:48 +00:00
IMIN 67746b021a Translated using Weblate (Korean)
Currently translated at 90.8% (199 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
2017-12-18 21:44:47 +00:00
Matthew Hodgson bfb60265cb Merge pull request #5610 from vector-im/t3chguy/devtools-1
add dark theme styling to devtools input box
2017-12-18 21:44:43 +00:00
Weblate 2f5bfd9694 Merge remote-tracking branch 'origin/develop' into develop 2017-12-18 19:50:30 +00:00
Michael Telatynski fbd9ba32aa Merge pull request #5851 from oivoodoo/add-oivoodoo-author
Fixes #1953 by adding oivoodoo as author
2017-12-18 19:50:26 +00:00
Michael Telatynski 05434e782a change Composer placeholder text based on replying/rich quoting state
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-18 19:49:38 +00:00
Alexandr Korsak 3164655a21 Fixes #1953 2017-12-18 22:41:46 +03:00
Michael Telatynski b16dcbc057 styling for on-demand quote nest traversal
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-18 19:28:19 +00:00
Michael Telatynski 47d4e5f8d1 nest quotes, but only when people want to click through them
loads pre-emptively

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-18 19:28:01 +00:00
Weblate cfdcf59b2e Merge remote-tracking branch 'origin/develop' into develop 2017-12-18 17:35:11 +00:00
Richard Lewis 32bdbdb2f3 Merge pull request #1669 from turt2live/travis/integ-theme
Give the current theme to widgets and the integration manager
2017-12-18 17:35:06 +00:00
Travis Ralston e5df0dcf1e $riot_theme -> $theme
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-12-18 09:19:54 -07:00
Weblate 8061579385 Merge remote-tracking branch 'origin/develop' into develop 2017-12-18 14:56:36 +00:00
Michael Telatynski 201d8f04c0 Merge pull request #1671 from oivoodoo/riot-web-issue-1953-multiple-file-upload
Allow multiple file uploads using drag & drop for RoomView
2017-12-18 14:56:31 +00:00
Weblate c8c208d9d7 Merge remote-tracking branch 'origin/develop' into develop 2017-12-18 13:04:28 +00:00
Mateusz Wiśniewski b0b2e761a8 Translated using Weblate (Polish)
Currently translated at 72.6% (696 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-12-18 13:04:28 +00:00
Juho Ylikorpi 5fddf3bbeb Translated using Weblate (Finnish)
Currently translated at 98.4% (943 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2017-12-18 13:04:27 +00:00
Tirifto cfedd57920 Translated using Weblate (Esperanto)
Currently translated at 72.6% (696 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2017-12-18 13:04:27 +00:00
Osoitz 5d0a82c83b Translated using Weblate (Basque)
Currently translated at 75.2% (721 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2017-12-18 13:04:27 +00:00
Michael Telatynski 779e4d026c Merge pull request #1670 from oivoodoo/issue/phone-number-preview
Fix issue with preview of phone number on register and waiting for sms code confirmation code
2017-12-18 13:04:22 +00:00
Alexandr Korsak d051a2e0b3 Remove extra space 2017-12-18 15:59:21 +03:00
Alexandr Korsak 78af02b29b Replace lodash/every by Array.prototype.every function 2017-12-18 15:51:01 +03:00
Weblate 1e4997c2c2 Merge remote-tracking branch 'origin/develop' into develop 2017-12-18 12:35:07 +00:00
Juho Ylikorpi dc3f7f3cd1 Translated using Weblate (Finnish)
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/
2017-12-18 12:35:06 +00:00
Tirifto 0ea8efcaf4 Translated using Weblate (Esperanto)
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2017-12-18 12:35:06 +00:00
Matthew Hodgson fbbca2e466 Merge pull request #5824 from pafcu/patch-1
Instructions on security issues
2017-12-18 12:35:00 +00:00
Alexandr Korsak c07c4fd1cb Allow multiple file uploads on drag & drop 2017-12-18 13:20:18 +03:00
Alexandr Korsak fddbf3a2a2 Fix issue with preview of phone number on register and waiting for sms code confirmation code 2017-12-18 12:23:54 +03:00
Michael Telatynski 882068078d fix missing space
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-17 20:53:53 +00:00
Michael Telatynski 9603b21199 s/Quote/Reply/ and ES6 tweaks
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-17 20:20:45 +00:00