summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* 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-264-50/+36
* Merge branch 'develop' into storage_transactionsMark Haines2014-08-266-15/+16
|\
| * Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-266-15/+16
| |\
| | * Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$ro...Kegan Dougal2014-08-266-15/+16
* | | 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-2674-869/+3466
|\|
| * Fix pyflakes errorsMark Haines2014-08-2611-31/+11
| * Avoid double call of refresh at app startupEmmanuel ROHEE2014-08-262-5/+7
| * Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-265-34/+35
| |\
| | * Fix ALL THE UNIT TESTSKegan Dougal2014-08-265-34/+35
| * | Determine and send user presence stateEmmanuel ROHEE2014-08-264-5/+140
| * | Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-268-14/+217
| |\|
| | * Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur...Kegan Dougal2014-08-264-7/+38
| | |\
| | | * Add the ability to turn on the twisted manhole telnet service.Erik Johnston2014-08-262-2/+13
| | | * Add a do_users_share_a_room method and use that in the presence handler.Erik Johnston2014-08-262-5/+25
| | |/ | |/|
| * | Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-2614-170/+117
| |\ \
| | | * webclient: Updated to use /rooms/$roomid/[invite|join|leave]Kegan Dougal2014-08-261-7/+11
| | | * 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
| | |/
| | * URL renaming: Room state keys now use the format /rooms/$roomid/state/$event_...Kegan Dougal2014-08-261-2/+2
| | * Adjusted webclient to use new state paths. Updated membership msg template to...Kegan Dougal2014-08-266-47/+24
| | * 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-2655-606/+2633
| | |\ | | |/ | |/|
| * | Order 'get_recent_events_for_room' correctly.Erik Johnston2014-08-261-1/+1
| * | The landing URL is now '#/' which actually points to homeControllerEmmanuel ROHEE2014-08-251-2/+2
| * | Merge remote-tracking branch 'origin/master' into developEmmanuel ROHEE2014-08-251-2/+2
| |\ \
| | * | Ensure that we don't have duplicate hosts in the pdu destinations listErik Johnston2014-08-241-2/+2
| | * | Merge branch 'hotfixes-0.0.1' of github.com:matrix-org/synapseErik Johnston2014-08-244-4/+14
| | |\ \
| * | \ \ Merge remote-tracking branch 'origin/hotfixes-0.0.1' into developEmmanuel ROHEE2014-08-2524-40/+1787
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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
| | |/ /
| | * | oopsMatthew Hodgson2014-08-231-1/+1
| | * | very quick and dirty responsive design for iPhonesMatthew Hodgson2014-08-236-30/+110
| | * | point out the non-quick-start guideMatthew Hodgson2014-08-231-2/+4
| | * | Mention in changelog that we disabled presence. v0.0.1Erik Johnston2014-08-221-0/+2
| | * | skip presence tests which broke when presence polling was disabledMark Haines2014-08-223-0/+13
| | * | 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
| | * | avatar urlroot2014-08-221-1/+1
| | * | add 0.0.0 into the changelog, and add datesMatthew Hodgson2014-08-221-2/+8
| | * | Merge branch 'release-v0.0.1' of github.com:matrix-org/synapseErik Johnston2014-08-2263-1386/+1956
| | |\ \
| | * | | Added initial swagger REST API spec.Kegan Dougal2014-08-227-0/+1607
| * | | | Oops. Removed my NetBeans private foldersEmmanuel ROHEE2014-08-253-39/+0
| * | | | Added "Your name" as placeholder to help user understand what is this alone i...Emmanuel ROHEE2014-08-221-1/+1
| * | | | Merge branch 'settings-page' into developEmmanuel ROHEE2014-08-2215-452/+503
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Use /home everywhereEmmanuel ROHEE2014-08-226-12/+12
| | * | | renamed rooms to home - renamed filesEmmanuel ROHEE2014-08-224-0/+23
| | * | | renamed rooms to homeEmmanuel ROHEE2014-08-223-0/+16
| | * | | Move profile parts of the rooms page and the config content into a new page: ...Emmanuel ROHEE2014-08-228-201/+237
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1Erik Johnston2014-08-224-49/+95
| |\ \ \ \
| * | | | | Move the 'Upgrade' section to just below the 'Installation' sectionErik Johnston2014-08-221-6/+8
| * | | | | Update the README.rst to refer people to UPGRADE.rstErik Johnston2014-08-221-0/+6
| * | | | | Rename files to .rst for consistency.Erik Johnston2014-08-222-0/+0
| * | | | | Add a missing '='Erik Johnston2014-08-221-1/+2
| * | | | | Add CHANGES and UPGRADE files.Erik Johnston2014-08-222-0/+43
| * | | | | Don't return state event outlier's when paginating.Erik Johnston2014-08-223-2/+9
| * | | | | Add a database-prepare-for-0.0.1.shErik Johnston2014-08-221-0/+2
| * | | | | Add database-prepare-for-0.0.1.sh that should be run before starting a v0.0.1...Erik Johnston2014-08-221-0/+19
| * | | | | Bump versions to 0.0.1Erik Johnston2014-08-223-1/+4
| * | | | | Allow people to specify database location in database-save.shErik Johnston2014-08-221-1/+1
| * | | | | Check if the membership message was for the room we were in before updating t...Erik Johnston2014-08-221-0/+2
| * | | | | Keep track of people's presence and query that when we update the members list.Erik Johnston2014-08-222-3/+10
| * | | | | Reinitialize room when creating a RoomController so that we start off with a ...Erik Johnston2014-08-222-1/+13
| | |/ / / | |/| | |
| * | | | Use $location.url instead of $location.path to get clean page URL without has...Emmanuel ROHEE2014-08-224-10/+10
| * | | | Make the content repo work with in daemon mode. Return the full url on upload...Erik Johnston2014-08-223-9/+24
| * | | | resizeImage: generate an image in the format of the original image. (Tested w...Emmanuel ROHEE2014-08-221-1/+3
| * | | | Safari needs the img.onload event before actually working on the imgEmmanuel ROHEE2014-08-222-27/+39
| * | | | homeserver runs webclient by default nowMatthew Hodgson2014-08-221-8/+3
| * | | | improve leftBlock cssMatthew Hodgson2014-08-221-1/+6
| * | | | -w is no moreMatthew Hodgson2014-08-221-2/+1
| * | | | fix mainInput retaining focus between sending consecutive messages by disabli...Matthew Hodgson2014-08-222-4/+4
| * | | | fix weird fontsizes on iOSMatthew Hodgson2014-08-221-0/+1
| * | | | sacrifice a goat or two to make wordwrap actually work properlyMatthew Hodgson2014-08-222-28/+21
| * | | | rename autoComplete directive as tabComplete to avoid confusion with the auto...Matthew Hodgson2014-08-221-15/+15
| * | | | add fixme pointing out name disambiguation is a bit flakeyMatthew Hodgson2014-08-221-1/+4
| * | | | host a webclient by defaultMatthew Hodgson2014-08-211-2/+2
| * | | | actually display room metadata based on m.room.membe eventsMatthew Hodgson2014-08-213-2/+23
| * | | | Add a var.Erik Johnston2014-08-211-1/+1
| * | | | Only start event streaming after having set up the controllers.Erik Johnston2014-08-216-5/+19
| * | | | Add ts field to all events.Erik Johnston2014-08-212-2/+7
| * | | | Change webclient to always hit the im sync api before streaming so we get cur...Erik Johnston2014-08-212-7/+41
| * | | | Change IM sync api to also return the current presence list.Erik Johnston2014-08-212-6/+23
| * | | | stop hammering the HS for displayname and avatar URLsMatthew Hodgson2014-08-211-3/+5
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1Erik Johnston2014-08-216-38/+294
| |\ \ \ \
| * | | | | Use the new 'inviter' key from im sync for room display names.Erik Johnston2014-08-212-3/+8
| * | | | | Fixed first pagination detectionEmmanuel ROHEE2014-08-211-2/+3
| * | | | | cheer up erik and remove the double-horizontal-border between adjacent text p...Matthew Hodgson2014-08-211-0/+1
| * | | | | 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-269-106/+53
| | | | | * Impl: /rooms/roomid/state/eventtype/state_key - Renamed RoomTopicRestServlet ...Kegan Dougal2014-08-222-20/+43
| | | | |/ | | | |/|
| | | * | Updater command line client to new IS APIDavid Baker2014-08-221-25/+37
| | | * | Update web client to use new IS API.David Baker2014-08-223-24/+58
| | |/ /
| | * | Show image fullscreen when clicking on the thumbnailEmmanuel ROHEE2014-08-212-3/+31
| | * | If there are available, show image thumbnails in the messages listEmmanuel ROHEE2014-08-211-3/+7
| | * | Generate thumbnail client side and send its URL and info with the image messa...Emmanuel ROHEE2014-08-213-28/+149
| | * | Made uploadContent compatible for sending Blob objectsEmmanuel ROHEE2014-08-211-4/+22
| | * | Added resizeImage()Emmanuel ROHEE2014-08-211-1/+86
| |/ /
* | | 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-226-58/+162
|/ /
* | 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
|\|