summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Re-enable presence, un-skip presence testsPaul "LeoNerd" Evans2014-08-281-8/+0
| | |/ | |/|
| * | Remove get_state_for_room function from federation handlerMark Haines2014-08-281-15/+11
| * | use @wraps to set the __name__ __module__ and __doc__ correctly for logged fu...Mark Haines2014-08-281-0/+2
| * | Support multiple login flows when deciding how to login. Updated cmdclient an...Kegan Dougal2014-08-281-1/+1
| * | Fix pyflakes warningsMark Haines2014-08-284-10/+4
| * | Merge backfill_ and backfill in federation handlerMark Haines2014-08-281-18/+5
| |/
| * Fix bug where we used UserID objects instead of strignsErik Johnston2014-08-281-1/+2
* | Create the correct events with the right configuration when creating a new room.Erik Johnston2014-08-285-21/+104
|/
* Fix typo in NullSource.get_pagination_rows. Remove unused import.Erik Johnston2014-08-281-2/+1
* Define a NullSource useful for unit-testingPaul "LeoNerd" Evans2014-08-271-0/+16
* Split out MessageHandlerErik Johnston2014-08-273-276/+305
* Merge branch 'develop' into storage_transactionsMark Haines2014-08-272-2/+6
|\
| * If timeout=0, return immediatelyErik Johnston2014-08-271-1/+5
* | Merge branch 'develop' into storage_transactionsMark Haines2014-08-2718-644/+635
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2014-08-271-0/+46
| |\
| * | Comments!Erik Johnston2014-08-271-0/+35
| * | Remove stale FIXMEsErik Johnston2014-08-271-2/+0
| * | Remove store_id from notifier.on_new_room_event calls.Erik Johnston2014-08-272-13/+8
| * | Turn off presence again.Erik Johnston2014-08-271-2/+2
| * | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-274-37/+14
| |\ \
| * | | Index sources in a nicer fashion.Erik Johnston2014-08-273-16/+15
| * | | Convert get_paginat_rows to use PaginationConfig. This allows people to suppl...Erik Johnston2014-08-273-41/+61
| * | | PEP8 tweaks.Erik Johnston2014-08-275-10/+12
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-2710-76/+369
| |\ \ \
| * | | | Implement presence event source. Change the way the notifier indexes listenersErik Johnston2014-08-275-80/+107
| * | | | Enable presence again. Fix up api to match old api.Erik Johnston2014-08-265-10/+35
| * | | | Fix exceptions so that the event stream works. Presence like events are turne...Erik Johnston2014-08-261-2/+4
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-265-123/+60
| |\ \ \ \
| * | | | | WIP: Completely change how event streaming and pagination work. This reflects...Erik Johnston2014-08-2615-655/+430
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-265-9/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-2611-31/+11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-263-0/+168
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-2622-155/+281
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Use new StreamToken in pagination configErik Johnston2014-08-211-5/+9
| * | | | | | | | | Add in StreamToken typeErik Johnston2014-08-211-0/+74
* | | | | | | | | | Return the store_id from persist_eventMark Haines2014-08-271-1/+3
* | | | | | | | | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-279-75/+273
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Added RestServlet for /rooms/$roomid/initialSyncKegan Dougal2014-08-271-0/+30
| * | | | | | | | | Added RestServlet for /rooms/$roomid/stateKegan Dougal2014-08-271-0/+16
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Renamed /ds to /directoryKegan Dougal2014-08-271-1/+1
| * | | | | | | | Renamed /public/rooms to /publicRoomsKegan Dougal2014-08-273-36/+13
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | A reliable logger.info() message /after/ the TCP port has been opened and is ...Paul "LeoNerd" Evans2014-08-271-0/+1
| * | | | | | | Initial typing notification support - EDU federation, but no timers, and no a...Paul "LeoNerd" Evans2014-08-272-0/+148
| * | | | | | | Added parse_roomid() helperPaul "LeoNerd" Evans2014-08-271-0/+5
| * | | | | | | Use SQLite's PRAGMA user_version to check if the database file really matches...Paul "LeoNerd" Evans2014-08-271-6/+28
| * | | | | | | Neater database setup at application startup time; only .connect() it once, n...Paul "LeoNerd" Evans2014-08-271-17/+19
| * | | | | | | Final url modifications: renamed /presence_list to /presence/list to keep the...Kegan Dougal2014-08-271-1/+1
| * | | | | | | Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and remov...Kegan Dougal2014-08-271-17/+14
* | | | | | | | add _get_room_member, fix datastore methodsMark Haines2014-08-275-12/+33
* | | | | | | | Start updating state handling to use snapshotsMark Haines2014-08-272-18/+13
* | | | | | | | Remove call to get_federation from homeserverMark Haines2014-08-271-4/+0
* | | | | | | | Fill out prev_events before calling persist_eventMark Haines2014-08-273-65/+28
* | | | | | | | Remove unused populate_previous_pdusMark Haines2014-08-273-27/+1
* | | | | | | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-2712-129/+160
|\| | | | | | |
| * | | | | | | Added support for GET /events/$eventid with auth checks.Kegan Dougal2014-08-274-2/+45
| * | | | | | | Modified /join/$identifier to support $identifier being a room ID in addition...Kegan Dougal2014-08-273-14/+61
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Pepper UT TODOsKegan Dougal2014-08-262-0/+6
| * | | | | | Feedback: Removed FeedbackRestServlet. Modified keys on FeedbackEvent. Expand...Kegan Dougal2014-08-264-81/+13
| * | | | | | Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated cmd...Kegan Dougal2014-08-261-49/+0
| * | | | | | Added RoomSendEventRestServlet to send generic non-state events. It even appe...Kegan Dougal2014-08-261-2/+50
| | |_|_|_|/ | |/| | | |
| * | | | | Respect 'limit' param in initialSync apiErik Johnston2014-08-261-1/+5
* | | | | | Fold federation/handler into handlers/federationMark Haines2014-08-266-172/+141
* | | | | | Use store.persist_event rather than pdu_actions.persist_outgoing/pdu_actions....Mark Haines2014-08-262-21/+2
* | | | | | Move new event boilerplate in room handlers into a method on a base clase.Mark Haines2014-08-262-52/+33
* | | | | | Move pdu and event persistence into a single persist_event functionMark Haines2014-08-263-49/+35
* | | | | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-263-7/+8
|\| | | | |
| * | | | | Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-263-7/+8
| |\ \ \ \ \
| | * | | | | Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$ro...Kegan Dougal2014-08-263-7/+8
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-261-1/+1
|\| | | | |
| * | | | | Use state_key rather than target_user_idMark Haines2014-08-261-1/+1
| |/ / / /
* | | | | Use state_key rather than target_user_idMark Haines2014-08-261-1/+1
* | | | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-2627-186/+460
|\| | | |
| * | | | Fix pyflakes errorsMark Haines2014-08-2611-31/+11
| | |_|/ | |/| |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur...Kegan Dougal2014-08-263-5/+35
| |\ \ \ | | | |/ | | |/|
| | * | Add the ability to turn on the twisted manhole telnet service.Erik Johnston2014-08-261-0/+10
| | * | Add a do_users_share_a_room method and use that in the presence handler.Erik Johnston2014-08-262-5/+25
| * | | Implemented /rooms/$roomid/[invite|join|leave] with POST / PUT (incl txn ids)Kegan Dougal2014-08-262-8/+35
| * | | Added basic in-memory REST transaction storage. Only the latest transaction f...Kegan Dougal2014-08-263-2/+103
| * | | Added servlet for /rooms/$roomid/[invite|join|leave]Kegan Dougal2014-08-261-0/+40
| |/ /
| * | Adjusted webclient to use new state paths. Updated membership msg template to...Kegan Dougal2014-08-261-1/+2
| * | Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur...Kegan Dougal2014-08-261-1/+1
| |\ \
| | * | Add 'state_key' to valid_keysErik Johnston2014-08-261-0/+1
| | * | Send down state_key to clientsErik Johnston2014-08-261-1/+0
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur...Kegan Dougal2014-08-2617-30/+153
| |\| |
| | * | Order 'get_recent_events_for_room' correctly.Erik Johnston2014-08-261-1/+1
| | * | Ensure that we don't have duplicate hosts in the pdu destinations listErik Johnston2014-08-241-2/+2
| | * | For the content repo, don't just use homeserver.hostname as that might not in...Erik Johnston2014-08-242-1/+10
| | * | Add a unique constraint on the room hosts tableErik Johnston2014-08-241-1/+2
| | * | Encode unicode from json as utf-8. This was required to allow people to regis...Erik Johnston2014-08-241-2/+2
| | * | Oops, we need to use defer.returnValue.Erik Johnston2014-08-221-1/+2
| | * | Make is_presence_visible always return true as it was thrashing the database.Erik Johnston2014-08-221-0/+3
| | * | Turn off more spammy logging.Erik Johnston2014-08-221-1/+1
| | * | Turn off spammy loggingErik Johnston2014-08-221-1/+1
| | * | Add indices to schemaErik Johnston2014-08-222-0/+24
| | * | Don't return state event outlier's when paginating.Erik Johnston2014-08-223-2/+9
| | * | Bump versions to 0.0.1Erik Johnston2014-08-221-0/+2
| | * | Make the content repo work with in daemon mode. Return the full url on upload...Erik Johnston2014-08-222-8/+23
| | * | host a webclient by defaultMatthew Hodgson2014-08-211-2/+2
| | * | Add ts field to all events.Erik Johnston2014-08-212-2/+7
| | * | Change IM sync api to also return the current presence list.Erik Johnston2014-08-212-6/+23
| | * | In the initial sync api, return the inviter for rooms in the 'invited' stateErik Johnston2014-08-211-0/+4
| | * | Return the current state in the initial sync api.Erik Johnston2014-08-211-0/+3
| | * | Stop internal keys from getting into SynapseEventsErik Johnston2014-08-212-0/+6
| | * | Wait for getting a Join in response to an invite/join dance.Erik Johnston2014-08-212-2/+28
| | |/
| * | Removed member list servlet: now using generic state paths.Kegan Dougal2014-08-268-102/+51
| * | Impl: /rooms/roomid/state/eventtype/state_key - Renamed RoomTopicRestServlet ...Kegan Dougal2014-08-222-20/+43
| |/
* | fix a few pyflakes errorsMark Haines2014-08-262-7/+6
* | Move the event storage into a single transactionMark Haines2014-08-266-48/+60
* | Take a snapshot of the state of the room before performing updatesMark Haines2014-08-224-53/+135
|/
* Make event stream storage return all membership events about the user, regard...Erik Johnston2014-08-201-4/+6
* Use the "collect_presencelike_data" distributor signal instead of re-implemen...Paul "LeoNerd" Evans2014-08-201-30/+2
* Fix exception name in _fill_out_join_content() exceptionPaul "LeoNerd" Evans2014-08-201-1/+3
* Define __copy__ and __deepcopy__ as identity functions on DomainSpecificStrin...Paul "LeoNerd" Evans2014-08-201-0/+8
* Kill the "_homeserver_" injected messages for room membership changesPaul "LeoNerd" Evans2014-08-202-58/+6
* Give the event_id of the failed eventErik Johnston2014-08-201-1/+4
* Better handle the edge cases of trying to remote join roomsErik Johnston2014-08-202-37/+88
* Don't generate room membership messages. Include previous state of in members...Erik Johnston2014-08-201-7/+10
* Only hit get_room_events_stream if we have a valid user_idErik Johnston2014-08-191-0/+3
* Fix token to correct formatErik Johnston2014-08-191-1/+1
* Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-191-3/+0
|\
| * Don't delete OFFLINE users from the presence cache, so we can report on their...Paul "LeoNerd" Evans2014-08-191-3/+0
* | Remove debug logging from token parsing funcs.Erik Johnston2014-08-191-2/+0
* | Add comment about what strorage.stream doesErik Johnston2014-08-191-0/+20
* | Default from param to 'END'Erik Johnston2014-08-191-0/+1
* | PresenceStreamData was expecting *_key to be intsErik Johnston2014-08-191-0/+3
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-198-18/+194
|\|
| * Ensure that federation's .send_edu() returns a DeferredPaul "LeoNerd" Evans2014-08-191-0/+1
| * More unquotes. Also, don't return the room_id on membership state changes, th...Kegan Dougal2014-08-191-6/+8
| * Unquote sender IDs.Kegan Dougal2014-08-191-2/+2
| * Perform the 'REST'-level tests of Presence against the real Presence handler ...Paul "LeoNerd" Evans2014-08-191-1/+1
| * Implement and test presence dropping of remote usersPaul "LeoNerd" Evans2014-08-191-2/+6
| * Deny __iter__ on UserID/RoomID/RoomName instances as it's a subtle bug that w...Paul "LeoNerd" Evans2014-08-191-0/+6
| * Reduce the amount of incredibly spammy stack traces. Expected errors (e.g. Sy...Kegan Dougal2014-08-191-1/+13
| * Small amounts of cleanup and bonus round comments.Kegan Dougal2014-08-181-4/+8
| * Implemented GETs for the ContentRepoResource. It all actually appears to be w...Kegan Dougal2014-08-182-13/+62
| * hs: Make the uploads directory if it doesn't exist. Namespace uploads by the ...Kegan Dougal2014-08-181-5/+46
| * Auth content uploads. Added a mapping function from request > filename. Added...Kegan Dougal2014-08-182-13/+33
| * Added /matrix/content path, HS resource_for_content_repo attribute and FileUp...Kegan Dougal2014-08-184-4/+41
* | Fix bug where we sometimes set min_token to None.Erik Johnston2014-08-191-1/+2
* | Print out stacktrace when we failed to persist event.Erik Johnston2014-08-191-1/+1
* | Add a 'backfill room' buttonErik Johnston2014-08-196-25/+81
* | Change the way pagination works to support out of order events.Erik Johnston2014-08-196-79/+225
* | Fix typos in SQL and where we still had rowid's (which no longer exist)Erik Johnston2014-08-182-7/+7
* | Make snapshot_all_rooms return results in the correct form, including start a...Erik Johnston2014-08-182-6/+28
* | SQL doesn't allow AUTOINCREMENT on non PRIMARY KEY columns.Erik Johnston2014-08-182-3/+20
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-183-12/+14
|\|
| * Update the default longpoll timeout time.Kegan Dougal2014-08-181-1/+1
| * Allow room presence visibility between users who share a roomPaul "LeoNerd" Evans2014-08-181-7/+5
| * Precent lack of presence visiblity from causing room /members/list to failPaul "LeoNerd" Evans2014-08-181-4/+8
* | Add two different columns for ordering the events table, one which can be use...Erik Johnston2014-08-184-19/+33
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-182-2/+8
|\|
| * improve commentMatthew Hodgson2014-08-161-1/+1
| * emergency bodges to turn off presence ACLs in order to makeMatthew Hodgson2014-08-161-2/+7
| * retcols is mandatory. i have no idea how this could ever have worked?Matthew Hodgson2014-08-161-0/+1
* | Not all event streams returns SynapseEventsErik Johnston2014-08-181-1/+5
* | We don't need to do a json.loads hereErik Johnston2014-08-181-2/+2
* | Ensure we have a 'membership' key in RoomMemberEventsErik Johnston2014-08-181-0/+2
* | Disable the ability to GET individualy messages. We need to think about the c...Erik Johnston2014-08-181-5/+7
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-151-3/+12
|\|
| * When starting to poll for presence, also include members of all shared roomsPaul "LeoNerd" Evans2014-08-151-3/+12
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-151-0/+7
|\|
| * Also include users' presence when responding to /rooms/:room_id/members/listPaul "LeoNerd" Evans2014-08-151-0/+7
| * Fix imsync's SELECT query to only find the rooms I'm actually joined in, not ...Paul "LeoNerd" Evans2014-08-151-2/+5
* | Rename method name to not clash with other ones in storage.Erik Johnston2014-08-152-4/+4
* | Fix typo of key nameErik Johnston2014-08-151-1/+1
* | We no longer need to special case room config events.Erik Johnston2014-08-151-2/+2
* | PEP8 cleanupsErik Johnston2014-08-157-16/+29
* | Comment.Erik Johnston2014-08-151-0/+1
* | Support generic events.Erik Johnston2014-08-152-5/+8
* | Fix bug when generating a key when get_room_events_stream returned zero rowsErik Johnston2014-08-151-3/+7
* | Actually use MAX_STREAM_SIZE constant.Erik Johnston2014-08-151-1/+1
* | Fix pagination to work with new db schemaErik Johnston2014-08-152-31/+48
* | Correctly return new token when returning events. Serialize events correctly.Erik Johnston2014-08-155-9/+25
* | Start chagning the events stream to work with the new DB schemaErik Johnston2014-08-158-118/+102
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-1520-107/+235
|\|
| * Add a check to make sure that during state conflict res we only request a PDU...Erik Johnston2014-08-151-2/+10
| * Fix pontenial bug in state resolution handler that compared dicts rather than...Erik Johnston2014-08-151-1/+4
| * Remember to reflect membership LEAVE events to the leaving member so they kno...Paul "LeoNerd" Evans2014-08-151-0/+4
| * Pass back the user_id in the response to /login in case it has changed. Store...Kegan Dougal2014-08-142-5/+7
| * hs: Make /login accept full user IDs or just local parts. webclient: Only ena...Kegan Dougal2014-08-141-1/+5
| * Reflect user's messages up to themselves before pushing it to federatoin; als...Paul "LeoNerd" Evans2014-08-141-2/+2
| * We really don't need debug logging of all the SQL statements we execute; we'r...Paul "LeoNerd" Evans2014-08-141-4/+0
| * Put some DEBUG logging in lockutils.py so we can debug roomlocksPaul "LeoNerd" Evans2014-08-141-3/+9
| * Be more helpful when failing to register/login, stating why (communication er...Kegan Dougal2014-08-141-2/+2
| * Send forbidden codes when doing login attempts.Kegan Dougal2014-08-141-3/+3
| * Round Presence mtime and mtime_age to nearest msec; avoids floats for msec va...Paul "LeoNerd" Evans2014-08-141-5/+15
| * Change relative db paths to absolute paths in case we daemonize.Erik Johnston2014-08-141-2/+9
| * chmod +x homeserver.pyPaul "LeoNerd" Evans2014-08-141-0/+0
| * Added M_UNKNOWN_TOKEN error code and send it when there is an unrecognised ac...Kegan Dougal2014-08-142-2/+4
| * Default error code BAD_PAGINATION for EventStreamErrorsKegan Dougal2014-08-141-1/+4
| * Added web client prefixKegan Dougal2014-08-142-4/+5
| * Added a urls module for keeping client and federation prefixes.Kegan Dougal2014-08-145-14/+23
| * If the web client is enabled, automatically redirect root '/' to the web clie...Kegan Dougal2014-08-142-4/+30
| * Fixed dynamic resource mapping to clobber dummy Resources with the actual des...Kegan Dougal2014-08-141-5/+27
| * Honour the -w flag to enable the web client at /matrix/clientKegan Dougal2014-08-141-5/+8
| * Removed http_server from HomeServer. Updated unit tests to use either resourc...Kegan Dougal2014-08-143-14/+7
| * Make federation use resource_for_federation as well.Kegan Dougal2014-08-144-49/+5
| * Start phasing out HttpServer: we should be using Resources instead. Added res...Kegan Dougal2014-08-145-21/+97
* | Reimplement the get public rooms api to work with new DB schemaErik Johnston2014-08-157-37/+101
* | Fix up typos and correct sql queriesErik Johnston2014-08-146-44/+36
* | Update StreamStoreErik Johnston2014-08-141-245/+36
* | Start fixing places that use the data store.Erik Johnston2014-08-146-39/+33
* | Fix typoErik Johnston2014-08-141-1/+1
* | Rename _execute_queryErik Johnston2014-08-144-4/+4
* | Fix up RoomMemberStore to work with the new schema.Erik Johnston2014-08-143-97/+79
* | Actually encode dicts as json in the DBErik Johnston2014-08-142-3/+4
* | Change relative db paths to absolute paths in case we daemonize.Erik Johnston2014-08-141-2/+9
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-1416-93/+124
|\|
| * fix http client GET parameters; somehow missing named param. how could this h...Matthew Hodgson2014-08-141-2/+2
| * fix whitespaceMatthew Hodgson2014-08-141-0/+1
| * An initial hack at storing presence state-change mtimes in database and prese...Paul "LeoNerd" Evans2014-08-134-9/+39
| * Set datastore's .hs field in SQLBaseStore rather than in the toplevel DataSto...Paul "LeoNerd" Evans2014-08-132-1/+1
| * when we're talking about backfilling data in federation, call it backfilling ...Matthew Hodgson2014-08-135-41/+41
| * Implement directory service federation by Federation Queries; avoid local_onl...Paul "LeoNerd" Evans2014-08-132-27/+29
| * Add a HomeServer.parse_roomalias() to avoid having to RoomAlias.from_sring(.....Paul "LeoNerd" Evans2014-08-133-14/+12
* | Make feedback table also store sender.Erik Johnston2014-08-132-1/+3
* | Initial stab at refactoring the SQL tables, including rejigging some of the s...Erik Johnston2014-08-136-261/+115
* | Convert im schema to a 'one' table structureErik Johnston2014-08-131-26/+31
|/
* Now that HS->HS Profile lookups use Federation Queries, we don't need the 'lo...Paul "LeoNerd" Evans2014-08-132-10/+4
* Use new Federation Query API to implement HS->HS fetching of remote users' pr...Paul "LeoNerd" Evans2014-08-131-25/+41
* Define the concept of a 'federation Query'; creating API for making and handl...Paul "LeoNerd" Evans2014-08-132-0/+75
* Update get_json()'s documentation to match the actual observed behaviourPaul "LeoNerd" Evans2014-08-131-4/+3
* Handle a potential race in the notifier when calling get_events_for which res...Erik Johnston2014-08-131-3/+7
* Don't pass host_web_client flag to register_servlets, it needs to be a Resour...Kegan Dougal2014-08-132-4/+2
* Merge branch 'master' of github.com:matrix-org/synapseKegan Dougal2014-08-133-22/+24
|\
| * Fix logging verbosity parsing codePaul "LeoNerd" Evans2014-08-131-3/+2
| * Namespace all the Federation HTTP URLs to /matrix/federation/v1/...Paul "LeoNerd" Evans2014-08-131-15/+18
| * Use strings instead of opaque magic-number constants for presence states; ren...Paul "LeoNerd" Evans2014-08-131-4/+4
* | Merge branch 'master' of github.com:matrix-org/synapseKegan Dougal2014-08-131-3/+3
|\|
| * verbose by default pleaseMatthew Hodgson2014-08-131-3/+3
* | Added a -w flag which will host the web client if specified. Currently this j...Kegan Dougal2014-08-135-48/+65
|/
* Return the room_alias when GETing public rooms.Kegan Dougal2014-08-131-2/+5
* add in whitespace after copyright statements to improve legibilityMatthew Hodgson2014-08-1375-1/+75
* actually register the login servlet (uncommitted code thinko?)Matthew Hodgson2014-08-131-3/+2
* Just say yes to OPTIONS requests, since we want to turn on CORS headers for a...Erik Johnston2014-08-121-0/+5
* Reference Matrix Home Servermatrix.org2014-08-1283-0/+11941