ae9f8cda7e
Merge branch 'develop' into markjh/distributor_facade
2015-12-01 21:18:13 +00:00
5d321e4b9a
Fix definitions script
2015-12-01 21:17:58 +00:00
a9526831a4
Wrap calls to distributor.fire in appropriately named functions so that static analysis can work out want is calling what
2015-12-01 20:53:04 +00:00
ed0f79bdc5
Only fire user_joined_room if the membership has changed
2015-12-01 19:46:15 +00:00
98ee629d00
Added --report-status=yes|no as Synapse won't generate the config without it
2015-12-01 20:20:53 +01:00
f73ea0bda2
Merge branch 'develop' into markjh/edu_frequency
2015-12-01 19:15:27 +00:00
c533f69d38
Added libffi-devel in CentOS 7 installation requirements and fixed indentation of yum groupinstall. Signed-off-by: Mads Robin Christensen <mads@v42.dk>
2015-12-01 20:00:41 +01:00
a2922bb944
Merge pull request #392 from matrix-org/markjh/client_config
...
Add API for setting per user account data at the top level or room level.
2015-12-01 18:42:59 +00:00
95f30ecd1f
Add API for setting account_data globaly or on a per room basis
2015-12-01 18:41:32 +00:00
f487355364
Merge pull request #407 from MadsRC/develop
...
Develop
2015-12-01 18:41:31 +00:00
6e70979973
Merge pull request #400 from matrix-org/daniel/versioning
...
Merge pull request # 400 from matrix-org/daniel/versioning
2015-12-01 17:36:37 +00:00
14d7acfad4
Host /unstable and /r0 versions of r0 APIs
2015-12-01 17:34:32 +00:00
27c5e1b374
Search: Don't disregard grouping info in pagination tokens
2015-12-01 16:47:18 +00:00
af96c6f4d3
Merge pull request #404 from matrix-org/markjh/trivial_rename
...
Rename presence_handler.send_invite
2015-12-01 16:11:03 +00:00
d32db0bc45
Merge pull request #402 from matrix-org/markjh/event_formatting
...
Copy rather than move the fields to shuffle between a v1 and a v2 event.
2015-12-01 16:10:24 +00:00
7b593af7e1
rename the method in the tests as well
2015-12-01 16:06:17 +00:00
3d3da2b460
Only fire user_joined_room on the distributor if the user has actually joined the room
2015-12-01 16:03:08 +00:00
31069ecf6a
Rename presence_handler.send_invite to presence_handler.send_presence_invite to distinguish it from normal invites
2015-12-01 15:59:45 +00:00
2430fcd462
Merge pull request #403 from matrix-org/erikj/search-ts
...
Allow paginating search ordered by recents
2015-12-01 14:46:27 +00:00
f593a6e5f8
Add options to definitions.py to fetch referrers and to output dot
2015-12-01 14:29:42 +00:00
c91a05776f
Merge pull request #398 from matrix-org/markjh/jenkins_postgres
...
Run sytest against postgresql
2015-12-01 13:25:44 +00:00
5f9a2cb337
Write the tap results for each database to different files when running sytest
2015-12-01 13:24:43 +00:00
8c902431ba
Set the port when running sytest under postgresql
2015-12-01 12:01:29 +00:00
a33c0748e3
Use a PORT_BASE environment variable to configure the ports that sytest uses
2015-12-01 11:48:20 +00:00
306415391d
Only add the user_id if the sender is present
2015-12-01 11:14:48 +00:00
d0f28b46cd
Merge pull request #399 from matrix-org/erikj/search
...
Return words to highlight in search results
2015-12-01 11:13:07 +00:00
da7dd58641
Tidy up a bit
2015-12-01 11:06:40 +00:00
bde8d78b8a
Copy rather than move the fields to shuffle between a v1 and a v2 event.
...
This should make all v1 APIs compatible with v2 clients. While still
allowing v1 clients to access the fields.
This makes the documentation easier since we can just document the v2
format and explain that some of the fields, in some of the APIs are
duplicated for backwards compatibility, rather than having to document
two separate event formats.
2015-11-30 17:46:35 +00:00
4dcaa42b6d
Allow paginating search ordered by recents
2015-11-30 17:45:31 +00:00
76936f43ae
Return words to highlight in search results
2015-11-27 16:40:42 +00:00
f280726037
Run sytest against postgresql if appropriate databases exist for it to run against
2015-11-26 16:50:44 +00:00
6cd595e438
Merge pull request #397 from matrix-org/erikj/redaction_inequality
...
Allow user to redact with an equal power
2015-11-26 13:23:09 +00:00
17dd5071ef
Allow user to redact with an equal power
...
Users only need their power level to be equal to the redact level for
them to be allowed to redact events.
2015-11-26 11:17:57 +00:00
df7cf6c0eb
Fix SQL for postgres again
2015-11-23 18:54:41 +00:00
3e573a5c6b
Fix SQL for postgres
2015-11-23 18:48:53 +00:00
7dfa455508
Remove size specifier for database column
...
Postgres doesn't support them like this.
We don't have a bool type in common between postgres and sqlite.
2015-11-23 18:35:25 +00:00
924d85a75e
Merge pull request #375 from matrix-org/daniel/guestroominitialsync
...
Clean up room initialSync for guest users
2015-11-23 16:10:49 +00:00
91695150cc
Merge pull request #396 from MadsRC/develop
...
CentOS 7 dep instructions from MadsRC
2015-11-21 10:51:32 +00:00
3dd09a8795
Added myself to AUTHORS.rst
...
Signed-off-by: Mads Robin Christensen <mads@v42.dk>
2015-11-20 22:39:10 +01:00
d7739c4e37
Added prerequisite instructions for CentOS 7
...
Signed-off-by: Mads Robin Christensen <mads@v42.dk>
2015-11-20 22:37:23 +01:00
c6a15f5026
Merge pull request #385 from matrix-org/daniel/forgetrooms
...
Allow users to forget rooms
2015-11-20 18:07:26 +00:00
8c3af5bc62
Merge pull request #395 from matrix-org/erikj/perspective_limiter
...
Don't limit connections to perspective servers
2015-11-20 17:23:26 +00:00
0eabfa55f6
Fix typo
2015-11-20 17:17:58 +00:00
6408541075
Don't limit connections to perspective servers
2015-11-20 17:15:44 +00:00
93f7bb8dd5
Merge pull request #394 from matrix-org/erikj/search
...
Add options for including state in search results
2015-11-20 16:31:24 +00:00
1d9c1d4166
Merge pull request #389 from matrix-org/rav/flatten_sync_response
...
v2 sync: Get rid of the event_map, and rename the keys of the rooms obj
2015-11-20 15:18:55 +00:00
3f151da314
Merge pull request #391 from matrix-org/erikj/remove_token_from_flow
...
Remove m.login.token from advertised flows.
2015-11-20 14:16:59 +00:00
6b95a79724
Add option to include the current room state
2015-11-20 14:16:42 +00:00
e3dae653e8
Comment
2015-11-20 14:05:22 +00:00
9de1f328ad
Merge pull request #393 from matrix-org/erikj/destination_retry_max
...
Use min and not max to set an upper bound on retry interval
2015-11-20 13:41:20 +00:00
Mark Haines