Travis Ralston
572a6056ad
Clarify that login flows must be completed in order
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1134
Evidence of this being the case is shown here: https://github.com/matrix-org/synapse/pull/5174
6 years ago
Travis Ralston
62890d21b2
Fix example Content-Type for /media/upload request
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1770
6 years ago
Travis Ralston
88d47fd57e
Rename changelog entry to point to PR
...
We use the PR for every other entry, so here is no exception.
6 years ago
Travis Ralston
d8eb294906
Fix s2s changelog entries
6 years ago
Travis Ralston
d0fd20fdb4
Clarify how homeservers are meant to auth themselves to appservices
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1765
Note that the swagger definitions already say that authorization is required. It just wasn't mentioned in the spec.
6 years ago
Travis Ralston
10648aa9e8
Clarify that FAIL_ERROR is not limited to just homeservers.
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1735
6 years ago
Travis Ralston
bf8ca3abba
Merge pull request #2026 from matrix-org/travis/1.0/msc1452-server-notices
...
Add server notices support
6 years ago
Travis Ralston
b1dccda49d
changelog
6 years ago
Travis Ralston
40cf4620d5
Merge pull request #2027 from matrix-org/travis/1.0/pw-change-uia
...
Add rationale for UIA on change password, and how access tokens behave
6 years ago
Travis Ralston
1aa71f2436
Merge pull request #2029 from matrix-org/travis/1.0/delete-alias
...
Add M_NOT_FOUND definition for deleting non-existent aliases
6 years ago
Travis Ralston
23ab1c527a
Clarify how redactions affect room state
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1726
6 years ago
Travis Ralston
00f97636a2
Add missing reason property to m.call.hangup
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1689
6 years ago
Travis Ralston
1bda3fe2b2
Spec MSISDN UIA support
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1702
1702 describes the lack of `bind_msisdn` parameter, however the whole login type was missing from UIA.
6 years ago
Travis Ralston
d52fcdacfa
Add M_NOT_FOUND definition for deleting non-existent aliases
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1675
6 years ago
Travis Ralston
221d9f24fd
Clarify that logging out deletes devices too
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1651
6 years ago
Travis Ralston
1d33adf62d
Add rationale for UIA on change password, and how access tokens behave
...
Fixes https://github.com/matrix-org/matrix-doc/issues/680
6 years ago
Travis Ralston
5eea4a477f
Add server notices support
...
As per [MSC1452](https://github.com/matrix-org/matrix-doc/issues/1452 )
Fixes https://github.com/matrix-org/matrix-doc/issues/1254
Although MSC1452 focuses on just the warnings part of the server notices, the base for notices has not been established in the spec. This commit adds the needed support to be able to handle notices.
No intentional divergences from the proposal are included in this changeset. There are a few additions which are used in practice although not defined in the proposal, such as who is responsible for aesthetics, sending notices, and other misc rules.
6 years ago
Travis Ralston
17a9524cad
changelog
6 years ago
Travis Ralston
5c268ef21f
Merge pull request #2020 from matrix-org/travis/1.0/msc1930-tombstone-notif
...
Add a .m.rule.tombstone default push rule for room upgrades
6 years ago
Travis Ralston
ceaccffdf7
Add a .m.rule.tombstone default push rule for room upgrades
...
As per [MSC1930](https://github.com/matrix-org/matrix-doc/pull/1930 )
There are no known changes to this proposal since it was accepted.
6 years ago
Travis Ralston
3c38956510
Remove prev_content from the redaction essential keys list
...
As per [MSC1954](https://github.com/matrix-org/matrix-doc/pull/1954 )
No known changes since the proposal was accepted.
6 years ago
Travis Ralston
9c2a789d34
Add missing changelogs and make existing ones match conventions
...
The conventions are not set in stone, however the changelog should not be a mixed bag of voices.
6 years ago
Travis Ralston
ba18a6e9fa
Merge pull request #1992 from matrix-org/anoa/missing_punctuation3
...
Add missing period
6 years ago
Travis Ralston
00b7b70c06
Create 1992.clarification
6 years ago
Travis Ralston
7e093e95fc
Merge pull request #1991 from matrix-org/anoa/missing_punctuation2
...
Add missing punctuation
6 years ago
Travis Ralston
c54a5fc3df
Merge pull request #1989 from matrix-org/anoa/typo2
...
Add missing 'as'
6 years ago
Andrew Morgan
713e4401b4
Add changelogs
6 years ago
Andrew Morgan
abd770419b
Add changelog
6 years ago
Andrew Morgan
20d2fdc288
Add changelog
6 years ago
Richard van der Hoff
14715468bb
Make thumbnail dimensions mandatory
...
Fixes #1883
6 years ago
Vikingat-RAGE
76ee13b9bb
Fixed bad spacing.
6 years ago
Travis Ralston
c08d223cfe
Merge pull request #1889 from ma1uta/push_rules
...
Fix for the #1865
6 years ago
Anatoly Sablin
5303ba54b7
Add a clarification changelog.
6 years ago
Travis Ralston
adb721bc0b
Fix unrelated changelog entry's RST representation
6 years ago
Travis Ralston
baf8948eb5
Describe M_UNSUPPORTED_ROOM_VERSION on invite and createRoom endpoints
...
Spec for MSC1866: https://github.com/matrix-org/matrix-doc/pull/1866
6 years ago
Anatoly Sablin
060c5c7b21
Add clarification changelog entry.
6 years ago
Travis Ralston
49119ed345
Merge pull request #1875 from matrix-org/travis/clarify-upgrades
...
Clarify the recommendations for "transferable state"
6 years ago
Travis Ralston
72242e4ebb
Merge pull request #1879 from matrix-org/travis/fix-capabilities
...
Correctly nest the capabilities response object
6 years ago
Travis Ralston
d31d2f5e57
Correctly nest the capabilities response object
...
Everything is contained in a "capabilities" property, which is not represented by the schema. The example was correct.
6 years ago
Andrew Morgan
48569c2156
Merge pull request #1853 from matrix-org/anoa/3pid_typos
...
Replace "3pid" with "3PID"
6 years ago
Travis Ralston
26810bccef
Merge pull request #1873 from matrix-org/travis/spec/get-account-data
...
Add routes for retrieving account data
6 years ago
Andrew Morgan
df7223f992
Add changelogs
6 years ago
Travis Ralston
f67782230a
changelog
6 years ago
Travis Ralston
5721712eae
Add M_RESOURCE_LIMIT_EXCEEDED
...
Original proposal: https://github.com/matrix-org/matrix-doc/issues/1504
No changes from the original proposal or implementations have been made intentionally here.
6 years ago
Travis Ralston
6bbf22cd04
Add routes for retrieving account data
...
Original proposal: https://github.com/matrix-org/matrix-doc/issues/1339
This contains no known differences to what was ultimately decided upon and implemented.
6 years ago
Travis Ralston
85578f9842
Fix spelling mistake: endponts -> endpoints
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1677
6 years ago
Travis Ralston
8bd9ca4edd
Prep for r0.1.1 of s2s
6 years ago
Travis Ralston
71f251c733
Merge pull request #1855 from matrix-org/travis/fix-wk-fallback
...
Fix contradiction in wellknown discovery for servers
6 years ago
Travis Ralston
4b68b5c939
Changelog
6 years ago
Travis Ralston
f37a6d2ef5
Changelog
6 years ago
Travis Ralston
8ace64bab7
r0.1.0 of the s2s specification
6 years ago
Travis Ralston
e27c83d9f8
Merge pull request #1817 from matrix-org/neilj/remove_presence_lists
...
remove references to presence lists
6 years ago
Travis Ralston
ccce6c196d
Specify how capabilities work in the c2s API
...
Original proposals:
* https://github.com/matrix-org/matrix-doc/pull/1753
* https://github.com/matrix-org/matrix-doc/pull/1804
Implementation proof:
* https://github.com/matrix-org/synapse/pull/4472
* https://github.com/matrix-org/matrix-js-sdk/pull/830
There is one change to MSC1753 which is included in this commit. MSC1804 remains unchanged. In the original proposal, the change password capability being present was an indication that password changes were possible. It was found that this doesn't really communicate the state very well to clients in that lack of a capability (or a 404, etc) would mean that users would erroneously not be able to change their passwords. A simple boolean flag was added to assist clients in detecting this capability.
6 years ago
Travis Ralston
4437c383bb
Merge pull request #1790 from matrix-org/travis/spec/login-redirect
...
Add a mechanism for redirecting clients after login
6 years ago
Neil Johnson
ed68f940cd
towncrier
6 years ago
Travis Ralston
84a4ca62c3
Merge pull request #1786 from matrix-org/travis/spec/exp-caps
...
Add support for unstable feature advertising via /versions
6 years ago
Travis Ralston
052d68d83d
Merge pull request #1791 from matrix-org/travis/spec/rver-upgrades
...
Add room version upgrades
6 years ago
Travis Ralston
5f12419afb
Clarify that changelog entries end with a full stop
6 years ago
Travis Ralston
56bfa76765
changelog
6 years ago
Travis Ralston
fbd8861180
Changelog
6 years ago
Travis Ralston
510468a3b1
Changelog
6 years ago
Travis Ralston
75c084e987
changelog
6 years ago
Travis Ralston
7461cd7f68
Add changelog
6 years ago
Hubert Chathi
1be3bd602a
add changelog
6 years ago
Travis Ralston
485928486a
Client-server r0.4.0 changelog
6 years ago
Travis Ralston
17a6a4c2ee
Merge branch 'travis/c2s/fix-changelog' into client_server/release-r0.4.0
6 years ago
Travis Ralston
bb2835651f
Merge pull request #1637 from turt2live/travis/c2s/clarify-errors
...
List known client-server error codes; Clarify priority of error codes vs http status code
6 years ago
Travis Ralston
680ab5e194
Misc formatting things
...
Consistency, make the renderer happy
6 years ago
Travis Ralston
247ae26ec4
Consistency
6 years ago
Travis Ralston
d5af3bae43
This isn't a new endpoint
6 years ago
Travis Ralston
10fa5a3a01
Changelog for r0.1.0 IS spec
6 years ago
Travis Ralston
7d34995ece
It's actually an "identity server implementing the Identity Service API"
...
Also add a note about appservices being special.
6 years ago
Travis Ralston
7ac76fa27c
Actually we're going with "identity server" afterall
6 years ago
Travis Ralston
cc0badaaa1
Fix all naming cases of "identity service"
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1396
Includes some "homeserver" fixes too. This commit does not include historical documentation or notes.
6 years ago
Travis Ralston
683072e624
Merge pull request #1636 from turt2live/travis/c2s/id-server
...
Clean up and flesh out all three editions of the /requestToken API
6 years ago
Travis Ralston
108c623557
Merge pull request #1635 from turt2live/travis/c2s/read-markers
...
Add read markers
6 years ago
Travis Ralston
e49ed5d1ec
Changelog
6 years ago
Hubert Chathi
c0dd7e0025
Merge pull request #1420 from Zil0/encrypted_attach
...
Document encrypted attachments
6 years ago
Travis Ralston
3146fc339a
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-errors
6 years ago
Travis Ralston
679ddabb53
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/read-markers
6 years ago
Travis Ralston
7f1b94c211
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/id-server
6 years ago
Travis Ralston
9004be7bda
Merge remote matrix-org/master
6 years ago
Travis Ralston
25778989a1
Merge pull request #1573 from turt2live/travis/c2s/sync-event-fields
...
Fix event schemas for /sync
6 years ago
Travis Ralston
f72c821be4
Merge pull request #1619 from turt2live/travis/c2s/local-echo
...
Reference that transaction IDs may be used to echo
6 years ago
Travis Ralston
2e3e189ea2
Merge remote matrix-org/master
6 years ago
Travis Ralston
2e316ea80b
Merge pull request #1630 from matrix-org/application_service/release-r0.1.0
...
r0.1.0 for the Application Service specification
6 years ago
Travis Ralston
136ba15eb2
Merge pull request #1605 from turt2live/travis/c2s/clarify-html-again
...
Mention that clients should not be producing invalid HTML
6 years ago
Travis Ralston
afa16f1e4e
Merge pull request #1606 from turt2live/travis/c2s/room-tags
...
Update the room tagging documentation
6 years ago
Travis Ralston
c127eed7e7
Merge pull request #1600 from turt2live/travis/c2s/media-csp
...
Specify the minimum CSP for media
6 years ago
Travis Ralston
73736d41db
Merge pull request #1569 from turt2live/travis/c2s/user-directory
...
Clarify the homeserver's behaviour for user searching
6 years ago
Travis Ralston
9646d99c9e
Merge pull request #1602 from turt2live/travis/general/redactions
...
Add the other fields the server is expected to keep on events
6 years ago
Travis Ralston
ac56e76746
Changelog
6 years ago
Travis Ralston
7f719b23e7
Merge pull request #1589 from turt2live/travis/c2s/inhibit-login
...
Document the inhibit_login registration option
6 years ago
Travis Ralston
f3181bbedd
Changelog
6 years ago
Travis Ralston
7516af3df2
Changelog
6 years ago
Travis Ralston
86c85aea71
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/3pid-binding
6 years ago
Travis Ralston
cee0a5ac7b
Merge pull request #1557 from turt2live/travis/general/r0-prep
...
Prepare the identity service and server-server APIs for r0
6 years ago
Travis Ralston
4630c06721
Appservice r0.1.0 changelog
6 years ago
Travis Ralston
951b442956
Merge pull request #1558 from turt2live/travis/c2s/fix-events
...
Fix client-server event schemas: move `age`, dedupe fields
6 years ago
Travis Ralston
2d18b0d2d8
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-html-again
6 years ago
Travis Ralston
49c5677969
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/user-directory
6 years ago
Travis Ralston
2753d24302
Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep
6 years ago
Travis Ralston
440841d1ff
Recommend a CSP rather than require it.
6 years ago
Travis Ralston
f04afaa9b9
Merge pull request #780 from mujx/missing-enum-fields
...
Add missing enum fields for the set_presence parameter
6 years ago
Travis Ralston
827033c128
Merge remote matrix-org/master
6 years ago
Travis Ralston
0f2e01f5b5
Merge pull request #1555 from turt2live/travis/as/cleanup
...
Application service spec cleanup; Security definitions; r0 prep
6 years ago
Travis Ralston
7ecf2406eb
Merge pull request #1590 from turt2live/travis/c2s/403-put-state
...
Document 403 error for sending state events
6 years ago
Travis Ralston
3d99c8b5a8
Changelog
6 years ago
Travis Ralston
38bb222461
Changelog
6 years ago
Travis Ralston
a5c3924492
Merge remote matrix-org/master
6 years ago
Hubert Chathi
4230e375fa
Merge pull request #1465 from Zil0/key_sharing
...
Document key sharing events
6 years ago
Hubert Chathi
0130620cc1
Merge pull request #1596 from uhoreg/e2e_sessions
...
specify how to handle multiple olm sessions with the same device
6 years ago
Travis Ralston
e7a69a6a6d
Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep
6 years ago
Travis Ralston
2ab2f91088
Merge remote-tracking branch 'matrix-org/master' into travis/releases/push-gateway/r0.1.0
6 years ago
Travis Ralston
30ff020ac7
Changelog
6 years ago
Travis Ralston
26d5a24b88
Merge remote matrix-org/master
6 years ago
Travis Ralston
60b97fcf26
Changelog
6 years ago
Travis Ralston
86f616bb31
Changelog
6 years ago
Travis Ralston
39ef845a53
Merge pull request #1547 from turt2live/travis/c2s/pills
...
Document how mentions (pills) work
6 years ago
Hubert Chathi
5019fb7c49
Merge pull request #1359 from uhoreg/well-known
...
.well-known discovery
6 years ago
Hubert Chathi
9d0fec3645
add changelog
6 years ago
Travis Ralston
d1add1f58c
Changelog
6 years ago
Travis Ralston
5d0f77de3a
changelog
6 years ago
Travis Ralston
4df67d9305
changelog
6 years ago
Travis Ralston
6cdb463829
Merge pull request #1571 from turt2live/travis/general/number-to-int
...
Replace applicable types of 'number' to 'integer'
6 years ago
Travis Ralston
4278a9a516
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/fix-events
6 years ago
Travis Ralston
e4f8c23972
Merge pull request #1562 from turt2live/travis/c2s/html-formatting
...
Define the supported HTML subset for message events
6 years ago
Travis Ralston
f9c7014a65
Merge pull request #1577 from turt2live/travis/c2s/search-filter
...
Specify the type of filter the search API expects
6 years ago
Travis Ralston
03065b0584
Merge pull request #1572 from turt2live/travis/c2s/sync-left-account-data
...
Add `account_data` to left rooms in /sync
6 years ago
Travis Ralston
9527ce31f5
Merge pull request #1570 from turt2live/travis/c2s/sync-filtering
...
Update filtering API documentation
6 years ago
Travis Ralston
ee2ebe6792
Merge pull request #1568 from turt2live/travis/c2s/invite-room-state
...
Move `invite_room_state` to the correct place in the client-server API
6 years ago
Travis Ralston
fa3e9a7609
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/pills
6 years ago
Travis Ralston
fa96d8629b
Prepare the appservice spec for an r0 release
...
This puts the scaffolding in place for an r0 release to happen, such as the changelog and version variables.
6 years ago
Travis Ralston
87133d8505
Merge pull request #1574 from turt2live/travis/c2s/fix-directory-put
...
Clean up PUT /directory/room
6 years ago
Travis Ralston
4e885c3f77
Merge pull request #1550 from turt2live/travis/general/acls
...
Server ACLs
6 years ago
Travis Ralston
a0b17e6ed6
Merge pull request #1551 from turt2live/travis/c2s/push-rules
...
General improvements to the push rules module
6 years ago
Travis Ralston
7b7933327a
Changelog
6 years ago
Travis Ralston
ce0befd7d0
Changelog
6 years ago
Travis Ralston
fd47184ce3
Changelog
6 years ago
Travis Ralston
e8edfba114
Changelog
6 years ago
Travis Ralston
e75a1836b8
Changelog
6 years ago
Travis Ralston
b0fbd7be7c
Changelog
6 years ago
Travis Ralston
e926b4a840
Changelog
6 years ago
Travis Ralston
3b2bf18c67
Changelog
6 years ago
Travis Ralston
5ceb132110
Changelog
6 years ago
Travis Ralston
3c472f70e3
Changelog
6 years ago
Valentin Deniaud
d6f5d590f8
add encrypted attachments changelog
6 years ago
Valentin Deniaud
faa13aaa40
fixup! add key sharing changelog
6 years ago
Travis Ralston
06d43aef17
Changelog
6 years ago
Travis Ralston
d370a2c6fd
Prepare the identity service and server-server APIs for r0
...
* Create the changelog scaffolding
* Set up the variables for versioning
6 years ago
Travis Ralston
9b19fc27de
changelog
6 years ago
Travis Ralston
dc94820450
Changelog
6 years ago
Travis Ralston
a95d7092eb
Changelog
6 years ago
Travis Ralston
bce324818b
Changelog
6 years ago
Valentin Deniaud
7355d23ea5
add key sharing changelog
6 years ago
Travis Ralston
3869f68a5c
Merge remote-tracking branch 'matrix-org/master' into travis/general/room-versions
6 years ago
Travis Ralston
e4f5c3d55e
Merge pull request #1518 from turt2live/travis/c2s/create-room-improvements
...
Add general clarity to the /createRoom endpoint
6 years ago
Will Hunt
4ab64e11af
Add news frag
6 years ago
Travis Ralston
26746cf785
Merge pull request #1517 from turt2live/travis/c2s/auth-header
...
Dedicate a section on how to use access tokens
6 years ago
Richard van der Hoff
206f78cb48
Rename 1284.feature.rst to 1284.feature
6 years ago
Valentin Deniaud
98e2e8de71
changelog
6 years ago
Hubert Chathi
f5dc0eaed2
document msisdn-related endpoints in IS ( #1507 )
...
* add msisdn endpoints in Identity Server spec
* add in CS endpoints that use the IS msisdn endpoints
6 years ago
Michael Telatynski
17a0dcc7d3
add newsfragment for #1176
6 years ago
Travis Ralston
ba51d5960e
r0.1.0 release of the Push Gateway specification
...
Because this is the first release, it has several moving parts to it:
* The version variables have been defined.
* The towncrier changelog has been prepared for future modifications.
* The templating has been updated to better support future versions of the specification.
* A release process document has been created.
6 years ago
Travis Ralston
ef7570e62d
Changelog
6 years ago
Travis Ralston
b159f21857
changelog
6 years ago
Travis Ralston
ae02e8834d
changelog
6 years ago
Travis Ralston
7751750396
changelog
6 years ago
Hubert Chathi
6a3cf10be9
Merge remote-tracking branch 'origin/master' into well-known
6 years ago
Hubert Chathi
292d334509
document new login identifier object ( #1390 )
6 years ago
Travis Ralston
9e6f2b2fd0
Add newsfragment
6 years ago
Travis Ralston
baf19cc741
Add newsfragment for 1379
6 years ago
Travis Ralston
1e500fd005
Add newsfragment for third party network endpoints
...
Specifying multiple entries for the same PR would be covered under: https://github.com/hawkowl/towncrier/pull/119
6 years ago
Travis Ralston
67665fa3a6
Merge remote-tracking branch 'matrix-org/master' into travis/towncrier
6 years ago
Travis Ralston
91c59e7384
Merge pull request #1353 from matrix-org/anoa/as_thirdparty_lookup
...
Thirdparty Entity Lookup API
6 years ago
Travis Ralston
0faae54fc1
Merge pull request #1400 from turt2live/travis/search-improvements
...
Clarify some of the properties on the search result
6 years ago
Travis Ralston
e164392d93
Merge remote-tracking branch 'matrix-org/master' into travis/towncrier
6 years ago
Travis Ralston
b6f9e13d46
Add newsfragment
6 years ago
Travis Ralston
c999b7c2e2
Add newsfragment
6 years ago
Travis Ralston
e9f7d2096e
Add changelog entry for CORS
6 years ago
Travis Ralston
c79010f0d6
Merge pull request #1365 from turt2live/travis/cors
...
Document the CORS/preflight headers
6 years ago
Travis Ralston
c65c6e2e70
Add changelog entries removed in the merge from master
6 years ago
Travis Ralston
f68c82bd6c
Don't let the newsfragments wink out of existence
6 years ago
Travis Ralston
34089e302c
Add general documentation for maintainers
6 years ago
Travis Ralston
ee9abc5fd7
Convert unstable changelog to towncrier
6 years ago
Travis Ralston
9277e4c52d
Add initial towncrier support
6 years ago
Travis Ralston
d7a979da63
Merge remote-tracking branch 'matrix-org/master' into travis/all-the-auth
6 years ago
Travis Ralston
dd9414472b
Merge remote-tracking branch 'matrix-org/master' into travis/cors
6 years ago
Travis Ralston
e7a6ff1064
Merge branch 'master' into travis/spec-reason
6 years ago
Travis Ralston
4485b2f025
Merge branch 'master' into travis/server-name-join
6 years ago
Travis Ralston
c1c1f28c79
Merge branch 'master' into travis/dont-forget-to-leave
6 years ago
Travis Ralston
3935861445
Merge pull request #1380 from turt2live/travis/define-roomevent
...
Define RoomEvent on /rooms/{roomId}/messages
6 years ago
Travis Ralston
f98f603048
Merge pull request #1381 from turt2live/travis/general-clarifications
...
Rename some titles to avoid confusion between request and response schemas
6 years ago
Andrew Morgan
cc3724b54a
fix indentation, error messages. add rest of PR
6 years ago
Travis Ralston
0867ab2365
Add to changelog
6 years ago
Travis Ralston
e0cdfd8897
Merge branch 'master' into patch-1
6 years ago
Travis Ralston
95e8f1bdde
Add to changelog
6 years ago
Hubert Chathi
ce1e2c0904
incorporate feedback from reviewers
7 years ago
Travis Ralston
a19bbc8089
Add to changelog
7 years ago
Travis Ralston
67e74bd8c5
Merge remote-tracking branch 'matrix-org/master' into travis/cors
7 years ago