Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor | Erik Johnston | 2014-08-26 | 8 | -17/+22 |
|\ | |||||
| * | Respect 'limit' param in initialSync api | Erik Johnston | 2014-08-26 | 1 | -1/+5 |
| | | |||||
| * | Merge branch 'client_server_url_rename' into develop | Kegan Dougal | 2014-08-26 | 6 | -15/+16 |
| |\ | |||||
| | * | Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> ↵ | Kegan Dougal | 2014-08-26 | 6 | -15/+16 |
| | | | | | | | | | | | | /rooms/$roomid/members. /rooms$roomid/messages/list >> /room/$roomid/messages. Updated cmdclient, tests and webclient. | ||||
| * | | Use state_key rather than target_user_id | Mark Haines | 2014-08-26 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor | Erik Johnston | 2014-08-26 | 11 | -31/+11 |
|\| | |||||
| * | Fix pyflakes errors | Mark Haines | 2014-08-26 | 11 | -31/+11 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor | Erik Johnston | 2014-08-26 | 7 | -39/+42 |
|\| | |||||
| * | Avoid double call of refresh at app startup | Emmanuel ROHEE | 2014-08-26 | 2 | -5/+7 |
| | | |||||
| * | Merge branch 'client_server_url_rename' into develop | Kegan Dougal | 2014-08-26 | 5 | -34/+35 |
| |\ | |||||
| | * | Fix ALL THE UNIT TESTS | Kegan Dougal | 2014-08-26 | 5 | -34/+35 |
| | | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor | Erik Johnston | 2014-08-26 | 7 | -12/+319 |
|\| | | |||||
| * | | Determine and send user presence state | Emmanuel ROHEE | 2014-08-26 | 4 | -5/+140 |
| | | | |||||
| * | | Merge branch 'client_server_url_rename' into develop | Kegan Dougal | 2014-08-26 | 8 | -14/+217 |
| |\| | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-08-26 | 4 | -7/+38 |
| | |\ | | | | | | | | | | | | | client_server_url_rename | ||||
| | * | | webclient: Updated to use /rooms/$roomid/[invite|join|leave] | Kegan Dougal | 2014-08-26 | 1 | -7/+11 |
| | | | | |||||
| | * | | Implemented /rooms/$roomid/[invite|join|leave] with POST / PUT (incl txn ids) | Kegan Dougal | 2014-08-26 | 2 | -8/+35 |
| | | | | |||||
| | * | | Added basic in-memory REST transaction storage. Only the latest transaction ↵ | Kegan Dougal | 2014-08-26 | 3 | -2/+103 |
| | | | | | | | | | | | | | | | | for a given path/access_token combo is stored in order to prevent storing ALL request/response pairs. | ||||
| | * | | Added servlet for /rooms/$roomid/[invite|join|leave] | Kegan Dougal | 2014-08-26 | 1 | -0/+40 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor | Erik Johnston | 2014-08-26 | 63 | -800/+3107 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Add the ability to turn on the twisted manhole telnet service. | Erik Johnston | 2014-08-26 | 2 | -2/+13 |
| | | | | |||||
| * | | | Add a do_users_share_a_room method and use that in the presence handler. | Erik Johnston | 2014-08-26 | 2 | -5/+25 |
| |/ / | |||||
| * | | Merge branch 'client_server_url_rename' into develop | Kegan Dougal | 2014-08-26 | 14 | -170/+117 |
| |\| | |||||
| | * | URL renaming: Room state keys now use the format ↵ | Kegan Dougal | 2014-08-26 | 1 | -2/+2 |
| | | | | | | | | | | | | /rooms/$roomid/state/$event_type/$state_key. cmdclient: Fixed double urlencoding on leave command. Stream from the END since START now produces an error on /events. | ||||
| | * | Adjusted webclient to use new state paths. Updated membership msg template ↵ | Kegan Dougal | 2014-08-26 | 6 | -47/+24 |
| | | | | | | | | | | | | to actually show the person invited. Factored out common membership functions in matrix service. | ||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-08-26 | 1 | -1/+1 |
| | |\ | | |/ | |/| | | | | client_server_url_rename | ||||
| * | | Add 'state_key' to valid_keys | Erik Johnston | 2014-08-26 | 1 | -0/+1 |
| | | | |||||
| * | | Send down state_key to clients | Erik Johnston | 2014-08-26 | 1 | -1/+0 |
| | | | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-08-26 | 55 | -606/+2633 |
| | |\ | | |/ | |/| | | | | client_server_url_rename | ||||
| * | | Order 'get_recent_events_for_room' correctly. | Erik Johnston | 2014-08-26 | 1 | -1/+1 |
| | | | |||||
| * | | The landing URL is now '#/' which actually points to homeController | Emmanuel ROHEE | 2014-08-25 | 1 | -2/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | Emmanuel ROHEE | 2014-08-25 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Ensure that we don't have duplicate hosts in the pdu destinations list | Erik Johnston | 2014-08-24 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'hotfixes-0.0.1' of github.com:matrix-org/synapse | Erik Johnston | 2014-08-24 | 4 | -4/+14 |
| | |\ \ | |||||
| * | \ \ | Merge remote-tracking branch 'origin/hotfixes-0.0.1' into develop | Emmanuel ROHEE | 2014-08-25 | 24 | -40/+1787 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | For the content repo, don't just use homeserver.hostname as that might not ↵ | Erik Johnston | 2014-08-24 | 2 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | include the port due to SRV. | ||||
| | * | | | Add a unique constraint on the room hosts table | Erik Johnston | 2014-08-24 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Encode unicode from json as utf-8. This was required to allow people to ↵ | Erik Johnston | 2014-08-24 | 1 | -2/+2 |
| | |/ / | | | | | | | | | | | | | register on my laptop | ||||
| | * | | oops | Matthew Hodgson | 2014-08-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | very quick and dirty responsive design for iPhones | Matthew Hodgson | 2014-08-23 | 6 | -30/+110 |
| | | | | |||||
| | * | | point out the non-quick-start guide | Matthew Hodgson | 2014-08-23 | 1 | -2/+4 |
| | | | | |||||
| | * | | Mention in changelog that we disabled presence. v0.0.1 | Erik Johnston | 2014-08-22 | 1 | -0/+2 |
| | | | | |||||
| | * | | skip presence tests which broke when presence polling was disabled | Mark Haines | 2014-08-22 | 3 | -0/+13 |
| | | | | |||||
| | * | | Oops, we need to use defer.returnValue. | Erik Johnston | 2014-08-22 | 1 | -1/+2 |
| | | | | |||||
| | * | | Make is_presence_visible always return true as it was thrashing the database. | Erik Johnston | 2014-08-22 | 1 | -0/+3 |
| | | | | |||||
| | * | | Turn off more spammy logging. | Erik Johnston | 2014-08-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Turn off spammy logging | Erik Johnston | 2014-08-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add indices to schema | Erik Johnston | 2014-08-22 | 2 | -0/+24 |
| | | | | |||||
| | * | | avatar url | root | 2014-08-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | add 0.0.0 into the changelog, and add dates | Matthew Hodgson | 2014-08-22 | 1 | -2/+8 |
| | | | | |||||
| | * | | Merge branch 'release-v0.0.1' of github.com:matrix-org/synapse | Erik Johnston | 2014-08-22 | 63 | -1386/+1956 |
| | |\ \ | |||||
| | * | | | Added initial swagger REST API spec. | Kegan Dougal | 2014-08-22 | 7 | -0/+1607 |
| | | | | | |||||
| * | | | | Oops. Removed my NetBeans private folders | Emmanuel ROHEE | 2014-08-25 | 3 | -39/+0 |
| | | | | | |||||
| * | | | | Added "Your name" as placeholder to help user understand what is this alone ↵ | Emmanuel ROHEE | 2014-08-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | input box | ||||
| * | | | | Merge branch 'settings-page' into develop | Emmanuel ROHEE | 2014-08-22 | 15 | -452/+503 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Use /home everywhere | Emmanuel ROHEE | 2014-08-22 | 6 | -12/+12 |
| | | | | | |||||
| | * | | | renamed rooms to home - renamed files | Emmanuel ROHEE | 2014-08-22 | 4 | -0/+23 |
| | | | | | |||||
| | * | | | renamed rooms to home | Emmanuel ROHEE | 2014-08-22 | 3 | -0/+16 |
| | | | | | |||||
| | * | | | Move profile parts of the rooms page and the config content into a new page: ↵ | Emmanuel ROHEE | 2014-08-22 | 8 | -201/+237 |
| | | | | | | | | | | | | | | | | | | | | settings | ||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1 | Erik Johnston | 2014-08-22 | 4 | -49/+95 |
| |\ \ \ \ | |||||
| * | | | | | Move the 'Upgrade' section to just below the 'Installation' section | Erik Johnston | 2014-08-22 | 1 | -6/+8 |
| | | | | | | |||||
| * | | | | | Update the README.rst to refer people to UPGRADE.rst | Erik Johnston | 2014-08-22 | 1 | -0/+6 |
| | | | | | | |||||
| * | | | | | Rename files to .rst for consistency. | Erik Johnston | 2014-08-22 | 2 | -0/+0 |
| | | | | | | |||||
| * | | | | | Add a missing '=' | Erik Johnston | 2014-08-22 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Add CHANGES and UPGRADE files. | Erik Johnston | 2014-08-22 | 2 | -0/+43 |
| | | | | | | |||||
| * | | | | | Don't return state event outlier's when paginating. | Erik Johnston | 2014-08-22 | 3 | -2/+9 |
| | | | | | | |||||
| * | | | | | Add a database-prepare-for-0.0.1.sh | Erik Johnston | 2014-08-22 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Add database-prepare-for-0.0.1.sh that should be run before starting a ↵ | Erik Johnston | 2014-08-22 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | v0.0.1 homeserver. | ||||
| * | | | | | Bump versions to 0.0.1 | Erik Johnston | 2014-08-22 | 3 | -1/+4 |
| | | | | | | |||||
| * | | | | | Allow people to specify database location in database-save.sh | Erik Johnston | 2014-08-22 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Check if the membership message was for the room we were in before updating ↵ | Erik Johnston | 2014-08-22 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | the membership list | ||||
| * | | | | | Keep track of people's presence and query that when we update the members list. | Erik Johnston | 2014-08-22 | 2 | -3/+10 |
| | | | | | | |||||
| * | | | | | Reinitialize room when creating a RoomController so that we start off with a ↵ | Erik Johnston | 2014-08-22 | 2 | -1/+13 |
| | |/ / / | |/| | | | | | | | | | | | | | clean slate, as it expects/ | ||||
| * | | | | Use $location.url instead of $location.path to get clean page URL without ↵ | Emmanuel ROHEE | 2014-08-22 | 4 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hash arguments of the previous page. This happpens with room URL like http://127.0.0.1:8080/matrix/client/#/room/#public:localhost. The second hash part is transferred to the next page when using $location.path. | ||||
| * | | | | Make the content repo work with in daemon mode. Return the full url on ↵ | Erik Johnston | 2014-08-22 | 3 | -9/+24 |
| | | | | | | | | | | | | | | | | | | | | upload. Update the webclient to use new content repo api. | ||||
| * | | | | resizeImage: generate an image in the format of the original image. (Tested ↵ | Emmanuel ROHEE | 2014-08-22 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | with tranparent PNG, transparent GIF, BMP, JPEG) | ||||
| * | | | | Safari needs the img.onload event before actually working on the img | Emmanuel ROHEE | 2014-08-22 | 2 | -27/+39 |
| | | | | | |||||
| * | | | | homeserver runs webclient by default now | Matthew Hodgson | 2014-08-22 | 1 | -8/+3 |
| | | | | | |||||
| * | | | | improve leftBlock css | Matthew Hodgson | 2014-08-22 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | -w is no more | Matthew Hodgson | 2014-08-22 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | fix mainInput retaining focus between sending consecutive messages by ↵ | Matthew Hodgson | 2014-08-22 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | disabling commit 955662d6 | ||||
| * | | | | fix weird fontsizes on iOS | Matthew Hodgson | 2014-08-22 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | sacrifice a goat or two to make wordwrap actually work properly | Matthew Hodgson | 2014-08-22 | 2 | -28/+21 |
| | | | | | |||||
| * | | | | rename autoComplete directive as tabComplete to avoid confusion with the ↵ | Matthew Hodgson | 2014-08-22 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | autocomplete html attribute | ||||
| * | | | | add fixme pointing out name disambiguation is a bit flakey | Matthew Hodgson | 2014-08-22 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | host a webclient by default | Matthew Hodgson | 2014-08-21 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | actually display room metadata based on m.room.membe events | Matthew Hodgson | 2014-08-21 | 3 | -2/+23 |
| | | | | | |||||
| * | | | | Add a var. | Erik Johnston | 2014-08-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Only start event streaming after having set up the controllers. | Erik Johnston | 2014-08-21 | 6 | -5/+19 |
| | | | | | |||||
| * | | | | Add ts field to all events. | Erik Johnston | 2014-08-21 | 2 | -2/+7 |
| | | | | | |||||
| * | | | | Change webclient to always hit the im sync api before streaming so we get ↵ | Erik Johnston | 2014-08-21 | 2 | -7/+41 |
| | | | | | | | | | | | | | | | | | | | | current presence state | ||||
| * | | | | Change IM sync api to also return the current presence list. | Erik Johnston | 2014-08-21 | 2 | -6/+23 |
| | | | | | |||||
| * | | | | stop hammering the HS for displayname and avatar URLs | Matthew Hodgson | 2014-08-21 | 1 | -3/+5 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1 | Erik Johnston | 2014-08-21 | 6 | -38/+294 |
| |\ \ \ \ | |||||
| * | | | | | 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 |
| | | | | | | |||||
| | | | | * | Removed member list servlet: now using generic state paths. | Kegan Dougal | 2014-08-26 | 9 | -106/+53 |
| | | | | | | |||||
| | | | | * | Impl: /rooms/roomid/state/eventtype/state_key - Renamed RoomTopicRestServlet ↵ | Kegan Dougal | 2014-08-22 | 2 | -20/+43 |
| | | | |/ | | | |/| | | | | | | | | | | | to RoomStateEventRestServlet. Support generic state event sending. | ||||
| | | * | | Updater command line client to new IS API | David Baker | 2014-08-22 | 1 | -25/+37 |
| | | | | | |||||
| | | * | | Update web client to use new IS API. | David Baker | 2014-08-22 | 3 | -24/+58 |
| | |/ / | |||||
| | * | | 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 new StreamToken in pagination config | Erik Johnston | 2014-08-21 | 1 | -5/+9 |
| | | | |||||
* | | | Add in StreamToken type | Erik Johnston | 2014-08-21 | 1 | -0/+74 |
|/ / | |||||
* | | 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 |