OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,285 Commits
215 Branches
561 Tags
462 MiB
Commit Graph

3285 Commits (3d30db81e0d7571ae5208063320456563fb02f27)

Author SHA1 Message Date
Kegan Dougal 4f860b4c6d Review comments: If-statement style 2017-01-17 10:50:44 +00:00
Richard van der Hoff 09ce74cc76 Fix a couple of minor review comments 2017-01-16 18:44:46 +00:00
lukebarnard aa6e168505 Remove comment 2017-01-16 18:58:53 +01:00
lukebarnard 5ab287fa1a Use pre-calculated displaynames to handle dupes 2017-01-16 18:57:49 +01:00
lukebarnard a79dc886ba Order sequences by occurance of the first event in each sequence 2017-01-16 18:46:17 +01:00
Kegan Dougal f168f9cd06 Fix vector-im/riot-web#2833 : Fail nicely when people try to register numeric user IDs 2017-01-16 17:25:44 +00:00
Richard van der Hoff ac22803ba0 Allow Modal to be used with async-loaded components 
Add Modal.createDialogAsync, which can be used to display asynchronously-loaded
React components. Also make EncryptedEventDialog use it as a handy
demonstration.
 2017-01-16 17:18:38 +00:00
lukebarnard 4be444d524 Move shouldComponentUpdate 2017-01-16 15:12:00 +01:00
lukebarnard 82d6805a71 Canonicalise certain transition pairs, handle arbitrary consecutive transitions 
Transition pairs joined,left and left,joined are now transformed into single meta-transitions "joined_and_left" and "left_and_joined" respectively. These are described as "joined and left", "left and rejoined".

Treat consecutive sequences of transitions as repetitions, and handle any arbitrary repetitions of transitions:

...,joined,left,joined,left,joined,left,...

is canonicalised into
...,joined_and_left, joined_and_left, joined_and_left,...

which is truncated and described as
... , joined and left 3 times, ...

This also works if there are multiple consecutive sequences separated by other transitions:

..., banned, banned, banned, joined, unbanned, unbanned, unbanned,...

becomes
... was banned 3 times, joined, was unbanned 3 times ...
 2017-01-16 14:49:07 +01:00
David Baker 1d5112db5d Back to develop js-sdk 2017-01-16 13:22:57 +00:00
David Baker 936e12dfe4 Merge branch 'master' into develop 2017-01-16 13:22:11 +00:00
David Baker a9256b0ab1 v0.8.5 2017-01-16 13:21:34 +00:00
David Baker 834c8d0890 Prepare changelog for v0.8.5 2017-01-16 13:21:34 +00:00
David Baker 3679e47002 js-sdk 0.7.4 2017-01-16 13:19:24 +00:00
lukebarnard fb68fff536 Refactor renderCommaSeparated for reuse 2017-01-16 13:45:42 +01:00
Richard van der Hoff e37bf6b7be Skip crypto tests on PhantomJS 2017-01-14 01:41:48 +00:00
Richard van der Hoff d63f7e8359 Expose megolm import/export via the devtools 2017-01-14 01:34:34 +00:00
Richard van der Hoff f8e56778ea Encryption and decryption for megolm backups 2017-01-14 01:34:34 +00:00
Richard van der Hoff 1d5d44d63d TextEncoder polyfill 
Apparently Safari doesn't sport a TextEncoder, so here's a polyfill for it.
 2017-01-14 00:45:51 +00:00
Jani Mustonen b323551f22 Adhered to code review 2017-01-13 19:36:41 +02:00
Jani Mustonen 5e013860ee Definition for AccessibleButton 2017-01-13 19:36:41 +02:00
Jani Mustonen 959163f2ef Proper accessible buttons 2017-01-13 19:36:41 +02:00
Jani Mustonen 041196d729 Added quick search functionality 2017-01-13 19:36:40 +02:00
Jani Mustonen d2ff2715ce Buttonified almost everything. Stylesheet is broken. 2017-01-13 19:36:40 +02:00
Jani Mustonen 8d79716421 Turned the links to buttons to comply with MDN's recommendations 2017-01-13 19:36:40 +02:00
Jani Mustonen ad072cc179 Turned buttons from divs to links. Makes it possible for screen readers and hotkeys to recognize the buttons. 2017-01-13 19:36:40 +02:00
Luke Barnard 77ae041407 Order names by order of first events for users 2017-01-13 16:40:33 +00:00
Kegsay 07b3c58c61 Merge pull request #614 from matrix-org/kegan/show-error-on-pl-change-fail 
Show the error dialog when requests to PUT power levels fail
 2017-01-13 15:26:26 +00:00
