Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | SYN-48: Track User-Agents as well as IPs for client devices. | Erik Johnston | 2014-09-29 | 4 | -5/+20 |
| | |||||
* | Track the IP users connect with. Add an admin column to users table. | Erik Johnston | 2014-09-26 | 9 | -12/+67 |
| | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-25 | 5 | -5/+30 |
|\ | |||||
| * | Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse v0.3.4 | Erik Johnston | 2014-09-25 | 46 | -233/+1297 |
| |\ | |||||
| | * | Just use a yaml list for turn servers | David Baker | 2014-09-25 | 2 | -3/+3 |
| | | | |||||
| | * | More change log lines | Erik Johnston | 2014-09-25 | 1 | -0/+3 |
| | | | |||||
| | * | Bump version and changelog | Erik Johnston | 2014-09-25 | 3 | -2/+24 |
| |/ |/| | |||||
* | | Add realm to coturn options (it needs it). | David Baker | 2014-09-25 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'deletions' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-25 | 17 | -27/+531 |
|\ \ | |||||
| * | | Don't strip out null's in serialized events, as that is not need anymore and ↵ | Erik Johnston | 2014-09-25 | 1 | -1/+2 |
| | | | | | | | | | | | | it's not in the spec (yet) | ||||
| * | | Don't strip of False values from events when serializing | Erik Johnston | 2014-09-25 | 1 | -1/+1 |
| | | | |||||
| * | | Rename redaction test case to something helpful | Erik Johnston | 2014-09-25 | 1 | -1/+1 |
| | | | |||||
| * | | Add LIMIT to scalar subquery | Erik Johnston | 2014-09-25 | 3 | -5/+10 |
| | | | |||||
| * | | More tests. | Erik Johnston | 2014-09-25 | 1 | -1/+82 |
| | | | |||||
| * | | Add test for redactions | Erik Johnston | 2014-09-25 | 1 | -0/+181 |
| | | | |||||
| * | | Rename deletions to redactions | Erik Johnston | 2014-09-24 | 16 | -74/+77 |
| | | | |||||
| * | | Make deleting deletes not undelete | Erik Johnston | 2014-09-24 | 1 | -14/+4 |
| | | | |||||
| * | | Fix bug where we didn't correctly pull out the event_id of the deletion | Erik Johnston | 2014-09-24 | 2 | -3/+8 |
| | | | |||||
| * | | Fill out the prune_event method. | Erik Johnston | 2014-09-24 | 1 | -6/+31 |
| | | | |||||
| * | | Fix test. | Erik Johnston | 2014-09-24 | 1 | -1/+1 |
| | | | |||||
| * | | Add v4 deltas to current sql. | Erik Johnston | 2014-09-24 | 3 | -1/+10 |
| | | | |||||
| * | | Rename 'pruned' to 'pruned_because' | Erik Johnston | 2014-09-23 | 3 | -3/+3 |
| | | | |||||
| * | | SYN-12: Implement auth for deletion by adding a 'delete_level' on the ops ↵ | Erik Johnston | 2014-09-23 | 4 | -6/+43 |
| | | | | | | | | | | | | | | | | | | levels event SYN-12 # comment Auth has been added. | ||||
| * | | Add prune_event method | Erik Johnston | 2014-09-23 | 1 | -0/+39 |
| | | | |||||
| * | | Make sure we don't persist the 'pruned' key | Erik Johnston | 2014-09-23 | 1 | -1/+1 |
| | | | |||||
| * | | Add m.room.deletion. If an event is deleted it will be returned to clients ↵ | Erik Johnston | 2014-09-23 | 9 | -21/+144 |
| | | | | | | | | | | | | 'pruned', i.e. all client specified keys will be removed. | ||||
| * | | Add a deletions table | Erik Johnston | 2014-09-22 | 1 | -0/+5 |
| | | | |||||
* | | | fix rst warnings | David Baker | 2014-09-25 | 1 | -0/+3 |
| | | | |||||
* | | | add howto for setting up your very own TURN server | David Baker | 2014-09-25 | 1 | -0/+89 |
| | | | |||||
* | | | Fix bug where we tried to insert state events with null state key | Erik Johnston | 2014-09-25 | 1 | -1/+2 |
| | | | |||||
* | | | BF: Do a pagination when opening a room from an invitation | Emmanuel ROHEE | 2014-09-25 | 1 | -5/+8 |
| | | | |||||
* | | | Merge branch 'turn' into develop | David Baker | 2014-09-25 | 7 | -6/+165 |
|\ \ \ | |||||
| * | | | Add stun server fallback and I-told-you-so message if we get no TURN server ↵ | David Baker | 2014-09-25 | 2 | -18/+34 |
| | | | | | | | | | | | | | | | | and the connection fails. | ||||
| * | | | Make turn server endpoint return an empty object if no turn servers to | David Baker | 2014-09-25 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | match the normal response. Don't break if the turn_uris option isn't present. | ||||
| * | | | Refresh turn server before the ttl runs out. Support firefox. | David Baker | 2014-09-24 | 1 | -14/+23 |
| | | | | |||||
| * | | | The REST API spec only alows for returning a single server so name the | David Baker | 2014-09-24 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | endpoint appropriately. | ||||
| * | | | Hopefully implement turn in the web client (probably wrong for Firefox ↵ | David Baker | 2014-09-24 | 2 | -3/+34 |
| | | | | | | | | | | | | | | | | because Firefox is a special snowflake) | ||||
| * | | | Oops | David Baker | 2014-09-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | rename endpoint to better reflect what it is and allow specifying multiple uris | David Baker | 2014-09-24 | 2 | -8/+6 |
| | | | | |||||
| * | | | Use standard base64 encoding with padding to get the same result as | David Baker | 2014-09-24 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | coturn. | ||||
| * | | | The config is not hierarchical | David Baker | 2014-09-23 | 1 | -3/+3 |
| | | | | |||||
| * | | | Add support for TURN servers as per the TURN REST API ↵ | David Baker | 2014-09-23 | 4 | -2/+104 |
| | | | | | | | | | | | | | | | | (http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00) | ||||
* | | | | Fix test where we changed arguments used to call the notifier | Erik Johnston | 2014-09-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | SYN-46: An invite received from fedearation didn't wake up the event stream ↵ | Erik Johnston | 2014-09-25 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | for the invited user. | ||||
* | | | | Fixed SYWEB-36: use getUserDisplayName for disambiguating display name in ↵ | Emmanuel ROHEE | 2014-09-25 | 2 | -24/+10 |
| | | | | | | | | | | | | | | | | member list and message sender name. This method is robust when disambiguation is no more required | ||||
* | | | | getUserDisplayName: Disambiguate users who have the same displayname in the ↵ | Emmanuel ROHEE | 2014-09-25 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | room. Displayname are then disambiguate where it is necessary | ||||
* | | | | Don't set the room name to be the room alias on room creation if the client ↵ | Erik Johnston | 2014-09-24 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | didn't supply a name | ||||
* | | | | Fixed getUserDisplayname when the user has a null displayname | Emmanuel ROHEE | 2014-09-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | SYN-70: And fix another bug where I can't type | Erik Johnston | 2014-09-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | SYN-70: Fix typo | Erik Johnston | 2014-09-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fixed SYWEB-74: Emote desktop notifications sometimes lack a name: ↵ | Emmanuel ROHEE | 2014-09-24 | 1 | -32/+49 |
| | | | | | | | | | | | | | | | | "undefined waves" | ||||
* | | | | SYWEB-27: Public rooms with 2 users must not considered as 1:1 chat room and ↵ | Emmanuel ROHEE | 2014-09-24 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | so, they must no be renamed | ||||
* | | | | Fixed SYWEB-28: show displayname changes in recents | Emmanuel ROHEE | 2014-09-24 | 1 | -21/+28 |
| | | | | |||||
* | | | | Added hasOwnProperty tests when required to be robust to random properties ↵ | Emmanuel ROHEE | 2014-09-24 | 3 | -1/+12 |
| | | | | | | | | | | | | | | | | added to he Object prototype | ||||
* | | | | State data now provides up-to-date users displaynames. So use it first. | Emmanuel ROHEE | 2014-09-24 | 2 | -50/+36 |
| | | | | | | | | | | | | | | | | | | | | Continue to use presence data as fallback solution which is required when users do not join the room yet. Created eventHandlerService.getUserDisplayName() as a single point to compute display name. | ||||
* | | | | close buttons on recents (SYWEB-68) | Matthew Hodgson | 2014-09-24 | 3 | -2/+14 |
| | | | | |||||
* | | | | close buttons on recents (SYWEB-68) | Matthew Hodgson | 2014-09-24 | 1 | -0/+0 |
| | | | | |||||
* | | | | on safari at least keypress's event.which returns ASCII rather than ↵ | Matthew Hodgson | 2014-09-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | keycodes, so 38 & 40 was swallowing ( and & rather than up-arrow and down-arrow(!) | ||||
* | | | | comment-convo with kegan | Matthew Hodgson | 2014-09-23 | 1 | -1/+10 |
| | | | | |||||
* | | | | fix yet more room id leak disasters | Matthew Hodgson | 2014-09-23 | 1 | -5/+12 |
| | | | | |||||
* | | | | oops, stupid bug on room/$room/state | Matthew Hodgson | 2014-09-23 | 2 | -4/+4 |
| | | | | |||||
* | | | | manu: what's going on here? | Matthew Hodgson | 2014-09-23 | 1 | -3/+4 |
| | | | | |||||
* | | | | Bugfix for older Pythons that lack hmac.compare_digest() | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -1/+11 |
| | | | | |||||
* | | | | use all new /rooms/<room id>/state to actually gather the state for rooms ↵ | Matthew Hodgson | 2014-09-23 | 3 | -8/+49 |
| | | | | | | | | | | | | | | | | whenever join them. a bit ugly, as we don't currently have a nice place to gather housekeeping after joining a room, so horrible code duplication... | ||||
* | | | | patch over another scenario whe we leak room IDs. i have *zero* idea why or ↵ | Matthew Hodgson | 2014-09-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | where the webclient is overriding message.membership to be "join" though, when it comes down the events pipe as "invite" (which was causing this failure mode) | ||||
* | | | | fix a case of rampaging SYWEB-78 | Matthew Hodgson | 2014-09-23 | 1 | -0/+5 |
| | | | | |||||
* | | | | Fix SYWEB-72 : Improve performance when typing. | Kegan Dougal | 2014-09-23 | 2 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | Swapped ng-keydown to a directive, which does the same thing (check if up/down arrow then call history.goUp/goDown). This has *dramatically* improved performance when typing in rooms which have lots (>100) of messages loaded. | ||||
* | | | | SYWEB-28: Fixed weird members list ordering: sort members on their last ↵ | Emmanuel ROHEE | 2014-09-23 | 1 | -3/+10 |
| | | | | | | | | | | | | | | | | activity absolute time | ||||
* | | | | Merge branch 'jira/SYN-60' into develop | Paul "LeoNerd" Evans | 2014-09-23 | 2 | -6/+44 |
|\ \ \ \ | |||||
| * | | | | Send an HMAC(SHA1) protecting the User ID for the ReCAPTCHA bypass, rather ↵ | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -7/+26 |
| | | | | | | | | | | | | | | | | | | | | than simply the secret itself, so it's useless if that HMAC leaks | ||||
| * | | | | Config values are almost never 'None', but they might be empty string. ↵ | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Detect their presence by truth | ||||
| * | | | | Make sure the config actually /has/ a captcha_bypass_secret set before ↵ | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | trying to compare it | ||||
| * | | | | Allow a (hidden undocumented) key to m.login.recaptcha to specify a shared ↵ | Paul "LeoNerd" Evans | 2014-09-23 | 2 | -6/+24 |
| | | | | | | | | | | | | | | | | | | | | secret to allow bots to bypass the ReCAPTCHA test (SYN-60) | ||||
* | | | | | remove old commented-out code | Matthew Hodgson | 2014-09-23 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | fix one cause of SYWEB-53 | Matthew Hodgson | 2014-09-23 | 1 | -7/+4 |
| | | | | | |||||
* | | | | | Update API docs to include notes on /rooms/$roomid/state | Kegan Dougal | 2014-09-23 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Implemented /rooms/$roomid/state API. | Kegan Dougal | 2014-09-23 | 2 | -6/+23 |
| |/ / / |/| | | | |||||
* | | | | Partial fix of SYWEB-28: If members do not have last_active_ago, compare ↵ | Emmanuel ROHEE | 2014-09-23 | 1 | -1/+17 |
| | | | | | | | | | | | | | | | | their presence state to order them | ||||
* | | | | send messages to users from the home page (SYWEB-19) | Matthew Hodgson | 2014-09-23 | 3 | -4/+42 |
| | | | | |||||
* | | | | fix NPE | Matthew Hodgson | 2014-09-23 | 1 | -2/+1 |
| | | | | |||||
* | | | | Fix SYWEB-8 : Buggy tab-complete. | Kegan Dougal | 2014-09-23 | 1 | -19/+40 |
|/ / / | | | | | | | | | | | | | | | | | | | The first red blink was caused by an uninitialised search index. There is no caching of entries, since this then wouldn't update if someone joined/left during the tab. Instead, set to search index to MAX_VALUE then fix it to a valid index AFTER the search is complete. Also ditched trailing space on ": ". | ||||
* | / | Show display name changes in the message list. | Kegan Dougal | 2014-09-22 | 2 | -8/+30 |
| |/ |/| | |||||
* | | Bump versions and changelog v0.3.3 | Erik Johnston | 2014-09-22 | 3 | -2/+22 |
| | | |||||
* | | Add working protractor e2e test. | Kegan Dougal | 2014-09-22 | 4 | -8/+26 |
| | | | | | | | | | | | | | | | | This uses the ignoreSynchronization flag because of the longpoll on the event stream. It would be better to use $interval, but couldn't get that to *reliably* work when testing. I suspect that $interval won't help us here, since there is genuinely an open $http connection, as we're doing a long poll. https://github.com/angular/protractor/issues/49 for more info. | ||||
* | | Set required environment variables for e2e testing. | Kegan Dougal | 2014-09-22 | 3 | -6/+15 |
| | | | | | | | | | | Added an 'id' to the login button so it can be automatically triggered. Also, added an onPrepare section to protractor.conf to do the login. | ||||
* | | Updated test README to include a section on environment-protractor.js | Kegan Dougal | 2014-09-22 | 1 | -0/+6 |
| | | | | | | | | The environment file is .gitignored so random selenium servers aren't accidentally pushed. | ||||
* | | Added boilerplate for running end-to-end tests.\nThis is done using ↵ | Kegan Dougal | 2014-09-22 | 5 | -6/+30 |
|/ | | | | Protractor, which looks for a .gitignored file environment-protractor.js which contains the selenium endpoint url. | ||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-22 | 2 | -2/+1 |
|\ | |||||
| * | Fix undefined variable error | David Baker | 2014-09-19 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse | Erik Johnston | 2014-09-18 | 32 | -310/+3413 |
| |\ | |||||
| * | | Remove lie from change log. | Erik Johnston | 2014-09-18 | 1 | -1/+0 |
| | | | |||||
* | | | Propagate failure reason to the other party. | David Baker | 2014-09-22 | 2 | -7/+8 |
| | | | |||||
* | | | Better logging of ICE candidates and fail the call when ICE fails. | David Baker | 2014-09-22 | 2 | -8/+12 |
| | | | |||||
* | | | Fixed unit test; it all actually works. Added a README for running the tests ↵ | Kegan Dougal | 2014-09-22 | 1 | -0/+9 |
| | | | | | | | | | | | | with karma/jasmine. | ||||
* | | | go back to the original behaviour of only notifying if we think the app is ↵ | Matthew Hodgson | 2014-09-20 | 1 | -8/+14 |
| | | | | | | | | | | | | backgrounded or idle... | ||||
* | | | remove insanely busy logging which is killing CPU | Matthew Hodgson | 2014-09-20 | 1 | -2/+6 |
| | | | |||||
* | | | remove the ng-model attribute from mainInput textarea to stop the digest ↵ | Matthew Hodgson | 2014-09-20 | 2 | -16/+16 |
| | | | | | | | | | | | | being run every time you press a key (SYWEB-4) | ||||
* | | | Notify a callee that their browser doesn't support VoIP too. | David Baker | 2014-09-19 | 5 | -9/+20 |
| | | | | | | | | | | | | SYWEB-14 #resolved | ||||
* | | | Move video background element up as it was causing the page to scroll. | David Baker | 2014-09-19 | 1 | -1/+3 |
| | | | |||||
* | | | Join rooms if we're not already in them when accepting a call coming from ↵ | David Baker | 2014-09-19 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | that room. SYWEB-55 #resolve | ||||
* | | | SYWEB-32: made all input/textearea inherit the font of their parent | Emmanuel ROHEE | 2014-09-19 | 1 | -0/+5 |
| | | | |||||
* | | | Fix the "is webrtc supported" titles on buttons and make the video / voice ↵ | David Baker | 2014-09-19 | 1 | -6/+6 |
| | | | | | | | | | | | | call buttons appear in multi-user rooms but be greyed out with approriate titles. | ||||
* | | | Test that prev_content get's added if there is a prev_state key (in the ↵ | Erik Johnston | 2014-09-19 | 1 | -17/+70 |
| | | | | | | | | | | | | event stream). | ||||
* | | | Merge branch 'videocalls' into develop | David Baker | 2014-09-19 | 6 | -19/+224 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: webclient/room/room.html | ||||
| * | | | First working version of UI chrome for video calls. | David Baker | 2014-09-19 | 3 | -14/+35 |
| | | | | |||||
| * | | | add unprefixed filter css as well | David Baker | 2014-09-18 | 1 | -0/+2 |
| | | | | |||||
| * | | | Prettier and stabler video with basic support for viewing mode. For now, ↵ | David Baker | 2014-09-18 | 4 | -19/+70 |
| | | | | | | | | | | | | | | | | transition into 'large' mode is disabled. | ||||
| * | | | WIP video chat layout | David Baker | 2014-09-18 | 4 | -4/+38 |
| | | | | |||||
| * | | | Video calling (in a tiny box at the moment) | David Baker | 2014-09-17 | 6 | -15/+106 |
| | | | | |||||
* | | | | SYWEB-13 SYWEB-14: disabled "Call" button if the browser does not support ↵ | Emmanuel ROHEE | 2014-09-19 | 3 | -2/+14 |
| | | | | | | | | | | | | | | | | all required WebRTC features | ||||
* | | | | SYWEB-13: disabled "Send image" button if the browser does not support HTML5 ↵ | Emmanuel ROHEE | 2014-09-19 | 1 | -6/+16 |
| | | | | | | | | | | | | | | | | file API | ||||
* | | | | SYWEB-13: Do not start the app if the browser does not support WEBStorage. | Emmanuel ROHEE | 2014-09-19 | 3 | -4/+37 |
| | | | | | | | | | | | | | | | | Internet Explorer case: Launch the app only for versions 9 and higher. | ||||
* | | | | SYN-47: Fix bug where we still returned events for rooms we had left. | Erik Johnston | 2014-09-19 | 2 | -1/+174 |
| | | | | | | | | | | | | | | | | SYN-47 #resolve | ||||
* | | | | Small formatting fixes | Kegan Dougal | 2014-09-19 | 1 | -8/+10 |
| | | | | |||||
* | | | | formatting | Kegan Dougal | 2014-09-19 | 1 | -5/+9 |
| | | | | |||||
* | | | | A kind of the typo in the fix of SYWEB-44 | Emmanuel ROHEE | 2014-09-19 | 1 | -2/+2 |
| | | | | |||||
* | | | | Room id leaks: log them when then happens. Plus log the conditions that made ↵ | Emmanuel ROHEE | 2014-09-19 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | them happen | ||||
* | | | | Fixed SYWEB-16: When sending an invite over federation, the remote user sees ↵ | Emmanuel ROHEE | 2014-09-19 | 1 | -22/+38 |
| |_|/ |/| | | | | | | | | the name of the resulting invite room as *their* name rather than the inviters | ||||
* | | | fix SYWEB-41 (hopefully) | Matthew Hodgson | 2014-09-18 | 1 | -1/+7 |
| | | | |||||
* | | | Fixed missing component dependency which created a crash | Emmanuel ROHEE | 2014-09-18 | 1 | -3/+2 |
| | | | |||||
* | | | Added test directory, karma conf, and angular-mocks. Expect it to work? Pah, ↵ | Kegan Dougal | 2014-09-18 | 3 | -0/+2314 |
| | | | | | | | | | | | | not yet. | ||||
* | | | Oops. Removed dev logs | Emmanuel ROHEE | 2014-09-18 | 1 | -1/+0 |
| | | | |||||
* | | | SYWEB-14: BF: rooms invitations were not visible in recents after ↵ | Emmanuel ROHEE | 2014-09-18 | 3 | -3/+22 |
| | | | | | | | | | | | | launching/refreshing the web page | ||||
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-18 | 4 | -3/+10 |
|\ \ \ | | |/ | |/| | |||||
| * | | Bump Changelog and version v0.3.2 | Erik Johnston | 2014-09-18 | 3 | -2/+9 |
| | | | |||||
| * | | undefined is empty. Fixed bug where empty bingWords with old accounts which ↵ | Kegan Dougal | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | | hadn't logged in didn't send notifications. | ||||
* | | | fix wordwrap | Matthew Hodgson | 2014-09-18 | 1 | -2/+2 |
| | | | |||||
* | | | fix binger description | Matthew Hodgson | 2014-09-18 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-18 | 5 | -21/+17 |
|\| | | |||||
| * | | Bump changelog and versions v0.3.1 | Erik Johnston | 2014-09-18 | 3 | -2/+11 |
| | | | |||||
| * | | SYWEB-40: Only local rooms are shown in the recents list. | Emmanuel ROHEE | 2014-09-18 | 1 | -7/+0 |
| | | | | | | | | | | | | Removed an old patch that deduplicated join events. This patch is now useless. Plus it is buggy since it compared event.content and event.prev_content only on the membership field whereas these objects contain more data now like displayname... | ||||
| * | | Reverted patches done for SYWEB-40 | Emmanuel ROHEE | 2014-09-18 | 2 | -12/+6 |
| | | | |||||
* | | | Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-18 | 23 | -298/+1064 |
|\ \ \ | |/ / |/| | | | | | | | | Conflicts: tests/handlers/test_profile.py | ||||
| * | | Merge branch 'develop' into test-sqlite-memory | Paul "LeoNerd" Evans | 2014-09-17 | 40 | -452/+1259 |
| |\ \ | |||||
| * | | | Remark on remaining storage modules that still need unit tests | Paul "LeoNerd" Evans | 2014-09-17 | 1 | -0/+5 |
| | | | | |||||
| * | | | Neaten more of the storage layer tests with assertObjectHasAttributes; more ↵ | Paul "LeoNerd" Evans | 2014-09-17 | 3 | -20/+22 |
| | | | | | | | | | | | | | | | | standardisation on test layout | ||||
| * | | | Unit tests for (some) room events via the RoomStore | Paul "LeoNerd" Evans | 2014-09-17 | 1 | -0/+85 |
| | | | | |||||
| * | | | Use new assertObjectHasAttributes() in tests/storage/test_room.py | Paul "LeoNerd" Evans | 2014-09-17 | 1 | -3/+6 |
| | | | | |||||
| * | | | Added a useful unit test primitive for asserting object attributes | Paul "LeoNerd" Evans | 2014-09-17 | 1 | -0/+11 |
| | | | | |||||
| * | | | More RoomStore tests | Paul "LeoNerd" Evans | 2014-09-17 | 1 | -4/+40 |
| | | | | |||||
| * | | | Print expected-vs-actual data types on typecheck failure from check_json() | Paul "LeoNerd" Evans | 2014-09-17 | 1 | -1/+2 |
| | | | | |||||
| * | | | Initial pass at a RoomStore test | Paul "LeoNerd" Evans | 2014-09-15 | 1 | -0/+53 |
| | | | | |||||
| * | | | Also unittest RoomMemberStore's joined_hosts_for_room() | Paul "LeoNerd" Evans | 2014-09-15 | 1 | -0/+48 |
| | | | | |||||
| * | | | Use new 'tests.unittest' in new storage level tests | Paul "LeoNerd" Evans | 2014-09-15 | 5 | -5/+5 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/develop' into test-sqlite-memory | Paul "LeoNerd" Evans | 2014-09-15 | 44 | -108/+269 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/develop' into test-sqlite-memory | Paul "LeoNerd" Evans | 2014-09-12 | 32 | -3833/+7332 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/pdu.py | ||||
| * | | | | | Initial hack at some RoomMemberStore unit tests | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -0/+109 |
| | | | | | | |||||
| * | | | | | More accurate docs / clearer paramter names in RoomMemberStore | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -6/+7 |
| | | | | | | |||||
| * | | | | | Revert recent changes to RoomMemberStore | Paul "LeoNerd" Evans | 2014-09-12 | 2 | -28/+10 |
| | | | | | | |||||
| * | | | | | Now don't need the other logger.debug() call in _execute | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -5/+0 |
| | | | | | | |||||
| * | | | | | Logging of all SQL queries via the 'synapse.storage.SQL' logger | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -2/+43 |
| | | | | | | |||||
| * | | | | | Add a .runInteraction() method on SQLBaseStore itself to wrap the .db_pool | Paul "LeoNerd" Evans | 2014-09-12 | 8 | -33/+42 |
| | | | | | | |||||
| * | | | | | Add a better _store_room_member_txn() method that takes separated fields ↵ | Paul "LeoNerd" Evans | 2014-09-11 | 1 | -8/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | instead of an event object; also add FIXME comment about a big bug in the logic | ||||
| * | | | | | Rename _store_room_member_txn to _store_room_member_from_event_txn so we can ↵ | Paul "LeoNerd" Evans | 2014-09-11 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | create another, more sensible function of that name | ||||
| * | | | | | Unit-test for RegistrationStore using SQLiteMemoryDbPool | Paul "LeoNerd" Evans | 2014-09-11 | 1 | -0/+69 |
| | | | | | | |||||
| * | | | | | Perform PresenceInvitesTestCase against real SQLiteMemoryDbPool | Paul "LeoNerd" Evans | 2014-09-11 | 1 | -78/+98 |
| | | | | | | |||||
| * | | | | | Need to prepare() the SQLiteMemoryDbPool before passing it to HomeServer ↵ | Paul "LeoNerd" Evans | 2014-09-11 | 6 | -18/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | constructor, as DataStore's constructor will want it ready | ||||
| * | | | | | Start of converting PresenceHandler unit tests to use SQLiteMemoryDbPool - ↵ | Paul "LeoNerd" Evans | 2014-09-11 | 1 | -46/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | just the 'State' test case for now | ||||
| * | | | | | Unit-test DirectoryHandler against (real) SQLite memory store, not mocked ↵ | Paul "LeoNerd" Evans | 2014-09-11 | 1 | -15/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | storage layer | ||||
| * | | | | | Added unit tests of DirectoryStore | Paul "LeoNerd" Evans | 2014-09-11 | 1 | -0/+66 |
| | | | | | | |||||
| * | | | | | Test ProfileHandler against the real datastore layer using SQLite :memory: | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -25/+25 |
| | | | | | | |||||
| * | | | | | Added unit tests for PresenceDataStore too | Paul "LeoNerd" Evans | 2014-09-10 | 2 | -2/+166 |
| | | | | | | |||||
| * | | | | | Remember to kill now-dead import in test_profile.py | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Move SQLiteMemoryDbPool implementation into tests.utils | Paul "LeoNerd" Evans | 2014-09-10 | 2 | -27/+15 |
| | | | | | | |||||
| * | | | | | It's considered polite to actually wait for DB prepare before running tests | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | Also test avatar_url profile field | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -0/+14 |
| | | | | | | |||||
| * | | | | | Tiny trivial PoC unit-test using SQLite in :memory: mode | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -0/+78 |
| | | | | | | |||||
| * | | | | | prepare_database() on db_conn, not plain name, so we can pass in the ↵ | Paul "LeoNerd" Evans | 2014-09-10 | 2 | -32/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | connection from outside | ||||
| * | | | | | Make sure not to open our TCP ports until /after/ the DB is nicely prepared ↵ | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | ready for use | ||||
| * | | | | | No need for a tiny run() function any more, just use reactor.run() directly | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -6/+2 |
| | | | | | | |||||
| * | | | | | Move database preparing code out of homserver.py into storage where it belongs | Paul "LeoNerd" Evans | 2014-09-10 | 3 | -64/+71 |
| | | | | | | |||||
* | | | | | | Merge branch 'release-v0.3.0' of github.com:matrix-org/synapse v0.3.0 | Erik Johnston | 2014-09-18 | 68 | -623/+1807 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.3.0 | Erik Johnston | 2014-09-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SYWEB-3 : Boldify if the join_rule is public, rather than visibility so it ↵ | Kegan Dougal | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plays nicer with federation. | ||||
| | * | | | | | | Patch for SYWEB-40 : isStateEvent is not being set correctly, and really ↵ | Kegan Dougal | 2014-09-18 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shouldn't be a configurable arg in the first place. As a result of being undefined, the events.rooms[rid].members object was not being updated in some cases, which combined with the recents-filter bug (32808e4), caused federated rooms to not appear in the recents list. | ||||
| | * | | | | | | Still add the room to the filtered list even if you can't work out the ↵ | Kegan Dougal | 2014-09-18 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | number of users in the room. | ||||
| * | | | | | | | Update Change log | Erik Johnston | 2014-09-18 | 1 | -2/+29 |
| | | | | | | | | |||||
| * | | | | | | | SYWEB-3 : Boldify if the join_rule is public, rather than visibility so it ↵ | Kegan Dougal | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plays nicer with federation. | ||||
| * | | | | | | | Update version in UPGRADE | Erik Johnston | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Patch for SYWEB-40 : isStateEvent is not being set correctly, and really ↵ | Kegan Dougal | 2014-09-18 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shouldn't be a configurable arg in the first place. As a result of being undefined, the events.rooms[rid].members object was not being updated in some cases, which combined with the recents-filter bug (32808e4), caused federated rooms to not appear in the recents list. | ||||
| * | | | | | | | Still add the room to the filtered list even if you can't work out the ↵ | Kegan Dougal | 2014-09-18 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | number of users in the room. | ||||
| * | | | | | | | unbreak calls in firefox | David Baker | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | add note to upgrade.rst about web client spec breaking change. | David Baker | 2014-09-17 | 1 | -0/+8 |
| | | | | | | | | |||||
| * | | | | | | | Bump versions | Erik Johnston | 2014-09-17 | 2 | -2/+2 |
| |/ / / / / / | |||||
| * | | | | | | Create room entries for public rooms too so their public state is ↵ | Kegan Dougal | 2014-09-17 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | transferred over correctly when you join it. | ||||
| * | | | | | | webclient SYWEB-3 : Public rooms are bold. Can't think of a nicer way which ↵ | Kegan Dougal | 2014-09-17 | 4 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't clutter the recents list. | ||||
| * | | | | | | SYWEB-30: BF: When switching between rooms, pagination flickered between the ↵ | Emmanuel ROHEE | 2014-09-17 | 2 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | top of the room before jumping to the bottom of the page | ||||
| * | | | | | | SYWEB-3 : Added 'visibility' key to rooms returned via /initialSync | Kegan Dougal | 2014-09-17 | 1 | -0/+5 |
| | | | | | | | |||||
| * | | | | | | SYWEB-22: Format emote('/me') messages correctly in desktop notification | Emmanuel ROHEE | 2014-09-17 | 1 | -1/+7 |
| | | | | | | | |||||
| * | | | | | | SYN-40: When a user updates their displayname or avatar update all their ↵ | Erik Johnston | 2014-09-17 | 3 | -3/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | join events for all the rooms they are currently in. | ||||
| * | | | | | | BF: edit the actual room name not the displayed room name (which has been ↵ | Emmanuel ROHEE | 2014-09-17 | 2 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | computed) | ||||
| * | | | | | | SYWEB-15: Always show the room alias as well as its name in the UI | Emmanuel ROHEE | 2014-09-17 | 1 | -54/+56 |
| | | | | | | | |||||
| * | | | | | | SYWEB-7: Use sessionStorage to make per-room history survives when the user ↵ | Emmanuel ROHEE | 2014-09-17 | 1 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigates through rooms | ||||
| * | | | | | | SYWEB-7: Up & down keys let user step through the history as per readline or ↵ | Emmanuel ROHEE | 2014-09-17 | 2 | -3/+72 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | xchat | ||||
| * | | | | | WEB-35: joins/parts should trigger desktop notifications | Emmanuel ROHEE | 2014-09-17 | 1 | -4/+18 |
| | | | | | | |||||
| * | | | | | Bugfix when content isn't a string. | Kegan Dougal | 2014-09-16 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Don't bing for sent messages. Handle cases where the member is unknown ↵ | Kegan Dougal | 2014-09-16 | 2 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | rather than erroring out. | ||||
| * | | | | | Added basic RegExp support. | Kegan Dougal | 2014-09-16 | 2 | -5/+3 |
| | | | | | | |||||
| * | | | | | WEB-27: We don't need to show the user-count in Recents in the room ↵ | Emmanuel ROHEE | 2014-09-16 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | sidepanel - takes up too much room | ||||
| * | | | | | Bing on all the things if there are 0 bing words. | Kegan Dougal | 2014-09-16 | 2 | -0/+7 |
| | | | | | | |||||
| * | | | | | hidden/minimise/focus disaster disclaimer with the TODO | Kegan Dougal | 2014-09-16 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Added utility function containsBingWord and hook up some css to it. | Kegan Dougal | 2014-09-16 | 3 | -31/+46 |
| | | | | | | |||||
| * | | | | | Added bing detection logic. Persist the display name of the user in ↵ | Kegan Dougal | 2014-09-16 | 4 | -7/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | localstorage for use when binging. | ||||
| * | | | | | Move the notification logic out of an individual room controller and into ↵ | Kegan Dougal | 2014-09-16 | 2 | -17/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | the general event handler, so we can notify for >1 room. | ||||
| * | | | | | Added a section on bing words if you enable desktop notifications. | Kegan Dougal | 2014-09-16 | 3 | -2/+19 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Time out calls from both ends properly. | David Baker | 2014-09-16 | 2 | -8/+20 |
| | | | | | |||||
| * | | | | Fixed scroll flickering when opening the room | Emmanuel ROHEE | 2014-09-16 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | If an initialSync has been already done on a room, we do not need to ↵ | Emmanuel ROHEE | 2014-09-16 | 1 | -2/+15 |
| | | | | | | | | | | | | | | | | | | | | paginate back to get more messages | ||||
| * | | | | WEB-29: Improve room page content loading | Emmanuel ROHEE | 2014-09-16 | 3 | -8/+26 |
| | | | | | | | | | | | | | | | | | | | | InitialSync: load the 30 last messages of each room so that a full page of messages can be displayed without additionnal request | ||||
| * | | | | Update spec with the lifetime field. | David Baker | 2014-09-16 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | Use event age to recognise which calls are current and which aren't and ↵ | David Baker | 2014-09-16 | 4 | -16/+79 |
| | | | | | | | | | | | | | | | | | | | | hence support answering calls that were placed before we loaded the page. | ||||
| * | | | | Comment out password reset for now, until the mechanism is fully discussed ↵ | Kegan Dougal | 2014-09-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | (IS token auth vs HS auth) | ||||
| * | | | | Added support for the HS to send emails. Use it to send password resets. ↵ | Kegan Dougal | 2014-09-16 | 4 | -2/+130 |
| | | | | | | | | | | | | | | | | | | | | Added email_smtp_server and email_from_address config args. Added emailutils. | ||||
| * | | | | Added PasswordResetRestServlet. Hit the IS to confirm the email/user. Need ↵ | Kegan Dougal | 2014-09-16 | 2 | -1/+50 |
| | | | | | | | | | | | | | | | | | | | | to send email. | ||||
| * | | | | Merge remote-tracking branch 'origin/develop' into webclient_data_centralisation | Emmanuel ROHEE | 2014-09-16 | 28 | -233/+709 |
| |\ \ \ \ | |||||
| | * | | | | Fix bug where we didn't always get 'prev_content' key | Erik Johnston | 2014-09-15 | 1 | -4/+1 |
| | | | | | | |||||
| | * | | | | Fix bug where we incorrectly calculated 'age_ts' from 'age' key rather than ↵ | Erik Johnston | 2014-09-15 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | the reverse. Don't transmit age_ts to clients for now. | ||||
| | * | | | | Correctly handle receiving 'missing' Pdus from federation, rather than just ↵ | Erik Johnston | 2014-09-15 | 3 | -13/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | discarding them. | ||||
| | * | | | | Improve logging in federation handler. | Erik Johnston | 2014-09-15 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Fix unit tests after adding extra argument on put_json | Erik Johnston | 2014-09-15 | 3 | -10/+28 |
| | | | | | | |||||
| | * | | | | Fix 'age' key to update on retries | Erik Johnston | 2014-09-15 | 3 | -8/+41 |
| | | | | | | |||||
| | * | | | | More helpful 400 error messages. | Kegan Dougal | 2014-09-15 | 1 | -1/+5 |
| | | | | | | |||||
| | * | | | | Updated CHANGES and UPGRADE to reflect registration API changes. | Kegan Dougal | 2014-09-15 | 2 | -0/+34 |
| | | | | | | |||||
| | * | | | | Be consistent when associating keys with login types for registration/login. | Kegan Dougal | 2014-09-15 | 4 | -4/+4 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-09-15 | 11 | -16/+52 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | registration-api-changes in preparation for re-merge to develop. | ||||
| | | * | | | Correctly handle the 'age' key in events and pdus | Erik Johnston | 2014-09-15 | 10 | -15/+51 |
| | | | | | | |||||
| | * | | | | Update spec to include m.login.email.identity | Kegan Dougal | 2014-09-15 | 1 | -1/+26 |
| | | | | | | |||||
| | * | | | | Fix unit tests. | Kegan Dougal | 2014-09-15 | 1 | -2/+8 |
| | | | | | | |||||
| | * | | | | Updated cmdclient to use new registration logic. | Kegan Dougal | 2014-09-15 | 1 | -11/+26 |
| | | | | | | |||||
| | * | | | | Make captcha work again with the new registration logic. | Kegan Dougal | 2014-09-15 | 2 | -1/+22 |
| | | | | | | |||||
| | * | | | | Updated webclient to support the new registration logic. | Kegan Dougal | 2014-09-15 | 1 | -23/+120 |
| | | | | | | |||||
| | * | | | | Split out password/captcha/email logic. | Kegan Dougal | 2014-09-15 | 2 | -140/+217 |
| | | | | | | |||||
| | * | | | | Added LoginType constants. Created general structure for processing ↵ | Kegan Dougal | 2014-09-15 | 2 | -20/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | registrations. | ||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-09-15 | 73 | -3922/+8162 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | registration-api-changes | ||||
| | * | | | | | Updated spec and api docs to desired new format. | Kegan Dougal | 2014-09-08 | 2 | -33/+73 |
| | | | | | | | |||||
| * | | | | | | Filter room where the user has been banned | Emmanuel ROHEE | 2014-09-15 | 2 | -5/+29 |
| | | | | | | | |||||
| * | | | | | | Recents must not show temporary fake messages | Emmanuel ROHEE | 2014-09-15 | 4 | -10/+32 |
| | | | | | | | |||||
| * | | | | | | Recents uses data directly from $rootscope.events | Emmanuel ROHEE | 2014-09-15 | 4 | -171/+95 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | BF: inviter field has moved to the room root object | Emmanuel ROHEE | 2014-09-15 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
| * | | | | BF: presence and eventMap were not reset at logout. | Emmanuel ROHEE | 2014-09-15 | 1 | -10/+14 |
| | | | | | |||||
| * | | | | Use "white-space: pre-wrap" for "Text will wrap when necessary, and on line ↵ | Emmanuel ROHEE | 2014-09-15 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | breaks" | ||||
| * | | | | Merge remote-tracking branch 'origin/master' into develop | Emmanuel ROHEE | 2014-09-15 | 3 | -3/+6 |
| |\ \ \ \ | |||||
| * | | | | | Define a CLOS-like 'around' modifier as a decorator, to neaten up the ↵ | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -10/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | 'orig_*' noise of wrapping the setUp()/tearDown() methods | ||||
| * | | | | | Add some docstrings | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -0/+6 |
| | | | | | | |||||
| * | | | | | Additionally look first for a 'loglevel' attribute on the running test ↵ | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | method, before the TestCase | ||||
| * | | | | | Define a (class) decorator for easily setting a DEBUG logging level on a ↵ | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | TestCase | ||||
| * | | | | | Allow a TestCase to set a 'loglevel' attribute, which overrides the logging ↵ | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | level while that testcase runs | ||||
| * | | | | | Have all unit tests import from our own subclass of trial's unittest ↵ | Paul "LeoNerd" Evans | 2014-09-12 | 21 | -61/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | TestCase; set up logging in ONE PLACE ONLY | ||||
| * | | | | | Update CHANGES.rst v0.2.3 | Erik Johnston | 2014-09-12 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-12 | 4 | -2/+23 |
| |\ \ \ \ \ |