Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-26 | 8 | -21/+60 |
|\ | |||||
| * | Merge pull request #34 from matrix-org/remove_serialize_event_from_hs | Mark Haines | 2015-01-26 | 7 | -21/+45 |
| |\ | | | | | | | Don't pass the HS to serialize_event just so that it can get the current time. | ||||
| | * | Remove unused import from server.py | Mark Haines | 2015-01-26 | 1 | -1/+0 |
| | | | |||||
| | * | Pass the current time to serialize event, rather than passing an | Mark Haines | 2015-01-26 | 7 | -20/+45 |
| | | | | | | | | | | | | | | | | | | HS and getting a clock from it and calling time_msec on the clock. Remove the serialize_event method from the HS since it is no longer needed. | ||||
| * | | Create (empty) v2_alpha REST tests directory | Paul "LeoNerd" Evans | 2015-01-26 | 1 | -0/+15 |
| |/ | |||||
* | | Add handler for /sync API | Mark Haines | 2015-01-26 | 1 | -0/+110 |
| | | |||||
* | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-26 | 2 | -1/+7 |
|\| | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py | ||||
| * | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 6 | -1/+132 |
| | | |||||
| * | Stop complaining about Synapse Angular SDK 0.6.1 | Paul "LeoNerd" Evans | 2015-01-23 | 1 | -1/+1 |
| | | |||||
| * | Update .gitignore | Erik Johnston | 2015-01-23 | 1 | -0/+6 |
| | | |||||
* | | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 2 | -1/+7 |
| | | |||||
* | | Start implementing the v2_alpha sync API | Mark Haines | 2015-01-23 | 5 | -0/+272 |
|/ | |||||
* | Merge pull request #33 from matrix-org/extract_rest_servlet_from_client_v1 | Mark Haines | 2015-01-23 | 12 | -72/+100 |
|\ | | | | | Extract the client v1 base RestServlet to a separate class | ||||
| * | Add RestServlet base class in synapse/http/servlet.py | Mark Haines | 2015-01-23 | 1 | -0/+56 |
| | | |||||
| * | Extract the client v1 base RestServlet to a separate class | Mark Haines | 2015-01-23 | 11 | -72/+44 |
|/ | |||||
* | Merge pull request #32 from matrix-org/remove_parse_id_from_hs | Mark Haines | 2015-01-23 | 35 | -179/+168 |
|\ | | | | | Remove parse id from hs | ||||
| * | Remove hs.parse_eventid | Mark Haines | 2015-01-23 | 1 | -9/+0 |
| | | |||||
| * | Replace hs.parse_roomalias with RoomAlias.from_string | Mark Haines | 2015-01-23 | 8 | -26/+18 |
| | | |||||
| * | Replace hs.parse_roomid with RoomID.from_string | Mark Haines | 2015-01-23 | 8 | -21/+15 |
| | | |||||
| * | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 31 | -133/+145 |
|/ | |||||
* | Merge pull request #31 from matrix-org/client_api_resource | Mark Haines | 2015-01-23 | 5 | -28/+18 |
|\ | | | | | Merge rest servlets into the client json resource object | ||||
| * | Merge rest servlets into the client json resource object | Mark Haines | 2015-01-23 | 5 | -28/+18 |
| | | |||||
* | | Rename MockedDatastoreTestCase to MockedDatastorePresenceTestCase since it ↵ | Paul "LeoNerd" Evans | 2015-01-22 | 1 | -3/+3 |
| | | | | | | | | is still presence-specific | ||||
* | | Much merging of test case setUp() methods to make them much more | Paul "LeoNerd" Evans | 2015-01-22 | 1 | -273/+193 |
|/ | | | | shareable | ||||
* | Merge pull request #30 from matrix-org/client_api_restructure | Mark Haines | 2015-01-22 | 37 | -62/+118 |
|\ | | | | | Move client v1 api rest servlets into a "client/v1" directory | ||||
| * | Move client rest tests back under rest | Mark Haines | 2015-01-22 | 9 | -5/+19 |
| | | |||||
| * | Move rest APIs back under the rest directory | Mark Haines | 2015-01-22 | 31 | -19/+33 |
| | | |||||
| * | Move client v1 api rest servlets into a "client/v1" directory | Mark Haines | 2015-01-22 | 23 | -24/+52 |
|/ | |||||
* | Fix manifest. Ignore contrib and docs directories when checking manifest ↵ | Mark Haines | 2015-01-22 | 3 | -5/+9 |
| | | | | against source control. | ||||
* | Add demo and scripts to python manifest | Mark Haines | 2015-01-22 | 1 | -2/+11 |
| | |||||
* | update .gitignore, set media-store-path in demo | Mark Haines | 2015-01-22 | 2 | -9/+5 |
| | |||||
* | Move experiments, graph and cmdclient into contrib | Mark Haines | 2015-01-22 | 6 | -0/+0 |
| | |||||
* | Remove jsfiddles | Mark Haines | 2015-01-22 | 16 | -1079/+0 |
| | |||||
* | Move scripts into scripts | Mark Haines | 2015-01-22 | 6 | -2/+2 |
| | |||||
* | Abstract out the room ID from presence tests, so it's stored in self | Paul "LeoNerd" Evans | 2015-01-21 | 1 | -8/+10 |
| | |||||
* | Use common base class for two Presence unit-tests, avoiding boilerplate ↵ | Paul "LeoNerd" Evans | 2015-01-21 | 1 | -54/+25 |
| | | | | copypasta | ||||
* | Only start the notifier timeout once we've had a chance to check for ↵ | Mark Haines | 2015-01-19 | 1 | -2/+2 |
| | | | | updates. Otherwise the timeout could fire while we are waiting for the database to return any updates it might have | ||||
* | Fix pyflakes errors | Mark Haines | 2015-01-19 | 1 | -1/+1 |
| | |||||
* | Fix syntax | Mark Haines | 2015-01-19 | 1 | -2/+3 |
| | |||||
* | Allow ':memory:' as the database path for sqlite3 | Mark Haines | 2015-01-19 | 2 | -2/+11 |
| | |||||
* | Finish renaming "context" to "room_id" in federation codebase | Mark Haines | 2015-01-16 | 7 | -99/+62 |
| | |||||
* | Fold _do_request_for_transaction into the methods that called it since it ↵ | Mark Haines | 2015-01-16 | 1 | -44/+11 |
| | | | | was a trivial wrapper around client.get_json | ||||
* | Split transport layer into client and server parts | Mark Haines | 2015-01-16 | 3 | -272/+321 |
| | |||||
* | Remove temporary debug logging that was accidentally committed | Mark Haines | 2015-01-16 | 1 | -2/+0 |
| | |||||
* | Have /join/:room_id return the room ID in response anyway, for consistency ↵ | Paul "LeoNerd" Evans | 2015-01-13 | 1 | -1/+1 |
| | | | | of clients (SYN-234) | ||||
* | Have MockClock detect attempts to cancel expired timers, to prevent a repeat ↵ | Paul "LeoNerd" Evans | 2015-01-13 | 1 | -4/+16 |
| | | | | of SYN-230 | ||||
* | Don't try to cancel already-expired timers - SYN-230 | Paul "LeoNerd" Evans | 2015-01-13 | 1 | -2/+8 |
| | |||||
* | Remove unused functions | Mark Haines | 2015-01-13 | 4 | -30/+0 |
| | |||||
* | get_room_events isn't called anywhere | Mark Haines | 2015-01-13 | 1 | -30/+0 |
| | |||||
* | Fix stream token ordering | Mark Haines | 2015-01-13 | 1 | -72/+101 |
| | |||||
* | Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-01-13 | 3 | -3/+3 |
|\ | |||||
| * | Bump version | Erik Johnston | 2015-01-13 | 2 | -2/+2 |
| | | |||||
| * | Insert 'age' into top level when returning events to clients | Erik Johnston | 2015-01-13 | 1 | -1/+1 |
| | | |||||
* | | Use float rather than integer divisions to turn msec into sec - so timeouts ↵ | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -1/+1 |
| | | | | | | | | under 1000msec will actually work | ||||
* | | Check that setting typing notification still works after explicit timeout at ↵ | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -1/+50 |
| | | | | | | | | REST layer - SYN-230 | ||||
* | | Make typing notification timeouts print a (debug) logging message | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -1/+7 |
| | | |||||
* | | Don't make @unittest.DEBUG print the huge amount of verbosity generated by ↵ | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -0/+2 |
| | | | | | | | | the synapse.storage loggers | ||||
* | | Check that setting typing notification still works after explicit timeout - ↵ | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -0/+26 |
| | | | | | | | | SYN-230 | ||||
* | | SYN-178: Fix off by one. | Kegan Dougal | 2015-01-12 | 1 | -2/+6 |
| | | |||||
* | | Add copyrighter script for sql | Mark Haines | 2015-01-12 | 1 | -0/+33 |
| | | |||||
* | | don't clobber pythonpath | Matthew Hodgson | 2015-01-09 | 1 | -2/+2 |
| | | |||||
* | | oops | Matthew Hodgson | 2015-01-08 | 1 | -1/+1 |
| | | |||||
* | | spell out that local libs may need to be explicitly given priority | Matthew Hodgson | 2015-01-08 | 1 | -0/+9 |
| | | |||||
* | | Check the existance and versions of necessary modules when starting synapse, ↵ | Mark Haines | 2015-01-08 | 2 | -0/+85 |
| | | | | | | | | log which modules are used | ||||
* | | SYN-142: Rotate logs if logging to file. Fixed to a 4 file rotate with ↵ | Kegan Dougal | 2015-01-08 | 1 | -1/+4 |
| | | | | | | | | 100MB/file for now. | ||||
* | | make our JPEG thumbnail quality less horrifically ugly | Matthew Hodgson | 2015-01-08 | 1 | -1/+1 |
| | | |||||
* | | Add raw query param for scrollback. | Kegan Dougal | 2015-01-08 | 2 | -3/+9 |
| | | |||||
* | | Add better help message for --server-name config option. | Erik Johnston | 2015-01-08 | 1 | -2/+6 |
| | | |||||
* | | Return the raw federation event rather than adding extra keys for federation ↵ | Kegan Dougal | 2015-01-08 | 6 | -19/+27 |
| | | | | | | | | data. | ||||
* | | Add missing continuation indent. | Erik Johnston | 2015-01-08 | 1 | -1/+2 |
| | | |||||
* | | Add 'raw' query parameter to expose the event graph and signatures to savvy ↵ | Kegan Dougal | 2015-01-08 | 6 | -16/+28 |
| | | | | | | | | clients. | ||||
* | | Add optional limit to graph script | Erik Johnston | 2015-01-08 | 1 | -6/+24 |
| | | |||||
* | | Merge branch 'master' into develop | Mark Haines | 2015-01-08 | 3 | -5/+5 |
|\| | |||||
| * | Merge branch 'hotfixes-v0.6.1' v0.6.1a | Mark Haines | 2015-01-08 | 3 | -5/+5 |
| |\ | |||||
| | * | Bump version | Mark Haines | 2015-01-08 | 2 | -2/+2 |
| | | | |||||
| | * | SYN-231: User agent header broken | Mark Haines | 2015-01-08 | 1 | -3/+3 |
| |/ | |||||
| * | Merge branch 'release-v0.6.1' of github.com:matrix-org/synapse v0.6.1 | Erik Johnston | 2015-01-07 | 137 | -310/+601 |
| |\ | |||||
* | | | Log server version on startup | Erik Johnston | 2015-01-07 | 1 | -0/+3 |
| | | | |||||
* | | | Change error message for missing pillow libs. | Kegan Dougal | 2015-01-07 | 1 | -2/+4 |
| | | | |||||
* | | | PEP8 and pyflakes warnings | Kegan Dougal | 2015-01-07 | 2 | -2/+4 |
| | | | |||||
* | | | Update tests | Kegan Dougal | 2015-01-07 | 1 | -1/+1 |
| | | | |||||
* | | | SYN-154: Tweak how the m.room.create check is done. | Kegan Dougal | 2015-01-07 | 2 | -12/+12 |
| | | | | | | | | | | | | | | | Don't perform the check in auth.is_host_in_room but instead do it in _do_join and also assert that there are no m.room.members in the room before doing so. | ||||
* | | | SYN-154: Better error messages when joining an unknown room by ID. | Kegan Dougal | 2015-01-07 | 3 | -6/+17 |
| | | | | | | | | | | | | | | | | | | The simple fix doesn't work here because room creation also involves unknown room IDs. The check relies on the presence of m.room.create for rooms being created, whereas bogus room IDs have no state events at all. | ||||
* | | | *cough* | Matthew Hodgson | 2015-01-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'release-v0.6.1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-01-07 | 3 | -2/+10 |
|\ \ \ | | |/ | |/| | |||||
| * | | Improve change log | Erik Johnston | 2015-01-07 | 1 | -2/+2 |
| | | | |||||
| * | | Bump version and changelog | Erik Johnston | 2015-01-07 | 3 | -2/+10 |
|/ / | |||||
* | | Remove unused import | Erik Johnston | 2015-01-07 | 1 | -2/+0 |
| | | |||||
* | | Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-01-07 | 2 | -9/+16 |
|\ \ | |||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2015-01-07 | 2 | -1/+2 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge branch 'master' into develop | Mark Haines | 2015-01-06 | 2 | -1/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'hotfixes-v0.6.0a' v0.6.0b | Mark Haines | 2014-12-29 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | Return the argument passed to the callback in a deferred callback, otherwise ↵ | Mark Haines | 2014-12-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | twisted will replace the deferred result with 'None' | ||||
| * | | | improve error msg | Matthew Hodgson | 2014-12-24 | 1 | -1/+1 |
| |/ / | |||||
| | * | Optimize FrozenEvent creation | Erik Johnston | 2015-01-06 | 2 | -9/+16 |
| |/ |/| | |||||
* | | Use time.time() instead of time.clock() | Erik Johnston | 2015-01-06 | 1 | -4/+4 |
| | | |||||
* | | Fix typo where we used wrong var. | Erik Johnston | 2015-01-06 | 1 | -2/+2 |
| | | |||||
* | | Only fetch the columns we need. | Erik Johnston | 2015-01-06 | 1 | -1/+1 |
| | | |||||
* | | RoomsForUser now has sender instead of user_id | Erik Johnston | 2015-01-06 | 1 | -1/+1 |
| | | |||||
* | | Add delta and bump DB version | Erik Johnston | 2015-01-06 | 2 | -1/+17 |
| | | |||||
* | | Add index on transaction_id to sent_transcations | Erik Johnston | 2015-01-06 | 2 | -4/+1 |
| | | |||||
* | | Actually time that function | Erik Johnston | 2015-01-06 | 1 | -0/+1 |
| | | |||||
* | | Time how long calls to _get_destination_retry_timings take | Erik Johnston | 2015-01-06 | 2 | -12/+64 |
| | | |||||
* | | Don't include None's in _get_events_txn | Erik Johnston | 2015-01-06 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-01-06 | 2 | -26/+54 |
|\ \ | |||||
| * | | Name 'user_rooms_intersect' transaction | Erik Johnston | 2015-01-06 | 1 | -16/+18 |
| | | | |||||
| * | | We don't need the full events for get_rooms_for_user_where_membership_is | Erik Johnston | 2015-01-06 | 2 | -10/+36 |
| | | | |||||
* | | | SYN-32 Use the ANTIALIAS resize method for thumbnailing images | Mark Haines | 2015-01-06 | 1 | -3/+3 |
| | | | |||||
* | | | Add some logging for when we are sending transactions. | Matrix | 2015-01-06 | 1 | -0/+6 |
| | | | |||||
* | | | Increase default maximum attachment size to 10M | Mark Haines | 2015-01-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #28 from matrix-org/erikj-perf | Mark Haines | 2015-01-06 | 5 | -111/+118 |
|\| | | | | | | | | Database performance improvements. | ||||
| * | | PEP8 | Erik Johnston | 2015-01-06 | 2 | -3/+4 |
| | | | |||||
| * | | Remove debug lines | Erik Johnston | 2015-01-06 | 1 | -7/+0 |
| | | | |||||
| * | | Don't do batching when getting events. | Erik Johnston | 2015-01-06 | 1 | -35/+4 |
| | | | |||||
| * | | Only fetch prev_content when a client is streaming/paginating. Use ↵ | Erik Johnston | 2015-01-06 | 2 | -86/+92 |
| | | | | | | | | | | | | transactions for event streams. | ||||
| * | | Temporarily turn off 'redacted_because' and 'prev_content' keys | Erik Johnston | 2015-01-06 | 1 | -0/+2 |
| | | | |||||
| * | | More debug logging | Erik Johnston | 2015-01-06 | 1 | -0/+4 |
| | | | |||||
| * | | Add some debug logging | Erik Johnston | 2015-01-06 | 1 | -0/+12 |
| | | | |||||
| * | | Reformat | Erik Johnston | 2015-01-06 | 1 | -13/+14 |
| | | | |||||
| * | | Add RoomMemberStore.get_users_in_room, so that we can get the list of joined ↵ | Erik Johnston | 2015-01-06 | 2 | -8/+18 |
| | | | | | | | | | | | | users without having to retrieve the full events | ||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2015-01-06 | 6 | -7/+46 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2014-12-21 | 4 | -6/+26 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2014-12-19 | 8 | -15/+72 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2014-12-18 | 5 | -44/+79 |
| |\ \ \ \ | |||||
| * | | | | | Test some ideas that might help performance a bit | Erik Johnston | 2014-12-17 | 4 | -23/+32 |
| | | | | | | |||||
* | | | | | | Update copyright notices | Mark Haines | 2015-01-06 | 132 | -128/+212 |
| | | | | | | |||||
* | | | | | | Set a content-length for JSON responses | Mark Haines | 2015-01-06 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | SYN-208/SYN-228: Add runtime checks on startup to enforce that JPEG/PNG ↵ | Kegan Dougal | 2015-01-06 | 1 | -0/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | support is included when installing pillow. | ||||
* | | | | | | SYN-229: Include Content-Length when downloading files | Mark Haines | 2015-01-06 | 3 | -7/+23 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | spell out that VoIP needs TURN | Matthew Hodgson | 2014-12-24 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | clarify these instructions a media-repo specific | Matthew Hodgson | 2014-12-24 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | spell out that upgrading is just installing over the top | Matthew Hodgson | 2014-12-24 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Include version in User-Agent and Server headers | Mark Haines | 2014-12-22 | 4 | -6/+35 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'hotfixes-v0.6.0' v0.6.0a | Mark Haines | 2014-12-19 | 8 | -13/+42 |
|\ \ \ \ | |||||
| * | | | | Mock ratelimiter to make tests pass. | Kegan Dougal | 2014-12-19 | 2 | -4/+16 |
| | | | | | |||||
| * | | | | more changelogs | Matthew Hodgson | 2014-12-19 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Rate limit display names and avatar urls per request rather than per event. | Kegan Dougal | 2014-12-19 | 1 | -2/+4 |
| | |_|/ | |/| | | |||||
| * | | | Set a state_key for the topic and room name, otherwise they won't be treated ↵ | Mark Haines | 2014-12-19 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | as room state | ||||
| * | | | Look for name, topic in the event content rather than the event itself when ↵ | Mark Haines | 2014-12-19 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | persisting room name and topic events | ||||
| * | | | bump_presence_active_time when sending a message event | Mark Haines | 2014-12-19 | 1 | -0/+6 |
| | | | | |||||
| * | | | Don't ratelimit room create events | Mark Haines | 2014-12-19 | 2 | -3/+4 |
|/ / / | |||||
* | | | Merge branch 'release-v0.6.0' v0.6.0 | Mark Haines | 2014-12-19 | 101 | -2219/+4746 |
|\ \ \ | |||||
| * | | | Bump web sdk version to 0.6.0 | Mark Haines | 2014-12-19 | 1 | -2/+2 |
| | | | | |||||
| * | | | Set display name when joining via alias | Mark Haines | 2014-12-19 | 1 | -0/+5 |
| | | | | |||||
| * | | | Remove unneeded federation keys from events | Mark Haines | 2014-12-19 | 1 | -0/+3 |
| | | | | |||||
| * | | | SYN-203: Handle requests for thunbnails for images that are small | Mark Haines | 2014-12-19 | 1 | -5/+14 |
| | | | | |||||
| * | | | s/user_id/sender/ | Mark Haines | 2014-12-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'develop' into release-v0.6.0 | Mark Haines | 2014-12-19 | 1 | -0/+31 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Update README.rst | Kegsay | 2014-12-18 | 1 | -0/+9 |
| | | | | | | | | | | | | Add gotcha: The content repository requires additional cygwin packages. | ||||
| | * | | Update README.rst | Kegsay | 2014-12-18 | 1 | -0/+22 |
| | | | | | | | | | | | | Add windows (cygwin) install instructions. | ||||
| * | | | Supply auth_chain along with current state in '/state/', fetch auth events ↵ | Mark Haines | 2014-12-18 | 4 | -31/+55 |
| | | | | | | | | | | | | | | | | from a remote server if we are missing some of them | ||||
| * | | | Replace distributor deferred list, with a simple for loop until I understand ↵ | Mark Haines | 2014-12-18 | 2 | -14/+25 |
| | | | | | | | | | | | | | | | | why the former breaks and the latter doesn't | ||||
| * | | | Don't yield on sending the event accross federation. | Mark Haines | 2014-12-18 | 1 | -2/+2 |
| | |/ | |/| | |||||
| * | | Use _get_events_txn instead of _parse_events_txn | Erik Johnston | 2014-12-16 | 1 | -7/+1 |
| | | | |||||
| * | | Fix where we pulled in event.state_events from hotfixes branch | Erik Johnston | 2014-12-16 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'hotfixes-v0.5.4a' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-12-16 | 2 | -10/+14 |
| |\ \ | | | | | | | | | | | | | release-v0.6.0 | ||||
| | * | | Add FIXME | Erik Johnston | 2014-12-16 | 1 | -0/+1 |
| | | | | |||||
| | * | | Fix bug where we did not send the full auth chain to people that joined over ↵ | Erik Johnston | 2014-12-16 | 2 | -10/+13 |
| |/ / |/| | | | | | | | | federation | ||||
* | | | Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse v0.5.4a | Erik Johnston | 2014-12-13 | 4 | -4/+10 |
|\ \ \ | |||||
| | * | | Make error messages slightly more helpful | Erik Johnston | 2014-12-16 | 1 | -5/+5 |
| | | | | |||||
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.6.0 | Erik Johnston | 2014-12-16 | 15 | -322/+99 |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: synapse/state.py | ||||
| | | * | Merge branch 'release-v0.6.0' into develop | Mark Haines | 2014-12-16 | 10 | -53/+194 |
| | | |\ | |||||
| | | * | | SYN-142: Use a default log file 'homeserver.log' so people get logging by ↵ | Kegan Dougal | 2014-12-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | default. | ||||
| | | * | | Remove send_message since nothing was calling it. Remove Snapshot because ↵ | Mark Haines | 2014-12-16 | 2 | -118/+0 |
| | | | | | | | | | | | | | | | | | | | | only send_message was using it | ||||
| | | * | | Construct the EventContext in the state handler rather than constructing one ↵ | Mark Haines | 2014-12-16 | 6 | -59/+50 |
| | | | | | | | | | | | | | | | | | | | | and then immediately calling state_handler.annotate_context_with_state | ||||
| | | * | | clean up coding style a bit | Mark Haines | 2014-12-16 | 8 | -26/+26 |
| | | | | | |||||
| | | * | | Remove annotate_event_with_state as nothing was using it. Update state tests ↵ | Mark Haines | 2014-12-16 | 2 | -135/+39 |
| | | | | | | | | | | | | | | | | | | | | to call annotate_context_with_state | ||||
| | * | | | Use is_outlier() so that we don't get AttributeError | Erik Johnston | 2014-12-16 | 3 | -7/+5 |
| | | | | | |||||
| | * | | | Don't assume an event exists | Erik Johnston | 2014-12-16 | 1 | -2/+4 |
| | | | | | |||||
| | * | | | Mention that we should pull in new deps before running upgrade script | Erik Johnston | 2014-12-16 | 1 | -0/+4 |
| | | |/ | | |/| | |||||
| | * | | Change upgrade script to not check hashes or signatures | Erik Johnston | 2014-12-16 | 1 | -46/+53 |
| | | | | |||||
| | * | | Enable rate limiting for all events | Erik Johnston | 2014-12-16 | 1 | -0/+5 |
| | | | | |||||
| | * | | Fix typo where we thought a list was a dict | Erik Johnston | 2014-12-16 | 1 | -3/+4 |
| | | | | |||||
| | * | | Fix upgrade script to run all the missing deltas. | Erik Johnston | 2014-12-16 | 2 | -1/+77 |
| | | | | |||||
| | * | | Do run all deltas up to missing delta 10 | Erik Johnston | 2014-12-16 | 1 | -4/+4 |
| | | | | |||||
| | * | | Bump UPGRADES and CHANGES | Erik Johnston | 2014-12-16 | 3 | -0/+27 |
| | | | | |||||
| | * | | Make failure to run appropraite upgrade scripts more helpful. | Erik Johnston | 2014-12-16 | 2 | -3/+22 |
| | | | | |||||
| | * | | Fix bugs in upgrade script. | Erik Johnston | 2014-12-16 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | Handle the case when there are colons in server_name. Handle http exceptions more gracefully. | ||||
| | * | | Rename upgrade script | Erik Johnston | 2014-12-16 | 1 | -0/+0 |
| | | | | |||||
| | * | | Include database bump in upgrade script | Erik Johnston | 2014-12-16 | 1 | -0/+2 |
| | | | | |||||
| | * | | Bump database version | Erik Johnston | 2014-12-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | Bump version | Erik Johnston | 2014-12-16 | 2 | -2/+2 |
| | |/ | |||||
| | * | Merge pull request #25 from matrix-org/events_refactor | Mark Haines | 2014-12-16 | 60 | -1812/+2114 |
| | |\ | | | | | | | | | Event refactor | ||||
| | | * | Fix pyflakes | Erik Johnston | 2014-12-16 | 1 | -2/+0 |
| | | | | |||||
| | | * | Remove FrozenEncoder | Erik Johnston | 2014-12-16 | 1 | -8/+0 |
| | | | | |||||
| | | * | Better english in docstrings are helpful. | Erik Johnston | 2014-12-16 | 1 | -2/+2 |
| | | | | |||||
| | | * | Update upgrade script | Erik Johnston | 2014-12-16 | 2 | -3/+12 |
| | | | | |||||
| | | * | Persist internal_metadata | Erik Johnston | 2014-12-16 | 4 | -5/+13 |
| | | | | |||||
| | | * | Add basic docstring to annotate_context_with_state | Erik Johnston | 2014-12-16 | 1 | -0/+11 |
| | | | | |||||
| | | * | Kill off synapse.api.events.* | Erik Johnston | 2014-12-16 | 26 | -925/+74 |
| | | | | |||||
| | | * | Add fixme to raising of AuthError in federation land | Erik Johnston | 2014-12-16 | 1 | -0/+1 |
| | | | | |||||
| | | * | Fix pyflakes | Erik Johnston | 2014-12-15 | 1 | -2/+0 |
| | | | | |||||
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-15 | 2 | -8/+26 |
| | | |\ | |||||
| | | * | | Use frozenutils | Erik Johnston | 2014-12-15 | 2 | -34/+5 |
| | | | | | |||||
| | | * | | User.is_mine is no longer a thing. Use hs.is_mine instead. | Erik Johnston | 2014-12-15 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Rename MessageHandler.handle_event. Add a few comments. | Erik Johnston | 2014-12-15 | 7 | -14/+32 |
| | | | | | |||||
| | | * | | Remove unused functions | Erik Johnston | 2014-12-15 | 1 | -42/+0 |
| | | | | | |||||
| | | * | | Finish up upgrade script | Erik Johnston | 2014-12-15 | 2 | -31/+95 |
| | | | | | |||||
| | | * | | Get current member state from current_state snapshot. Fix leave test. | Erik Johnston | 2014-12-15 | 2 | -4/+15 |
| | | | | | |||||
| | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-15 | 13 | -56/+449 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/handlers/test_room.py | ||||
| | | * | | | Add beginnings of upgrade script | Erik Johnston | 2014-12-15 | 1 | -0/+223 |
| | | | | | | |||||
| | | * | | | Fix bug where we ignored event_edge_hashes table | Erik Johnston | 2014-12-15 | 5 | -7/+10 |
| | | | | | | |||||
| | | * | | | Remove unused imports | Erik Johnston | 2014-12-12 | 3 | -3/+0 |
| | | | | | | |||||
| | | * | | | Make auth module use EventTypes constants | Erik Johnston | 2014-12-12 | 1 | -27/+23 |
| | | | | | | |||||
| | | * | | | Fix tests and remove debug logging | Erik Johnston | 2014-12-12 | 2 | -6/+7 |
| | | | | | | |||||
| | | * | | | Consistently url decode and decode as utf 8 the URL parts | Erik Johnston | 2014-12-12 | 5 | -43/+35 |
| | | | | | | |||||
| | | * | | | Store json as UTF-8 and not bytes | Erik Johnston | 2014-12-12 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Pyflakes | Erik Johnston | 2014-12-12 | 1 | -1/+0 |
| | | | | | | |||||
| | | * | | | Fix membership handler test | Erik Johnston | 2014-12-12 | 1 | -82/+97 |
| | | | | | | |||||
| | | * | | | Fix test. | Erik Johnston | 2014-12-12 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Validate message, topic and name event contents | Erik Johnston | 2014-12-12 | 3 | -1/+27 |
| | | | | | | |||||
| | | * | | | Fix stream test. Make sure we add join to auth_events for invitiations | Erik Johnston | 2014-12-12 | 2 | -4/+6 |
| | | | | | | |||||
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-11 | 27 | -20/+1422 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: setup.py | ||||
| | | * | | | | Fix replication tests | Erik Johnston | 2014-12-11 | 1 | -12/+6 |
| | | | | | | | |||||
| | | * | | | | Fix federation test | Erik Johnston | 2014-12-11 | 2 | -19/+25 |
| | | | | | | | |||||
| | | * | | | | Fix room creation test | Erik Johnston | 2014-12-11 | 1 | -34/+34 |
| | | | | | | | |||||
| | | * | | | | Fix public room joining by making sure replaces_state never points to itself. | Erik Johnston | 2014-12-11 | 3 | -10/+13 |
| | | | | | | | |||||
| | | * | | | | Fix prev_content | Erik Johnston | 2014-12-11 | 3 | -3/+16 |
| | | | | | | | |||||
| | | * | | | | Fix redaction tests | Erik Johnston | 2014-12-11 | 1 | -6/+8 |
| | | | | | | | |||||
| | | * | | | | Fix redactions. Fix 'age' key | Erik Johnston | 2014-12-11 | 6 | -30/+83 |
| | | | | | | | |||||
| | | * | | | | Fix some tests | Erik Johnston | 2014-12-10 | 5 | -130/+120 |
| | | | | | | | |||||
| | | * | | | | .from_string() no longer takes a HS | Erik Johnston | 2014-12-10 | 1 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Remove dead code | Erik Johnston | 2014-12-10 | 2 | -27/+0 |
| | | | | | | | |||||
| | | * | | | | Add some basic event validation | Erik Johnston | 2014-12-10 | 2 | -10/+27 |
| | | | | | | | |||||
| | | * | | | | Add new event graphing tool | Erik Johnston | 2014-12-10 | 1 | -0/+138 |
| | | | | | | | |||||
| | | * | | | | Fix bug where we clobbered old state group values | Erik Johnston | 2014-12-10 | 3 | -2/+13 |
| | | | | | | | |||||
| | | * | | | | Actually fix bug when uploading state with empty state_key | Erik Johnston | 2014-12-10 | 2 | -2/+3 |
| | | | | | | | |||||
| | | * | | | | Fix bug when uploading state with empty state_key | Erik Johnston | 2014-12-10 | 6 | -88/+29 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-10 | 15 | -27/+311 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Fix AttributeError | Erik Johnston | 2014-12-10 | 2 | -1/+4 |
| | | | | | | | | |||||
| | | * | | | | | Make depth increase. | Erik Johnston | 2014-12-10 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Add __str__ to FrozenEvent | Erik Johnston | 2014-12-10 | 1 | -0/+5 |
| | | | | | | | | |||||
| | | * | | | | | Try and figure out how and why signatures are being changed. | Erik Johnston | 2014-12-10 | 9 | -34/+86 |
| | | | | | | | | |||||
| | | * | | | | | This is to test jenkins | Erik Johnston | 2014-12-09 | 1 | -1/+0 |
| | | | | | | | | |||||
| | | * | | | | | This is to test jenkins | Erik Johnston | 2014-12-09 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | This is to test jenkins | Erik Johnston | 2014-12-09 | 1 | -0/+1 |
| | | | | | | | | |||||
| | | * | | | | | This is to test jenkins | Erik Johnston | 2014-12-09 | 1 | -0/+0 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-09 | 1 | -3/+3 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | PEP8 | Erik Johnston | 2014-12-09 | 2 | -2/+2 |
| | | | | | | | | | |||||
| | | * | | | | | | Fix joining from an invite | Erik Johnston | 2014-12-09 | 4 | -17/+20 |
| | | | | | | | | | |||||
| | | * | | | | | | Change the way we implement get_events to be less sucky | Erik Johnston | 2014-12-09 | 2 | -36/+22 |
| | | | | | | | | | |||||
| | | * | | | | | | Delete test file | Erik Johnston | 2014-12-09 | 1 | -1/+0 |
| | | | | | | | | | |||||
| | | * | | | | | | This is to test jenkins | Erik Johnston | 2014-12-09 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | This is to test jenkins | Erik Johnston | 2014-12-09 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | This is to test jenkins | Erik Johnston | 2014-12-09 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | This is to test jenkins | Erik Johnston | 2014-12-09 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | This is to test jenkins | Erik Johnston | 2014-12-09 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | This is to test jenkins | Erik Johnston | 2014-12-09 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Add PEP8 newlines | Erik Johnston | 2014-12-09 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Add PEP8 newlines | Erik Johnston | 2014-12-09 | 3 | -3/+3 |
| | | | | | | | | |