OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
5,809 Commits
217 Branches
561 Tags
468 MiB
Commit Graph

5809 Commits (f42ae1662b42ef23bea1466de344bb1a56559d20)

Author SHA1 Message Date
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
Luke Barnard d9a67355d2 Merge pull request #1190 from matrix-org/luke/fix-rte-paste-html-md-on 
Only insert HTML into the composer in RTE mode
 2017-07-06 13:59:52 +01:00
Michael Telatynski ff7ae5b995
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/markdown_allow_u 2017-07-06 13:56:20 +01:00
Luke Barnard 2aa5a3a09c Merge pull request #1191 from matrix-org/t3chguy/room-settings-unban-no-pl 
only show unban button in RoomSettings if user has sufficient PL to do so
 2017-07-06 13:54:52 +01:00
Michael Telatynski fcd8321a63
Allow underline through MD and in RTE (MD) using <u> which works with CM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-06 13:49:13 +01:00
Michael Telatynski 6149b37245
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-settings-unban-no-pl 2017-07-06 13:30:40 +01:00
Michael Telatynski c6d9ec42a2
only show unban button in RoomSettings if user has sufficient PL to do so 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-06 12:51:55 +01:00
Luke Barnard bdefb35c64 Only insert HTML into the composer in RTE mode 
If MD mode is enabled, paste the plaintext equivalent.
 2017-07-06 11:52:02 +01:00
Luke Barnard 3e93930dcc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-07-06 11:18:10 +01:00
Luke Barnard 6b6af3f148 Remove RTE content_state logging 2017-07-06 11:17:54 +01:00
Richard van der Hoff c29863362f Merge pull request #1189 from matrix-org/rav/fix_duplicate_preview_key 
Fix a React duplicate key error
 2017-07-06 11:08:03 +01:00
Richard van der Hoff 4f8d9d869e mention preserving ordering in comment 2017-07-06 10:47:15 +01:00
Kegan Dougal 42ba3ff410 Linting 2017-07-06 10:44:32 +01:00
Richard van der Hoff 6a2d6b2e6e Fix a React duplicate key error 
If a single message contains the same link twice, we get an error from React
about the clashing keys. De-dup the links to keep it quiet.
 2017-07-06 10:02:25 +01:00
Kegsay e0e321783b Append the scalar_token to the widget URL if the widget URL is a scalar URL (#1182) 2017-07-06 09:28:48 +01:00