summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-08-214-0/+415
|\
| * Added final jsfiddle: an example app demonstrating most of the c2s api.Kegan Dougal2014-08-204-0/+415
* | Make event stream storage return all membership events about the user, regard...Erik Johnston2014-08-201-4/+6
* | Quick fix to support array of room aliasesEmmanuel ROHEE2014-08-201-2/+3
* | BF: Apply image place holder only if the image message has the height informa...Emmanuel ROHEE2014-08-201-1/+1
* | BF: Wait for the room_id being resolved before starting paginationEmmanuel ROHEE2014-08-201-2/+2
* | Use the "collect_presencelike_data" distributor signal instead of re-implemen...Paul "LeoNerd" Evans2014-08-202-30/+4
* | 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
* | Create a placeholder for each image of the chat thread. The height of this pl...Emmanuel ROHEE2014-08-201-1/+4
* | Send images with their imageInfo (size, mymetype, width & height)Emmanuel ROHEE2014-08-205-17/+89
* | Sanitize message text content only if the type of current message in the ng-r...Emmanuel ROHEE2014-08-201-2/+2
* | Give the event_id of the failed eventErik Johnston2014-08-201-1/+4
* | Fix test. get_joined_hosts_for_room get's called multiple timesErik Johnston2014-08-201-3/+5
* | Fix federation test, since we now hit store.get_roomErik Johnston2014-08-201-1/+2
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-08-206-0/+375
|\|
| * Added more jsfiddles.Kegan Dougal2014-08-206-0/+375
* | Better handle the edge cases of trying to remote join roomsErik Johnston2014-08-202-37/+88
* | Replaced the image URL text input by a file selector button: "Send Image"Emmanuel ROHEE2014-08-202-18/+5
* | Disabled sending buttons while a message is being sent. Useful on bad Interne...Emmanuel ROHEE2014-08-202-6/+18
* | Don't generate room membership messages. Include previous state of in members...Erik Johnston2014-08-202-8/+16
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-08-2010-171/+415
|\|
| * File organisation sanity: put directives and filters into dedicated filesEmmanuel ROHEE2014-08-206-197/+254
| * Add some static fiddles for now (will migrate to github paths eventually)Kegan Dougal2014-08-191-1/+5
| * More fiddles, more fun!Kegan Dougal2014-08-193-0/+156
| * keepScroll: a directive to anchor the scroller position at the bottom when th...Emmanuel ROHEE2014-08-191-0/+27
* | 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-197-8/+100
|\|
| * Added registration/login jsfiddle, formatted so it can be loaded directly fro...Kegan Dougal2014-08-194-1/+98
| * BF: The enter key in the image URL box called sendImage() with no argumentEmmanuel ROHEE2014-08-191-1/+1
| * Cleaned dead codeEmmanuel ROHEE2014-08-191-3/+1
| * 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
* | Don't expect a reflection from events streamErik Johnston2014-08-191-3/+1
* | Update testsErik Johnston2014-08-192-12/+5
* | Default from param to 'END'Erik Johnston2014-08-191-0/+1
* | PresenceStreamData was expecting *_key to be intsErik Johnston2014-08-191-0/+3
* | Fix typo in merge conflictErik Johnston2014-08-191-2/+0
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-1929-391/+1256
|\|
| * ProofingKegan Dougal2014-08-191-19/+20
| * Rewrite of PresenceHandler test to ensure it covers the interaction with Fede...Paul "LeoNerd" Evans2014-08-191-149/+279
| * Ensure that federation's .send_edu() returns a DeferredPaul "LeoNerd" Evans2014-08-191-0/+1
| * Add a DeferredMockCallable; like mock's MockCallable but allows awaitingPaul "LeoNerd" Evans2014-08-191-0/+41
| * More formatting, more clarity.Kegan Dougal2014-08-191-23/+38
| * rst formatting, section heading intro blurbs.Kegan Dougal2014-08-191-18/+35
| * Added top level TODO and a bit more info on storing the 'end' token.Kegan Dougal2014-08-191-1/+9
| * Added a first cut for a 'how to' on the client-server API.Kegan Dougal2014-08-191-0/+244
| * 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-192-41/+93
| * Implement and test presence dropping of remote usersPaul "LeoNerd" Evans2014-08-192-2/+14
| * Deny __iter__ on UserID/RoomID/RoomName instances as it's a subtle bug that w...Paul "LeoNerd" Evans2014-08-191-0/+6
| * Rename MockHttpServer to MockHttpResource as it stands for one server resourc...Paul "LeoNerd" Evans2014-08-197-146/+147
| * Reduce the amount of incredibly spammy stack traces. Expected errors (e.g. Sy...Kegan Dougal2014-08-191-1/+13
| * Change mouse cursor to pointer on elements user can click onEmmanuel ROHEE2014-08-192-1/+5
| * Merge remote-tracking branch 'origin/master' into user_pageEmmanuel ROHEE2014-08-197-25/+188
| |\
| | * show private room_ids rather than nulls in notifs if there is no room_aliasMatthew Hodgson2014-08-181-1/+1
| | * 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-183-15/+65
| | * 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-184-31/+62
| | * Added /matrix/content path, HS resource_for_content_repo attribute and FileUp...Kegan Dougal2014-08-184-4/+41
| * | Fill user page with avatar, display name and matrix idEmmanuel ROHEE2014-08-193-5/+44
| * | Made small avatar image centerEmmanuel ROHEE2014-08-191-0/+1
| * | Use $location.url to open the user profile page. The user page URL is then th...Emmanuel ROHEE2014-08-191-1/+1
| * | Added link to user profile pagesEmmanuel ROHEE2014-08-192-1/+6
| * | Created boilerplate for user profile pageEmmanuel ROHEE2014-08-184-0/+43
| |/
| * In members list, on avatar mouseover, show a tooltip with the user matrix idEmmanuel ROHEE2014-08-181-2/+6
| * Join room: open the room URL with the room alias in itEmmanuel ROHEE2014-08-181-6/+2
| * Support urlencoded room aliases in room URLEmmanuel ROHEE2014-08-182-17/+29
| * If possible, use href with room alias in rooms listEmmanuel ROHEE2014-08-181-2/+2
| * Support room alias in rooms URL (ex: http://127.0.0.1:8000/#/room/#public:loc...Emmanuel ROHEE2014-08-183-1/+58
* | 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-198-82/+227
* | 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-184-3/+23
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-185-18/+55
|\|
| * Update the default longpoll timeout time.Kegan Dougal2014-08-181-1/+1
| * Increase /events timeout to 30 secs. We don't need it so low anymore to get a...Kegan Dougal2014-08-181-1/+1
| * Allow room presence visibility between users who share a roomPaul "LeoNerd" Evans2014-08-182-12/+45
| * 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-1817-131/+1232
|\|
| * webclient: Tweak namespace of auto-complete directive. ng- should really only...Kegan Dougal2014-08-182-2/+2
| * Disabled image upload UIsEmmanuel ROHEE2014-08-182-2/+6
| * Do not start the event stream if the user is not logged in (=if he does not h...Emmanuel ROHEE2014-08-183-9/+17
| * Added another button to upload and send an image.Emmanuel ROHEE2014-08-182-2/+20
| * make my emotes white againMatthew Hodgson2014-08-181-0/+4
| * make text font sizes consistentMatthew Hodgson2014-08-172-13/+26
| * implement html5 notifications. (have to be explicitly requested under Config)Matthew Hodgson2014-08-174-3/+37
| * unbreak login sequence (which spuriously required a sydent server to be speci...Matthew Hodgson2014-08-171-2/+2
| * oops, debugging crept inMatthew Hodgson2014-08-171-1/+0
| * dial down loggingMatthew Hodgson2014-08-171-5/+5
| * - use css3 to make avatars always the right aspect ratioMatthew Hodgson2014-08-173-4/+105
| * autohyperlink messages using linkyMatthew Hodgson2014-08-164-3/+581
| * use minified angular by defaultMatthew Hodgson2014-08-161-2/+2
| * minified angularjs stuff to speed things upMatthew Hodgson2014-08-164-0/+249
| * improve infinite scrolling so it keeps paginating until you have a scrollbar ...Matthew Hodgson2014-08-161-17/+28
| * remove log spamMatthew Hodgson2014-08-161-2/+2
| * disambiguate identical displaynamesMatthew Hodgson2014-08-161-1/+23
| * make presence timestamps less verboseMatthew Hodgson2014-08-161-3/+3
| * roll back b602834 as it made a bizarre subset of avatars go awolMatthew Hodgson2014-08-161-6/+5
| * order the members list by most recently activeMatthew Hodgson2014-08-162-7/+19
| * don't hammer a new hit for every displayname and avatar_url when we already h...Matthew Hodgson2014-08-161-1/+14
| * improve commentMatthew Hodgson2014-08-161-1/+1
| * merge weirdnessMatthew 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
| * display mtime_age in webclientMatthew Hodgson2014-08-163-10/+33
| * slightly hacky but more functional infinite scrollingMatthew Hodgson2014-08-161-30/+36
| * switch some elements from being styled by class to styled by idMatthew Hodgson2014-08-155-36/+36
| * FormattingKegan Dougal2014-08-152-21/+22
* | Change the MemoryDataStore to implement new storage apiErik Johnston2014-08-181-99/+50
* | 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
* | Don't bother generating png'sErik Johnston2014-08-181-1/+1
* | Disable the ability to GET individualy messages. We need to think about the c...Erik Johnston2014-08-182-41/+43
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-1511-28/+173
|\|
| * Get presence for members when you enter a room (it was coming down but wasn't...Kegan Dougal2014-08-151-0/+4
| * Added infinite scrolling. It's sliiiightly buggy in that it jumps down the li...Kegan Dougal2014-08-157-9/+115
| * When new invites come down, update the My Rooms list. Added hacks to make the...Kegan Dougal2014-08-153-16/+32
| * Document that /rooms/:room_id/members/list yields profile and presence inform...Paul "LeoNerd" Evans2014-08-151-0/+10
| * When starting to poll for presence, also include members of all shared roomsPaul "LeoNerd" Evans2014-08-151-3/+12
* | Fix some of the tests to reflect changes in the storage layer.Erik Johnston2014-08-153-39/+11
* | 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
* | 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
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-1510-88/+330
|\|
| * Fix imsync's SELECT query to only find the rooms I'm actually joined in, not ...Paul "LeoNerd" Evans2014-08-151-2/+5
| * Create a room-nuking script as it's useful for emergency debuggingPaul "LeoNerd" Evans2014-08-151-0/+24
| * Remove old polling stuff from RoomController. Added service comments. Do not ...Kegan Dougal2014-08-154-45/+20
| * Event streaming now happens on an app level, rather than a per-room level. Ma...Kegan Dougal2014-08-155-19/+76
| * Store messages in $rootScope so they can be accessed from multiple controller...Kegan Dougal2014-08-153-12/+29
| * Added event handler service which.. handles events. More specifically, it $br...Kegan Dougal2014-08-155-32/+124
| * Added event stream service which neatly blobs together requests / state for t...Kegan Dougal2014-08-155-14/+91
* | 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-1547-270/+714
|\|
| * Add a check to make sure that during state conflict res we only request a PDU...Erik Johnston2014-08-152-2/+13
| * 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
| * Updated README about -w in all the places.Kegan Dougal2014-08-151-3/+3
| * s/Synapse/Matrix/Matthew Hodgson2014-08-141-3/+3
| * It's called Matrix :)Matthew Hodgson2014-08-141-11/+11
| * manual syutilMatthew Hodgson2014-08-141-0/+4
| * Update README to mention -w and remove SimpleHTTPServerKegan Dougal2014-08-141-9/+3
| * Add documentation about Federation Queries and EDUsPaul "LeoNerd" Evans2014-08-141-9/+59
| * fix linewrapMatthew Hodgson2014-08-141-1/+2
| * More helpful display when the event stream fails, wiping it when the connecti...Kegan Dougal2014-08-142-5/+10
| * We can now upload avatar image somewhereEmmanuel ROHEE2014-08-141-4/+13
| * Create a temporary upload service server side (by hacking demos/webserver.py)...Emmanuel ROHEE2014-08-141-0/+1
| * Create a temporary upload service server side (by hacking demos/webserver.py)...Emmanuel ROHEE2014-08-142-1/+71
| * webclient: You can now paginate in rooms. Defaults to 10 messages, with a but...Kegan Dougal2014-08-144-21/+74
| * Pass back the user_id in the response to /login in case it has changed. Store...Kegan Dougal2014-08-144-7/+9
| * hs: Make /login accept full user IDs or just local parts. webclient: Only ena...Kegan Dougal2014-08-143-8/+6
| * 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
| * Auto-correct the username when logging in if there isn't an @Kegan Dougal2014-08-141-0/+6
| * 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-142-6/+18
| * Finish up room controller too. May have missed one or two, but testing didn't...Kegan Dougal2014-08-141-14/+14
| * Added extra nesting .data and rename callback to be response not dataKegan Dougal2014-08-142-31/+31
| * Move the unknown token broadcast to the interceptor. Return the $http promise...Kegan Dougal2014-08-144-30/+16
| * Added an access token interceptor to check unknown tokens.Kegan Dougal2014-08-141-3/+19
| * 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
| * Detect when the user access token is no more valid and log the user out in th...Emmanuel ROHEE2014-08-142-4/+20
| * Guess the home server URL on the login screen by inspecting the URL of the we...Kegan Dougal2014-08-141-1/+9
| * Added M_UNKNOWN_TOKEN error code and send it when there is an unrecognised ac...Kegan Dougal2014-08-143-3/+8
| * BF: Use ng-srcEmmanuel ROHEE2014-08-141-1/+1
| * 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
| * Use ng-srcEmmanuel ROHEE2014-08-141-1/+1
| * Show avatar in profile section and added a button to select a file (not yet w...Emmanuel ROHEE2014-08-143-6/+45
| * Merge remote-tracking branch 'origin/master'Emmanuel ROHEE2014-08-1416-93/+123
| |\
| | * 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-1412-30/+21
| | * 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-147-21/+101
| * | Created m-file-input. A directive to open a file selection dialog on whatever...Emmanuel ROHEE2014-08-142-0/+44
| |/
* | 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-1435-188/+412
|\|
| * grammar fix v0.0.0 alphaMatthew Hodgson2014-08-141-2/+2
| * fix emote presentationMatthew Hodgson2014-08-141-1/+1
| * fix http client GET parameters; somehow missing named param. how could this h...Matthew Hodgson2014-08-141-2/+2
| * config cssMatthew Hodgson2014-08-141-0/+12
| * completely change the CSS to be an entirely 'position: absolute' layout rathe...Matthew Hodgson2014-08-146-29/+46
| * fix whitespaceMatthew Hodgson2014-08-141-0/+1
| * Consistent capitalisation of 'Matrix' as a proper noun in README; 80 col wrapPaul "LeoNerd" Evans2014-08-131-4/+5
| * An initial hack at storing presence state-change mtimes in database and prese...Paul "LeoNerd" Evans2014-08-137-29/+101
| * Allow advancing the MockClock's timePaul "LeoNerd" Evans2014-08-131-0/+4
| * Don't mock out presence_handler's internal start/stop methods in presencelike...Paul "LeoNerd" Evans2014-08-131-9/+5
| * Move MockClock into tests.utils so we can reĆ¼se itPaul "LeoNerd" Evans2014-08-132-11/+11
| * 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-139-54/+54
| * don't hammer after 403Matthew Hodgson2014-08-131-1/+4
| * pagination was a terrible nameMatthew Hodgson2014-08-131-5/+5
| * Implement directory service federation by Federation Queries; avoid local_onl...Paul "LeoNerd" Evans2014-08-133-27/+141
| * Add a HomeServer.parse_roomalias() to avoid having to RoomAlias.from_sring(.....Paul "LeoNerd" Evans2014-08-134-14/+18
* | 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
|/
* Update graph.py to use new federation urlsErik Johnston2014-08-131-1/+1
* 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-133-33/+71
* Define the concept of a 'federation Query'; creating API for making and handl...Paul "LeoNerd" Evans2014-08-133-0/+113
* 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
* Store public room id > alias mappings.Kegan Dougal2014-08-131-0/+6
* typoMatthew Hodgson2014-08-131-1/+1
* Merge branch 'master' of git+ssh://github.com/matrix-org/synapseMatthew Hodgson2014-08-13116-188/+940
|\
| * 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-1313-146/+160
| |\
| | * more quickstart fixesMatthew Hodgson2014-08-131-4/+9
| | * Merge branch 'master' of git+ssh://github.com/matrix-org/synapseMatthew Hodgson2014-08-131-3/+2
| | |\
| | | * Fix logging verbosity parsing codePaul "LeoNerd" Evans2014-08-131-3/+2
| | * | refactor the README a load more to make the quickstart more visibleMatthew Hodgson2014-08-132-84/+83
| | |/
| | * Namespace all the Federation HTTP URLs to /matrix/federation/v1/...Paul "LeoNerd" Evans2014-08-133-27/+35
| | * Add troubleshooting section to help with PyNaCl bug.David Baker2014-08-131-0/+6