| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Put back the 'state.events' subobject | Richard van der Hoff | 2015-11-19 | 1 | -1/+1 |
| * | v2 /sync: Rename the keys of the 'rooms' object to match member states | Richard van der Hoff | 2015-11-19 | 1 | -3/+3 |
| * | Flatten the /sync response to remove the event_map | Richard van der Hoff | 2015-11-19 | 2 | -24/+14 |
| * | Merge pull request #381 from matrix-org/daniel/jenkins-sytest-cached | Daniel Wagner-Hall | 2015-11-18 | 1 | -2/+8 |
| |\ | |||||
| | * | Share sytest clone across runs | Daniel Wagner-Hall | 2015-11-18 | 1 | -2/+8 |
| |/ | |||||
| * | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-18 | 1 | -0/+3 |
| |\ | |||||
| | * | Erik pointed out we should advise on the lack of included client | Oddvar Lovaas | 2015-11-18 | 1 | -0/+3 |
| * | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-18 | 3 | -1/+9 |
| |\| | |||||
| | * | Merge branch 'hotfixes-v0.11.0-r1' v0.11.0-r1 | Erik Johnston | 2015-11-18 | 7 | -8/+49 |
| | |\ | |||||
| | | * | Change date | Erik Johnston | 2015-11-18 | 1 | -1/+1 |
| | | * | Better change log | Erik Johnston | 2015-11-18 | 1 | -2/+2 |
| | | * | Bump changelog and version | Erik Johnston | 2015-11-17 | 2 | -1/+7 |
| | * | | adding link to apt repo | Oddvar Lovaas | 2015-11-18 | 1 | -0/+2 |
| * | | | Merge pull request #384 from matrix-org/erikj/shorter_retries | Erik Johnston | 2015-11-17 | 5 | -7/+39 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Update tests | Erik Johnston | 2015-11-17 | 3 | -0/+17 |
| | * | | Add comment | Erik Johnston | 2015-11-17 | 1 | -0/+2 |
| | * | | Only retry federation requests for a long time for background requests | Erik Johnston | 2015-11-17 | 2 | -7/+20 |
| * | | | Merge branch 'hotfixes-v0.10.0-r1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-17 | 1 | -0/+3 |
| |\| | | |||||
| | * | | Implement required method 'resumeProducing' | Erik Johnston | 2015-11-17 | 1 | -0/+3 |
| | |/ | |||||
| | * | Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse v0.11.0 | Erik Johnston | 2015-11-17 | 172 | -2810/+8255 |
| | |\ | |||||
| * | \ | Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-17 | 3 | -3/+17 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Slightly more aggressive retry timers at HTTP level | Erik Johnston | 2015-11-17 | 1 | -2/+3 |
| | * | | Bump changelog and version | Erik Johnston | 2015-11-17 | 2 | -1/+6 |
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-17 | 10 | -45/+265 |
| | |\ \ | |/ / |/| | | |||||
| * | | | Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserver | Erik Johnston | 2015-11-17 | 5 | -39/+199 |
| |\ \ \ | |||||
| | * | | | Always check guest = true in macaroons | Steven Hammerton | 2015-11-17 | 1 | -1/+2 |
| | * | | | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-17 | 39 | -292/+1268 |
| | |\ \ \ | |||||
| | * | | | | Snakes not camels | Steven Hammerton | 2015-11-11 | 1 | -5/+5 |
| | * | | | | Minor review fixes | Steven Hammerton | 2015-11-11 | 2 | -17/+14 |
| | * | | | | Share more code between macaroon validation | Steven Hammerton | 2015-11-11 | 2 | -57/+17 |
| | * | | | | Updates to fallback CAS login to do new token login | Steven Hammerton | 2015-11-06 | 1 | -26/+12 |
| | * | | | | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-05 | 45 | -324/+1117 |
| | |\ \ \ \ | |||||
| | * | | | | | Allow hs to do CAS login completely and issue the client with a login token t... | Steven Hammerton | 2015-11-05 | 3 | -5/+218 |
| | * | | | | | Add service URL to CAS config | Steven Hammerton | 2015-11-04 | 1 | -0/+3 |
| * | | | | | | Merge pull request #380 from matrix-org/daniel/jenkins-sytest | Daniel Wagner-Hall | 2015-11-17 | 1 | -1/+22 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Run sytests on jenkins | Daniel Wagner-Hall | 2015-11-16 | 1 | -1/+22 |
| * | | | | | | | Merge pull request #379 from matrix-org/daniel/jenkins | Daniel Wagner-Hall | 2015-11-17 | 2 | -4/+18 |
| |\| | | | | | | |_|_|/ / / |/| | | | | | |||||
| | * | | | | | Output results files on jenkins | Daniel Wagner-Hall | 2015-11-16 | 2 | -4/+18 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #376 from matrix-org/daniel/jenkins | Daniel Wagner-Hall | 2015-11-16 | 3 | -1/+9 |
| |\ \ \ \ \ | |||||
| | * | | | | | Pull out jenkins script into a checked in script | Daniel Wagner-Hall | 2015-11-13 | 3 | -1/+9 |
| * | | | | | | Merge pull request #377 from matrix-org/paul/tiny-fixes | Paul Evans | 2015-11-13 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| | * | | | | | Don't complain if /make_join response lacks 'prev_state' list (SYN-517) | Paul "LeoNerd" Evans | 2015-11-13 | 1 | -0/+6 |
| | * | | | | | Merge branch 'develop' into paul/tiny-fixes | Paul "LeoNerd" Evans | 2015-11-13 | 100 | -1036/+3170 |
| | |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | | Merge pull request #374 from matrix-org/daniel/guestleave | Daniel Wagner-Hall | 2015-11-13 | 1 | -3/+14 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Allow guests to /room/:room_id/{join,leave} | Daniel Wagner-Hall | 2015-11-13 | 1 | -3/+14 |
| |/ / / / / / | |||||
| | * | | | | | Merge branch 'develop' into paul/tiny-fixes | Paul "LeoNerd" Evans | 2015-11-03 | 46 | -288/+1802 |
| | |\ \ \ \ \ | |||||
| | | | | | * | | Bump version and change log v0.11.0-rc2 | Erik Johnston | 2015-11-13 | 2 | -1/+9 |
| | | | | | * | | Merge branch 'develop' into release-v0.11.0 | Erik Johnston | 2015-11-13 | 18 | -142/+474 |
| | | | | | |\ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | | Implementation of state rollback in /sync | Richard van der Hoff | 2015-11-13 | 2 | -4/+69 |
| * | | | | | | | Fix a few race conditions in the state calculation | Richard van der Hoff | 2015-11-13 | 2 | -60/+77 |
| * | | | | | | | Make handlers.sync return a state dictionary, instead of an event list. | Richard van der Hoff | 2015-11-13 | 2 | -32/+40 |
| * | | | | | | | Update some comments | Richard van der Hoff | 2015-11-13 | 4 | -14/+98 |
| * | | | | | | | Merge pull request #369 from matrix-org/daniel/guestnonevents | Daniel Wagner-Hall | 2015-11-12 | 2 | -3/+20 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Return non-room events from guest /events calls | Daniel Wagner-Hall | 2015-11-12 | 2 | -3/+20 |
| * | | | | | | | | Merge pull request #368 from matrix-org/erikj/fix_federation_profile | Erik Johnston | 2015-11-12 | 3 | -6/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix missing profile data in federation joins | Erik Johnston | 2015-11-12 | 3 | -6/+13 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #366 from matrix-org/erikj/search_fix_sqlite_faster | Erik Johnston | 2015-11-12 | 1 | -3/+14 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| | * | | | | | | | Trailing whitespace | Erik Johnston | 2015-11-12 | 1 | -1/+1 |
| | * | | | | | | | Expand comment | Erik Johnston | 2015-11-12 | 1 | -0/+6 |
| | * | | | | | | | Comment | Erik Johnston | 2015-11-12 | 1 | -0/+2 |
| | * | | | | | | | Fix SQL syntax | Erik Johnston | 2015-11-12 | 1 | -2/+3 |
| | * | | | | | | | Use a (hopefully) more efficient SQL query for doing recency based room search | Erik Johnston | 2015-11-12 | 1 | -4/+6 |
| * | | | | | | | | Fix an issue with ignoring power_level changes on divergent graphs | Richard van der Hoff | 2015-11-12 | 2 | -5/+104 |
| * | | | | | | | | Merge pull request #367 from matrix-org/daniel/readafterleave | Daniel Wagner-Hall | 2015-11-12 | 1 | -10/+11 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Tweak guest access permissions | Daniel Wagner-Hall | 2015-11-12 | 1 | -10/+11 |
| * | | | | | | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync | Daniel Wagner-Hall | 2015-11-12 | 2 | -24/+34 |
| |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| | * | | | | | | | | Allow guest access to room initialSync | Daniel Wagner-Hall | 2015-11-11 | 2 | -24/+34 |
| * | | | | | | | | | Fix bug where assumed dict was namedtuple | Erik Johnston | 2015-11-12 | 1 | -1/+1 |
| | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #364 from matrix-org/daniel/guestdisplaynames | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Allow guests to set their display names | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #363 from matrix-org/daniel/guestscanjoin | Daniel Wagner-Hall | 2015-11-12 | 1 | -12/+21 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Consider joined guest users as joined users | Daniel Wagner-Hall | 2015-11-12 | 1 | -12/+21 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #362 from matrix-org/daniel/raceyraceyfunfun | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix race creating directories | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+5 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-11 | 2 | -1/+17 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | | Update date v0.11.0-rc1 | Erik Johnston | 2015-11-11 | 1 | -1/+1 |
| | * | | | | | | | Update CHANGES | Erik Johnston | 2015-11-11 | 1 | -1/+1 |
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-11 | 2 | -5/+11 |
| | |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #361 from matrix-org/daniel/guestcontext | Erik Johnston | 2015-11-11 | 2 | -5/+11 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Allow guests to access room context API | Daniel Wagner-Hall | 2015-11-11 | 2 | -5/+11 |
| | | |/ / / / / / | |/| | | | | | | |||||
| | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-11 | 24 | -141/+738 |
| | | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #359 from matrix-org/markjh/incremental_indexing | Erik Johnston | 2015-11-11 | 8 | -77/+492 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| | * | | | | | | | Fix param style to work on both sqlite and postgres | Mark Haines | 2015-11-11 | 1 | -2/+6 |
| | * | | | | | | | Fix the background update | Mark Haines | 2015-11-11 | 3 | -17/+19 |
| | * | | | | | | | Use a background task to update databases to use the full text search | Mark Haines | 2015-11-10 | 2 | -80/+28 |
| | * | | | | | | | Test for background updates | Mark Haines | 2015-11-10 | 2 | -0/+79 |
| | * | | | | | | | Run the background updates when starting synapse. | Mark Haines | 2015-11-10 | 4 | -10/+67 |
| | * | | | | | | | Add background update task for reindexing event search | Mark Haines | 2015-11-09 | 1 | -2/+96 |
| | * | | | | | | | Add storage module for tracking background updates. | Mark Haines | 2015-11-09 | 2 | -0/+231 |
| * | | | | | | | | Merge pull request #358 from matrix-org/daniel/publicwritable | Daniel Wagner-Hall | 2015-11-11 | 4 | -29/+71 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Return world_readable and guest_can_join in /publicRooms | Daniel Wagner-Hall | 2015-11-10 | 4 | -29/+71 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #355 from matrix-org/daniel/anonymouswriting | Daniel Wagner-Hall | 2015-11-10 | 7 | -12/+92 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 7 | -12/+92 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #356 from matrix-org/daniel/3pidyetagain | Daniel Wagner-Hall | 2015-11-10 | 2 | -7/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Get display name from identity server, not client | Daniel Wagner-Hall | 2015-11-09 | 2 | -7/+4 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #357 from matrix-org/rav/SYN-516 | Mark Haines | 2015-11-09 | 1 | -4/+12 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Don't fiddle with results returned by event sources | Richard van der Hoff | 2015-11-09 | 1 | -4/+12 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Add a couple of unit tests for room/<x>/messages | Richard van der Hoff | 2015-11-09 | 2 | -1/+57 |
| * | | | | | | | | Merge pull request #354 from matrix-org/markjh/SYN-513 | Mark Haines | 2015-11-09 | 2 | -3/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'develop' into markjh/SYN-513 | Mark Haines | 2015-11-09 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | | fix comedy important missing comma breaking recent-ordered FTS on sqlite | Matthew Hodgson | 2015-11-08 | 1 | -1/+1 |
| * | | | | | | | | | add a key existence check to tags_by_room to avoid /events 500'ing when testi... | Matthew Hodgson | 2015-11-06 | 1 | -1/+2 |
| | |/ / / / / / / |/| | | | | | | | |||||
| | * | | | | | | | SYN-513: Include updates for rooms that have had all their tags deleted | Mark Haines | 2015-11-09 | 2 | -2/+2 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #353 from matrix-org/daniel/oops | Daniel Wagner-Hall | 2015-11-06 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Remove accidentally added ID column | Daniel Wagner-Hall | 2015-11-06 | 1 | -1/+0 |
| |/ / / / / / / | |||||
| * | | | | / / | remove references to matrix.org/beta | Matthew Hodgson | 2015-11-06 | 1 | -7/+7 |
| | |_|_|_|/ / |/| | | | | | |||||
| | * | | | | | Remove anonymous access, since its not ready yet | Erik Johnston | 2015-11-05 | 1 | -2/+1 |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-05 | 14 | -190/+249 |
| | |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | | Merge pull request #350 from matrix-org/erikj/search | Erik Johnston | 2015-11-05 | 3 | -36/+288 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Be explicit about what we're doing | Erik Johnston | 2015-11-05 | 1 | -1/+1 |
| | * | | | | | | Remove redundant test | Erik Johnston | 2015-11-05 | 1 | -1/+0 |
| | * | | | | | | Increment by one, not five | Erik Johnston | 2015-11-05 | 1 | -1/+1 |
| * | | | | | | | Exchange 3pid invites for m.room.member invites | Daniel Wagner-Hall | 2015-11-05 | 10 | -180/+230 |
| * | | | | | | | Merge pull request #351 from matrix-org/daniel/fixtox | Daniel Wagner-Hall | 2015-11-05 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix tox config after fa1cf5ef34 | Daniel Wagner-Hall | 2015-11-05 | 1 | -3/+4 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #340 from matrix-org/erikj/server_retries | Erik Johnston | 2015-11-05 | 2 | -4/+13 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Retry dead servers a lot less often | Erik Johnston | 2015-11-02 | 2 | -4/+13 |
| | | |_|_|/ / / | |/| | | | | | |||||
| | | | * | | | | Add PR | Erik Johnston | 2015-11-05 | 1 | -1/+1 |
| | | | * | | | | Bump changelog and version number | Erik Johnston | 2015-11-05 | 2 | -1/+18 |
| | | |/ / / / | |||||
| | | * | | | | COMMENTS | Erik Johnston | 2015-11-05 | 1 | -4/+26 |
| | | * | | | | Error handling | Erik Johnston | 2015-11-05 | 1 | -1/+8 |
| | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-11-05 | 67 | -491/+853 |
| | | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-05 | 55 | -490/+572 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Open up /events to anonymous users for room events only | Daniel Wagner-Hall | 2015-11-05 | 20 | -82/+299 |
| | * | | | | | | Merge pull request #347 from matrix-org/markjh/check_filter | Mark Haines | 2015-11-05 | 1 | -18/+2 |
| | |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | | * | | | | | Remove fields that are both unspecified and unused from the filter checks, ch... | Mark Haines | 2015-11-04 | 1 | -18/+2 |
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Daniel Wagner-Hall | 2015-11-04 | 12 | -231/+7 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge pull request #339 from matrix-org/daniel/removesomelies | Daniel Wagner-Hall | 2015-11-04 | 8 | -42/+7 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch 'develop' into daniel/removesomelies | Mark Haines | 2015-11-04 | 20 | -270/+579 |
| | | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | | * | | | | | | | Merge pull request #346 from matrix-org/markjh/remove_lock_manager | Mark Haines | 2015-11-04 | 4 | -189/+0 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | | | * | | | | | | Remove the LockManager class because it wasn't being used | Mark Haines | 2015-11-04 | 4 | -189/+0 |
| | | |/ / / / / / | |||||
| | | | * | | | | | Remove more unused parameters | Daniel Wagner-Hall | 2015-11-02 | 6 | -13/+2 |
| | | | * | | | | | Remove unused arguments and code | Daniel Wagner-Hall | 2015-11-02 | 3 | -29/+5 |
| | | | |/ / / / | |||||
| | * | / / / / | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 33 | -167/+272 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-05 | 12 | -1/+281 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| | * | | | | | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into release-... | Erik Johnston | 2015-10-26 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge pull request #330 from matrix-org/erikj/login_fallback | Erik Johnston | 2015-10-26 | 5 | -0/+280 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge pull request #329 from matrix-org/erikj/static | Erik Johnston | 2015-10-26 | 7 | -1/+3 |
| | | |\ \ \ \ \ \ | |||||
| | * | | | | | | | | Use correct service url | Erik Johnston | 2015-10-26 | 1 | -3/+1 |
| | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | | Add login fallback | Erik Johnston | 2015-10-26 | 5 | -0/+280 |
| | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | Move static folder into synapse | Erik Johnston | 2015-10-26 | 7 | -1/+3 |
| | |/ / / / / | |||||
| | | | * | | | Implement basic pagination for search results | Erik Johnston | 2015-11-05 | 3 | -50/+86 |
| | | | * | | | Implement order and group by | Erik Johnston | 2015-11-04 | 2 | -17/+205 |
| | |_|/ / / |/| | | | | |||||
| * | | | | | Merge pull request #341 from matrix-org/markjh/v2_sync_receipts | Mark Haines | 2015-11-03 | 1 | -15/+30 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'develop' into markjh/v2_sync_receipts | Mark Haines | 2015-11-03 | 14 | -25/+524 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Include read receipts in v2 sync | Mark Haines | 2015-11-02 | 1 | -15/+30 |
| | | |_|/ / / | |/| | | | | |||||
| * | | | | | | Merge pull request #343 from matrix-org/erikj/fix_retries | Erik Johnston | 2015-11-03 | 2 | -46/+30 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| | * | | | | | Don't rearrange transaction_queue | Erik Johnston | 2015-11-03 | 1 | -12/+11 |
| | * | | | | | Fix broken cache for getting retry times. This meant we retried remote destin... | Erik Johnston | 2015-11-03 | 2 | -55/+40 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #335 from matrix-org/markjh/room_tags | Mark Haines | 2015-11-03 | 14 | -26/+525 |
| |\ \ \ \ \ | |/ / / / |/| | | | | |||||
| | * | | | | That TODO was done | Mark Haines | 2015-11-03 | 1 | -1/+0 |
| | * | | | | Spell "deferred" more correctly | Mark Haines | 2015-11-03 | 1 | -1/+1 |
| | * | | | | Include room tags in v2 /sync | Mark Haines | 2015-11-02 | 3 | -11/+70 |
| | * | | | | Store room tag content and return the content in the m.tag event | Mark Haines | 2015-11-02 | 4 | -22/+41 |
| | * | | | | Merge branch 'develop' into markjh/room_tags | Mark Haines | 2015-11-02 | 11 | -30/+339 |
| | |\ \ \ \ | |||||
| | * | | | | | Support clients supplying older tokens, fix short poll test | Mark Haines | 2015-10-30 | 2 | -3/+3 |
| | * | | | | | Include tags in v1 room initial sync | Mark Haines | 2015-10-30 | 1 | -0/+11 |
| | * | | | | | Include room tags v1 /initialSync | Mark Haines | 2015-10-30 | 1 | -0/+12 |
| | * | | | | | Inform the client of new room tags using v1 /events | Mark Haines | 2015-10-29 | 6 | -14/+91 |
| | * | | | | | Fix pyflakes errors | Mark Haines | 2015-10-28 | 2 | -3/+5 |
| | * | | | | | Add APIs for adding and removing tags from rooms | Mark Haines | 2015-10-28 | 5 | -0/+320 |
| * | | | | | | Merge pull request #338 from matrix-org/daniel/fixdb | Erik Johnston | 2015-11-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| | * | | | | | Add missing column | Daniel Wagner-Hall | 2015-10-30 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #337 from matrix-org/markjh/v2_sync_joining | Mark Haines | 2015-10-30 | 3 | -5/+9 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update the other place check_joined_room is called | Mark Haines | 2015-10-30 | 3 | -2/+4 |
| | * | | | | | Don't mark newly joined room timelines as limited in an incremental sync | Mark Haines | 2015-10-29 | 1 | -3/+5 |
| |/ / / / / | |||||
| * | | | | | Make search API honour limit set in filter | Erik Johnston | 2015-10-29 | 1 | -0/+3 |
| * | | | | | Merge pull request #336 from matrix-org/erikj/search | Erik Johnston | 2015-10-28 | 1 | -1/+52 |
| |\ \ \ \ \ | |||||
| | * | | | | | Optionally return event contexts with search results | Erik Johnston | 2015-10-28 | 1 | -1/+52 |
| | * | | | | | Merge branch 'erikj/context_api' into erikj/search | Erik Johnston | 2015-10-28 | 17 | -21/+354 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge pull request #334 from matrix-org/erikj/context_api | Erik Johnston | 2015-10-28 | 4 | -2/+229 |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | Docs | Erik Johnston | 2015-10-28 | 2 | -0/+39 |
| | * | | | | | | Add room context api | Erik Johnston | 2015-10-28 | 4 | -2/+190 |
| * | | | | | | | Merge pull request #332 from matrix-org/rav/full_state_sync | Richard van der Hoff | 2015-10-28 | 2 | -19/+38 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| | * | | | | | | Implement full_state incremental sync | Richard van der Hoff | 2015-10-26 | 2 | -19/+38 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Merge pull request #331 from matrix-org/rav/500_on_missing_sigil | Richard van der Hoff | 2015-10-27 | 2 | -3/+8 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| | * | | | | | Fix a 500 error resulting from empty room_ids | Richard van der Hoff | 2015-10-26 | 2 | -3/+8 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #328 from matrix-org/erikj/search | Erik Johnston | 2015-10-26 | 1 | -14/+17 |
| |\| | | | | |||||
| | * | | | | Pull out sender when computing search results | Erik Johnston | 2015-10-23 | 1 | -14/+17 |
| * | | | | | Merge pull request #327 from matrix-org/erikj/search | Erik Johnston | 2015-10-23 | 3 | -2/+30 |
| |\| | | | | |||||
| | * | | | | Implement rank function for SQLite FTS | Erik Johnston | 2015-10-23 | 3 | -2/+30 |
| * | | | | | Merge pull request #323 from matrix-org/daniel/sizelimits | Daniel Wagner-Hall | 2015-10-23 | 2 | -1/+30 |
| |\ \ \ \ \ | |||||
| | * | | | | | Reject events which are too large | Daniel Wagner-Hall | 2015-10-22 | 2 | -1/+30 |
| * | | | | | | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-10-23 | 8 | -12/+65 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | | Fix receipts for room initial sync | Erik Johnston | 2015-10-22 | 1 | -7/+1 |
| | * | | | | | Merge pull request #322 from matrix-org/erikj/password_config | Erik Johnston | 2015-10-22 | 5 | -4/+46 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Add config option to disable password login | Erik Johnston | 2015-10-22 | 5 | -4/+46 |
| | |/ / / / / | |||||
| | * | | | | | Reorder changelog v0.10.1-rc1 | Erik Johnston | 2015-10-16 | 1 | -6/+7 |
| | * | | | | | Update change log | Erik Johnston | 2015-10-15 | 1 | -0/+16 |
| | * | | | | | Bump version | Erik Johnston | 2015-10-15 | 1 | -1/+1 |
| * | | | | | | Merge pull request #325 from matrix-org/markjh/filter_dicts | Mark Haines | 2015-10-22 | 1 | -3/+22 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Don't assume that the event has a room_id or sender | Mark Haines | 2015-10-22 | 1 | -2/+2 |
| | * | | | | | | Support filtering events represented as dicts. | Mark Haines | 2015-10-22 | 1 | -3/+22 |
| * | | | | | | | Merge pull request #324 from matrix-org/erikj/search | Erik Johnston | 2015-10-22 | 5 | -16/+61 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||||
| | * | | | | | Actually filter results | Erik Johnston | 2015-10-22 | 1 | -3/+5 |
| | * | | | | | Rename | Erik Johnston | 2015-10-22 | 1 | -3/+3 |
| | * | | | | | LESS THAN | Erik Johnston | 2015-10-22 | 1 | -1/+2 |
| | * | | | | | Use namedtuple as return value | Erik Johnston | 2015-10-22 | 2 | -4/+18 |
| | * | | | | | Limit max number of SQL vars | Erik Johnston | 2015-10-22 | 1 | -4/+6 |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-22 | 0 | -0/+0 |
| | |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | | Merge pull request #319 from matrix-org/erikj/filter_refactor | Erik Johnston | 2015-10-22 | 3 | -125/+92 |
| |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-22 | 8 | -27/+329 |
| | | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | | Merge pull request #320 from matrix-org/appservice-retry-cap | Erik Johnston | 2015-10-22 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Cap the time to retry txns to appservices to 8.5 minutes | Kegan Dougal | 2015-10-21 | 1 | -2/+2 |
| * | | | | | | | | Merge pull request #314 from matrix-org/paul/event-redaction | Mark Haines | 2015-10-22 | 2 | -0/+115 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add some unit tests of prune_events() | Paul "LeoNerd" Evans | 2015-10-16 | 2 | -0/+115 |
| * | | | | | | | | | Don't keep appending report_stats to demo config | Erik Johnston | 2015-10-22 | 1 | -2/+6 |
| * | | | | | | | | | Merge pull request #321 from matrix-org/markjh/v2_sync_typing | Mark Haines | 2015-10-21 | 1 | -14/+41 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'develop' into markjh/v2_sync_typing | Mark Haines | 2015-10-21 | 27 | -214/+1027 |
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #316 from matrix-org/markjh/v2_sync_archived | Mark Haines | 2015-10-21 | 3 | -9/+163 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| | * | | | | | | | | | Include banned rooms in the archived section of v2 sync | Mark Haines | 2015-10-21 | 2 | -8/+11 |
| | * | | | | | | | | | Fix pep8 | Mark Haines | 2015-10-19 | 1 | -1/+0 |
| | * | | | | | | | | | Add rooms that the user has left under archived in v2 sync. | Mark Haines | 2015-10-19 | 3 | -9/+161 |
| * | | | | | | | | | | Merge pull request #318 from matrix-org/syn-502-login-bad-emails | Kegsay | 2015-10-21 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Use 403 and message to match handlers/auth | Kegan Dougal | 2015-10-21 | 1 | -3/+1 |
| | * | | | | | | | | | | Don't 500 when the email doesn't map to a valid user ID. | Kegan Dougal | 2015-10-20 | 1 | -0/+4 |
| | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| | | | * | | | | | | | Doc string for the SyncHandler.typing_by_room method | Mark Haines | 2015-10-21 | 1 | -0/+12 |
| | | | * | | | | | | | Include typing events in initial v2 sync | Mark Haines | 2015-10-20 | 1 | -14/+29 |
| | | |/ / / / / / / | |||||
| | | | | | * | | | | PEP8 | Erik Johnston | 2015-10-22 | 1 | -1/+2 |
| | | | | | * | | | | Move FTS to delta 25 | Erik Johnston | 2015-10-22 | 2 | -3/+3 |
| | | | | | * | | | | Filter room ids before hitting the database | Erik Johnston | 2015-10-21 | 2 | -1/+21 |
| | | | | | * | | | | Filter search results | Erik Johnston | 2015-10-21 | 1 | -2/+7 |
| | | | | | * | | | | Merge branch 'erikj/filter_refactor' into erikj/search | Erik Johnston | 2015-10-20 | 19 | -329/+597 |
| | | | | | |\ \ \ \ | | | | | |/ / / / | | | | |/| | | | | |||||
| | | | | * | | | | | Docstring | Erik Johnston | 2015-10-20 | 1 | -0/+5 |
| | | | | * | | | | | Refactor api.filtering to have a Filter API | Erik Johnston | 2015-10-20 | 3 | -126/+88 |
| | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Daniel Wagner-Hall | 2015-10-20 | 2 | -0/+129 |
| |\| | | | | | | | |||||
| | * | | | | | | | Merge pull request #315 from matrix-org/paul/test-vectors | Paul Evans | 2015-10-19 | 2 | -0/+129 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Invoke EventBuilder directly instead of going via the EventBuilderFactory | Paul "LeoNerd" Evans | 2015-10-19 | 1 | -35/+3 |
| | | * | | | | | | | Capture __init__.py | Paul "LeoNerd" Evans | 2015-10-19 | 1 | -0/+15 |
| | | * | | | | | | | Use assertIn() instead of assertTrue on the 'in' operator | Paul "LeoNerd" Evans | 2015-10-19 | 1 | -6/+6 |
| | | * | | | | | | | Another signing test vector using an 'm.room.message' with content, so that t... | Paul "LeoNerd" Evans | 2015-10-19 | 1 | -1/+49 |
| | | * | | | | | | | Initial minimial hack at a test of event hashing and signing | Paul "LeoNerd" Evans | 2015-10-19 | 1 | -0/+98 |
| | | | |/ / / / / | | |/| | | | | | |||||
| * | / | | | | | | Allow rejecting invites | Daniel Wagner-Hall | 2015-10-20 | 8 | -93/+353 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #312 from matrix-org/daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-19 | 2 | -8/+15 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Stuff signed data in a standalone object | Daniel Wagner-Hall | 2015-10-16 | 2 | -8/+15 |
| * | | | | | | | | Merge pull request #307 from matrix-org/erikj/search | Erik Johnston | 2015-10-19 | 10 | -2/+365 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | | Explicitly check for Sqlite3Engine | Erik Johnston | 2015-10-16 | 1 | -2/+5 |
| | * | | | | | | Typing | Erik Johnston | 2015-10-16 | 1 | -2/+2 |
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-16 | 13 | -25/+393 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Remove unused import | Erik Johnston | 2015-10-16 | 1 | -3/+1 |
| | * | | | | | | | Remove duplicate _filter_events_for_client | Erik Johnston | 2015-10-16 | 1 | -46/+0 |
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-16 | 3 | -97/+51 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-16 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Explicitly check for Sqlite3Engine | Erik Johnston | 2015-10-16 | 1 | -2/+5 |
| | * | | | | | | | | | docstring | Erik Johnston | 2015-10-16 | 1 | -0/+10 |
| | * | | | | | | | | | Add docstring | Erik Johnston | 2015-10-16 | 1 | -0/+11 |
| | * | | | | | | | | | Comment on the LIMIT 500 | Erik Johnston | 2015-10-16 | 1 | -0/+2 |
| | * | | | | | | | | | Split up run_upgrade | Erik Johnston | 2015-10-16 | 1 | -5/+11 |
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-15 | 7 | -171/+294 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| | * | | | | | | | | | Remove unused constatns | Erik Johnston | 2015-10-14 | 1 | -19/+0 |
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |