mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-14 11:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
6218 commits 219 branches 562 tags 474 MiB
Commit graph

6218 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Richard van der Hoff
67372d4fed Give Login an unmounted guard 2017-07-11 17:04:19 +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
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
David Baker
8690ed2181 Make the category functions React components 2017-07-11 14:28:44 +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
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
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
David Baker
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
David Baker
29990296d2 Lint 2017-07-11 11:02:23 +01:00
Luke Barnard
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
David Baker
925d5bd480 Add featured users to Group View 2017-07-10 19:32:02 +01:00
Luke Barnard
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
Luke Barnard
dfa97e8452 Add comment 2017-07-10 17:48:01 +01:00
Luke Barnard
6877b99435 Strip <img src="https?://..">s when transforming imgs instead of using allowedSchemesByTag 2017-07-10 17:44:49 +01:00
Luke Barnard
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
Travis Ralston
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
Luke Barnard
96f5f92c7f Disallow data attribute, we don't need it currently 2017-07-10 15:44:46 +01:00
Luke Barnard
f9ee89b2f4 Merge branch 'develop' into matthew/whitelist-uri-schemes 2017-07-10 15:42:03 +01:00
David Baker
0e67a9158c hide settings button until it's wired up 2017-07-10 15:32:57 +01:00
David Baker
048912a241 Remove commented ordering code 
No lomger needed now roosm come down in order
 2017-07-10 15:17:58 +01:00
Luke Barnard
66525f6826 Null-guard RR logic 2017-07-10 15:07:22 +01:00
David Baker
ac4be03f7b Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-10 14:51:13 +01:00
Luke Barnard
3718bc399f Merge pull request #1202 from matrix-org/luke/fix-redundant-bindings 
Remove redundant functions, bindings, props
 2017-07-10 14:46:22 +01:00
Luke Barnard
b104228a7b Remove redundant functions, bindings, props 2017-07-10 14:27:41 +01:00
David Baker
49ca29e422 Lint 2017-07-10 14:07:16 +01:00
David Baker
696c72be2b Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-10 14:03:30 +01:00
David Baker
0112afad3c Merge pull request #1199 from matrix-org/luke/fix-rte-emoji-prefixes 
Only allow completion of emoji in certain circumstances
 2017-07-10 14:02:01 +01:00
Luke Barnard
c9df079464 Merge pull request #1176 from matrix-org/luke/feature-enable-RTE 
Take RTE out of labs! 🎉
 2017-07-10 13:56:00 +01:00
Luke Barnard
9643f0c00b Merge pull request #1167 from matrix-org/dbkr/my_groups 
Implement 'Groups' page
 2017-07-10 09:37:06 +01:00
Sri Lakshmi
20672dde03 Translated using Weblate (Telugu) 
Currently translated at 20.6% (189 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/te/
 2017-07-10 07:04:18 +00:00
Carlos A. Carnero Delgado
d2ddb36203 Translated using Weblate (Spanish) 
Currently translated at 68.2% (625 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-07-10 04:16:05 +00:00
David Baker
86e717f30d Fix indenting 
Also autocomplete delay was duplicated
 2017-07-09 12:34:50 +01:00
Alexandre Morignot
997c1e269a Translated using Weblate (French) 
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/fr/
 2017-07-08 16:38:21 +00:00
നിദര്‍ശ്
3d0c71b1a2 Translated using Weblate (Malayalam) 
Currently translated at 3.6% (33 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ml/
 2017-07-08 02:49:38 +00:00
Nathan van Beelen
c7e818d1c5 Translated using Weblate (Dutch) 
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/nl/
 2017-07-07 20:09:49 +00:00
Kelvin
0061757c91 Translated using Weblate (Malayalam) 
Currently translated at 3.6% (33 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ml/
 2017-07-07 19:27:59 +00:00
Luke Barnard
4218308bef Merge pull request #1200 from matrix-org/luke/fix-invite-sync-type-error 
Possibly fix accepting invites
 2017-07-07 20:03:26 +01:00
Luke Barnard
62ee0f4e02 Fix accepting invites 
Accepting an invite would cause a room to arrive via /sync only for it to throw an error in the auto complete code and cause the client to go wibbly (infinite spinner or preview bar).

The logs that lead to the debugging of this are https://github.com/matrix-org/riot-web-rageshakes/issues/239

Hopefully the error being throw isn't totally unrelated but looking at the sync handling for inviteRooms in sync.js, new rooms are stored and _then_ the Room event is emitted. The Room event could trigger setUserListFromRoom, which is where the bug was. So the room should have been stored regardless of this bug and the client should have been recoverable by swapping away and viewing the room again.
 2017-07-07 19:43:30 +01:00