Richard van der Hoff
|
a544b68298
|
Merge branch 'master' into rav/is_token_grammar
|
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
|
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
|
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 |