Commit Graph

62531 Commits

Author SHA1 Message Date
David Baker 9c8e5119ba Merge pull request #2206 from matrix-org/dbkr/slate_update_fix_quote
Fix quote post slate update
2018-10-11 11:09:25 +01:00
David Baker 69adab2c9f Merge pull request #7478 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2018-10-11 11:08:59 +01:00
David Baker 80f0964342 Translated using Weblate (English (United States))
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/en_US/
2018-10-11 09:58:31 +00:00
David Baker 3efc09586b More API changes 2018-10-11 10:47:36 +01:00
David Baker 4d1f2cdfa9 Fix quote post slate update
Missed API update
2018-10-11 10:29:55 +01:00
Weblate 56372b6a5f Merge remote-tracking branch 'origin/develop' into develop 2018-10-11 09:29:42 +00:00
Matthew Hodgson af4d3da7a8 link to Here Be Dragons 2018-10-11 10:29:28 +01:00
Bruno Windels eed9c56c51 Merge branch 'develop' into matthew/dharma 2018-10-11 09:56:07 +02:00
David Baker b267798010 Kill FuzzyMatcher
This has been commented out for ages. Just remove it and make things
use QueryMatcher directly rather than looking like they do fuzzy matching
but not.
2018-10-10 19:18:06 +01:00
Weblate 99789a94c1 Merge remote-tracking branch 'origin/develop' into develop 2018-10-10 16:35:41 +00:00
Bruno Windels bba04a6820 Merge pull request #2205 from matrix-org/dbkr/lazy_load_check_before_sync
Handle InvalidStoreError from js-sdk
2018-10-10 18:35:36 +02:00
Weblate ae1971f5d2 Merge remote-tracking branch 'origin/develop' into develop 2018-10-10 16:35:17 +00:00
Matthew Hodgson 5c184e501d dep on dev sdks 2018-10-10 17:35:06 +01:00
David Baker 655627209a unused function 2018-10-10 17:25:32 +01:00
David Baker 0abcb5c78d Handle InvalidStoreError from js-sdk
js-sdk now emits sync state ERROR with an InvalidStoreError if the
store needs to be cleared before it can be used.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/759
2018-10-10 17:07:17 +01:00
Weblate ff7365ddef Merge remote-tracking branch 'origin/develop' into develop 2018-10-10 14:59:06 +00:00
Bruno Windels dfb4c594a8 Merge pull request #2204 from matrix-org/bwindels/rrfallbackavatars
Fall back to default avatar in RR when member isn't loaded yet
2018-10-10 16:58:59 +02:00
random 9c5691300b Translated using Weblate (Italian)
Currently translated at 100.0% (1267 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-10-10 14:41:22 +00:00
Bruno Windels f360b2db90 forward prop updates to children in Velociraptor with React.cloneElement 2018-10-10 16:15:50 +02:00
Bruno Windels 5128386160 allow read receipts without an existing member in MessagePanel 2018-10-10 16:15:20 +02:00
Bruno Windels 0767c278e7 put userId next to member in read receipt, fall back when member missing 2018-10-10 16:14:09 +02:00
Weblate 29c9e17afa Merge remote-tracking branch 'origin/develop' into develop 2018-10-10 10:10:25 +00:00
David Baker 97ed4ed0bb Merge pull request #2202 from matrix-org/dbkr/update_slate
Update to new version of slate
2018-10-10 11:10:20 +01:00
Weblate 589d3feea7 Merge remote-tracking branch 'origin/develop' into develop 2018-10-09 16:40:54 +00:00
David Baker 7a3df11854 Merge pull request #2203 from MTRNord/patch-5
Update karma to webpack 4
2018-10-09 17:40:49 +01:00
David Baker 6f9d673b79 Focus composer after closing room settings
For some reason the slate update means the composer doesn't
have the focus after closing the room settings, and the end to end
tests pick this up!
2018-10-09 17:35:40 +01:00
Marcel a1dfc6bd25 Remove invalid object in karma webpack config
root is replaced with modules in webpack 4
2018-10-09 17:45:21 +02:00
Marcel b143060b8c Remove json-loader
json-loader is now included in webpack4
2018-10-09 17:44:00 +02:00
Marcel f5012d87cf Fix karma webpack config 2018-10-09 17:40:25 +02:00
Marcel 10a3f08ee2 Update karma config for webpack 4 2018-10-09 17:32:39 +02:00
Marcel 20ef16ad00 Update webpack dependencies used for karma 2018-10-09 17:28:24 +02:00
David Baker 4e1fabd140 Remove spurious ...atributes in the wrong place
We already have it above
2018-10-09 16:05:14 +01:00
Krombel 1ac7216ed7 Translated using Weblate (German)
Currently translated at 100.0% (1267 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-10-09 13:27:56 +00:00
Bruno Windels 1a2254677c test leaving members disappear from memberlist 2018-10-09 15:15:03 +02:00
David Baker 67e8a6f9dc Recovery key formatting is now done by the js-sdk 2018-10-09 14:01:58 +01:00
Weblate c349648714 Merge remote-tracking branch 'origin/develop' into develop 2018-10-09 10:04:55 +00:00
David Baker 41bc42e7d7 Merge pull request #2194 from pvagner/more_accessible_buttons
More accessible buttons - take 2
2018-10-09 11:04:50 +01:00
David Baker c1f51a76dd Update to new version of slate
Lots of fixes here as a lot of the API has changed (eg. anchorKey /
offsetKey are now anchor.key and offset.key, and collapseFocusToThing
is moveFocusToThing).

Also changes the ref to a function (sorry for lumping this into the
same PR).

Hopefully will fix https://github.com/vector-im/riot-web/issues/7105
2018-10-09 10:55:55 +01:00
Weblate 0bc79b506f Merge remote-tracking branch 'origin/develop' into develop 2018-10-09 08:58:37 +00:00
David Baker a16e92e5e0 Merge pull request #2200 from matrix-org/bwindels/rageshakeerrorcode
log correct error code when opening log idb
2018-10-09 09:58:31 +01:00
Weblate 3488f04dd4 Merge remote-tracking branch 'origin/develop' into develop 2018-10-09 03:18:28 +00:00
Travis Ralston 92db2b85f3 Merge pull request #7444 from aaronraimist/promise-defer
Fix riot-web Promise.defer warnings (#7409)
2018-10-08 21:18:22 -06:00
Jeff Huang fa0d2c2609 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1267 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-10-09 00:11:15 +00:00
Kévin C fc1ec589cd Translated using Weblate (French)
Currently translated at 100.0% (1267 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-10-08 21:37:24 +00:00
Bruno Windels 060a7807f0 v0.16.6 v0.16.6 2018-10-08 17:21:35 +02:00
Bruno Windels 52954982a3 Prepare changelog for v0.16.6 2018-10-08 17:21:35 +02:00
Bruno Windels dec60a9c85 v0.16.6 2018-10-08 17:19:54 +02:00
Bruno Windels 39b5e4b1e3 update matrix-react-sdk to 0.13.6 2018-10-08 17:16:22 +02:00
Weblate d10c680bbe Merge remote-tracking branch 'origin/develop' into develop 2018-10-08 15:10:26 +00:00
Bruno Windels 864c80c6ca Merge branch 'master' into develop 2018-10-08 17:09:59 +02:00