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

837 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erik Johnston 24e36adbe3 Mention e2e encryption 2015-10-15 16:09:11 +01:00
Erik Johnston 770cfbc5de Be explicit about the events the search is performed over 2015-10-15 16:08:24 +01:00
Erik Johnston cfca4a6c09 s/creteria/criteria/ 2015-10-15 15:51:02 +01:00
Erik Johnston 906c59385f s/had/has/ 2015-10-15 15:49:58 +01:00
Erik Johnston c47a94658a Mention supported keys 2015-10-15 11:12:00 +01:00
Erik Johnston af347baa68 Better phrasing 2015-10-15 11:06:15 +01:00
Erik Johnston 96a4996c76 Mention search categories 2015-10-15 11:02:37 +01:00
Erik Johnston 728b5a7951 Add very short summary 2015-10-14 17:20:00 +01:00
Erik Johnston 007bb1a69a Add extra new line 2015-10-14 16:26:14 +01:00
Erik Johnston 5e48b0b79a Add search to targets 2015-10-14 16:21:12 +01:00
Erik Johnston 38fcc563da Spell out full title 2015-10-14 16:20:08 +01:00
Erik Johnston 0efa3fd981 Add module 2015-10-14 16:17:04 +01:00
Erik Johnston d8bc0c9315 Add search module 2015-10-14 16:13:43 +01:00
Erik Johnston 2b9484cf48 Spell things correctly 2015-10-14 15:35:39 +01:00
Erik Johnston 392a1c5ad8 Another title 2015-10-14 15:06:16 +01:00
Erik Johnston ca9e44baac Moar titles 2015-10-14 15:01:21 +01:00
Erik Johnston a7a5cb088b Add titles 2015-10-14 14:35:08 +01:00
Erik Johnston e42c8b5b63 Add search API 2015-10-14 14:19:11 +01:00
Oddvar Lovaas 1cfe4f784f special css for spec/howto 2015-10-12 19:57:41 +01:00
Oddvar Lovaas ceebf34fca generate docs with new nav bar 2015-10-12 19:11:35 +01:00
Daniel Wagner-Hall 98f225a974 Merge pull request #90 from matrix-org/daniel/speculator 
Checkout SHA of origin/master rather than merging
 2015-10-12 18:19:55 +01:00
Daniel Wagner-Hall c48abd93b9 Merge pull request #41 from matrix-org/daniel/threepidinvites-2 
Specify third party room invites
 2015-10-12 18:11:52 +01:00
Daniel Wagner-Hall 2502ca7ac6 Merge branch 'master' into daniel/threepidinvites-2 
Conflicts:
	specification/targets.yaml
 2015-10-12 18:11:01 +01:00
Daniel Wagner-Hall 4a1fb74897 Review comments 2015-10-12 18:08:51 +01:00
Kegsay 616f3990aa Merge pull request #87 from matrix-org/module-push 
Push Module
 2015-10-12 17:51:44 +01:00
Kegan Dougal 8f5c796884 Linkify 'pushers' 2015-10-12 17:50:46 +01:00
Oddvar Lovaas 89426c9322 typos and fixes 2015-10-09 17:43:46 +01:00
Daniel Wagner-Hall 6922850643 Add missing return 2015-10-09 11:02:27 +01:00
Daniel Wagner-Hall b46f0e30b8 Checkout SHA of origin/master rather than merging 2015-10-09 11:02:00 +01:00
Daniel Wagner-Hall 481298db83 Revert "Checkout SHA of origin/master rather than merging" 
This reverts commit 0dbc6d8277.
 2015-10-09 11:01:35 +01:00
Daniel Wagner-Hall 0dbc6d8277 Checkout SHA of origin/master rather than merging 2015-10-09 10:59:26 +01:00
Daniel Wagner-Hall b7e98a263a Merge pull request #89 from matrix-org/daniel/speculator 
speculator: Specify merge target
 2015-10-09 10:48:24 +01:00
Daniel Wagner-Hall a0cf485919 speculator: Specify merge target 2015-10-09 10:43:27 +01:00
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
 2015-10-09 10:28:40 +01:00
Oddvar Lovaas 51ab51ae26 Only documents in matrix-doc! 2015-10-08 19:27:08 +01:00
Mark Haines d42c3195e6 Use 'true' rather than '1' for archived flag 2015-10-08 18:06:52 +01:00
Mark Haines 241096dc81 Add a flag to initial sync to indicate we want rooms that the user has left 2015-10-08 17:25:38 +01:00
Kegan Dougal 213cb25290 Wrap correctly 2015-10-08 16:38:41 +01:00
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.
 2015-10-08 16:21:26 +01:00
Daniel Wagner-Hall dc3c02aff5 Review comments 2015-10-08 10:08:38 -05:00
Daniel Wagner-Hall 21a40b317d Merge branch 'master' into daniel/threepidinvites-2 2015-10-08 09:41:17 -05:00
Kegan Dougal 9c95ee5c1f Modify wording and formatting 2015-10-08 15:36:03 +01:00
Kegan Dougal befa23624e It's dangerous to go alone, take this. 2015-10-08 13:41:47 +01:00
Kegan Dougal 65504db7bb Display nested keys on arrays of objects. Make it valid swagger. 2015-10-08 13:40:21 +01:00
Kegan Dougal 31ae4b3859 Swaggerify push notification API 
Edit units.py to support nested JSON request keys
 2015-10-08 13:08:21 +01:00
Kegan Dougal a9618a981b Swaggerify the /enabled endpoint 2015-10-08 11:16:42 +01:00
Kegan Dougal 56ce432399 Get profile tag keys displaying correctly. 2015-10-08 10:14:05 +01:00
Kegan Dougal f6da9d7760 Give valid swagger. Split out rule/ruleset to separate definitions. 2015-10-08 09:57:40 +01:00
Oddvar Lovaas 2ab9372b16 new nav bar. todo: get animation working. 2015-10-07 18:05:50 +01:00
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.
 2015-10-07 17:44:05 +01:00