Erik Johnston
a9770e5d24
Merge branch 'hotfixes-v0.10.0-r1' of github.com:matrix-org/synapse into develop
2015-11-17 18:27:17 +00:00
Erik Johnston
afdfd12bdf
Implement required method 'resumeProducing'
2015-11-17 16:57:06 +00:00
Erik Johnston
d3861b4442
Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse
2015-11-17 15:45:43 +00:00
Erik Johnston
391f2aa56c
Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop
2015-11-17 15:10:49 +00:00
Erik Johnston
bceec65913
Slightly more aggressive retry timers at HTTP level
2015-11-17 15:10:05 +00:00
Erik Johnston
9eff52d1a6
Bump changelog and version
2015-11-17 14:38:36 +00:00
Erik Johnston
0186aef814
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
2015-11-17 14:37:13 +00:00
Erik Johnston
e503848990
Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserver
...
SH CAS auth via homeserver
2015-11-17 14:36:15 +00:00
Daniel Wagner-Hall
90b3a98df7
Merge pull request #380 from matrix-org/daniel/jenkins-sytest
...
Merge pull request #380 from matrix-org/daniel/jenkins-sytest
Run sytests on jenkins
2015-11-17 09:17:03 -05:00
Daniel Wagner-Hall
d34990141e
Merge pull request #379 from matrix-org/daniel/jenkins
...
Output results files on jenkins
2015-11-17 09:14:20 -05:00
Steven Hammerton
f20d064e05
Always check guest = true in macaroons
2015-11-17 10:58:05 +00:00
Steven Hammerton
f5e25c5f35
Merge branch 'develop' into sh-cas-auth-via-homeserver
2015-11-17 10:55:41 +00:00
Daniel Wagner-Hall
f4db76692f
Run sytests on jenkins
2015-11-16 15:40:55 -05:00
Daniel Wagner-Hall
09bb5cf02f
Output results files on jenkins
...
Outputs:
* results.xml
* coverage.xml
* violations.flake8.log
2015-11-16 14:35:57 -05:00
Daniel Wagner-Hall
3b90df21d5
Merge pull request #376 from matrix-org/daniel/jenkins
...
Pull out jenkins script into a checked in script
2015-11-16 12:50:26 -05:00
Paul Evans
1654d3b329
Merge pull request #377 from matrix-org/paul/tiny-fixes
...
Don't complain if /make_join response lacks 'prev_state' list (SYN-517)
2015-11-13 17:43:30 +00:00
Paul "LeoNerd" Evans
aca6e5bf46
Don't complain if /make_join response lacks 'prev_state' list (SYN-517)
2015-11-13 17:27:25 +00:00
Paul "LeoNerd" Evans
4fbe6ca401
Merge branch 'develop' into paul/tiny-fixes
2015-11-13 17:26:59 +00:00
Daniel Wagner-Hall
233af7c74b
Pull out jenkins script into a checked in script
2015-11-13 16:22:51 +00:00
Daniel Wagner-Hall
6fed9fd697
Merge pull request #374 from matrix-org/daniel/guestleave
...
Allow guests to /room/:room_id/{join,leave}
2015-11-13 11:57:57 +00:00
Daniel Wagner-Hall
9c3f4f8dfd
Allow guests to /room/:room_id/{join,leave}
2015-11-13 11:56:58 +00:00
Erik Johnston
0644f0eb7d
Bump version and change log
2015-11-13 11:43:29 +00:00
Erik Johnston
da3dd4867d
Merge branch 'develop' into release-v0.11.0
2015-11-13 11:40:17 +00:00
Richard van der Hoff
e4d622aaaf
Implementation of state rollback in /sync
...
Implementation of SPEC-254: roll back the state dictionary to how it looked at
the start of the timeline.
Merged PR https://github.com/matrix-org/synapse/pull/373
2015-11-13 10:58:56 +00:00
Richard van der Hoff
fddedd51d9
Fix a few race conditions in the state calculation
...
Be a bit more careful about how we calculate the state to be returned by
/sync. In a few places, it was possible for /sync to return slightly later
state than that represented by the next_batch token and the timeline. In
particular, the following cases were susceptible:
* On a full state sync, for an active room
* During a per-room incremental sync with a timeline gap
* When the user has just joined a room. (Refactor check_joined_room to make it
less magical)
Also, use store.get_state_for_events() (and thus the existing stategroups) to
calculate the state corresponding to a particular sync position, rather than
state_handler.compute_event_context(), which recalculates from first principles
(and tends to miss some state).
Merged from PR https://github.com/matrix-org/synapse/pull/372
2015-11-13 10:39:09 +00:00
Richard van der Hoff
5ab4b0afe8
Make handlers.sync return a state dictionary, instead of an event list.
...
Basically this moves the process of flattening the existing dictionary into a
list up to rest.client.*, instead of doing it in handlers.sync. This simplifies
a bit of the code in handlers.sync, but it is also going to be somewhat
beneficial in the next stage of my hacking on SPEC-254.
Merged from PR #371
2015-11-13 10:35:01 +00:00
Richard van der Hoff
5dea4d37d1
Update some comments
...
Add a couple of type annotations, docstrings, and other comments, in the
interest of keeping track of what types I have.
Merged from pull request #370 .
2015-11-13 10:31:15 +00:00
Daniel Wagner-Hall
fc27ca9006
Merge pull request #369 from matrix-org/daniel/guestnonevents
...
Return non-room events from guest /events calls
2015-11-12 17:28:48 +00:00
Daniel Wagner-Hall
468a2ed4ec
Return non-room events from guest /events calls
2015-11-12 16:45:28 +00:00
Erik Johnston
018b504f5b
Merge pull request #368 from matrix-org/erikj/fix_federation_profile
...
Fix missing profile data in federation joins
2015-11-12 16:30:02 +00:00
Erik Johnston
49f1758d74
Merge pull request #366 from matrix-org/erikj/search_fix_sqlite_faster
...
Use a (hopefully) more efficient SQL query for doing recency based room search
2015-11-12 16:24:32 +00:00
Erik Johnston
c0b3554401
Fix missing profile data in federation joins
...
There was a regression where we stopped including profile data in
initial joins for rooms joined over federation.
2015-11-12 16:19:55 +00:00
Erik Johnston
3de46c7755
Trailing whitespace
2015-11-12 15:36:43 +00:00
Erik Johnston
8fd8e72cec
Expand comment
2015-11-12 15:33:47 +00:00
Richard van der Hoff
78f6010207
Fix an issue with ignoring power_level changes on divergent graphs
...
Changes to m.room.power_levels events are supposed to be handled at a high
priority; however a typo meant that the relevant bit of code was never
executed, so they were handled just like any other state change - which meant
that a bad person could cause room state changes by forking the graph from a
point in history when they were allowed to do so.
2015-11-12 15:24:59 +00:00
Daniel Wagner-Hall
06bfd0a3c0
Merge pull request #367 from matrix-org/daniel/readafterleave
...
Merge pull request #367 from matrix-org/daniel/readafterleave
Tweak guest access permissions
2015-11-12 15:22:02 +00:00
Erik Johnston
764e79d051
Comment
2015-11-12 15:19:56 +00:00
Daniel Wagner-Hall
0d08670f61
Merge pull request #360 from matrix-org/daniel/guestroominitialsync
...
Merge pull request #360 from matrix-org/daniel/guestroominitialsync
Allow guest access to room initialSync
2015-11-12 15:19:55 +00:00
Erik Johnston
320408ef47
Fix SQL syntax
2015-11-12 15:09:45 +00:00
Daniel Wagner-Hall
fb7e260a20
Tweak guest access permissions
...
* Allow world_readable rooms to be read by guests who have joined and
left
* Allow regular users to access world_readable rooms
2015-11-12 15:02:00 +00:00
Erik Johnston
14a9d805b9
Use a (hopefully) more efficient SQL query for doing recency based room search
2015-11-12 14:48:39 +00:00
Erik Johnston
39de87869c
Fix bug where assumed dict was namedtuple
2015-11-12 14:47:48 +00:00
Daniel Wagner-Hall
473a239d83
Merge pull request #364 from matrix-org/daniel/guestdisplaynames
...
Allow guests to set their display names
Depends: https://github.com/matrix-org/synapse/pull/363
Tests in https://github.com/matrix-org/sytest/pull/66
2015-11-12 13:44:46 +00:00
Daniel Wagner-Hall
0a93df5f9c
Allow guests to set their display names
...
Depends: https://github.com/matrix-org/synapse/pull/363
Tests in https://github.com/matrix-org/sytest/pull/66
2015-11-12 13:44:39 +00:00
Daniel Wagner-Hall
8ea5dccea1
Merge pull request #363 from matrix-org/daniel/guestscanjoin
...
Consider joined guest users as joined users
Otherwise they're inconveniently allowed to write events to the room
but not to read them from the room.
2015-11-12 13:37:09 +00:00
Daniel Wagner-Hall
50f1afbd5b
Consider joined guest users as joined users
...
Otherwise they're inconveniently allowed to write events to the room
but not to read them from the room.
2015-11-12 13:37:07 +00:00
Daniel Wagner-Hall
2fc81af06a
Merge pull request #362 from matrix-org/daniel/raceyraceyfunfun
...
Fix race creating directories
2015-11-12 12:05:21 +00:00
Daniel Wagner-Hall
6a9c4cfd0b
Fix race creating directories
2015-11-12 11:58:48 +00:00
Erik Johnston
884e601683
Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop
2015-11-11 18:35:16 +00:00
Erik Johnston
63b28c7816
Update date
2015-11-11 18:21:26 +00:00
