OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
5,764 Commits
219 Branches
563 Tags
448 MiB
Commit Graph

5764 Commits (199b7710519ec37571dbc5eed07a495e92288313)

Author SHA1 Message Date
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 `img`s 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
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
David Baker 86e717f30d Fix indenting 
Also autocomplete delay was duplicated
 2017-07-09 12:34:50 +01: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
Luke Barnard 9a272d4965 Only allow completion of emoji in certain circumstances 
Which are:
 - the emoji to complete is at the start of the query
 - there is a whitespace character before the emoji
 - there is an emoji before the emoji (so that several emoji can be input in-a-row)

Fixes https://github.com/vector-im/riot-web/issues/4498 (although it seems to be fixed through some other fix)
 2017-07-07 19:02:51 +01:00
David Baker 1e713557bb PR feedback 2017-07-07 18:34:40 +01:00
Kegan Dougal f2d243443b Suppress more errors from spurious postMessage calls on the demo instance 2017-07-07 17:44:25 +01:00
David Baker 0792c9a555 Merge pull request #1198 from matrix-org/luke/fix-rte-auto-complete-stuck 
Remove two possible sources for the "AutoComplete stays visible bug
 2017-07-07 16:11:56 +01:00
Luke Barnard 7a8f524f4a Remove two possible sources for the "AutoComplete stays visible bug 
which is now https://github.com/vector-im/riot-web/issues/4537 <- there.

This does two things:
 - Track which query was the most recent one requesting completion and only process completions for that one. (In this case the empty string "" doesn't have any completions but we still track it so that previous calls with non-empty queries would not race and cause completions to be shown when we actuall don't want any.)
 - Make the "do we want to show the AutoComplete box?" logic a bit more sane
 2017-07-07 15:30:31 +01:00
David Baker 681fd512d7 Lint 2017-07-07 13:46:05 +01:00
David Baker c1833f9833 Merge remote-tracking branch 'origin/dbkr/my_groups' into dbkr/groups_better_groupview 2017-07-07 13:44:35 +01:00
David Baker c21f90338d Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-07 12:02:15 +01:00
Luke Barnard b420a8389d Merge pull request #1197 from matrix-org/dbkr/my_groups_withMatrixClient 
WithMatrixClient -> withMatrixClient
 2017-07-07 11:47:13 +01:00
David Baker bc8c2d442b WithMatrixClient -> withMatrixClient 
because we're using it as a function rather than a React component
 2017-07-07 11:34:20 +01:00
Richard Lewis e970b68859 Merge pull request #1194 from matrix-org/rxl881/apps 
Use app ID for element key and pass screen parameter to scalar.
 2017-07-07 11:28:39 +01:00
Richard Lewis d1eab75cfc Trigger rebuild 2017-07-07 11:15:13 +01:00
David Baker fea0a941ce Fix lint 2017-07-07 11:01:54 +01:00
David Baker 3b439d4bb2 Empty commit 
Please re-test against update riot-web
 2017-07-07 10:50:03 +01:00
David Baker 183f45bc1f Fix lint errors 2017-07-07 10:41:59 +01:00
David Baker 45986306cc Merge remote-tracking branch 'origin/develop' into dbkr/my_groups 2017-07-07 10:32:37 +01:00
David Baker 28c0daf51d Merge pull request #1148 from matrix-org/erikj/group_server 
Add group view page
 2017-07-07 10:31:14 +01:00
David Baker 8df6deee23 Empty commit 
please re-test with updated riot-web branch
 2017-07-07 10:23:20 +01:00
David Baker 1deb406294 Fix race 2017-07-07 10:12:06 +01:00
Luke Barnard 32a01b54b8 Merge branch 'develop' into erikj/group_server 2017-07-07 10:08:49 +01:00
Richard Lewis 0a1647e5c6 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps 2017-07-07 09:48:24 +01:00
Luke Barnard 7fdbec4046 Merge pull request #1195 from matrix-org/luke/fix-rte-emoji-suggestions2 
Alter EMOJI_REGEX to include end of string ($)
 2017-07-06 21:59:44 +01:00
David Baker fa37d03db6 Improve the Group View page 
Show the rooms in the group in thir various categories, etc
 2017-07-06 19:13:14 +01:00
Luke Barnard 0a4f8ffead Alter EMOJI_REGEX to include end of string ($) 
Fixes https://github.com/vector-im/riot-web/issues/4529 because the match must include the remainder of the query.
 2017-07-06 18:11:46 +01:00
David Baker 282b63d0cf Merge pull request #1193 from matrix-org/luke/fix-create-room-preview 
Fix vector-im/riot-web#4526 by pretending to join when creating a room
 2017-07-06 17:58:30 +01:00
Luke Barnard a921059432 Fix vector-im/riot-web#4526 by pretending to join 
I thought about adding separate dispatches to prevent confusion but if anyone adds anything that listens to existing dispatches, they really ought to be grep-ing the world for said dispatch actions.
 2017-07-06 17:40:27 +01:00
Richard Lewis d091550ccb Use app ID for element key and pass screen parameter to scalar. 2017-07-06 15:59:59 +01:00
Luke Barnard 6404f7603c Merge pull request #1192 from matrix-org/t3chguy/markdown_allow_u 
Allow underline through MD and in RTE (MD) using <u> which works with CM
 2017-07-06 14:08:01 +01:00