Commit Graph

823 Commits (392a1c5ad821941ccedac27052b7022a62fd2b2c)
 

Author SHA1 Message Date
Erik Johnston 392a1c5ad8 Another title 9 years ago
Erik Johnston ca9e44baac Moar titles 9 years ago
Erik Johnston a7a5cb088b Add titles 9 years ago
Erik Johnston e42c8b5b63 Add search API 9 years ago
Oddvar Lovaas 1cfe4f784f special css for spec/howto 9 years ago
Oddvar Lovaas ceebf34fca generate docs with new nav bar 9 years ago
Daniel Wagner-Hall 98f225a974 Merge pull request #90 from matrix-org/daniel/speculator
Checkout SHA of origin/master rather than merging
9 years ago
Daniel Wagner-Hall c48abd93b9 Merge pull request #41 from matrix-org/daniel/threepidinvites-2
Specify third party room invites
9 years ago
Daniel Wagner-Hall 2502ca7ac6 Merge branch 'master' into daniel/threepidinvites-2
Conflicts:
	specification/targets.yaml
9 years ago
Daniel Wagner-Hall 4a1fb74897 Review comments 9 years ago
Kegsay 616f3990aa Merge pull request #87 from matrix-org/module-push
Push Module
9 years ago
Kegan Dougal 8f5c796884 Linkify 'pushers' 9 years ago
Oddvar Lovaas 89426c9322 typos and fixes 9 years ago
Daniel Wagner-Hall 6922850643 Add missing return 9 years ago
Daniel Wagner-Hall b46f0e30b8 Checkout SHA of origin/master rather than merging 9 years ago
Daniel Wagner-Hall 481298db83 Revert "Checkout SHA of origin/master rather than merging"
This reverts commit 0dbc6d8277.
9 years ago
Daniel Wagner-Hall 0dbc6d8277 Checkout SHA of origin/master rather than merging 9 years ago
Daniel Wagner-Hall b7e98a263a Merge pull request #89 from matrix-org/daniel/speculator
speculator: Specify merge target
9 years ago
Daniel Wagner-Hall a0cf485919 speculator: Specify merge target 9 years ago
Mark Haines d6bdde4cee Merge pull request #88 from matrix-org/markjh/initial_sync_archived_flag
Add flag to initial sync to say we want rooms that the user has left
9 years ago
Oddvar Lovaas 51ab51ae26 Only documents in matrix-doc! 9 years ago
Mark Haines d42c3195e6 Use 'true' rather than '1' for archived flag 9 years ago
Mark Haines 241096dc81 Add a flag to initial sync to indicate we want rooms that the user has left 9 years ago
Kegan Dougal 213cb25290 Wrap correctly 9 years ago
Kegan Dougal f2a6950cc3 Minor tweaks; allow objects without props/parents if a title is set
This allows us to do things like {Tweaks} where Tweaks is defined somewhere
else.
9 years ago
Daniel Wagner-Hall dc3c02aff5 Review comments 9 years ago
Daniel Wagner-Hall 21a40b317d Merge branch 'master' into daniel/threepidinvites-2 9 years ago
Kegan Dougal 9c95ee5c1f Modify wording and formatting 9 years ago
Kegan Dougal befa23624e It's dangerous to go alone, take this. 9 years ago
Kegan Dougal 65504db7bb Display nested keys on arrays of objects. Make it valid swagger. 9 years ago
Kegan Dougal 31ae4b3859 Swaggerify push notification API
Edit units.py to support nested JSON request keys
9 years ago
Kegan Dougal a9618a981b Swaggerify the /enabled endpoint 9 years ago
Kegan Dougal 56ce432399 Get profile tag keys displaying correctly. 9 years ago
Kegan Dougal f6da9d7760 Give valid swagger. Split out rule/ruleset to separate definitions. 9 years ago
Oddvar Lovaas 2ab9372b16 new nav bar. todo: get animation working. 9 years ago
Kegan Dougal db25276856 Start adding in push definitions
This is going to be painful to represent due to how the push API allows
mixed types (strings or objects) and mixed top-level keys ("content" rule kind
allowing "pattern" as a top-level key). We may wish to re-visit the design
of this API for v2.
9 years ago
Kegan Dougal 9540069acd Use valid JSON 9 years ago
Kegan Dougal c5edc60c4c Add push YAML for pushers endpoint.
Also display "required" text on required JSON body request params. Also
increase the size of the request param column to support longer param names
present in the pushers API.
9 years ago
Kegan Dougal d3ed517ebf Finish laying out rough sections 9 years ago
Kegan Dougal a7400508c6 Define module titles from the template 9 years ago
Kegan Dougal 319ba8f404 Combine push files into one
We can fork it out again if it makes sense, but certainly 2/3 of the files
were very small and it just adds more complexity when refactoring.
9 years ago
Kegsay a320d58948 Merge pull request #84 from matrix-org/markjh/v2_sync_templating
Add the fields required by the templating system to v2 sync
9 years ago
Kegan Dougal 7805ca87df If build.py throws, actually print stdout. Also run jenkins.sh in verbose mode. 9 years ago
Matthew Hodgson dffe9b3e4c more questions 9 years ago
Matthew Hodgson 91fb2ae723 edit oddvar's FAQ entries and add a bunch more questions 9 years ago
Matthew Hodgson 85c035bd82 Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc 9 years ago
Matthew Hodgson ed9028f0fc merge again... 9 years ago
Matthew Hodgson 2621c22956 fix barefaced lie regarding the passivity of ASes 9 years ago
Matthew Hodgson f62fa6b980 Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc 9 years ago
Oddvar Lovaas 10f3e7e84f Merge branch 'master' of github.com:matrix-org/matrix-doc 9 years ago