Commit Graph

7027 Commits (61b05e7ec350c0c002bb6d6bacd6566c80d0c30c)

Author SHA1 Message Date
David Baker 5fe48e44a0 Prepare changelog for v0.10.7-rc.1 2017-10-13 11:10:21 +01:00
David Baker 289fc230fe js-sdk rc.1 2017-10-13 11:05:58 +01:00
Weblate 872fc948c4 Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 09:31:54 +00:00
Andrey ead0b5d43f Translated using Weblate (Russian)
Currently translated at 92.8% (850 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-13 09:31:54 +00:00
Bamstam 264fe81f20 Translated using Weblate (German)
Currently translated at 93.1% (852 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-13 09:31:53 +00:00
Luke Barnard 065ae9580d Merge pull request #1459 from matrix-org/luke/groups-invite-warm-fuzzy
Add warm fuzzy dialog for inviting users to a group
2017-10-13 11:31:48 +02:00
Stefan Parviainen 45137f030b Fix merge conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-12 22:18:50 +02:00
David Baker 710c952428 Make features disabled by default
So we can then put them in labs on /develop & others can enable
them as desired.
2017-10-12 18:45:04 +01:00
Weblate 6c6751e14d Merge remote-tracking branch 'origin/develop' into develop 2017-10-12 17:38:22 +00:00
Andrey 915c15b454 Translated using Weblate (Russian)
Currently translated at 91.4% (837 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-12 17:38:22 +00:00
Osoitz a0b3b29b68 Translated using Weblate (Basque)
Currently translated at 92.4% (846 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2017-10-12 17:38:21 +00:00
David Baker 047daec587 Merge pull request #1468 from matrix-org/dbkr/labs_config
enable/disable features in config.json
2017-10-12 18:38:18 +01:00
David Baker 7176185dc2 Merge pull request #1469 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-10-12 17:46:01 +01:00
David Baker ff3a2c1807 Translated using Weblate (English (United States))
Currently translated at 99.6% (852 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2017-10-12 16:39:41 +00:00
David Baker 65eacff3d3 redundant code is redundant 2017-10-12 17:28:53 +01:00
David Baker ef3df3e3fa comment 2017-10-12 17:28:14 +01:00
David Baker 20f9d71782 oops 2017-10-12 17:27:09 +01:00
Weblate 11b4ffe302 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
Conflicts:
	src/i18n/strings/cs.json
	src/i18n/strings/de_DE.json
	src/i18n/strings/fi.json
	src/i18n/strings/fr.json
	src/i18n/strings/it.json
	src/i18n/strings/nl.json
	src/i18n/strings/ru.json
	src/i18n/strings/th.json
2017-10-12 16:20:59 +00:00
David Baker e50478aa1d enable/disable features in config.json
As per https://docs.google.com/document/d/1Kn-mz2dDce9Cqc4oUTl5yJXGvmTlky1_KezuwUg58x0/edit#

Replaces:
 * enableLabs setting
 * 'override' flag in labs
 * 'default' flag in labs

Un-feature-flags matrix apps since this was now overidden to be
enabled.
2017-10-12 17:03:38 +01:00
Kevin Brubeck Unhammer 55cdbe6655 Translated using Weblate (Norwegian Bokmål)
Currently translated at 0.1% (1 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2017-10-12 15:29:32 +00:00
Luke Barnard b73e28add3 Merge pull request #1463 from turt2live/travis/peek_rr
Don't send RR or RM when peeking at a room
2017-10-12 17:29:26 +02:00
Travis Ralston df7f1b46bf Stop peeking if anything went wrong, not just explicit failure
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-12 07:24:20 -06:00
Travis Ralston f1032bb115 Set isPeeking to false if peeking failed
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-12 07:05:09 -06:00
Carlos Marques 5955eab29a Translated using Weblate (Portuguese)
Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
2017-10-12 10:39:16 +00:00
Luke Barnard 91b888aa2d Merge pull request #1467 from matrix-org/luke/fix-autocomplete-hover-bug
Fix bug that inserted emoji when typing
2017-10-12 12:39:09 +02:00
Luke Barnard 36bb8b7dc4 Fix bug that inserted emoji when typing
This was quite simple in the end -- the mouse doens't move, but on some browsers, the autocomplete appearing beneath the mouse would cause the `onMouseOver`, which is not `onMouseMove`.

The fix was to use `onMouseMove`.

Fixes vector-im/riot-web#4974
2017-10-12 11:31:31 +01:00
Travis Ralston f3b1baa3c0 Suggest to invite people when speaking in an empty room
Adds vector-im/riot-web#1053

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 21:15:00 -06:00
Travis Ralston 6ce7eb952a Don't send RR or RM when peeking at a room
Fixes vector-im/riot-web#696

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 18:43:24 -06:00
Stefan Parviainen f694fb24ff Fix merge-conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 20:02:14 +02:00
Luke Barnard 757e42ddca Merge pull request #1458 from pafcu/emoji-fix2
Ignore VS16 char in RTE
2017-10-11 19:49:29 +02:00
Luke Barnard e0e5d51451 Merge pull request #1460 from matrix-org/dbkr/show_send_message_error
Show failures when sending messages
2017-10-11 19:46:32 +02:00
Luke Barnard 09b53d9f85 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-10-11 18:32:49 +01:00
Luke Barnard 73e752eda3 Regenerate .eslintignore.errorfiles
Which has now shrunk by 34 files due to linting with eslint --fix
2017-10-11 18:32:40 +01:00
Luke Barnard 013c0c56a7 Merge pull request #1461 from matrix-org/luke/lint-almighty
Run eslint --fix
2017-10-11 19:11:06 +02:00
Luke Barnard d3f9a3aeb5 Run eslint --fix
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
2017-10-11 17:56:17 +01:00
David Baker 5626c06b3c Show failures when sending messages
This is useful for the spam checking where otherwise you don't
really know why your message has failed to send
2017-10-11 17:42:54 +01:00
Luke Barnard 8958be9321 Merge pull request #1441 from turt2live/travis/who_banned
Show who banned the user on hover
2017-10-11 17:33:53 +02:00
Luke Barnard d2b9fcc7aa Merge pull request #1440 from turt2live/travis/pl_enhancements
Enhancements to room power level settings
2017-10-11 17:31:20 +02:00
Travis Ralston 8a2813ac08 Fallback to MXID instead of relying on the user being in the room
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 09:08:40 -06:00
Travis Ralston d1fdd20809 Show who banned the user on hover
Fixes https://github.com/vector-im/riot-web/issues/5039

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 09:08:29 -06:00
Luke Barnard 21a31b02d0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-10-11 16:02:10 +01:00
Luke Barnard 060bf3bdf6 Remove inline CSS 2017-10-11 16:02:01 +01:00
Travis Ralston 0ab5b1a6af _td translatable strings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 08:50:28 -06:00
Travis Ralston f874fc1203 Merge branch 'develop' into travis/pl_enhancements 2017-10-11 08:42:45 -06:00
Luke Barnard ffb9dd844a Merge pull request #868 from psaavedra/set_default_federate_by_settings
Added TextInputWithCheckbox dialog
2017-10-11 16:28:03 +02:00
Luke Barnard c128655321 Merge branch 'develop' into luke/groups-invite-warm-fuzzy 2017-10-11 16:05:51 +02:00
Luke Barnard 36666b3fc3 Add warm fuzzy dialog for inviting users to a group 2017-10-11 15:04:52 +01:00
Luke Barnard f6eca14bee Merge pull request #1456 from matrix-org/dbkr/say_which_homeserver
Make it clearer which HS you're logging into
2017-10-11 15:11:22 +02:00
David Baker 0f84216a9f Grey out login form when no valid HS 2017-10-11 14:05:34 +01:00
Luke Barnard 99aabd9025 Merge pull request #1451 from matrix-org/t3chguy/redundant_thing
Remove redundant stale onKeyDown
2017-10-11 14:31:08 +02:00