Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-23 09:38:38 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5313 commits 30 branches 42 tags 32 MiB
Commit graph

5313 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Haines 315f97e36b Merge branch 'master' into markjh/document_v1_rooms_api 2015-09-17 15:25:00 +01:00
Kegsay bb441427ac Merge pull request #48 from matrix-org/markjh/swagger 
De-duplicate event schema
 2015-09-17 15:16:02 +01:00
Mark Haines fd3401fc7a Remove accidentally committed swp file 2015-09-17 14:44:17 +01:00
Mark Haines d0b018c46e Fix syntax error in JSON 2015-09-17 14:43:09 +01:00
Mark Haines 380f186273 Log which file a json parse error occurred in 2015-09-17 14:42:43 +01:00
Mark Haines c49338006a replace definitions/*event.yaml with symlinks to /event-schemas/ 2015-09-17 13:09:35 +01:00
Mark Haines 2cf8da6b20 Update the gendoc script to load the core event schema from 
separate files.
 2015-09-17 10:28:57 +01:00
Mark Haines 6147562d14 Split the "core" definition files into separate files. To 
make it easier to use the schema files with tools that
don't support deep links.
 2015-09-17 10:09:37 +01:00
Daniel Wagner-Hall cf13701450 Merge branch 'master' into macaroons 2015-09-15 16:47:11 +01:00
Daniel Wagner-Hall a19e18a4da Merge branch 'master' into daniel/threepidinvites-2 2015-09-15 16:46:35 +01:00
Mark Haines 4d302d10c4 Merge pull request #47 from matrix-org/daniel/chdor 
Fix chdir path
 2015-09-15 16:38:47 +01:00
Daniel Wagner-Hall 21411309e0 Fix chdir path 2015-09-15 16:27:10 +01:00
Daniel Wagner-Hall 2e9d3d283a Swagger refresh tokens 2015-09-15 16:23:19 +01:00
Daniel Wagner-Hall 0f525e18b4 Merge branch 'master' into macaroons 
Conflicts:
	specification/10_client_server_api.rst
 2015-09-15 15:58:16 +01:00
Mark Haines 7eb8b4fde2 Add new-style docs for the APIs for getting events for a room 2015-09-15 15:52:36 +01:00
Kegsay 7fec98d651 Merge pull request #46 from matrix-org/markjh/gendoc_directory 
Set the current directory in gendoc.py to the scripts directory
 2015-09-15 11:55:18 +01:00
Mark Haines c3eab1cc3c Set the current working directory in gendoc.py to the script directory as that is where it expects to be run 2015-09-15 11:41:40 +01:00
Kegsay 916046670c Merge pull request #45 from matrix-org/daniel/swaggerlogin 
Swaggerify /login
 2015-09-14 17:15:35 +01:00
Daniel Wagner-Hall 3b44fb92f9 Clarify == case 2015-09-14 17:13:54 +01:00
Daniel Wagner-Hall 59a4e84361 s/registration/login/ 2015-09-14 17:10:46 +01:00
Daniel Wagner-Hall b916823d0f Merge branch 'master' into daniel/threepidinvites-2 2015-09-14 17:08:22 +01:00
Daniel Wagner-Hall f483340033 Clarify digest computation 2015-09-14 15:16:30 +01:00
Daniel Wagner-Hall b8e2ac5c1b Swaggerify /login 2015-09-14 13:49:27 +01:00
Daniel Wagner-Hall c55917d99c Add spec diff to index page 2015-09-14 11:08:16 +01:00
Daniel Wagner-Hall 521d625aac Fix typo 2015-09-14 11:06:57 +01:00
Daniel Wagner-Hall d9013cab5f speculator: Add HTML diffing 
I started fiddling with re-implementing the perl script in Go to add
some new functionality (and avoid the Perl), but it's not yet usable
 2015-09-14 11:03:54 +01:00
Daniel Wagner-Hall 0341c30824 Minor typo and formatting fixes 2015-09-14 10:39:22 +01:00
Daniel Wagner-Hall 1abb82d6e0 Merge branch 'master' into macaroons 2015-09-14 10:33:53 +01:00
Daniel Wagner-Hall b247761465 .gitignore speculator 2015-09-14 10:33:25 +01:00
Kegsay 2a2cd808fb Merge pull request #42 from matrix-org/speculator-list 
speculator: Add list-pull-request functionality
 2015-09-11 17:42:02 +01:00
Daniel Wagner-Hall d251f791fb speculator: Document / 2015-09-11 17:15:33 +01:00
Daniel Wagner-Hall f9ef934625 Merge branch 'master' into speculator-list 
Conflicts:
	scripts/speculator/main.go
 2015-09-11 15:31:32 +01:00
Kegsay e4f4670260 Merge pull request #44 from matrix-org/speculator-errs 
speculator: Don't ignore errors
 2015-09-11 15:30:15 +01:00
Kegsay b2eb7e7dc1 Merge pull request #43 from matrix-org/speculator-diff 
speculator: Unified diff for rst diff
 2015-09-11 15:29:50 +01:00
Daniel Wagner-Hall b6dab0009d speculator: Don't ignore errors 2015-09-11 14:43:26 +01:00
Daniel Wagner-Hall 20f0284155 speculator: Unified diff for rst diff 2015-09-11 14:40:52 +01:00
Daniel Wagner-Hall ba780a589a speculator: Add list-pull-request functionality 2015-09-11 14:40:08 +01:00
Kegsay da7c2e7fa8 Merge pull request #40 from matrix-org/markjh/history_for_rooms_that_have_been_left 
SPEC-216: Add rooms that have been left to initial sync
 2015-09-11 12:55:07 +01:00
Daniel Wagner-Hall 04fda9ca62 Merge branch 'master' into daniel/threepidinvites-2 2015-09-11 12:44:49 +01:00
Daniel Wagner-Hall fef97802b7 Merge pull request #39 from matrix-org/speculator 
speculator: Tool to preview spec pull requests
 2015-09-11 12:43:33 +01:00
Daniel Wagner-Hall bf318ffcd5 Add HTTP endpoints to README 2015-09-11 12:42:41 +01:00
Kegsay e788f565f8 Merge pull request #36 from matrix-org/daniel/threepidinvites 
Swagger /room/{roomId}/invite
 2015-09-11 11:59:21 +01:00
Daniel Wagner-Hall ca7dd49dc6 speculator: Add /healthz endpoint 2015-09-10 17:14:53 +01:00
Daniel Wagner-Hall 708f281270 Add comments about auth 2015-09-10 17:09:44 +01:00
Daniel Wagner-Hall c66a933640 Merge branch 'master' into daniel/threepidinvites-2 2015-09-10 16:47:50 +01:00
Daniel Wagner-Hall 306f91edb3 Specify third party room invitations 
SYN-458
 2015-09-10 16:46:22 +01:00
Kegsay 3011823c51 Merge pull request #27 from matrix-org/receipts 
Document receipts
 2015-09-10 16:18:19 +01:00
Kegsay c427c579cb Merge pull request #37 from matrix-org/continuserv 
continuserv: Server to live serve local updates to the spec
 2015-09-10 16:17:33 +01:00
Daniel Wagner-Hall c29aef362e Error on failure of Watcher.Add 2015-09-10 15:45:21 +01:00
Daniel Wagner-Hall 147ed4968d Merge branch 'master' into daniel/threepidinvites-2 2015-09-10 14:45:17 +01:00