summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2014-08-278-13/+284
| |\
| | * improve iOS layout a bitMatthew Hodgson2014-08-271-0/+10
| | * Added /rooms/$roomid/state and /rooms/$roomid/initialSync to API docs.Kegan Dougal2014-08-271-0/+73
| | * BF: mFileInput dependency got lost somewhere and upload buttons did not work ...Emmanuel ROHEE2014-08-272-2/+2
| * | 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
| * | Merge branch 'stream_refactor' into developErik Johnston2014-08-2717-636/+599
| |\ \
| | * | Turn off presence again.Erik Johnston2014-08-271-2/+2
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-2714-111/+289
| | |\ \
| | * | | 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-2723-748/+771
| | |\ \ \
| | * | | | 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-2610-161/+85
| | |\ \ \ \
| | * | | | | WIP: Completely change how event streaming and pagination work. This reflects...Erik Johnston2014-08-2616-655/+437
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-268-17/+22
| | |\ \ \ \ \
| | * \ \ \ \ \ 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-267-39/+42
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-267-12/+319
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-2663-800/+3107
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | 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-2734-792/+1341
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Added RestServlet for /rooms/$roomid/initialSyncKegan Dougal2014-08-271-0/+30
| * | | | | | | | | | | Added RestServlet for /rooms/$roomid/stateKegan Dougal2014-08-271-0/+16
| * | | | | | | | | | | Highlight the current room in the recents listEmmanuel ROHEE2014-08-274-2/+16
| * | | | | | | | | | | Added the recents component at the left hand side of the room pageEmmanuel ROHEE2014-08-272-1/+14
| * | | | | | | | | | | Added generic state/non-state event sending to the API docs.Kegan Dougal2014-08-271-8/+123
| |/ / / / / / / / / /
| * | | | | | | | | / api docs: Finished adding all C-S APIs. Added initialSync, publicRooms, membe...Kegan Dougal2014-08-274-53/+331
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | BF: use room_id if there is no aliasEmmanuel ROHEE2014-08-271-1/+1
| * | | | | | | | | Sort recents in anti-chronological orderEmmanuel ROHEE2014-08-273-1/+49
| * | | | | | | | | Moved recents things into a separate (and reusable) controlerEmmanuel ROHEE2014-08-276-117/+126
| * | | | | | | | | Moved assignRoomAliases into a central piece: matrixService for nowEmmanuel ROHEE2014-08-271-0/+34
| * | | | | | | | | Cleaned ng dependenciesEmmanuel ROHEE2014-08-271-3/+3
| * | | | | | | | | home/recents: show the last message of each messageEmmanuel ROHEE2014-08-273-8/+102
| * | | | | | | | | Rename go() into goToPage() which is available from everywhere thanks to the ...Emmanuel ROHEE2014-08-272-2/+6
| * | | | | | | | | Support limit and feedback param of initialSyncEmmanuel ROHEE2014-08-272-3/+15
| * | | | | | | | | Renamed /ds to /directoryKegan Dougal2014-08-272-2/+2
| * | | | | | | | | Renamed /public/rooms to /publicRoomsKegan Dougal2014-08-274-37/+14
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | fix joining rooms on webclientDavid Baker2014-08-271-1/+2
| * | | | | | | | git ignore all the homeserver*.db filesPaul "LeoNerd" Evans2014-08-271-1/+1
| * | | | | | | | A reliable logger.info() message /after/ the TCP port has been opened and is ...Paul "LeoNerd" Evans2014-08-271-0/+1
| * | | | | | | | Updated swagger JSON: cleaned up unused entries. Converted most paths to the ...Kegan Dougal2014-08-274-477/+105
| * | | | | | | | Removed urls.rst - The API docs / swagger JSON should be used as the canonica...Kegan Dougal2014-08-271-92/+0
| * | | | | | | | Initial typing notification support - EDU federation, but no timers, and no a...Paul "LeoNerd" Evans2014-08-273-0/+398
| * | | | | | | | 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
| * | | | | | | | Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-278-119/+59
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Final url modifications: renamed /presence_list to /presence/list to keep the...Kegan Dougal2014-08-272-4/+4
| | * | | | | | | | Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and remov...Kegan Dougal2014-08-276-115/+55
| |/ / / / / / / /
* | | | | | | | | add _get_room_member, fix datastore methodsMark Haines2014-08-275-12/+33
* | | | | | | | | Start updating state handling to use snapshotsMark Haines2014-08-274-25/+24
* | | | | | | | | Remove call to get_federation from homeserverMark Haines2014-08-271-4/+0
* | | | | | | | | Fill out prev_events before calling persist_eventMark Haines2014-08-275-83/+57
* | | | | | | | | Remove unused populate_previous_pdusMark Haines2014-08-273-27/+1
* | | | | | | | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-2717-167/+185
|\| | | | | | | |
| * | | | | | | | 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
| * | | | | | | Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-264-81/+13
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur...Kegan Dougal2014-08-260-0/+0
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-266-87/+73
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | | * | | | | | Feedback: Removed FeedbackRestServlet. Modified keys on FeedbackEvent. Expand...Kegan Dougal2014-08-264-81/+13
| | |/ / / / / /
| | * | | | | | Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated cmd...Kegan Dougal2014-08-266-87/+25
| | * | | | | | 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-269-189/+165
* | | | | | | 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-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