Mark Haines
|
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 |
|
Mark Haines
|
f593a6e5f8
|
Add options to definitions.py to fetch referrers and to output dot
|
2015-12-01 14:29:42 +00:00 |
|
Mark Haines
|
c91a05776f
|
Merge pull request #398 from matrix-org/markjh/jenkins_postgres
Run sytest against postgresql
|
2015-12-01 13:25:44 +00:00 |
|
Mark Haines
|
5f9a2cb337
|
Write the tap results for each database to different files when running sytest
|
2015-12-01 13:24:43 +00:00 |
|
Mark Haines
|
8c902431ba
|
Set the port when running sytest under postgresql
|
2015-12-01 12:01:29 +00:00 |
|
Mark Haines
|
a33c0748e3
|
Use a PORT_BASE environment variable to configure the ports that sytest uses
|
2015-12-01 11:48:20 +00:00 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
76936f43ae
|
Return words to highlight in search results
|
2015-11-27 16:40:42 +00:00 |
|
Mark Haines
|
f280726037
|
Run sytest against postgresql if appropriate databases exist for it to run against
|
2015-11-26 16:50:44 +00:00 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
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 |
|
Daniel Wagner-Hall
|
df7cf6c0eb
|
Fix SQL for postgres again
|
2015-11-23 18:54:41 +00:00 |
|
Daniel Wagner-Hall
|
3e573a5c6b
|
Fix SQL for postgres
|
2015-11-23 18:48:53 +00:00 |
|
Daniel Wagner-Hall
|
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 |
|
Daniel Wagner-Hall
|
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 |
|
Matthew Hodgson
|
91695150cc
|
Merge pull request #396 from MadsRC/develop
CentOS 7 dep instructions from MadsRC
|
2015-11-21 10:51:32 +00:00 |
|
Mads R. Christensen
|
3dd09a8795
|
Added myself to AUTHORS.rst
Signed-off-by: Mads Robin Christensen <mads@v42.dk>
|
2015-11-20 22:39:10 +01:00 |
|
Mads R. Christensen
|
d7739c4e37
|
Added prerequisite instructions for CentOS 7
Signed-off-by: Mads Robin Christensen <mads@v42.dk>
|
2015-11-20 22:37:23 +01:00 |
|
Mark Haines
|
c6a15f5026
|
Merge pull request #385 from matrix-org/daniel/forgetrooms
Allow users to forget rooms
|
2015-11-20 18:07:26 +00:00 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
0eabfa55f6
|
Fix typo
|
2015-11-20 17:17:58 +00:00 |
|
Erik Johnston
|
6408541075
|
Don't limit connections to perspective servers
|
2015-11-20 17:15:44 +00:00 |
|
Erik Johnston
|
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 |
|
Richard van der Hoff
|
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 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
6b95a79724
|
Add option to include the current room state
|
2015-11-20 14:16:42 +00:00 |
|
Erik Johnston
|
e3dae653e8
|
Comment
|
2015-11-20 14:05:22 +00:00 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
506874cca9
|
Optionally include historic profile info
|
2015-11-20 11:39:44 +00:00 |
|
Erik Johnston
|
2f2bbb4d06
|
Use min and not max to set an upper bound on retry interval
|
2015-11-20 09:34:58 +00:00 |
|
Daniel Wagner-Hall
|
95c3306798
|
Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into daniel/forgetrooms
|
2015-11-19 15:00:14 -05:00 |
|
Daniel Wagner-Hall
|
df6824a008
|
Ignore forgotten rooms in v2 sync
|
2015-11-19 14:54:47 -05:00 |
|
Paul "LeoNerd" Evans
|
dd11bf8a79
|
Merge branch 'develop' into rav/flatten_sync_response
|
2015-11-19 17:21:03 +00:00 |
|
Paul "LeoNerd" Evans
|
1cfda3d2d8
|
Merge branch 'develop' into daniel/forgetrooms
|
2015-11-19 16:53:13 +00:00 |
|
Erik Johnston
|
8b5349c7bc
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2015-11-19 16:17:54 +00:00 |
|
Erik Johnston
|
37de8a7f4a
|
Remove m.login.token from advertised flows.
|
2015-11-19 16:16:49 +00:00 |
|
Mark Haines
|
7a802ec0ff
|
Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data
s/private_user_data/account_data/
|
2015-11-19 15:21:35 +00:00 |
|
Daniel Wagner-Hall
|
d2ecde2cbb
|
Merge pull request #382 from matrix-org/daniel/macarooncleanup
Take a boolean not a list of lambdas
|
2015-11-19 15:16:32 +00:00 |
|
Daniel Wagner-Hall
|
248cfd5eb3
|
Take a boolean not a list of lambdas
|
2015-11-19 15:16:25 +00:00 |
|
Daniel Wagner-Hall
|
9da4c5340d
|
Simplify code
|
2015-11-19 10:07:21 -05:00 |
|
Erik Johnston
|
f9d9bd6aa0
|
Merge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse
|
2015-11-19 13:11:49 +00:00 |
|
Erik Johnston
|
5fcef78c6a
|
Bump changes and version
|
2015-11-19 13:09:48 +00:00 |
|
Erik Johnston
|
c104fd3494
|
Merge branch 'erikj/fix_port_script' into hotfixes-v0.11.0-r2
|
2015-11-19 13:08:44 +00:00 |
|
Erik Johnston
|
57a76c9aee
|
Merge pull request #388 from matrix-org/erikj/messages
Split out text for missing config options.
|
2015-11-19 13:08:09 +00:00 |
|
Erik Johnston
|
06f74068f4
|
Comment
|
2015-11-19 13:05:51 +00:00 |
|
Erik Johnston
|
e5d91b8e57
|
Merge pull request #387 from matrix-org/erikj/fix_port_script
Fix database port script to work with new event_search table
|
2015-11-19 13:04:28 +00:00 |
|
Richard van der Hoff
|
f6e092f6cc
|
Put back the 'state.events' subobject
We're keeping 'events', in case we decide to add more keys later.
|
2015-11-19 12:23:42 +00:00 |
|
Richard van der Hoff
|
24ae0eee8e
|
v2 /sync: Rename the keys of the 'rooms' object to match member states
joined->join
invited->invite
archived->leave
|
2015-11-19 10:51:12 +00:00 |
|
Richard van der Hoff
|
3c3fc6b268
|
Flatten the /sync response to remove the event_map
|
2015-11-19 10:51:11 +00:00 |
|
Erik Johnston
|
b361440738
|
Spelling
|
2015-11-19 09:11:42 +00:00 |
|