Kegan Dougal dcd0acb2b5 Review comments 2017-01-13 15:17:34 +00:00
Kegan Dougal e196cfaf91 Show the error dialog when requests to PUT power levels fail 
This is why I dislike Q.
 2017-01-13 14:51:01 +00:00
David Baker 3ac9ed7f8f v0.8.5-rc.1 2017-01-13 11:14:26 +00:00
David Baker 08020d1c39 Prepare changelog for v0.8.5-rc.1 2017-01-13 11:14:25 +00:00
David Baker 57652c06e3 released js-sdk 2017-01-13 11:13:17 +00:00
Luke Barnard d2d78919ce Overhaul MELS to deal with causality, kicks, etc. 
The MELS can now deal with arbitrary sequences of transitions per user, where a transition is a change in membership. A transition can be joined, left, invite_reject, invite_withdrawal, invited, banned, unbanned or kicked.

Repeated segments (modulo 1 and 2), such as joined,left,joined,left,joined will be handled and will be rendered as " ... and 10 others joined and left 2 times and then joined". The repeated segments are assumed to be at the beginning of the sequence. This could be improved to handle arbitrary repeated sequences.
 2017-01-12 18:55:53 +00:00
David Baker 6d07a1b7e3 Merge pull request #612 from matrix-org/dbkr/ci_build_js_sdk 
Build the js-sdk in the CI script
 2017-01-12 17:37:09 +00:00
David Baker 3706d6e32a js-sdk, not react-sdk 2017-01-12 17:14:51 +00:00
David Baker 4ca4441f77 Build js-sdk in travis too 2017-01-12 17:09:49 +00:00
David Baker 05d2836581 Retest 2017-01-12 16:55:34 +00:00
David Baker 2708859b34 npm install the js-sdk 
otherwise we don't have uglifyjs
 2017-01-12 16:38:48 +00:00
David Baker 314c57ca6b Retest 2017-01-12 16:29:27 +00:00
Matthew Hodgson cc8b3d4ba4 spell out email invites better 2017-01-12 13:46:19 +00:00
David Baker fcc40ee372 It's now just build 2017-01-11 19:03:20 +00:00
David Baker 5142cb63c8 s/build/compile/ for js sdk 2017-01-11 18:18:46 +00:00
David Baker a4aa74e85a Build the js-sdk in the CI script 
now it's transpiled
 2017-01-11 17:18:37 +00:00
David Baker 1f96467145 Merge pull request #609 from matrix-org/luke/fix-join-part-collapsing-redacted-joins 
Fix redacted member events being visible
 2017-01-11 17:10:35 +00:00
David Baker 4e1af30186 Merge pull request #611 from matrix-org/luke/fix-join-part-collapsing-use-state-key 
Use `getStateKey` instead of `getSender`
 2017-01-11 17:09:14 +00:00
Luke Barnard baaf827c48 Use `getStateKey` instead of `getSender` 
This makes sure that the kickee is not the user used for the MemberEventListSummary
 2017-01-11 17:03:14 +00:00
Luke Barnard 6e2a75bbee Fix redacted member events being visible 
This was due to the `MemberEventListSummary` not ignoring redacted joins/leaves. This was also causing bug #2765.
 2017-01-11 11:27:07 +00:00
David Baker e95f5b959f Merge pull request #608 from matrix-org/dbkr/move_screen_sharing_error 
Move screen sharing error check into platform
 2017-01-11 10:12:51 +00:00
David Baker 37d9108ceb Add error popup if screen sharing fails 2017-01-11 10:06:48 +00:00