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 |
|
Daniel Wagner-Hall
|
f0ee1d515b
|
Merge pull request #381 from matrix-org/daniel/jenkins-sytest-cached
Share sytest clone across runs
Depends on https://github.com/matrix-org/synapse/pull/380
|
2015-11-18 23:22:34 +00:00 |
|
Daniel Wagner-Hall
|
628ba81a77
|
Share sytest clone across runs
Depends on https://github.com/matrix-org/synapse/pull/380
|
2015-11-18 23:22:27 +00:00 |
|
Daniel Wagner-Hall
|
bed7889703
|
Apply forgetting properly to historical events
|
2015-11-18 18:11:12 -05:00 |
|
Erik Johnston
|
03204f54ac
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2015-11-18 18:38:06 +00:00 |
|
Erik Johnston
|
037ce4c68f
|
Split out text for missing config options.
This allows packages to more easily override the default messages to
include package specific options.
|
2015-11-18 18:37:05 +00:00 |
|
Oddvar Lovaas
|
2fcd9819ac
|
Erik pointed out we should advise on the lack of included client
|
2015-11-18 16:51:26 +00:00 |
|
Erik Johnston
|
162e2c1ce5
|
Fix database port script to work with new event_search table
|
2015-11-18 15:54:50 +00:00 |
|
Erik Johnston
|
1fe973fa5a
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2015-11-18 15:53:39 +00:00 |
|
Mark Haines
|
d153f482dd
|
Rename the database table
|
2015-11-18 15:33:02 +00:00 |
|
Mark Haines
|
1c960fbb80
|
s/private_user_data/account_data/
|
2015-11-18 15:31:04 +00:00 |
|
Erik Johnston
|
915e56e1af
|
Merge branch 'hotfixes-v0.11.0-r1'
|
2015-11-18 14:15:25 +00:00 |
|
Erik Johnston
|
fbb76a4d5d
|
Change date
|
2015-11-18 14:15:03 +00:00 |
|
Oddvar Lovaas
|
8bae98b314
|
adding link to apt repo
|
2015-11-18 11:44:35 +00:00 |
|
Erik Johnston
|
fe51b3628e
|
Better change log
|
2015-11-18 11:31:05 +00:00 |
|
Daniel Wagner-Hall
|
ba26eb3d5d
|
Allow users to forget rooms
|
2015-11-17 17:17:30 -05:00 |
|
Erik Johnston
|
cf844e2ad6
|
Bump changelog and version
|
2015-11-17 18:48:32 +00:00 |
|
Erik Johnston
|
b697a842a5
|
Merge pull request #384 from matrix-org/erikj/shorter_retries
Only retry federation requests for a long time for background requests
|
2015-11-17 18:46:04 +00:00 |
|
Erik Johnston
|
bd3de8f39a
|
Update tests
|
2015-11-17 18:38:48 +00:00 |
|