63695 Commits

Author SHA1 Message Date
David Baker 3093f2d6fb Merge pull request #1211 from matrix-org/rav/use_react_test_utils
Use matrix-react-test-utils rather than our own impl
2017-07-12 16:44:25 +01:00
Sri Lakshmi 9d56cbcf8f Translated using Weblate (Telugu)
Currently translated at 25.7% (236 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/te/
2017-07-12 14:43:13 +00:00
David Baker a48c7d2364 Only allow http and https widget URLs 2017-07-12 14:16:47 +01:00
Luke Barnard 0dbd1d988e Enable ctrl+k room filter focus
By using the `focus_room_filter` dispatch
2017-07-12 13:51:55 +01:00
Luke Barnard 4fe4e10abb Implement the focus_room_filter action
This is for ctrl+k room filtering and switching
2017-07-12 13:49:57 +01:00
Andrey 659ac2e8c7 Translated using Weblate (Russian)
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-07-12 11:02:09 +00:00
David Baker 918f5abe81 Lint correctly 2017-07-12 10:34:50 +01:00
David Baker 53316a76f4 Sandbox app iframes 2017-07-12 10:22:14 +01:00
strix aluco 71396e062d Translated using Weblate (Ukrainian)
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
2017-07-12 02:38:52 +00:00
Dreamwhite a05dbb1994 Translated using Weblate (Italian)
Currently translated at 1.0% (10 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2017-07-12 01:58:44 +00:00
Richard van der Hoff 7455002b1a InteractiveAuthDialogTest: increase timeout
Blindly increase the number of attempts, because it's failing on travis, but
not on my dev box...
2017-07-12 00:24:00 +01:00
Richard van der Hoff 928287b8fc Bump to matrix-react-test-utils 0.1.1
... because 0.1.0 was broken
2017-07-12 00:02:52 +01:00
Richard van der Hoff 7ae4e96e4d Merge pull request #1207 from matrix-org/rav/fix_dispatcher_race
Fix a race in session loading code
2017-07-11 23:21:33 +01:00
Richard van der Hoff 30ef6d4932 Merge pull request #1210 from matrix-org/t3chguy/test-crossplatform
use npm scripts arg passing instead of $KARMAFLAGS to make cross-compat
2017-07-11 23:18:53 +01:00
Richard van der Hoff ab61b6b1b6 Use matrix-react-test-utils rather than our own impl
waitForRenderedDOMComponentWithTag is now in matrix-react-test-utils.
2017-07-11 23:14:56 +01:00
Michael Telatynski 7473c654d5 use npm scripts arg passing instead of $KARMAFLAGS to make cross-compat 2017-07-11 22:54:18 +01:00
David Baker 569ea909c4 Merge pull request #1209 from matrix-org/luke/fix-emoji-support-zwj
Update `unicodeToImage` to maintain compatibility with emojione
2017-07-11 18:38:54 +01:00
David Baker eb4e4a66ff Merge pull request #1206 from matrix-org/rav/login_unmounted_guard
Give Login an unmounted guard
2017-07-11 18:37:50 +01:00
Luke Barnard 0df144cb62 Update unicodeToImage to maintain compatibility with emojione
We recently updated our version of emojione but this update included the addition of emoji represented in unicode with ZWJ (Zero-Width-Joiners). These ZWJs are not present in the asset file names, so any emoji with ZWJ in them were just not found (404 on the web client).

This updates `unicodeToImage` to be compatible with emojione 2.2.7 so that the correct filenames are used when converting from unicode to <img>.
2017-07-11 18:27:35 +01:00
Luke Barnard 3bab720a7b Merge pull request #1208 from matrix-org/rav/timelinepanel_test_flakiness
Fix a flaky test in the timelinepanel code
2017-07-11 18:10:55 +01:00
Szimszon 2ba1a84b0c Translated using Weblate (Hungarian)
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2017-07-11 16:40:51 +00:00
Weblate b5ef34b0a0 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 16:36:15 +00:00
Richard van der Hoff 898725082a Remove spurious comma
I am messing this up - fix to 0bbce1c
2017-07-11 17:35:25 +01:00
Richard van der Hoff 1139dd2be5 Fix a flaky test in the timelinepanel code
Sometimes it was possible for there to be a scroll event before the initial
pagination completed, which then upset the rest of the test. Just give it a few
ms to sort itself out instead.
2017-07-11 17:34:46 +01:00
Richard van der Hoff f5f1fe6ae6 Fix a race in session loading code
it was possible for on_logging_in to get dispatched *after* on_logged_in,
causing the app to wedge. Fix it by dispatching on_logging_in synchronously.
2017-07-11 17:09:06 +01:00
Weblate a00781b733 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 16:04:20 +00:00
Richard van der Hoff 67372d4fed Give Login an unmounted guard 2017-07-11 17:04:19 +01:00
Luke Barnard a619001533 Merge pull request #4530 from vector-im/dbkr/groups_better_groupview
CSS for Rooms in Group View
2017-07-11 17:04:16 +01:00
Luke Barnard af3b6484cd Merge pull request #1196 from matrix-org/dbkr/groups_better_groupview
Add more features to Group View
2017-07-11 17:03:47 +01:00
Weblate 2c65bd097b Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 16:01:08 +00:00
Richard van der Hoff 0bbce1c140 Add missing i18n string
This should have been part of
https://github.com/vector-im/riot-web/pull/4557/files
2017-07-11 17:00:04 +01:00
Weblate b3abf7c592 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 15:46:47 +00:00
Richard van der Hoff a201f74115 Merge pull request #4557 from vector-im/rav/homepage_again
more HomePage tweaks
2017-07-11 16:46:43 +01:00
Kegsay 6369253142 Scalar messaging: Add can_send_event operation (#1204)
This is mainly for use to pre-emptively show/hide buttons.
2017-07-11 15:20:33 +01:00
David Baker ff3c21ef10 Lint, including putting key in right place 2017-07-11 15:16:58 +01:00
David Baker 4e49ebd6ce Change incorrect refs to this.props 2017-07-11 14:31:07 +01:00
Richard van der Hoff bc60fa81af more HomePage tweaks
* Don't log errors with no context
* i18nify the "Couldn't load home page" message
2017-07-11 14:29:47 +01:00
David Baker 8690ed2181 Make the category functions React components 2017-07-11 14:28:44 +01:00
Weblate c465f40179 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 13:27:41 +00:00
Richard van der Hoff d25b441add Merge pull request #4556 from vector-im/rav/homepage_unmounted_guard
Give HomePage an unmounted guard
2017-07-11 14:27:38 +01:00
Andrey b830f82c65 Translated using Weblate (Russian)
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-07-11 13:16:05 +00:00
David Baker e242e5e714 Merge pull request #1205 from matrix-org/luke/feature-new-emojis
Bump the dep on emojione to 2.2.7 to add 🦈 and others
2017-07-11 14:13:13 +01:00
Richard van der Hoff d755903fdb typo 2017-07-11 14:10:18 +01:00
Richard van der Hoff 8ac26dd19f Give HomePage an unmounted guard
Also add missing return in error-handling path
2017-07-11 14:08:16 +01:00
Luke Barnard d146246805 Move "regional" category to after "flags"
Otherwise by default it appears first, pushing "people" further down the list

Also, remove "unicode9" category ordering, as this category does not exist as part of emojione
2017-07-11 14:06:15 +01:00
Luke Barnard 4766447e15 Bump the dep on emojione to 2.2.7 to add 🦈 and others
Also, re-run node scripts/emoji-data-strip.js to update emoji meta data in src/stripped-emoji.json
2017-07-11 13:48:15 +01:00
David Baker 222ca054c5 Use PropTypes.shape to define our required inputs 2017-07-11 13:41:00 +01:00
Weblate 4d34809279 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 12:23:32 +00:00
Richard van der Hoff b375c71a28 fix comments on node versions 2017-07-11 13:23:15 +01:00
Kegsay cf158530f5 Implement new widget API (#1201)
* Implement new widget API

This allows clients to see who provisioned which widgets.

* Update to make state_key the wid

* Update to latest API

* Only show widgets which have required fields

* Don't constantly show apps dialog

* Fix example to include data key
2017-07-11 12:15:27 +01:00