907e6da5be
Merge branch 'release-v0.33.8'
2018-11-01 21:31:46 +11:00
d0ebe82871
changelog
2018-11-01 21:29:11 +11:00
aa98e38896
version
2018-11-01 21:28:35 +11:00
e615e95590
changelog
2018-10-31 06:28:11 +11:00
67c1924899
version bump
2018-10-31 06:27:05 +11:00
086e1a8f3e
Fix search 500ing ( #4122 )
2018-10-31 06:26:46 +11:00
3b0a85fc8e
changelog
2018-10-29 21:54:01 +11:00
2b791865c4
version bump
2018-10-29 21:52:52 +11:00
77d70a7646
Port register_new_matrix_user to Python 3 and add tests ( #4085 )
2018-10-26 22:05:22 +11:00
6cb2e2448a
Merge pull request #4089 from dekonnection/master
...
Make Docker image listen on ipv6 as well as ipv4
2018-10-25 19:23:37 +01:00
379376e5e6
Make Docker image listening on ipv6 as well as ipv4
...
Signed-off-by: Cédric Laudrel <dek@iono.me>
2018-10-25 20:03:47 +02:00
cb53ce9d64
Refactor state group lookup to reduce DB hits ( #4011 )
...
Currently when fetching state groups from the data store we make two
hits two the database: once for members and once for non-members (unless
request is filtered to one or the other). This adds needless load to the
datbase, so this PR refactors the lookup to make only a single database
hit.
2018-10-25 17:49:55 +01:00
e5da60d75d
Merge remote-tracking branch 'origin/master' into develop
2018-10-25 17:08:09 +01:00
c85e063302
Merge pull request #4051 from matrix-org/erikj/alias_disallow_list
...
Add config option to control alias creation
2018-10-25 17:04:59 +01:00
95ad128851
Merge pull request #4081 from matrix-org/neilj/fix_mau_init
...
fix race condiftion in calling initialise_reserved_users
2018-10-25 16:33:40 +01:00
fcbd488e9a
add new line
2018-10-25 16:13:43 +01:00
b94a43d5b5
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disallow_list
2018-10-25 15:25:31 +01:00
e5481b22aa
Use allow/deny
2018-10-25 15:25:21 +01:00
c99b6c66bf
Merge pull request #3975 from matrix-org/matthew/autocreate_autojoin
...
Autocreate autojoin rooms
2018-10-25 15:00:40 +01:00
f8fe98812b
improve comments
2018-10-25 14:58:59 +01:00
f7f487e14c
Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocreate_autojoin
2018-10-25 14:40:06 +01:00
edd2d82809
oops, run the check_isort build
2018-10-25 01:06:39 +01:00
46f98a6a29
Only cache the wheels
2018-10-25 01:00:58 +01:00
fc33e81323
Combine the pep8 and check_isort builds into one
...
there's really no point spinning up two separate jobs for these.
2018-10-25 00:59:49 +01:00
77d3b5772f
disable coverage checking
...
I don't think we ever use this, and it slows things down. If we want to use it,
we should just do so on a couple of builds rather than all of them.
2018-10-25 00:36:00 +01:00
ea69a84bbb
fix style inconsistencies
2018-10-24 17:18:08 +01:00
663d9db8e7
commit transaction before closing
2018-10-24 17:17:30 +01:00
07126e43a4
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init
2018-10-24 16:25:39 +01:00
9ec2186586
isort
2018-10-24 16:09:21 +01:00
9532caf6ef
remove trailing whiter space
2018-10-24 16:08:25 +01:00
83d9ca7122
only fetch develop for check-newsfragments
2018-10-24 15:32:18 +01:00
480d98c91f
Disable newsfragment checks on branch builds
2018-10-24 15:31:00 +01:00
ab96ee29c9
reduce git clone depth
2018-10-24 15:30:54 +01:00
0f4fb537ce
fix branch regexp
2018-10-24 15:09:05 +01:00
3e438bfec8
also build on release branches
2018-10-24 15:04:55 +01:00
56a05583ae
Disable travis-ci branch builds for most branches
...
(We really don't need to kick off 10 builds for the branch as well as 10 for
the PR)
2018-10-24 14:43:55 +01:00
94a49e0636
fix tuple
...
Co-Authored-By: neilisfragile <neil@matrix.org>
2018-10-24 14:39:23 +01:00
9f72c209ee
Update changelog.d/3975.feature
...
Co-Authored-By: neilisfragile <neil@matrix.org>
2018-10-24 14:37:36 +01:00
78e8d4c3a5
Merge pull request #4083 from matrix-org/rav/fix_event_filter_validation
...
Allow backslashes in event field filters
2018-10-24 12:05:19 +01:00
3ad359e5be
Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_validation
2018-10-24 11:23:49 +01:00
7328039117
Merge pull request #4082 from matrix-org/rav/fix_pep8
...
Fix a number of flake8 errors
2018-10-24 11:23:35 +01:00
3904cbf307
Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase
...
Add v2 state resolution algorithm
2018-10-24 11:12:12 +01:00
7e07d25ed6
Allow backslashes in event field filters
...
Fixes a bug introduced in https://github.com/matrix-org/synapse/pull/1783 which
meant that single backslashes were not allowed in event field filters.
The intention here is to allow single-backslashes, but disallow
double-backslashes.
2018-10-24 11:11:24 +01:00
ef771cc4c2
Fix a number of flake8 errors
...
Broadly three things here:
* disable W504 which seems a bit whacko
* remove a bunch of `as e` expressions from exception handlers that don't use
them
* use `r""` for strings which include backslashes
Also, we don't use pep8 any more, so we can get rid of the duplicate config
there.
2018-10-24 10:39:03 +01:00
b313b9b009
isort
2018-10-24 10:02:41 +01:00
47a9ba435d
Use match rather than search
2018-10-24 09:54:57 +01:00
e0b9d5f0af
Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts
...
Clean up the way logcontexts and threads work in the pushers
2018-10-24 09:53:57 +01:00
dacbeb2e03
Comment
2018-10-24 09:47:49 +01:00
810715f79a
Rename resolve_events_with_factory
2018-10-24 09:44:22 +01:00
cb23aa4c42
Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation
...
Clean up room alias creation
2018-10-24 09:40:27 +01:00
Amber Brown