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
7473c654d5
use npm scripts arg passing instead of $KARMAFLAGS to make cross-compat
2017-07-11 22:54:18 +01:00
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
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
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
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
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
b5ef34b0a0
Merge remote-tracking branch 'origin/develop' into develop
2017-07-11 16:36:15 +00:00
898725082a
Remove spurious comma
...
I am messing this up - fix to 0bbce1c
2017-07-11 17:35:25 +01:00
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
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
a00781b733
Merge remote-tracking branch 'origin/develop' into develop
2017-07-11 16:04:20 +00:00
67372d4fed
Give Login an unmounted guard
2017-07-11 17:04:19 +01:00
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
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
2c65bd097b
Merge remote-tracking branch 'origin/develop' into develop
2017-07-11 16:01:08 +00:00
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
b3abf7c592
Merge remote-tracking branch 'origin/develop' into develop
2017-07-11 15:46:47 +00:00
a201f74115
Merge pull request #4557 from vector-im/rav/homepage_again
...
more HomePage tweaks
2017-07-11 16:46:43 +01:00
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
ff3c21ef10
Lint, including putting key in right place
2017-07-11 15:16:58 +01:00
4e49ebd6ce
Change incorrect refs to this.props
2017-07-11 14:31:07 +01:00
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
8690ed2181
Make the category functions React components
2017-07-11 14:28:44 +01:00
c465f40179
Merge remote-tracking branch 'origin/develop' into develop
2017-07-11 13:27:41 +00:00
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
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
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
d755903fdb
typo
2017-07-11 14:10:18 +01:00
8ac26dd19f
Give HomePage an unmounted guard
...
Also add missing return in error-handling path
2017-07-11 14:08:16 +01:00
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
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
222ca054c5
Use PropTypes.shape to define our required inputs
2017-07-11 13:41:00 +01:00
4d34809279
Merge remote-tracking branch 'origin/develop' into develop
2017-07-11 12:23:32 +00:00
b375c71a28
fix comments on node versions
2017-07-11 13:23:15 +01:00
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
5c89d3303b
Merge pull request #1203 from matrix-org/luke/fix-rte-user-completion
...
Fix bug where a received message would remove completions for users
2017-07-11 11:04:07 +01:00
29990296d2
Lint
2017-07-11 11:02:23 +01:00
e18924c8fc
Fix bug where a received message would remove completions for users
...
`Array.prototype.splice` will return the array of removed items, not a new array. The array operated on is actually modified in-place.
This was causing a few weird things to happen: https://github.com/vector-im/riot-web/issues/4511 and https://github.com/vector-im/riot-web/issues/4533 . This should fix both of them but it is concerning that doing the tab completion is required to reproduce. Let's just see how this goes before closing the issues.
Thanks @turt2live for reproducing both bugs, giving enough information for a fix :)
2017-07-11 10:42:02 +01:00
cefc3e6da9
Make CSS more generic
2017-07-10 19:32:25 +01:00
925d5bd480
Add featured users to Group View
2017-07-10 19:32:02 +01:00
4f95d4ccaf
Merge pull request #712 from matrix-org/matthew/whitelist-uri-schemes
...
whitelist data & mxc URIs on img tags: readds PR #333
2017-07-10 17:59:35 +01:00
dfa97e8452
Add comment
2017-07-10 17:48:01 +01:00
6877b99435
Strip <img src="https?://..">s when transforming imgs instead of using allowedSchemesByTag
2017-07-10 17:44:49 +01:00
bb9080425a
Allow image tags with src attributes with schemes http[s]
...
And transform `mxc:*` URLs to `https?://`
2017-07-10 16:27:23 +01:00
33e56de550
Translated using Weblate (English (United States))
...
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/en_US/
2017-07-10 15:05:54 +00:00
bc88585026
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (206 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/en_US/
2017-07-10 15:03:57 +00:00
96f5f92c7f
Disallow data attribute, we don't need it currently
2017-07-10 15:44:46 +01:00
f9ee89b2f4
Merge branch 'develop' into matthew/whitelist-uri-schemes
2017-07-10 15:42:03 +01:00
0e67a9158c
hide settings button until it's wired up
2017-07-10 15:32:57 +01:00
Richard van der Hoff
Michael Telatynski
David Baker
Luke Barnard
Luke Barnard
Szimszon
Weblate
Richard van der Hoff
Kegsay
David Baker
Andrey
Travis Ralston