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
Erik Johnston
cbf3cd6151
Add comment
2015-11-17 18:29:29 +00:00
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
cf4ef5f3c7
Only retry federation requests for a long time for background requests
2015-11-17 18:26:50 +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
641420c5e0
Clean up room initialSync for guest users
2015-11-13 15:44:57 +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
