a30ef7250b
Encode event IDs when redacting events
...
Because v3 rooms are a thing.
2019-06-05 15:27:55 -06:00
570ce4f4b7
Merge pull request #940 from uhoreg/fix_missing_logger
...
add missing logger
2019-06-05 14:49:38 -04:00
3c7c9048eb
add missing logger
2019-06-05 14:04:39 -04:00
41243757ee
Merge pull request #939 from uhoreg/unpicky_verification
...
verification: don't error if we don't know about some keys
2019-06-05 12:18:53 -04:00
2af311bd7d
verification: don't error if we don't know about some keys
2019-06-05 11:56:37 -04:00
1bc9ee7110
Merge pull request #937 from matrix-org/bwindels/redactions-local-echo
...
Local echo for redactions
2019-06-05 07:49:31 +00:00
4e040f8e77
correct comments about redaction events
2019-06-05 09:41:52 +02:00
58f163ed5c
emit Room.redactionCancelled event when undoing redaction local echo
2019-06-04 18:45:13 +02:00
c0c9f0122c
remove leftover newline
2019-06-04 16:08:14 +02:00
d33395e46d
improve naming and commenting for _aggregateNonLiveRelation
2019-06-04 15:54:31 +02:00
b83c7d3929
unneeded check, as redacted_because is now also set for local echo
2019-06-04 15:49:52 +02:00
b5df016b1b
remove unused method
2019-06-04 15:28:40 +02:00
a8b6be3b38
also set redacted_because with redaction local echo
2019-06-04 13:37:24 +02:00
78cf175f5a
also look for redaction local echo event in pendingList
...
also re-aggregate the relation if it's redaction has been cancelled
2019-06-04 11:55:48 +02:00
1b78856a7d
Merge pull request #934 from matrix-org/travis/re-check-version
...
Refresh safe room versions when the server looks more modern than us
2019-06-04 01:40:57 -06:00
8194287391
make redactEvent go through same local-echo aware path as other events
2019-06-03 18:37:25 +02:00
2eecea9a07
handle redactions in room pending event logic
2019-06-03 18:37:01 +02:00
465032dd4f
support marking an event as redacted in a way we can undo it later
...
in case the redaction can't be sent
2019-06-03 18:36:03 +02:00
e473315a89
Check for the correct capability when refreshing
2019-06-03 09:56:55 -06:00
9d34ad5287
Merge pull request #935 from matrix-org/travis/v4-rooms
...
Add v4 as a safe room version
2019-06-03 07:11:13 -06:00
a532cc5cf9
Add v4 as a safe room version
...
It's listed as stable in the spec, and this is for our fallback.
2019-06-02 23:36:02 -06:00
60c6c5bc41
Refresh safe room versions when the server looks more modern than us
...
Fixes https://github.com/vector-im/riot-web/issues/9845
2019-06-02 23:34:58 -06:00
0cbbbe8503
Merge pull request #933 from matrix-org/jryans/disable-guard-for-in
...
Disable guard-for-in rule
2019-05-31 18:10:57 +01:00
47a8d3e50a
Disable guard-for-in rule
...
The Google code style config for ESLint turns on `guard-for-in` to require
for-in loops to check own properties. This makes it annoying to iterate objects,
and we seem to disable the rule by line comments when it comes up anyway, so
this just disables it globally.
2019-05-31 16:36:54 +01:00
304da09f3b
Merge branch 'master' into develop
2019-05-31 10:30:58 +01:00
acd4dcb56e
v2.0.0
2019-05-31 10:29:21 +01:00
c170456cde
Prepare changelog for v2.0.0
2019-05-31 10:29:20 +01:00
4e739e4b06
Merge pull request #932 from matrix-org/jryans/login-change-release
...
Saves access_token and user_id after login for all login types
2019-05-31 10:05:34 +01:00
137c6919f6
Fix undefined logger in webstorage.js
2019-05-31 10:01:32 +01:00
842ce30190
Fix lint error in login.spec.js
2019-05-31 09:54:47 +01:00
df1539040c
Fix lint error in login.spec.js
2019-05-31 09:54:11 +01:00
2a04459bb2
fix(login): saves access_token and user_id after login for all login types
...
Signed-off-by: Sergii Stotskyi <sergiy.stotskiy@gmail.com >
Fixes #876
2019-05-31 09:40:51 +01:00
6367bf7c75
Merge pull request #931 from matrix-org/jryans/key-backup-base-x
...
Fix recovery key encoding for base-x 3.0.5
2019-05-30 18:29:17 +01:00
a0456dc430
Merge pull request #924 from jkasun/loglevel-extend
...
Extend loglevel logging for the whole project
2019-05-30 11:20:49 -06:00
52ec831b16
Merge pull request #930 from stalniy/fix/save-login-state
...
fix(login): saves access_token and user_id after login for all login types
2019-05-30 11:20:01 -06:00
8263062fab
Fix recovery key encoding for base-x 3.0.5
...
This fixes our recovery key encoding to work with base-x 3.0.5, which requires the
encoding input to be in a `Buffer`. (base-x is a dependency of bs58.)
Unfortunately, base-x hasn't marked this as breaking change through a major
version increment, so semantic versioning can't help us here to ensure we get
particular version.
I have verified that the change to `Buffer` works with both old and new base-x,
so we should be okay no matter what version is actually selected.
For extra fun, base-x 3.0.5 also uses newer JS features, which `uglify-js`
doesn't support. I have migrated to `terser` instead, which is what we're using
for Riot these days (via Webpack).
Fixes https://github.com/vector-im/riot-web/issues/9901
2019-05-30 15:42:39 +01:00
9a2bf78a8e
logger.dir changed to a log
2019-05-30 12:58:32 +05:30
cb16f7a60b
Minor Fixes
2019-05-30 09:35:37 +05:30
ad84631ddb
Change logger import to ES6
2019-05-30 09:27:25 +05:30
d78426d708
Merge branch 'master' into develop
2019-05-29 15:53:51 +01:00
a9543df6db
v1.2.0
2019-05-29 15:52:20 +01:00
aae388be93
Prepare changelog for v1.2.0
2019-05-29 15:52:19 +01:00
4ef970b4da
fix(login): saves access_token and user_id after login for all login types
...
Signed-off-by: Sergii Stotskyi <sergiy.stotskiy@gmail.com >
Fixes #876
2019-05-28 17:47:49 +03:00
b199f133b3
fixup readme
2019-05-27 10:41:04 -06:00
7d1b183a1b
Merge pull request #929 from spantaleev/fix-non-integer-media-sizes
...
Do not try to request thumbnails with non-integer sizes
2019-05-27 08:37:03 -06:00
49d119e92e
Do not try to request thumbnails with non-integer sizes
...
Issue described in: https://github.com/vector-im/riot-web/issues/9690
matrix-react-sdk was patched separately, so that it won't call `mxcUrlToHttp()`
(and in turn `getHttpUriForMxc()`) with non-integer sizes.
This patch fixes the JS SDK as well, hoping to prevent the same issue
from happening on other clients (besides matrix-react-sdk / riot-web).
Signed-off-by: Slavi Pantaleev <slavi@devture.com >
2019-05-27 11:25:35 +03:00
feed1da570
Merge branch 'develop' into loglevel-extend
2019-05-24 18:00:40 +05:30
a3ad835d84
Merge pull request #928 from matrix-org/revert-927-travis/wk-discovery
...
Revert "Add a bunch of debugging to .well-known IS validation"
2019-05-23 14:47:48 -06:00
f8afee8ebd
Revert "Add a bunch of debugging to .well-known IS validation"
2019-05-23 14:47:38 -06:00
7e955fc312
Merge pull request #927 from matrix-org/travis/wk-discovery
...
Add a bunch of debugging to .well-known IS validation
2019-05-23 14:19:33 -06:00
Travis Ralston