Commit graph

  • d12a7c3939 Merge branch 'master' of github.com:matrix-org/synapse into develop Erik Johnston 2014-08-21 11:00:59 +0100
  • ebd3c41ede Make event stream storage return all membership events about the user, regardless of if they were in the room or not. Erik Johnston 2014-08-20 16:07:20 +0100
  • 7371e68f55 Quick fix to support array of room aliases Emmanuel ROHEE 2014-08-20 17:46:16 +0200
  • 5048f4a915 Added final jsfiddle: an example app demonstrating most of the c2s api. Kegan Dougal 2014-08-20 16:45:59 +0100
  • 2f52e8ee18 BF: Apply image place holder only if the image message has the height information Emmanuel ROHEE 2014-08-20 17:17:17 +0200
  • 96da42085c BF: Wait for the room_id being resolved before starting pagination Emmanuel ROHEE 2014-08-20 17:08:05 +0200
  • 583add34fe Use the "collect_presencelike_data" distributor signal instead of re-implementing its behaviour Paul "LeoNerd" Evans 2014-08-20 16:04:01 +0100
  • 50718825bd Fix exception name in _fill_out_join_content() exception Paul "LeoNerd" Evans 2014-08-20 15:50:37 +0100
  • e01bdf2432 Define __copy__ and __deepcopy__ as identity functions on DomainSpecificString, so that copy.deepcopy() will work on them Paul "LeoNerd" Evans 2014-08-20 15:25:17 +0100
  • 9c0e570496 Kill the "_homeserver_" injected messages for room membership changes Paul "LeoNerd" Evans 2014-08-20 14:58:45 +0100
  • ba88c9105c Create a placeholder for each image of the chat thread. The height of this placeholder is the height of the image so that the scroller position will not be disrupted when the image will be actually loaded and displayed in its full height Emmanuel ROHEE 2014-08-20 17:04:32 +0200
  • 6d3391f2f0 Send images with their imageInfo (size, mymetype, width & height) Emmanuel ROHEE 2014-08-20 16:18:50 +0200
  • da2f5aac0e Sanitize message text content only if the type of current message in the ng-repeat loop is "text" In case of image message, the body can be a JSON object (ImageInfo) and ngSanitize does not like that (ie it generates exception in the console) Emmanuel ROHEE 2014-08-20 15:41:14 +0200
  • e8244c23ba Give the event_id of the failed event Erik Johnston 2014-08-20 15:53:07 +0100
  • d100ac8c82 Fix test. get_joined_hosts_for_room get's called multiple times Erik Johnston 2014-08-20 15:10:36 +0100
  • 5c4c591c61 Fix federation test, since we now hit store.get_room Erik Johnston 2014-08-20 14:59:43 +0100
  • beb0a179bd Merge branch 'master' of github.com:matrix-org/synapse into develop Erik Johnston 2014-08-20 14:43:02 +0100
  • 5ef0948eaa Better handle the edge cases of trying to remote join rooms Erik Johnston 2014-08-20 14:42:36 +0100
  • f60e5a1aec Added more jsfiddles. Kegan Dougal 2014-08-20 13:47:20 +0100
  • d6a3639269 Replaced the image URL text input by a file selector button: "Send Image" Emmanuel ROHEE 2014-08-20 14:09:55 +0200
  • 955662d64c Disabled sending buttons while a message is being sent. Useful on bad Internet connection. Emmanuel ROHEE 2014-08-20 13:43:31 +0200
  • 849627b82e Don't generate room membership messages. Include previous state of in membership messages. Erik Johnston 2014-08-20 11:50:16 +0100
  • 2ffb075772 Merge branch 'master' of github.com:matrix-org/synapse into develop Erik Johnston 2014-08-20 10:29:16 +0100
  • ecce301632 File organisation sanity: put directives and filters into dedicated files Emmanuel ROHEE 2014-08-20 11:28:36 +0200
  • f4839ea042 Add some static fiddles for now (will migrate to github paths eventually) Kegan Dougal 2014-08-19 17:48:49 +0100
  • 89ed81bb1f More fiddles, more fun! Kegan Dougal 2014-08-19 17:34:31 +0100
  • 9ca5bc7892 keepScroll: a directive to anchor the scroller position at the bottom when the browser is resizing Emmanuel ROHEE 2014-08-19 18:29:41 +0200
  • d4fb1c8a92 Only hit get_room_events_stream if we have a valid user_id Erik Johnston 2014-08-19 17:18:19 +0100
  • ae493c9418 Fix token to correct format Erik Johnston 2014-08-19 16:45:55 +0100
  • e2b861cc67 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor Erik Johnston 2014-08-19 16:41:13 +0100
  • eea2dc7dde Remove debug logging from token parsing funcs. Erik Johnston 2014-08-19 16:40:38 +0100
  • d94765999d Add comment about what strorage.stream does Erik Johnston 2014-08-19 16:40:25 +0100
  • b796d4b9d0 Added registration/login jsfiddle, formatted so it can be loaded directly from jsfiddle. Requires jQuery 1.8.3 Kegan Dougal 2014-08-19 16:39:30 +0100
  • cc48e920d6 Don't expect a reflection from events stream Erik Johnston 2014-08-19 15:54:07 +0100
  • 41333452e5 Update tests Erik Johnston 2014-08-19 15:52:20 +0100
  • 7c60905ee7 Default from param to 'END' Erik Johnston 2014-08-19 15:52:10 +0100
  • 5c00614aab PresenceStreamData was expecting *_key to be ints Erik Johnston 2014-08-19 15:51:10 +0100
  • 4f773de6ba BF: The enter key in the image URL box called sendImage() with no argument Emmanuel ROHEE 2014-08-19 16:37:31 +0200
  • c5d601d5cd Cleaned dead code Emmanuel ROHEE 2014-08-19 16:24:49 +0200
  • 22dd0b37c4 Fix typo in merge conflict Erik Johnston 2014-08-19 15:02:47 +0100
  • 89cabba3e0 Don't delete OFFLINE users from the presence cache, so we can report on their offline mtime Paul "LeoNerd" Evans 2014-08-19 14:48:05 +0100
  • 347242a5c4 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor Erik Johnston 2014-08-19 14:48:19 +0100
  • 7e83a58c4d Proofing Kegan Dougal 2014-08-19 14:38:26 +0100
  • 840771190f Fix bug where we sometimes set min_token to None. Erik Johnston 2014-08-19 14:32:47 +0100
  • 234128586b Print out stacktrace when we failed to persist event. Erik Johnston 2014-08-19 14:30:28 +0100
  • d7cfb91a7a Rewrite of PresenceHandler test to ensure it covers the interaction with Federation as well Paul "LeoNerd" Evans 2014-08-19 14:25:17 +0100
  • 992782b9f5 Ensure that federation's .send_edu() returns a Deferred Paul "LeoNerd" Evans 2014-08-19 14:24:53 +0100
  • fcdc40a5dd Add a DeferredMockCallable; like mock's MockCallable but allows awaiting on method calls to be made later Paul "LeoNerd" Evans 2014-08-18 15:10:31 +0100
  • e636e8799e More formatting, more clarity. Kegan Dougal 2014-08-19 14:25:03 +0100
  • 75b6d982a0 Add a 'backfill room' button Erik Johnston 2014-08-19 14:20:03 +0100
  • 598a1d8ff9 Change the way pagination works to support out of order events. Erik Johnston 2014-08-19 14:19:48 +0100
  • 77f1cc7d6d rst formatting, section heading intro blurbs. Kegan Dougal 2014-08-19 14:03:16 +0100
  • 8464009a66 Added top level TODO and a bit more info on storing the 'end' token. Kegan Dougal 2014-08-19 13:43:45 +0100
  • 185a68b473 Added a first cut for a 'how to' on the client-server API. Kegan Dougal 2014-08-19 12:30:54 +0100
  • caef65d819 More unquotes. Also, don't return the room_id on membership state changes, they already know it. Kegan Dougal 2014-08-19 12:30:28 +0100
  • ece7a6d995 Unquote sender IDs. Kegan Dougal 2014-08-19 11:50:57 +0100
  • 88f7482b92 Perform the 'REST'-level tests of Presence against the real Presence handler as well, mocking out the datastore beneath it Paul "LeoNerd" Evans 2014-08-18 16:52:29 +0100
  • 83f031207e Implement and test presence dropping of remote users Paul "LeoNerd" Evans 2014-08-18 16:43:18 +0100
  • 6fafa878f6 Deny __iter__ on UserID/RoomID/RoomName instances as it's a subtle bug that will bite you Paul "LeoNerd" Evans 2014-08-18 16:07:14 +0100
  • bb793019a5 Rename MockHttpServer to MockHttpResource as it stands for one server resource rather than an entire server Paul "LeoNerd" Evans 2014-08-18 14:03:07 +0100
  • f48792eec4 Reduce the amount of incredibly spammy stack traces. Expected errors (e.g. SynapseErrors) shouldn't have their full trace logged every time. Don't send responses to disconnected requests. Kegan Dougal 2014-08-19 10:55:44 +0100
  • 509ce6c137 Change mouse cursor to pointer on elements user can click on Emmanuel ROHEE 2014-08-19 11:37:07 +0200
  • ff21d4d93b Merge remote-tracking branch 'origin/master' into user_page Emmanuel ROHEE 2014-08-19 09:44:50 +0200
  • d7a4f2ed7f Fill user page with avatar, display name and matrix id Emmanuel ROHEE 2014-08-19 09:37:10 +0200
  • 38f5c1c378 Made small avatar image center Emmanuel ROHEE 2014-08-19 09:24:35 +0200
  • f144f8cc56 Use $location.url to open the user profile page. The user page URL is then the one expected: http://127.0.0.1:8000/#/user/@Manu:localhost:8080 insteaf of http://127.0.0.1:8000/#/user/@Manu:localhost:8080#public:localhost:8080 Emmanuel ROHEE 2014-08-19 09:06:21 +0200
  • c3f1548bb4 Added link to user profile pages Emmanuel ROHEE 2014-08-19 08:58:53 +0200
  • cdc5ffe2a2 show private room_ids rather than nulls in notifs if there is no room_alias Matthew Hodgson 2014-08-18 17:14:43 +0100
  • e37b040bc3 Small amounts of cleanup and bonus round comments. Kegan Dougal 2014-08-18 17:22:31 +0100
  • 58548ab557 Implemented GETs for the ContentRepoResource. It all actually appears to be working. Kegan Dougal 2014-08-18 17:18:39 +0100
  • 590ab24c85 hs: Make the uploads directory if it doesn't exist. Namespace uploads by the base64 encoded user id of the uploader. Make a reasonable attempt to retry clashing upload paths. Try to guess a sensible file extension depending on the content type. Kegan Dougal 2014-08-18 16:18:11 +0100
  • 35da1bf4a3 Auth content uploads. Added a mapping function from request > filename. Added exception handling for content uploads. webclient: Only prefix the client API path on doRequest, not doBaseRequest (this would've broken the identity server auth too). Added matrixService.uploadContent. May not require mFileUpload anymore. Kegan Dougal 2014-08-18 15:50:55 +0100
  • a18b1a649c Added /matrix/content path, HS resource_for_content_repo attribute and FileUploadResource. Added stub methods. Kegan Dougal 2014-08-18 15:01:08 +0100
  • ecfdf23250 Created boilerplate for user profile page Emmanuel ROHEE 2014-08-18 18:05:42 +0200
  • 301e55d11d In members list, on avatar mouseover, show a tooltip with the user matrix id Emmanuel ROHEE 2014-08-18 17:49:50 +0200
  • f8693c6b48 Join room: open the room URL with the room alias in it Emmanuel ROHEE 2014-08-18 17:41:23 +0200
  • 43772d0b15 Support urlencoded room aliases in room URL Emmanuel ROHEE 2014-08-18 17:40:05 +0200
  • 1422a22970 Fix typos in SQL and where we still had rowid's (which no longer exist) Erik Johnston 2014-08-18 16:25:18 +0100
  • 4eb8f84aa8 Make snapshot_all_rooms return results in the correct form, including start and end tokens. Erik Johnston 2014-08-18 16:20:21 +0100
  • cebceb7b9d If possible, use href with room alias in rooms list Emmanuel ROHEE 2014-08-18 17:14:57 +0200
  • e5257b21b3 Support room alias in rooms URL (ex: http://127.0.0.1:8000/#/room/#public:localhost:8080) Emmanuel ROHEE 2014-08-18 17:11:08 +0200
  • 709a92cee8 SQL doesn't allow AUTOINCREMENT on non PRIMARY KEY columns. Erik Johnston 2014-08-18 16:00:46 +0100
  • b4a1f2ccb5 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor Erik Johnston 2014-08-18 15:53:40 +0100
  • fc26275bb3 Add two different columns for ordering the events table, one which can be used for pagination and one which can be as tokens for notifying clients. Also add a 'processed' field which is currently always set to True Erik Johnston 2014-08-18 15:50:41 +0100
  • b37ced8f63 Update the default longpoll timeout time. Kegan Dougal 2014-08-18 14:30:07 +0100
  • c12f55aa3b Increase /events timeout to 30 secs. We don't need it so low anymore to get around request suppression when changing rooms, since there is just a single event stream now. Kegan Dougal 2014-08-18 14:25:20 +0100
  • faf25e3a83 Allow room presence visibility between users who share a room Paul "LeoNerd" Evans 2014-08-18 13:41:43 +0100
  • 7d324612ec Precent lack of presence visiblity from causing room /members/list to fail Paul "LeoNerd" Evans 2014-08-18 13:17:35 +0100
  • 1c2caacd67 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor Erik Johnston 2014-08-18 11:14:57 +0100
  • 663a259d64 Change the MemoryDataStore to implement new storage api Erik Johnston 2014-08-18 11:08:03 +0100
  • 291010f100 Not all event streams returns SynapseEvents Erik Johnston 2014-08-18 11:06:59 +0100
  • 2f91d16033 We don't need to do a json.loads here Erik Johnston 2014-08-18 11:00:22 +0100
  • 1a1e0384ef Ensure we have a 'membership' key in RoomMemberEvents Erik Johnston 2014-08-18 10:59:57 +0100
  • bc2512fa95 Don't bother generating png's Erik Johnston 2014-08-18 10:59:34 +0100
  • dccb2f57be Disable the ability to GET individualy messages. We need to think about the correct API to do this, as the current one doesn't make much sense. Erik Johnston 2014-08-18 10:59:04 +0100
  • f65176564f webclient: Tweak namespace of auto-complete directive. ng- should really only be used for official ng directives. Kegan Dougal 2014-08-18 09:59:47 +0100
  • 71584930cb Disabled image upload UIs Emmanuel ROHEE 2014-08-18 10:54:43 +0200
  • 0b5674ccc5 Do not start the event stream if the user is not logged in (=if he does not has an access token yet) Add isUserLoggedIn to check this. Emmanuel ROHEE 2014-08-18 10:44:29 +0200
  • d5bebc9eaa Added another button to upload and send an image. The text input and its send button for sending an image URL will be removed once we have a true upload image service Emmanuel ROHEE 2014-08-14 18:53:05 +0200
  • 39ff6c840f make my emotes white again Matthew Hodgson 2014-08-18 01:30:58 +0100