Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1 | Erik Johnston | 2014-08-21 | 6 | -38/+294 |
|\ | |||||
| * | Show image fullscreen when clicking on the thumbnail | Emmanuel ROHEE | 2014-08-21 | 2 | -3/+31 |
| | | |||||
| * | If there are available, show image thumbnails in the messages list | Emmanuel ROHEE | 2014-08-21 | 1 | -3/+7 |
| | | |||||
| * | Generate thumbnail client side and send its URL and info with the image ↵ | Emmanuel ROHEE | 2014-08-21 | 3 | -28/+149 |
| | | | | | | | | message body | ||||
| * | Made uploadContent compatible for sending Blob objects | Emmanuel ROHEE | 2014-08-21 | 1 | -4/+22 |
| | | |||||
| * | Added resizeImage() | Emmanuel ROHEE | 2014-08-21 | 1 | -1/+86 |
| | | |||||
* | | Use the new 'inviter' key from im sync for room display names. | Erik Johnston | 2014-08-21 | 2 | -3/+8 |
| | | |||||
* | | Fixed first pagination detection | Emmanuel ROHEE | 2014-08-21 | 1 | -2/+3 |
| | | |||||
* | | cheer up erik and remove the double-horizontal-border between adjacent text ↵ | Matthew Hodgson | 2014-08-21 | 1 | -0/+1 |
| | | | | | | | | plinths | ||||
* | | In the initial sync api, return the inviter for rooms in the 'invited' state | Erik Johnston | 2014-08-21 | 1 | -0/+4 |
| | | |||||
* | | Return the current state in the initial sync api. | Erik Johnston | 2014-08-21 | 1 | -0/+3 |
| | | |||||
* | | Stop internal keys from getting into SynapseEvents | Erik Johnston | 2014-08-21 | 2 | -0/+6 |
| | | |||||
* | | Wait for getting a Join in response to an invite/join dance. | Erik Johnston | 2014-08-21 | 2 | -2/+28 |
|/ | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-08-21 | 4 | -0/+415 |
|\ | |||||
| * | Added final jsfiddle: an example app demonstrating most of the c2s api. | Kegan Dougal | 2014-08-20 | 4 | -0/+415 |
| | | |||||
* | | Make event stream storage return all membership events about the user, ↵ | Erik Johnston | 2014-08-20 | 1 | -4/+6 |
| | | | | | | | | regardless of if they were in the room or not. | ||||
* | | Quick fix to support array of room aliases | Emmanuel ROHEE | 2014-08-20 | 1 | -2/+3 |
| | | |||||
* | | BF: Apply image place holder only if the image message has the height ↵ | Emmanuel ROHEE | 2014-08-20 | 1 | -1/+1 |
| | | | | | | | | information | ||||
* | | BF: Wait for the room_id being resolved before starting pagination | Emmanuel ROHEE | 2014-08-20 | 1 | -2/+2 |
| | | |||||
* | | Use the "collect_presencelike_data" distributor signal instead of ↵ | Paul "LeoNerd" Evans | 2014-08-20 | 2 | -30/+4 |
| | | | | | | | | re-implementing its behaviour | ||||
* | | Fix exception name in _fill_out_join_content() exception | Paul "LeoNerd" Evans | 2014-08-20 | 1 | -1/+3 |
| | | |||||
* | | Define __copy__ and __deepcopy__ as identity functions on ↵ | Paul "LeoNerd" Evans | 2014-08-20 | 1 | -0/+8 |
| | | | | | | | | DomainSpecificString, so that copy.deepcopy() will work on them | ||||
* | | Kill the "_homeserver_" injected messages for room membership changes | Paul "LeoNerd" Evans | 2014-08-20 | 2 | -58/+6 |
| | | |||||
* | | Create a placeholder for each image of the chat thread. The height of this ↵ | Emmanuel ROHEE | 2014-08-20 | 1 | -1/+4 |
| | | | | | | | | 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 | ||||
* | | Send images with their imageInfo (size, mymetype, width & height) | Emmanuel ROHEE | 2014-08-20 | 5 | -17/+89 |
| | | |||||
* | | Sanitize message text content only if the type of current message in the ↵ | Emmanuel ROHEE | 2014-08-20 | 1 | -2/+2 |
| | | | | | | | | | | | | 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) | ||||
* | | Give the event_id of the failed event | Erik Johnston | 2014-08-20 | 1 | -1/+4 |
| | | |||||
* | | Fix test. get_joined_hosts_for_room get's called multiple times | Erik Johnston | 2014-08-20 | 1 | -3/+5 |
| | | |||||
* | | Fix federation test, since we now hit store.get_room | Erik Johnston | 2014-08-20 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-08-20 | 6 | -0/+375 |
|\| | |||||
| * | Added more jsfiddles. | Kegan Dougal | 2014-08-20 | 6 | -0/+375 |
| | | |||||
* | | Better handle the edge cases of trying to remote join rooms | Erik Johnston | 2014-08-20 | 2 | -37/+88 |
| | | |||||
* | | Replaced the image URL text input by a file selector button: "Send Image" | Emmanuel ROHEE | 2014-08-20 | 2 | -18/+5 |
| | | |||||
* | | Disabled sending buttons while a message is being sent. Useful on bad ↵ | Emmanuel ROHEE | 2014-08-20 | 2 | -6/+18 |
| | | | | | | | | Internet connection. | ||||
* | | Don't generate room membership messages. Include previous state of in ↵ | Erik Johnston | 2014-08-20 | 2 | -8/+16 |
| | | | | | | | | membership messages. | ||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-08-20 | 10 | -171/+415 |
|\| | |||||
| * | File organisation sanity: put directives and filters into dedicated files | Emmanuel ROHEE | 2014-08-20 | 6 | -197/+254 |
| | | |||||
| * | Add some static fiddles for now (will migrate to github paths eventually) | Kegan Dougal | 2014-08-19 | 1 | -1/+5 |
| | | |||||
| * | More fiddles, more fun! | Kegan Dougal | 2014-08-19 | 3 | -0/+156 |
| | | |||||
| * | keepScroll: a directive to anchor the scroller position at the bottom when ↵ | Emmanuel ROHEE | 2014-08-19 | 1 | -0/+27 |
| | | | | | | | | the browser is resizing | ||||
* | | Only hit get_room_events_stream if we have a valid user_id | Erik Johnston | 2014-08-19 | 1 | -0/+3 |
| | | |||||
* | | Fix token to correct format | Erik Johnston | 2014-08-19 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-19 | 7 | -8/+100 |
|\| | |||||
| * | Added registration/login jsfiddle, formatted so it can be loaded directly ↵ | Kegan Dougal | 2014-08-19 | 4 | -1/+98 |
| | | | | | | | | from jsfiddle. Requires jQuery 1.8.3 | ||||
| * | BF: The enter key in the image URL box called sendImage() with no argument | Emmanuel ROHEE | 2014-08-19 | 1 | -1/+1 |
| | | |||||
| * | Cleaned dead code | Emmanuel ROHEE | 2014-08-19 | 1 | -3/+1 |
| | | |||||
| * | Don't delete OFFLINE users from the presence cache, so we can report on ↵ | Paul "LeoNerd" Evans | 2014-08-19 | 1 | -3/+0 |
| | | | | | | | | their offline mtime | ||||
* | | Remove debug logging from token parsing funcs. | Erik Johnston | 2014-08-19 | 1 | -2/+0 |
| | | |||||
* | | Add comment about what strorage.stream does | Erik Johnston | 2014-08-19 | 1 | -0/+20 |
| | | |||||
* | | Don't expect a reflection from events stream | Erik Johnston | 2014-08-19 | 1 | -3/+1 |
| | | |||||
* | | Update tests | Erik Johnston | 2014-08-19 | 2 | -12/+5 |
| | | |||||
* | | Default from param to 'END' | Erik Johnston | 2014-08-19 | 1 | -0/+1 |
| | | |||||
* | | PresenceStreamData was expecting *_key to be ints | Erik Johnston | 2014-08-19 | 1 | -0/+3 |
| | | |||||
* | | Fix typo in merge conflict | Erik Johnston | 2014-08-19 | 1 | -2/+0 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-19 | 29 | -391/+1256 |
|\| | | | | | | | | | | | | | Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py | ||||
| * | Proofing | Kegan Dougal | 2014-08-19 | 1 | -19/+20 |
| | | |||||
| * | Rewrite of PresenceHandler test to ensure it covers the interaction with ↵ | Paul "LeoNerd" Evans | 2014-08-19 | 1 | -149/+279 |
| | | | | | | | | Federation as well | ||||
| * | Ensure that federation's .send_edu() returns a Deferred | Paul "LeoNerd" Evans | 2014-08-19 | 1 | -0/+1 |
| | | |||||
| * | Add a DeferredMockCallable; like mock's MockCallable but allows awaiting | Paul "LeoNerd" Evans | 2014-08-19 | 1 | -0/+41 |
| | | | | | | | | on method calls to be made later | ||||
| * | More formatting, more clarity. | Kegan Dougal | 2014-08-19 | 1 | -23/+38 |
| | | |||||
| * | rst formatting, section heading intro blurbs. | Kegan Dougal | 2014-08-19 | 1 | -18/+35 |
| | | |||||
| * | Added top level TODO and a bit more info on storing the 'end' token. | Kegan Dougal | 2014-08-19 | 1 | -1/+9 |
| | | |||||
| * | Added a first cut for a 'how to' on the client-server API. | Kegan Dougal | 2014-08-19 | 1 | -0/+244 |
| | | |||||
| * | More unquotes. Also, don't return the room_id on membership state changes, ↵ | Kegan Dougal | 2014-08-19 | 1 | -6/+8 |
| | | | | | | | | they already know it. | ||||
| * | Unquote sender IDs. | Kegan Dougal | 2014-08-19 | 1 | -2/+2 |
| | | |||||
| * | Perform the 'REST'-level tests of Presence against the real Presence handler ↵ | Paul "LeoNerd" Evans | 2014-08-19 | 2 | -41/+93 |
| | | | | | | | | as well, mocking out the datastore beneath it | ||||
| * | Implement and test presence dropping of remote users | Paul "LeoNerd" Evans | 2014-08-19 | 2 | -2/+14 |
| | | |||||
| * | Deny __iter__ on UserID/RoomID/RoomName instances as it's a subtle bug that ↵ | Paul "LeoNerd" Evans | 2014-08-19 | 1 | -0/+6 |
| | | | | | | | | will bite you | ||||
| * | Rename MockHttpServer to MockHttpResource as it stands for one server ↵ | Paul "LeoNerd" Evans | 2014-08-19 | 7 | -146/+147 |
| | | | | | | | | resource rather than an entire server | ||||
| * | Reduce the amount of incredibly spammy stack traces. Expected errors (e.g. ↵ | Kegan Dougal | 2014-08-19 | 1 | -1/+13 |
| | | | | | | | | SynapseErrors) shouldn't have their full trace logged every time. Don't send responses to disconnected requests. | ||||
| * | Change mouse cursor to pointer on elements user can click on | Emmanuel ROHEE | 2014-08-19 | 2 | -1/+5 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into user_page | Emmanuel ROHEE | 2014-08-19 | 7 | -25/+188 |
| |\ | |||||
| | * | show private room_ids rather than nulls in notifs if there is no room_alias | Matthew Hodgson | 2014-08-18 | 1 | -1/+1 |
| | | | |||||
| | * | Small amounts of cleanup and bonus round comments. | Kegan Dougal | 2014-08-18 | 1 | -4/+8 |
| | | | |||||
| | * | Implemented GETs for the ContentRepoResource. It all actually appears to be ↵ | Kegan Dougal | 2014-08-18 | 3 | -15/+65 |
| | | | | | | | | | | | | working. | ||||
| | * | hs: Make the uploads directory if it doesn't exist. Namespace uploads by the ↵ | Kegan Dougal | 2014-08-18 | 1 | -5/+46 |
| | | | | | | | | | | | | 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. | ||||
| | * | Auth content uploads. Added a mapping function from request > filename. ↵ | Kegan Dougal | 2014-08-18 | 4 | -31/+62 |
| | | | | | | | | | | | | 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. | ||||
| | * | Added /matrix/content path, HS resource_for_content_repo attribute and ↵ | Kegan Dougal | 2014-08-18 | 4 | -4/+41 |
| | | | | | | | | | | | | FileUploadResource. Added stub methods. | ||||
| * | | Fill user page with avatar, display name and matrix id | Emmanuel ROHEE | 2014-08-19 | 3 | -5/+44 |
| | | | |||||
| * | | Made small avatar image center | Emmanuel ROHEE | 2014-08-19 | 1 | -0/+1 |
| | | | |||||
| * | | Use $location.url to open the user profile page. The user page URL is then ↵ | Emmanuel ROHEE | 2014-08-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Added link to user profile pages | Emmanuel ROHEE | 2014-08-19 | 2 | -1/+6 |
| | | | |||||
| * | | Created boilerplate for user profile page | Emmanuel ROHEE | 2014-08-18 | 4 | -0/+43 |
| |/ | |||||
| * | In members list, on avatar mouseover, show a tooltip with the user matrix id | Emmanuel ROHEE | 2014-08-18 | 1 | -2/+6 |
| | | |||||
| * | Join room: open the room URL with the room alias in it | Emmanuel ROHEE | 2014-08-18 | 1 | -6/+2 |
| | | |||||
| * | Support urlencoded room aliases in room URL | Emmanuel ROHEE | 2014-08-18 | 2 | -17/+29 |
| | | |||||
| * | If possible, use href with room alias in rooms list | Emmanuel ROHEE | 2014-08-18 | 1 | -2/+2 |
| | | |||||
| * | Support room alias in rooms URL (ex: ↵ | Emmanuel ROHEE | 2014-08-18 | 3 | -1/+58 |
| | | | | | | | | http://127.0.0.1:8000/#/room/#public:localhost:8080) | ||||
* | | Fix bug where we sometimes set min_token to None. | Erik Johnston | 2014-08-19 | 1 | -1/+2 |
| | | |||||
* | | Print out stacktrace when we failed to persist event. | Erik Johnston | 2014-08-19 | 1 | -1/+1 |
| | | |||||
* | | Add a 'backfill room' button | Erik Johnston | 2014-08-19 | 6 | -25/+81 |
| | | |||||
* | | Change the way pagination works to support out of order events. | Erik Johnston | 2014-08-19 | 8 | -82/+227 |
| | | |||||
* | | Fix typos in SQL and where we still had rowid's (which no longer exist) | Erik Johnston | 2014-08-18 | 2 | -7/+7 |
| | | |||||
* | | Make snapshot_all_rooms return results in the correct form, including start ↵ | Erik Johnston | 2014-08-18 | 2 | -6/+28 |
| | | | | | | | | and end tokens. | ||||
* | | SQL doesn't allow AUTOINCREMENT on non PRIMARY KEY columns. | Erik Johnston | 2014-08-18 | 4 | -3/+23 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-18 | 5 | -18/+55 |
|\| | |||||
| * | Update the default longpoll timeout time. | Kegan Dougal | 2014-08-18 | 1 | -1/+1 |
| | | |||||
| * | Increase /events timeout to 30 secs. We don't need it so low anymore to get ↵ | Kegan Dougal | 2014-08-18 | 1 | -1/+1 |
| | | | | | | | | around request suppression when changing rooms, since there is just a single event stream now. | ||||
| * | Allow room presence visibility between users who share a room | Paul "LeoNerd" Evans | 2014-08-18 | 2 | -12/+45 |
| | | |||||
| * | Precent lack of presence visiblity from causing room /members/list to fail | Paul "LeoNerd" Evans | 2014-08-18 | 1 | -4/+8 |
| | | |||||
* | | Add two different columns for ordering the events table, one which can be ↵ | Erik Johnston | 2014-08-18 | 4 | -19/+33 |
| | | | | | | | | 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 | ||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-18 | 17 | -131/+1232 |
|\| | |||||
| * | webclient: Tweak namespace of auto-complete directive. ng- should really ↵ | Kegan Dougal | 2014-08-18 | 2 | -2/+2 |
| | | | | | | | | only be used for official ng directives. | ||||
| * | Disabled image upload UIs | Emmanuel ROHEE | 2014-08-18 | 2 | -2/+6 |
| | | |||||
| * | Do not start the event stream if the user is not logged in (=if he does not ↵ | Emmanuel ROHEE | 2014-08-18 | 3 | -9/+17 |
| | | | | | | | | | | | | has an access token yet) Add isUserLoggedIn to check this. | ||||
| * | Added another button to upload and send an image. | Emmanuel ROHEE | 2014-08-18 | 2 | -2/+20 |
| | | | | | | | | The text input and its send button for sending an image URL will be removed once we have a true upload image service | ||||
| * | make my emotes white again | Matthew Hodgson | 2014-08-18 | 1 | -0/+4 |
| | | |||||
| * | make text font sizes consistent | Matthew Hodgson | 2014-08-17 | 2 | -13/+26 |
| | | | | | | | | | | | | | | add a gap between bubble-blocks from different users make sent-text lighter than received-text wrap the memberslist text more sensibly fix height of bubbles to match that of avatars (32px) | ||||
| * | implement html5 notifications. (have to be explicitly requested under Config) | Matthew Hodgson | 2014-08-17 | 4 | -3/+37 |
| | | |||||
| * | unbreak login sequence (which spuriously required a sydent server to be ↵ | Matthew Hodgson | 2014-08-17 | 1 | -2/+2 |
| | | | | | | | | specified, which login.html was no longer doing...) | ||||
| * | oops, debugging crept in | Matthew Hodgson | 2014-08-17 | 1 | -1/+0 |
| | | |||||
| * | dial down logging | Matthew Hodgson | 2014-08-17 | 1 | -5/+5 |
| | | |||||
| * | - use css3 to make avatars always the right aspect ratio | Matthew Hodgson | 2014-08-17 | 3 | -4/+105 |
| | | | | | | | | - implement slightly overengineered tab/shift-tab autocomplete function | ||||
| * | autohyperlink messages using linky | Matthew Hodgson | 2014-08-16 | 4 | -3/+581 |
| | | |||||
| * | use minified angular by default | Matthew Hodgson | 2014-08-16 | 1 | -2/+2 |
| | | |||||
| * | minified angularjs stuff to speed things up | Matthew Hodgson | 2014-08-16 | 4 | -0/+249 |
| | | |||||
| * | improve infinite scrolling so it keeps paginating until you have a scrollbar ↵ | Matthew Hodgson | 2014-08-16 | 1 | -17/+28 |
| | | | | | | | | (if it can) | ||||
| * | remove log spam | Matthew Hodgson | 2014-08-16 | 1 | -2/+2 |
| | | |||||
| * | disambiguate identical displaynames | Matthew Hodgson | 2014-08-16 | 1 | -1/+23 |
| | | |||||
| * | make presence timestamps less verbose | Matthew Hodgson | 2014-08-16 | 1 | -3/+3 |
| | | |||||
| * | roll back b602834 as it made a bizarre subset of avatars go awol | Matthew Hodgson | 2014-08-16 | 1 | -6/+5 |
| | | |||||
| * | order the members list by most recently active | Matthew Hodgson | 2014-08-16 | 2 | -7/+19 |
| | | |||||
| * | don't hammer a new hit for every displayname and avatar_url when we already ↵ | Matthew Hodgson | 2014-08-16 | 1 | -1/+14 |
| | | | | | | | | have them in the members list... | ||||
| * | improve comment | Matthew Hodgson | 2014-08-16 | 1 | -1/+1 |
| | | |||||
| * | merge weirdness | Matthew Hodgson | 2014-08-16 | 1 | -1/+1 |
| | | |||||
| * | emergency bodges to turn off presence ACLs in order to make | Matthew Hodgson | 2014-08-16 | 1 | -2/+7 |
| | | | | | | | | matrix.org:8080 actually work | ||||
| * | retcols is mandatory. i have no idea how this could ever have worked? | Matthew Hodgson | 2014-08-16 | 1 | -0/+1 |
| | | |||||
| * | display mtime_age in webclient | Matthew Hodgson | 2014-08-16 | 3 | -10/+33 |
| | | |||||
| * | slightly hacky but more functional infinite scrolling | Matthew Hodgson | 2014-08-16 | 1 | -30/+36 |
| | | |||||
| * | switch some elements from being styled by class to styled by id | Matthew Hodgson | 2014-08-15 | 5 | -36/+36 |
| | | |||||
| * | Formatting | Kegan Dougal | 2014-08-15 | 2 | -21/+22 |
| | | |||||
* | | Change the MemoryDataStore to implement new storage api | Erik Johnston | 2014-08-18 | 1 | -99/+50 |
| | | |||||
* | | Not all event streams returns SynapseEvents | Erik Johnston | 2014-08-18 | 1 | -1/+5 |
| | | |||||
* | | We don't need to do a json.loads here | Erik Johnston | 2014-08-18 | 1 | -2/+2 |
| | | |||||
* | | Ensure we have a 'membership' key in RoomMemberEvents | Erik Johnston | 2014-08-18 | 1 | -0/+2 |
| | | |||||
* | | Don't bother generating png's | Erik Johnston | 2014-08-18 | 1 | -1/+1 |
| | | |||||
* | | Disable the ability to GET individualy messages. We need to think about the ↵ | Erik Johnston | 2014-08-18 | 2 | -41/+43 |
| | | | | | | | | correct API to do this, as the current one doesn't make much sense. | ||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-15 | 11 | -28/+173 |
|\| | |||||
| * | Get presence for members when you enter a room (it was coming down but ↵ | Kegan Dougal | 2014-08-15 | 1 | -0/+4 |
| | | | | | | | | wasn't being stored in the right place) | ||||
| * | Added infinite scrolling. It's sliiiightly buggy in that it jumps down the ↵ | Kegan Dougal | 2014-08-15 | 7 | -9/+115 |
| | | | | | | | | list a bit, but it is overall working pretty well. Added ng-infinite-scroll-matrix.js and jquery-1.8.3 as deps. | ||||
| * | When new invites come down, update the My Rooms list. Added hacks to make ↵ | Kegan Dougal | 2014-08-15 | 3 | -16/+32 |
| | | | | | | | | the display name a bit nicer (/im/sync needs to return room aliases / membership events better) | ||||
| * | Document that /rooms/:room_id/members/list yields profile and presence ↵ | Paul "LeoNerd" Evans | 2014-08-15 | 1 | -0/+10 |
| | | | | | | | | information about room members | ||||
| * | When starting to poll for presence, also include members of all shared rooms | Paul "LeoNerd" Evans | 2014-08-15 | 1 | -3/+12 |
| | | |||||
* | | Fix some of the tests to reflect changes in the storage layer. | Erik Johnston | 2014-08-15 | 3 | -39/+11 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-15 | 1 | -0/+7 |
|\| | |||||
| * | Also include users' presence when responding to /rooms/:room_id/members/list | Paul "LeoNerd" Evans | 2014-08-15 | 1 | -0/+7 |
| | | |||||
* | | Rename method name to not clash with other ones in storage. | Erik Johnston | 2014-08-15 | 2 | -4/+4 |
| | | |||||
* | | Fix typo of key name | Erik Johnston | 2014-08-15 | 1 | -1/+1 |
| | | |||||
* | | We no longer need to special case room config events. | Erik Johnston | 2014-08-15 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-15 | 10 | -88/+330 |
|\| | | | | | | | | | Conflicts: synapse/storage/roommember.py | ||||
| * | Fix imsync's SELECT query to only find the rooms I'm actually joined in, not ↵ | Paul "LeoNerd" Evans | 2014-08-15 | 1 | -2/+5 |
| | | | | | | | | every room I have ever joined | ||||
| * | Create a room-nuking script as it's useful for emergency debugging | Paul "LeoNerd" Evans | 2014-08-15 | 1 | -0/+24 |
| | | |||||
| * | Remove old polling stuff from RoomController. Added service comments. Do not ↵ | Kegan Dougal | 2014-08-15 | 4 | -45/+20 |
| | | | | | | | | start the event stream on startup unless you have credentials. | ||||
| * | Event streaming now happens on an app level, rather than a per-room level. ↵ | Kegan Dougal | 2014-08-15 | 5 | -19/+76 |
| | | | | | | | | Make eventStreamService manage it's own repolling provided no one calls stop() on it. Couple the stream with eventHandlerService so any controller can just blithely call eventStreamService.resume() and expect to 'get stuff' without having to handle promises (though resume() still returns a promise for that request and proxies it through $q). Kill and reset the stream if you logout. | ||||
| * | Store messages in $rootScope so they can be accessed from multiple ↵ | Kegan Dougal | 2014-08-15 | 3 | -12/+29 |
| | | | | | | | | controllers without duplicated storage for each. This also gives updates. | ||||
| * | Added event handler service which.. handles events. More specifically, it ↵ | Kegan Dougal | 2014-08-15 | 5 | -32/+124 |
| | | | | | | | | $broadcasts events depending on their type, and does processing on events (shuffling keys, adding events to $rootScope so displays will automatically update, sending delivery receipts, and so on). Some of this logic was previously contained in the RoomController, which fails the moment you add >1 room into the mix, hence requiring a Service to handle events, rather than having each individual controller maintain their part of the world. | ||||
| * | Added event stream service which neatly blobs together requests / state for ↵ | Kegan Dougal | 2014-08-15 | 5 | -14/+91 |
| | | | | | | | | the event stream. This depends on matrix service to do the actual hit. Currently this has exactly the same behaviour as before. | ||||
* | | PEP8 cleanups | Erik Johnston | 2014-08-15 | 7 | -16/+29 |
| | | |||||
* | | Comment. | Erik Johnston | 2014-08-15 | 1 | -0/+1 |
| | | |||||
* | | Support generic events. | Erik Johnston | 2014-08-15 | 2 | -5/+8 |
| | | |||||
* | | Fix bug when generating a key when get_room_events_stream returned zero rows | Erik Johnston | 2014-08-15 | 1 | -3/+7 |
| | | |||||
* | | Actually use MAX_STREAM_SIZE constant. | Erik Johnston | 2014-08-15 | 1 | -1/+1 |
| | | |||||
* | | Fix pagination to work with new db schema | Erik Johnston | 2014-08-15 | 2 | -31/+48 |
| | | |||||
* | | Correctly return new token when returning events. Serialize events correctly. | Erik Johnston | 2014-08-15 | 5 | -9/+25 |
| | | |||||
* | | Start chagning the events stream to work with the new DB schema | Erik Johnston | 2014-08-15 | 8 | -118/+102 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-15 | 47 | -270/+714 |
|\| | | | | | | | | | Conflicts: synapse/storage/stream.py | ||||
| * | Add a check to make sure that during state conflict res we only request a ↵ | Erik Johnston | 2014-08-15 | 2 | -2/+13 |
| | | | | | | | | PDU we don't have. | ||||
| * | Fix pontenial bug in state resolution handler that compared dicts rather ↵ | Erik Johnston | 2014-08-15 | 1 | -1/+4 |
| | | | | | | | | than their id's | ||||
| * | Remember to reflect membership LEAVE events to the leaving member so they ↵ | Paul "LeoNerd" Evans | 2014-08-15 | 1 | -0/+4 |
| | | | | | | | | know it happened | ||||
| * | Updated README about -w in all the places. | Kegan Dougal | 2014-08-15 | 1 | -3/+3 |
| | | |||||
| * | s/Synapse/Matrix/ | Matthew Hodgson | 2014-08-14 | 1 | -3/+3 |
| | | |||||
| * | It's called Matrix :) | Matthew Hodgson | 2014-08-14 | 1 | -11/+11 |
| | | |||||
| * | manual syutil | Matthew Hodgson | 2014-08-14 | 1 | -0/+4 |
| | | |||||
| * | Update README to mention -w and remove SimpleHTTPServer | Kegan Dougal | 2014-08-14 | 1 | -9/+3 |
| | | |||||
| * | Add documentation about Federation Queries and EDUs | Paul "LeoNerd" Evans | 2014-08-14 | 1 | -9/+59 |
| | | |||||
| * | fix linewrap | Matthew Hodgson | 2014-08-14 | 1 | -1/+2 |
| | | |||||
| * | More helpful display when the event stream fails, wiping it when the ↵ | Kegan Dougal | 2014-08-14 | 2 | -5/+10 |
| | | | | | | | | connection is regained. | ||||
| * | We can now upload avatar image somewhere | Emmanuel ROHEE | 2014-08-14 | 1 | -4/+13 |
| | | |||||
| * | Create a temporary upload service server side (by hacking ↵ | Emmanuel ROHEE | 2014-08-14 | 1 | -0/+1 |
| | | | | | | | | demos/webserver.py) and client side with an angularjs service component. | ||||
| * | Create a temporary upload service server side (by hacking ↵ | Emmanuel ROHEE | 2014-08-14 | 2 | -1/+71 |
| | | | | | | | | demos/webserver.py) and client side with an angularjs service component. | ||||
| * | webclient: You can now paginate in rooms. Defaults to 10 messages, with a ↵ | Kegan Dougal | 2014-08-14 | 4 | -21/+74 |
| | | | | | | | | button to get more (needs to be hooked into infini-scrolling). | ||||
| * | Pass back the user_id in the response to /login in case it has changed. ↵ | Kegan Dougal | 2014-08-14 | 4 | -7/+9 |
| | | | | | | | | Store and use that on the webclient rather than the input field. | ||||
| * | hs: Make /login accept full user IDs or just local parts. webclient: Only ↵ | Kegan Dougal | 2014-08-14 | 3 | -8/+6 |
| | | | | | | | | enable Register button when both password fields match. | ||||
| * | Reflect user's messages up to themselves before pushing it to federatoin; ↵ | Paul "LeoNerd" Evans | 2014-08-14 | 1 | -2/+2 |
| | | | | | | | | also release roomlock before touching federation so we don't halt progress on the world | ||||
| * | We really don't need debug logging of all the SQL statements we execute; ↵ | Paul "LeoNerd" Evans | 2014-08-14 | 1 | -4/+0 |
| | | | | | | | | we're quite happy these all work now | ||||
| * | Auto-correct the username when logging in if there isn't an @ | Kegan Dougal | 2014-08-14 | 1 | -0/+6 |
| | | |||||
| * | Put some DEBUG logging in lockutils.py so we can debug roomlocks | Paul "LeoNerd" Evans | 2014-08-14 | 1 | -3/+9 |
| | | |||||
| * | Be more helpful when failing to register/login, stating why (communication ↵ | Kegan Dougal | 2014-08-14 | 2 | -6/+18 |
| | | | | | | | | error, user in user, wrong credentials, etc). Make the HS send M_USER_IN_USE. | ||||
| * | Finish up room controller too. May have missed one or two, but testing ↵ | Kegan Dougal | 2014-08-14 | 1 | -14/+14 |
| | | | | | | | | didn't pick anything up. | ||||
| * | Added extra nesting .data and rename callback to be response not data | Kegan Dougal | 2014-08-14 | 2 | -31/+31 |
| | | |||||
| * | Move the unknown token broadcast to the interceptor. Return the $http ↵ | Kegan Dougal | 2014-08-14 | 4 | -30/+16 |
| | | | | | | | | promise and not a wrapped one via $q. Everything now needs a level deeper nesting. Fixed registration and login. | ||||
| * | Added an access token interceptor to check unknown tokens. | Kegan Dougal | 2014-08-14 | 1 | -3/+19 |
| | | |||||
| * | Send forbidden codes when doing login attempts. | Kegan Dougal | 2014-08-14 | 1 | -3/+3 |
| | | |||||
| * | Round Presence mtime and mtime_age to nearest msec; avoids floats for msec ↵ | Paul "LeoNerd" Evans | 2014-08-14 | 1 | -5/+15 |
| | | | | | | | | values over the wire | ||||
| * | Change relative db paths to absolute paths in case we daemonize. | Erik Johnston | 2014-08-14 | 1 | -2/+9 |
| | | |||||
| * | chmod +x homeserver.py | Paul "LeoNerd" Evans | 2014-08-14 | 1 | -0/+0 |
| | | |||||
| * | Detect when the user access token is no more valid and log the user out in ↵ | Emmanuel ROHEE | 2014-08-14 | 2 | -4/+20 |
| | | | | | | | | this case | ||||
| * | Guess the home server URL on the login screen by inspecting the URL of the ↵ | Kegan Dougal | 2014-08-14 | 1 | -1/+9 |
| | | | | | | | | web client. | ||||
| * | Added M_UNKNOWN_TOKEN error code and send it when there is an unrecognised ↵ | Kegan Dougal | 2014-08-14 | 3 | -3/+8 |
| | | | | | | | | access_token | ||||
| * | BF: Use ng-src | Emmanuel ROHEE | 2014-08-14 | 1 | -1/+1 |
| | | |||||
| * | Default error code BAD_PAGINATION for EventStreamErrors | Kegan Dougal | 2014-08-14 | 1 | -1/+4 |
| | | |||||
| * | Added web client prefix | Kegan Dougal | 2014-08-14 | 2 | -4/+5 |
| | | |||||
| * | Added a urls module for keeping client and federation prefixes. | Kegan Dougal | 2014-08-14 | 5 | -14/+23 |
| | | |||||
| * | If the web client is enabled, automatically redirect root '/' to the web ↵ | Kegan Dougal | 2014-08-14 | 2 | -4/+30 |
| | | | | | | | | client path. | ||||
| * | Fixed dynamic resource mapping to clobber dummy Resources with the actual ↵ | Kegan Dougal | 2014-08-14 | 1 | -5/+27 |
| | | | | | | | | desired Resource in the event of a collision (as is the case for '/matrix/client' and '/matrix/client/api/v1') | ||||
| * | Use ng-src | Emmanuel ROHEE | 2014-08-14 | 1 | -1/+1 |
| | | |||||
| * | Show avatar in profile section and added a button to select a file (not yet ↵ | Emmanuel ROHEE | 2014-08-14 | 3 | -6/+45 |
| | | | | | | | | wired to upload service) | ||||
| * | Merge remote-tracking branch 'origin/master' | Emmanuel ROHEE | 2014-08-14 | 16 | -93/+123 |
| |\ | |||||
| | * | Honour the -w flag to enable the web client at /matrix/client | Kegan Dougal | 2014-08-14 | 1 | -5/+8 |
| | | | |||||
| | * | Removed http_server from HomeServer. Updated unit tests to use either ↵ | Kegan Dougal | 2014-08-14 | 12 | -30/+21 |
| | | | | | | | | | | | | resource_for_federation or resource_for_client depending on what is being tested. | ||||
| | * | Make federation use resource_for_federation as well. | Kegan Dougal | 2014-08-14 | 4 | -49/+5 |
| | | | |||||
| | * | Start phasing out HttpServer: we should be using Resources instead. Added ↵ | Kegan Dougal | 2014-08-14 | 7 | -21/+101 |
| | | | | | | | | | | | | resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree. | ||||
| * | | Created m-file-input. A directive to open a file selection dialog on ↵ | Emmanuel ROHEE | 2014-08-14 | 2 | -0/+44 |
| |/ | | | | | | | whatever HTML element | ||||
* | | Reimplement the get public rooms api to work with new DB schema | Erik Johnston | 2014-08-15 | 7 | -37/+101 |
| | | |||||
* | | Fix up typos and correct sql queries | Erik Johnston | 2014-08-14 | 6 | -44/+36 |
| | | |||||
* | | Update StreamStore | Erik Johnston | 2014-08-14 | 1 | -245/+36 |
| | | |||||
* | | Start fixing places that use the data store. | Erik Johnston | 2014-08-14 | 6 | -39/+33 |
| | | |||||
* | | Fix typo | Erik Johnston | 2014-08-14 | 1 | -1/+1 |
| | | |||||
* | | Rename _execute_query | Erik Johnston | 2014-08-14 | 4 | -4/+4 |
| | | |||||
* | | Fix up RoomMemberStore to work with the new schema. | Erik Johnston | 2014-08-14 | 3 | -97/+79 |
| | | |||||
* | | Actually encode dicts as json in the DB | Erik Johnston | 2014-08-14 | 2 | -3/+4 |
| | | |||||
* | | Change relative db paths to absolute paths in case we daemonize. | Erik Johnston | 2014-08-14 | 1 | -2/+9 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-14 | 35 | -188/+412 |
|\| | | | | | | | | | Conflicts: synapse/storage/_base.py | ||||
| * | grammar fix v0.0.0 alpha | Matthew Hodgson | 2014-08-14 | 1 | -2/+2 |
| | | |||||
| * | fix emote presentation | Matthew Hodgson | 2014-08-14 | 1 | -1/+1 |
| | | |||||
| * | fix http client GET parameters; somehow missing named param. how could this ↵ | Matthew Hodgson | 2014-08-14 | 1 | -2/+2 |
| | | | | | | | | have ever worked!? | ||||
| * | config css | Matthew Hodgson | 2014-08-14 | 1 | -0/+12 |
| | | |||||
| * | completely change the CSS to be an entirely 'position: absolute' layout ↵ | Matthew Hodgson | 2014-08-14 | 6 | -29/+46 |
| | | | | | | | | rather than top-to-bottom. makes the overscroll much more predictable and sane and not dependent on CSS expressions. | ||||
| * | fix whitespace | Matthew Hodgson | 2014-08-14 | 1 | -0/+1 |
| | | |||||
| * | Consistent capitalisation of 'Matrix' as a proper noun in README; 80 col wrap | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -4/+5 |
| | | |||||
| * | An initial hack at storing presence state-change mtimes in database and ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 7 | -29/+101 |
| | | | | | | | | presenting age durations to clients/federation events | ||||
| * | Allow advancing the MockClock's time | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -0/+4 |
| | | |||||
| * | Don't mock out presence_handler's internal start/stop methods in ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -9/+5 |
| | | | | | | | | presencelike unit test; it's rude | ||||
| * | Move MockClock into tests.utils so we can reüse it | Paul "LeoNerd" Evans | 2014-08-13 | 2 | -11/+11 |
| | | |||||
| * | Set datastore's .hs field in SQLBaseStore rather than in the toplevel ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 2 | -1/+1 |
| | | | | | | | | DataStore mixed-in result class | ||||
| * | when we're talking about backfilling data in federation, call it backfilling ↵ | Matthew Hodgson | 2014-08-13 | 9 | -54/+54 |
| | | | | | | | | - not pagination. | ||||
| * | don't hammer after 403 | Matthew Hodgson | 2014-08-13 | 1 | -1/+4 |
| | | |||||
| * | pagination was a terrible name | Matthew Hodgson | 2014-08-13 | 1 | -5/+5 |
| | | |||||
| * | Implement directory service federation by Federation Queries; avoid ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 3 | -27/+141 |
| | | | | | | | | local_only hack; add unit tests | ||||
| * | Add a HomeServer.parse_roomalias() to avoid having to ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 4 | -14/+18 |
| | | | | | | | | RoomAlias.from_sring(..., hs=hs) - similar to parse_userid() | ||||
* | | Make feedback table also store sender. | Erik Johnston | 2014-08-13 | 2 | -1/+3 |
| | | |||||
* | | Initial stab at refactoring the SQL tables, including rejigging some of the ↵ | Erik Johnston | 2014-08-13 | 6 | -261/+115 |
| | | | | | | | | storage layer. | ||||
* | | Convert im schema to a 'one' table structure | Erik Johnston | 2014-08-13 | 1 | -26/+31 |
|/ | |||||
* | Update graph.py to use new federation urls | Erik Johnston | 2014-08-13 | 1 | -1/+1 |
| | |||||
* | Now that HS->HS Profile lookups use Federation Queries, we don't need the ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 2 | -10/+4 |
| | | | | 'local_only' antirecursion hack | ||||
* | Use new Federation Query API to implement HS->HS fetching of remote users' ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 3 | -33/+71 |
| | | | | profile information instead of (ab)using the client-side REST API | ||||
* | Define the concept of a 'federation Query'; creating API for making and ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 3 | -0/+113 |
| | | | | handling Queries on the Federation's increasingly-inaccurately-named ReplicationLayer | ||||
* | Update get_json()'s documentation to match the actual observed behaviour | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -4/+3 |
| | |||||
* | Handle a potential race in the notifier when calling get_events_for which ↵ | Erik Johnston | 2014-08-13 | 1 | -3/+7 |
| | | | | resulted in an uncaught KeyError | ||||
* | Store public room id > alias mappings. | Kegan Dougal | 2014-08-13 | 1 | -0/+6 |
| |