1100 Commits (b0d7302ea5100e3ae6d23fb969caa8552b3b57d8)

 

All Branches   

Search

Author	SHA1	Message	Date
Kegsay	b0d7302ea5	Merge pull request #137 from matrix-org/daniel/multipleexamples ... Daniel/multipleexamples	9 years ago
Daniel Wagner-Hall	4faede73a1	Merge branch 'master' into daniel/multipleexamples	9 years ago
Daniel Wagner-Hall	cc4869e68a	Merge pull request #174 from matrix-org/daniel/speculatorhardening ... Several improvements to speculator to prepare it for actually being used by the masses, not just us devs	9 years ago
Daniel Wagner-Hall	6a6cbd9d24	Always try to build continuserv & speculator on jenkins	9 years ago
Daniel Wagner-Hall	c432396079	Add comment	9 years ago
Daniel Wagner-Hall	866fa58276	Rename	9 years ago
Daniel Wagner-Hall	e045f28b44	Pull out constant for permissions ... Also, drop permissions from 0755 to 0700	9 years ago
Oddvar Lovaas	24356d864e	Merge pull request #176 from matrix-org/daniel/gendoc ... Tweaks to spec generation for matrix.org	9 years ago
Oddvar Lovaas	092ff1370a	Merge pull request #175 from matrix-org/daniel/genimprovements ... Add anchors to spec	9 years ago
Richard van der Hoff	181d3f976d	Initial proposal for websockets support.	9 years ago
Richard van der Hoff	d8dd380dfa	Merge pull request #164 from matrix-org/rav/SPEC-254 ... Fix /sync documentation, post SPEC-254	9 years ago
Richard van der Hoff	e7610c7cc5	Merge pull request #165 from matrix-org/rav/flatten_sync ... /sync response format tweaks	9 years ago
Daniel Wagner-Hall	4ac85997f5	Fix check	9 years ago
Daniel Wagner-Hall	da93317a78	Take dir not files as args	9 years ago
Daniel Wagner-Hall	ca3a9e3562	exec gendoc outside of script	9 years ago
Daniel Wagner-Hall	e041033048	Rename file	9 years ago
Daniel Wagner-Hall	8586744771	Add anchors to spec ... This is currently done by a script on the prod serving machine. We might as well keep the matrix.org spec and dev spec as similar as possible.	9 years ago
Daniel Wagner-Hall	6f1d00097b	Only bother trying to fetch if we need to	9 years ago
Daniel Wagner-Hall	8872e17f93	Fall back to last known HEAD sha if fetch fails	9 years ago
Daniel Wagner-Hall	dd53847211	Include command stderr in error text	9 years ago
Daniel Wagner-Hall	757b0bcd12	Try to build continuserv and speculator	9 years ago
Daniel Wagner-Hall	9ad64b02d1	speculator: guard against concurrent git commands	9 years ago
Daniel Wagner-Hall	1a1a7d87dc	Revert "Changelog for 0.3.0" ... This reverts commit 5aeaa42a50.	9 years ago
Daniel Wagner-Hall	5aeaa42a50	Changelog for 0.3.0	9 years ago
Paul Evans	e95a1616af	Merge pull request #143 from matrix-org/paul/federation-room-join ... Document the federation remote join handshake	9 years ago
Richard van der Hoff	d7d59d78e1	/sync: Put state dict back to being a list ... Turning the state into a dict-of-dicts caused more pain than it solved. Put it back to a list.	9 years ago
Daniel Wagner-Hall	7b1e8359d9	Merge pull request #173 from matrix-org/daniel/forgetrooms ... Specify /rooms/:room_id/forget	9 years ago
Richard van der Hoff	6653362f31	Unflatten 'unsigned' ... It turns out that flattening 'unsigned' comes with too many downsides. Let's stick with the status quo.	9 years ago
Daniel Wagner-Hall	6763317e64	Specify /rooms/:room_id/forget	9 years ago
Daniel Wagner-Hall	a0fb7af8fc	Merge pull request #172 from matrix-org/daniel/specleaving ... Swaggerify /rooms/:room_id/leave	9 years ago
Daniel Wagner-Hall	8201eaa042	Swaggerify /rooms/:room_id/leave	9 years ago
Kegsay	994c0974f9	Merge pull request #162 from matrix-org/rav/refactor_tables ... Rewrite the table templates	9 years ago
Kegan Dougal	d1c685f296	Merge branch 'master' into rav/refactor_tables	9 years ago
Mark Haines	03a0377c76	Plans for end-to-end in matrix	9 years ago
Daniel Wagner-Hall	5db56df851	Merge pull request #160 from matrix-org/daniel/optional ... Note that invite_room_state is optional	9 years ago
Richard van der Hoff	7ff593b3de	Merge branch 'rav/SPEC-254' into rav/flatten_sync ... Conflicts: specification/events.rst	9 years ago
Richard van der Hoff	0db055b4ea	Fix another reference to 'txn_id'	9 years ago
Richard van der Hoff	58b7901b51	Merge branch 'rav/SPEC-254' into rav/flatten_sync ... Conflicts: api/client-server/v2_alpha/definitions/event.json api/client-server/v2_alpha/sync.yaml	9 years ago
Paul "LeoNerd" Evans	233e8486bc	Wording fix - objects contain keys, not list elements directly	9 years ago
Richard van der Hoff	8316881393	txn_id field in events is called transaction_id	9 years ago
Paul "LeoNerd" Evans	6cbfba7011	'auth_events' is a List, not a String	9 years ago
Paul "LeoNerd" Evans	122c082fcf	Comment about origin servers of invites having subsequently left the room	9 years ago
Kegsay	2b19b50f4f	Merge pull request #167 from matrix-org/more_nesting ... Support more nesting	9 years ago
Paul "LeoNerd" Evans	923f05e554	More consistency around 'resident homeserver'	9 years ago
Paul "LeoNerd" Evans	36af793f05	s/full object/full event/	9 years ago
Kegan Dougal	8648f86032	Moar spaces	9 years ago
Erik Johnston	96be7ff241	Support more nesting	9 years ago
Richard van der Hoff	e1b12a753e	Fix typos and missing file	9 years ago
Richard van der Hoff	29bd4d45ee	Flatten the response to /sync ... Now that we don't expect there to be duplication betwen the 'timeline' and 'state' results, there's no point in having the state map. (That does mean the events themselves need event_id fields though). Also: - move the contents of the 'unsigned' dictionary into the events themselves - replace the state list with two layers of dictionary keyed on type and state_key - rename the children of the 'rooms' dict from "joined/invited/archived" to "join/invite/leave" to match the membership states	9 years ago
Richard van der Hoff	b41d771c15	Fix typos in /sync example response	9 years ago