Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into request_logging | Mark Haines | 2014-10-30 | 46 | -199/+391 |
|\ | | | | | | | | | Conflicts: synapse/config/logger.py | ||||
| * | Fix pep8 warnings | Mark Haines | 2014-10-30 | 35 | -135/+179 |
| | | |||||
| * | SYWEB-112: Use the right user ID when determining invites for display on the ↵ | Kegan Dougal | 2014-10-30 | 1 | -2/+9 |
| | | | | | | | | recents list. | ||||
| * | SYWEB-48: Better regex for binging on usernames. | Kegan Dougal | 2014-10-29 | 1 | -1/+28 |
| | | | | | | | | | | | | This uses /\blocalpart\b|\bdisplayname\b/i which is overall a lot better than before. This specifically gets @localpart references which the bug was originally for. | ||||
| * | Use floating-point rather than integer division to handle timeouts so that ↵ | Paul "LeoNerd" Evans | 2014-10-29 | 1 | -1/+1 |
| | | | | | | | | non-zero but sub-second waits don't collapse to zero | ||||
| * | SYWEB-127: Open event info modal dialog when the bubble is clicked. | Kegan Dougal | 2014-10-29 | 1 | -12/+11 |
| | | | | | | | | | | | | This allows images to be clicked by clicking on the edge with the bubble. This is important since Redactions are only visible on the event info screen. | ||||
| * | Fix an off-by-one bug in presence event stream pagination; this might be ↵ | Paul "LeoNerd" Evans | 2014-10-29 | 2 | -1/+17 |
| | | | | | | | | responsible for any number of bug reports | ||||
| * | Construct a source-specific 'SourcePaginationConfig' to pass into ↵ | Paul "LeoNerd" Evans | 2014-10-29 | 6 | -40/+43 |
| | | | | | | | | get_pagination_rows; meaning each source doesn't have to care about its own name any more | ||||
| * | Remove redundant (and incorrect) presence pagination fetching code | Paul "LeoNerd" Evans | 2014-10-29 | 1 | -3/+0 |
| | | |||||
| * | oops - fix css on desktop | Matthew Hodgson | 2014-10-29 | 1 | -1/+0 |
| | | |||||
| * | SYWEB-98: Handle incoming m.room.redaction events. | Kegan Dougal | 2014-10-29 | 1 | -0/+39 |
| | | | | | | | | UI for redactions is now complete. | ||||
| * | SYWEB-98: Add redactEvent matrix API call. | Kegan Dougal | 2014-10-29 | 3 | -2/+30 |
| | | |||||
| * | SYWEB-98: Add a 'Redact' button to the event info modal dialog. | Kegan Dougal | 2014-10-29 | 2 | -3/+31 |
| | | | | | | | | | | I think this is better than overriding the right-click contextual menu. Currently clicking this button does nothing. | ||||
| * | Implement SYWEB-58: Clicking a notification now takes you to that room. | Kegan Dougal | 2014-10-29 | 2 | -1/+7 |
| | | |||||
| * | Fix SYWEB-128 : Auto-scroll broken if not exactly at bottom of list. | Kegan Dougal | 2014-10-29 | 1 | -1/+3 |
| | | | | | | | | | | Added a small 10px buffer so if the list isn't quite at the bottom it still actually scrolls. | ||||
* | | Pep8 and a few doc strings | Mark Haines | 2014-10-30 | 2 | -17/+40 |
| | | |||||
* | | Add a request-id to each log line | Mark Haines | 2014-10-30 | 11 | -31/+205 |
|/ | |||||
* | fix mobile CSS layout | Matthew Hodgson | 2014-10-28 | 2 | -4/+9 |
| | |||||
* | Fix SYWEB-110 : Prevent room ID leaking by looking for an m.room.name | Kegan Dougal | 2014-10-27 | 1 | -1/+11 |
| | |||||
* | Remove duplicate join_event from create_room | Mark Haines | 2014-10-27 | 1 | -5/+0 |
| | |||||
* | Fix SYWEB-114 : Error message when trying to invite a user already in the room. | Kegan Dougal | 2014-10-27 | 1 | -1/+1 |
| | |||||
* | Don't clobber existing css | Kegan Dougal | 2014-10-27 | 1 | -209/+0 |
| | |||||
* | SYWEB-121: Have some bootstrap files. | Kegan Dougal | 2014-10-27 | 2 | -0/+9457 |
| | |||||
* | Implement SYWEB-121 : Display JSON when clicking messages. | Kegan Dougal | 2014-10-27 | 4 | -12/+24 |
| | | | | | JSON is displayed as a modal dialog via AngularJS' bootstrap module, "ui.bootstrap". | ||||
* | HandleRoomMember: handle correctly prev_content | giomfo | 2014-10-27 | 1 | -1/+1 |
| | |||||
* | Fix SYWEB-109 : No error if HS rejects the username in registration. | Kegan Dougal | 2014-10-27 | 1 | -0/+3 |
| | | | | | Display all error messages from the server when registering, rather than just the types of errors the client recognises. | ||||
* | Remove test_pyflakes. | Kegan Dougal | 2014-10-27 | 1 | -1/+0 |
| | |||||
* | Test pyflakes jenikns integration | Mark Haines | 2014-10-27 | 1 | -0/+1 |
| | |||||
* | Fix pyflakes warnings | Mark Haines | 2014-10-27 | 4 | -4/+2 |
| | |||||
* | Add log message if we can't enable ECC. Require pyopenssl>=0.14 since 0.13 ↵ | Mark Haines | 2014-10-24 | 2 | -1/+5 |
| | | | | doesn't seem to have ECC | ||||
* | Wrap preparing the database in a transaction. Otherwise it will take many ↵ | Mark Haines | 2014-10-24 | 1 | -3/+4 |
| | | | | seconds to complete because sqlite will create a transaction per statement | ||||
* | switch from the deprecated msg.content.prev to msg.prev_content.membership, ↵ | Matthew Hodgson | 2014-10-24 | 3 | -9/+9 |
| | | | | and fix the bug where kicks of unjoined users aren't displayed sensibly in the history | ||||
* | Merge branch 'master' into develop | Mark Haines | 2014-10-24 | 1 | -1/+1 |
|\ | |||||
| * | Coturn's timestamps are in seconds, not milliseconds | David Baker | 2014-10-21 | 1 | -1/+1 |
| | | |||||
* | | Added pylint config file: ignore missing-docstring messages. | Kegan Dougal | 2014-10-24 | 1 | -0/+280 |
| | | |||||
* | | Added a param (--no-rate-limit) to demo/start.sh to disable the HS rate limit | manuroe | 2014-10-20 | 2 | -1/+11 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-10-20 | 8 | -12/+74 |
|\| | |||||
| * | use a tagged version of syutil rather than master | Mark Haines | 2014-10-20 | 1 | -1/+1 |
| | | |||||
| * | Use https link to download syutil as not everyone has ssh access to github. | Mark Haines | 2014-10-20 | 1 | -2/+3 |
| | | |||||
| * | Add get_json method to 3pid http client. Better logging for errors in 3pid ↵ | Mark Haines | 2014-10-20 | 2 | -2/+41 |
| | | | | | | | | requests | ||||
| * | Fix auto generating signing_keys | Mark Haines | 2014-10-18 | 1 | -1/+1 |
| | | |||||
| * | improve changelog slightly | Matthew Hodgson | 2014-10-18 | 1 | -5/+7 |
| | | |||||
| * | fix timestamps some more | Matthew Hodgson | 2014-10-17 | 3 | -5/+5 |
| |\ | |/ |/| | | | Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse | ||||
* | | more timestamp fixes | Matthew Hodgson | 2014-10-17 | 3 | -5/+5 |
| | | |||||
| * | Bump the other version v0.4.1 | Erik Johnston | 2014-10-18 | 1 | -1/+1 |
| | | |||||
| * | Bump version | Erik Johnston | 2014-10-18 | 1 | -1/+1 |
| | | |||||
| * | Bunp to change log. | Erik Johnston | 2014-10-18 | 1 | -0/+5 |
| | | |||||
| * | Merge pull request #9 from matrix-org/develop | Erik Johnston | 2014-10-18 | 2 | -4/+3 |
| |\ | |/ |/| | Fix issue with timestamps in webclient | ||||
* | | fix webclient to know about right timestamps | Matthew Hodgson | 2014-10-17 | 2 | -4/+3 |
| | | |||||
* | | Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-10-17 | 25 | -5551/+73 |
|\ \ | |||||
| | * | I can't type apparently | Erik Johnston | 2014-10-17 | 2 | -2/+2 |
| | | | |||||
| | * | Update changelong and upgrade | Erik Johnston | 2014-10-17 | 2 | -0/+15 |
| | | | |||||
| | * | Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse | Erik Johnston | 2014-10-17 | 88 | -6704/+1645 |
| | |\ | | |/ | |/| | |||||
| * | | Check that we have auth headers and fail nicely | Erik Johnston | 2014-10-17 | 1 | -0/+5 |
| | | | |||||
| * | | More log lines. | Erik Johnston | 2014-10-17 | 1 | -7/+15 |
| | | | |||||
| * | | add log line for checking verifying signatures | Mark Haines | 2014-10-17 | 1 | -0/+1 |
| | | | |||||
| * | | Bump syutil dependency | Erik Johnston | 2014-10-17 | 1 | -2/+2 |
| | | | |||||
| * | | Bump version and changelog | Erik Johnston | 2014-10-17 | 4 | -10/+12 |
| | | | |||||
| * | | Bump database version number. | Erik Johnston | 2014-10-17 | 2 | -1/+32 |
| | | | |||||
| * | | Merge branch 'docs-restructuring' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-10-17 | 16 | -5531/+6 |
|/| | | |||||
| * | | move swagger JSON from synapse project to matrix-doc project | Matthew Hodgson | 2014-10-09 | 8 | -1897/+0 |
| | | | |||||
| * | | move matrix-generic content to new matrix-doc git project | Matthew Hodgson | 2014-10-09 | 9 | -3721/+6 |
| | | | |||||
| * | | Add spec-additions.rst with info on recaptcha and common event fields. | Kegan Dougal | 2014-10-09 | 1 | -0/+89 |
| | | | |||||
| * | | Restructure specification sections. | Kegan Dougal | 2014-10-09 | 1 | -837/+835 |
| | | | |||||
* | | | keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating ↵ | Mark Haines | 2014-10-17 | 8 | -13/+18 |
| | | | | | | | | | | | | schema | ||||
* | | | SPEC-7: Rename 'ts' to 'origin_server_ts' | Mark Haines | 2014-10-17 | 16 | -42/+42 |
| | | | |||||
* | | | SPEC-7: Don't stamp event contents with 'hsob_ts' | Mark Haines | 2014-10-17 | 1 | -13/+3 |
| | | | |||||
* | | | move gendoc into matrix-doc project | Matthew Hodgson | 2014-10-17 | 3 | -794/+0 |
| | | | |||||
* | | | Remove warning since the end result is still $sanitize'd | Kegan Dougal | 2014-10-15 | 1 | -3/+1 |
| | | | |||||
* | | | Add unsanitizedLinky filter to fix links in formatted messages. | Kegan Dougal | 2014-10-15 | 2 | -5/+57 |
| | | | | | | | | | | | | | | | | | | This filter is identical to ngSanitize's linky but instead of sanitizing text which isn't linkified in the addText function, it doesn't. | ||||
* | | | Remove org.matrix.custom.text.html event type and replace it with 'format' ↵ | Kegan Dougal | 2014-10-15 | 2 | -3/+2 |
| | | | | | | | | | | | | and 'formatted_body' keys on m.text messages | ||||
* | | | Add support for org.matrix.custom.text.html | Kegan Dougal | 2014-10-15 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | This format will remain undocumented as it is not yet suitable for introduction into the specification. | ||||
* | | | Make sure to return an empty JSON object ({}) from presence PUT/POST ↵ | Paul "LeoNerd" Evans | 2014-10-14 | 1 | -2/+2 |
| | | | | | | | | | | | | requests rather than an empty string ("") because most deserialisers won't like the latter | ||||
* | | | SYN-103: Ignore the 'origin' key in received EDUs. Instead take the origin ↵ | Mark Haines | 2014-10-14 | 5 | -3/+10 |
| | | | | | | | | | | | | from the transaction itself | ||||
* | | | remove debugging logging for signing requests | Mark Haines | 2014-10-14 | 1 | -4/+0 |
| | | | |||||
* | | | Note that this breaks federation | Erik Johnston | 2014-10-14 | 2 | -0/+9 |
| | | | |||||
* | | | Merge pull request #8 from matrix-org/server2server_signing | Mark Haines | 2014-10-14 | 28 | -468/+786 |
|\ \ \ | | | | | | | | | Server2server signing | ||||
| * | | | typoe | Matthew Hodgson | 2014-10-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Better response message when signature is missing or unsupported | Mark Haines | 2014-10-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Respond with more helpful error messages for unsigned requests | Mark Haines | 2014-10-13 | 6 | -10/+45 |
| | | | | |||||
| * | | | Raise a SynapseError if the authorisation header is missing or malformed | Mark Haines | 2014-10-13 | 2 | -19/+31 |
| | | | | |||||
| * | | | Remove debug logging, raise a proper SynapseError if the auth header is missing | Mark Haines | 2014-10-13 | 1 | -5/+4 |
| | | | | |||||
| * | | | Verify signatures for server2server requests | Mark Haines | 2014-10-13 | 5 | -25/+100 |
| | | | | |||||
| * | | | SYN-75 sign at the request level rather than the transaction level | Mark Haines | 2014-10-13 | 7 | -52/+70 |
| | | | | |||||
| * | | | Merge branch 'develop' into server2server_signing | Mark Haines | 2014-10-13 | 1 | -11/+35 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Replace on_send_callback with something a bit clearer so that we can sign ↵ | Mark Haines | 2014-10-13 | 1 | -11/+35 |
| | | | | | | | | | | | | | | | | messages | ||||
| * | | | Merge branch develop into server2server_signing | Mark Haines | 2014-10-13 | 22 | -527/+911 |
| |\ \ \ | |/ / / |/| | | | | | | | | | | | Conflicts: synapse/app/homeserver.py | ||||
* | | | | remove wishlist in favour of jira | Matthew Hodgson | 2014-10-12 | 1 | -9/+0 |
| | | | | |||||
* | | | | Fixed test. | Kegan Dougal | 2014-10-09 | 1 | -1/+0 |
| | | | | |||||
* | | | | Still broken. | Kegan Dougal | 2014-10-09 | 1 | -1/+2 |
| | | | | |||||
* | | | | Break a test. | Kegan Dougal | 2014-10-09 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Fix unit test. | Kegan Dougal | 2014-10-08 | 1 | -1/+1 |
| | | | |||||
* | | | Break unit test. | Kegan Dougal | 2014-10-08 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #7 from matrix-org/paul/doc | Erik Johnston | 2014-10-07 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | Clarify that room alias domain names will be server-scoped; nonlocal edi... | ||||
| * | | | Clarify that room alias domain names will be server-scoped; nonlocal edits ↵ | Paul "LeoNerd" Evans | 2014-10-07 | 1 | -0/+8 |
|/ / / | | | | | | | | | | are unliekly to work but nonlocal lookups will | ||||
* | | | SPEC-3: First hack at defining some of the various event related concepts | Erik Johnston | 2014-10-07 | 1 | -0/+53 |
| | | | |||||
* | | | Add quick and dirty doc about state resolution | Erik Johnston | 2014-10-06 | 1 | -0/+51 |
| | | | |||||
* | | | Clarify how-to some more. | Kegan Dougal | 2014-10-06 | 1 | -2/+3 |
| | | | |||||
* | | | Update JSFiddles/how-to to support the new registration format. | Kegan Dougal | 2014-10-06 | 3 | -3/+3 |
| | | | |||||
* | | | Add more section headings. | Kegan Dougal | 2014-10-06 | 1 | -5/+37 |
| | | | |||||
* | | | Clarify room permission / power level information. | Kegan Dougal | 2014-10-06 | 1 | -16/+19 |
| | | | |||||
* | | | Add information about the initialSync API. | Kegan Dougal | 2014-10-06 | 1 | -8/+46 |
| | | | | | | | | | | | | | | | | | | Outline and describe the keys from the initial sync API. Hide room-scoped initial sync API for now as it is not implemented and needs more thought before it can be specced. | ||||
* | | | swagger: Added DELETE method for directory server. | Kegan Dougal | 2014-10-06 | 1 | -0/+16 |
| | | | |||||
* | | | More spec work. | Kegan Dougal | 2014-10-03 | 1 | -14/+11 |
| | | | |||||
* | | | Merge pull request #6 from matrix-org/paul/doc | Erik Johnston | 2014-10-03 | 1 | -4/+26 |
|\ \ \ | | | | | | | | | Clarify how m.room.alias event works | ||||
| * | | | Clarify how m.room.alias event works | Paul "LeoNerd" Evans | 2014-10-03 | 1 | -4/+26 |
| | | | | |||||
* | | | | Flesh out room alias section. | Kegan Dougal | 2014-10-03 | 1 | -9/+29 |
|/ / / | |||||
* | | | Add more information to TODOs. Explain m.room.join_rules. | Kegan Dougal | 2014-10-03 | 1 | -12/+21 |
| | | | |||||
* | | | Federation protocol URLs should have an H2 heading, not H1 | Paul "LeoNerd" Evans | 2014-10-02 | 1 | -1/+1 |
| | | | |||||
* | | | Remove TODO note about VoIP events as they now have their own entire section | Paul "LeoNerd" Evans | 2014-10-02 | 1 | -3/+0 |
| | | | |||||
* | | | Merge pull request #5 from matrix-org/paul/doc | Erik Johnston | 2014-10-02 | 1 | -8/+101 |
|\ \ \ | | | | | | | | | Document the Profile system | ||||
| * | | | Document the Profile system | Paul "LeoNerd" Evans | 2014-10-02 | 1 | -8/+101 |
| | | | | |||||
* | | | | Merge pull request #4 from matrix-org/erikj-spec-changes | Paul Evans | 2014-10-02 | 1 | -23/+24 |
|\ \ \ \ | | | | | | | | | | | Erikj spec changes | ||||
| * | | | | Add todo notes | Erik Johnston | 2014-10-02 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Remove incorrect reasons for empty PDU lists. | Erik Johnston | 2014-10-02 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | Remove note about assymetry of having left a room. | Erik Johnston | 2014-10-02 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if you leave a room you still appear in the members list. This is basically a bug with the current implementation/spec, rather than something that should happen. | ||||
| * | | | | m.room.ops_levels includes redact_level | Erik Johnston | 2014-10-02 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Don't use spaces in example room alias | Erik Johnston | 2014-10-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix default value and key names. | Erik Johnston | 2014-10-02 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Be less alarmist about not using an ID server. | Erik Johnston | 2014-10-02 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Alias lookups return a server list. | Erik Johnston | 2014-10-02 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | All room state is currently shared. | Erik Johnston | 2014-10-02 | 1 | -6/+5 |
| |/ / / | |||||
* | | | | Fix pyflakes errors | Mark Haines | 2014-10-02 | 2 | -9/+3 |
| | | | | |||||
* | | | | Add a keyword argument to get_json to avoid retrying on DNS failures. Rather ↵ | Mark Haines | 2014-10-02 | 6 | -20/+16 |
| | | | | | | | | | | | | | | | | than passing MatrixHttpClient.RETRY_DNS_LOOKUP_FAILURES as a fake query string parameter | ||||
* | | | | Merge branch 'master' into develop | David Baker | 2014-10-02 | 3 | -4/+6 |
|\ \ \ \ | |||||
| * | | | | Fix ncorrect ports in documentation and add notes on how generate-config ↵ | David Baker | 2014-10-02 | 3 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also generates certs bound to whatever hostname you give with --generate-config. SYN-87 #resolved | ||||
* | | | | | Split PlainHttpClient into separate clients for talking to Identity servers ↵ | Mark Haines | 2014-10-02 | 6 | -156/+163 |
| |/ / / |/| | | | | | | | | | | | and talking to Capatcha servers | ||||
* | | | | Merge branch 'master' into develop | Mark Haines | 2014-10-02 | 1 | -82/+86 |
|\| | | | |||||
| * | | | Trivial formatting fixes for README. | Mark Haines | 2014-10-02 | 1 | -82/+86 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'origin/master' into develop | Mark Haines | 2014-10-02 | 2 | -5/+8 |
|\| | | | |||||
| * | | | Update README setup instructions to be correct. Make synapse spit out ↵ | David Baker | 2014-10-02 | 2 | -5/+8 |
| | | | | | | | | | | | | | | | | explanatory note when generating config to tell people to look at it and customise it. | ||||
| * | | | Re-apply a0b1b34c71e46304f7024f0570db92f4577303b5 to master (fixing synctl) | David Baker | 2014-10-02 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | Make instructions synctl gives for generateing a config file actuall ↵ | David Baker | 2014-10-02 | 1 | -2/+2 |
| | | | | | | | | | | | | generate a config file. Also, make synctil run synapse correctly by invoking a module such that the path is correct to pull in other bits from the working directory rather than requiring them to be on the PYTHONPATH (which would lead to people being very confused when they edit source in the working directory and their changes do not take effect). | ||||
* | | | Added a TODO-doc marker about the presence timing system | Paul "LeoNerd" Evans | 2014-10-01 | 1 | -0/+6 |
| | | | |||||
* | | | Define the client and server APIs for Presence | Paul "LeoNerd" Evans | 2014-10-01 | 1 | -9/+102 |
| | | | |||||
* | | | Continue moving content out of docs/model/presence into the main spec; ↵ | Paul "LeoNerd" Evans | 2014-10-01 | 3 | -100/+24 |
| | | | | | | | | | | | | delete model docs that are duplicated | ||||
* | | | SPEC-25: Add details on how to prune redacted events. | Erik Johnston | 2014-10-01 | 1 | -0/+30 |
| | | | | | | | | | | | | | | | | | | | | | SPEC-25 #comment I've added the details of what the server should do on receipt of a redaction event. In reality it can do whatever it wants, and its probably a reasonable implementation to flag it up to a server admin for verification before actually redacting an event. | ||||
* | | | Move documented but-unimplemented 'presence idle times' into a new document ↵ | Paul "LeoNerd" Evans | 2014-10-01 | 2 | -8/+20 |
| | | | | | | | | | | | | to contain such features | ||||
* | | | s/m.room.redacted/m.room.redaction/ | Erik Johnston | 2014-10-01 | 1 | -1/+1 |
| | | | |||||
* | | | Nuke the entire 'Typing Notifications' spec section given as they don't ↵ | Paul "LeoNerd" Evans | 2014-10-01 | 1 | -16/+0 |
| | | | | | | | | | | | | exist yet in the implementation | ||||
* | | | remove "red", "blue" and "green" server_name mappings | Mark Haines | 2014-10-01 | 1 | -7/+0 |
| | | | |||||
* | | | Annotate all the 'TODO' marks as relating to either the specification itself ↵ | Paul "LeoNerd" Evans | 2014-09-30 | 1 | -50/+54 |
| | | | | | | | | | | | | or the documentation thereof | ||||
| | * | Merge branch 'develop' into server2server_signing | Mark Haines | 2014-09-30 | 64 | -934/+2403 |
| | |\ | |_|/ |/| | | | | | | | | | | | Conflicts: synapse/storage/__init__.py tests/rest/test_presence.py | ||||
* | | | pyflakes cleanup | Erik Johnston | 2014-09-30 | 3 | -3/+1 |
| | | | |||||
* | | | SYN-2: Allow server admins to delete room aliases | Erik Johnston | 2014-09-30 | 4 | -21/+99 |
| | | | |||||
* | | | Re-wrap content after latest additions | Paul "LeoNerd" Evans | 2014-09-29 | 1 | -25/+30 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/develop' into develop | Paul "LeoNerd" Evans | 2014-09-29 | 17 | -40/+335 |
|\ \ \ | |||||
| * | | | Add a 'Redactions' section. | Erik Johnston | 2014-09-29 | 1 | -0/+17 |
| | | | | |||||
| * | | | Add m.room.redacted in events list | Erik Johnston | 2014-09-29 | 1 | -0/+16 |
| | | | | |||||
| * | | | Merge branch 'whois' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-29 | 16 | -40/+302 |
| |\ \ \ | |||||
| | * | | | Unbreak tests after changing storage API | Erik Johnston | 2014-09-29 | 4 | -12/+53 |
| | | | | | |||||
| | * | | | Update docstring | Erik Johnston | 2014-09-29 | 2 | -2/+3 |
| | | | | | |||||
| | * | | | SYN-48: Delete dead code | Erik Johnston | 2014-09-29 | 1 | -26/+0 |
| | | | | | |||||
| | * | | | SYN-48: Fix typo. Get the whois for requested user rather tahan the requester | Erik Johnston | 2014-09-29 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | SYN-48: Implement WHOIS rest servlet | Erik Johnston | 2014-09-29 | 9 | -25/+190 |
| | | | | | |||||
| | * | | | Add auth check to test if a user is an admin or not. | Erik Johnston | 2014-09-29 | 2 | -0/+11 |
| | | | | | |||||
| | * | | | 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 |
| | | | | | |||||
| * | | | | No longer need the Freenode verification key file | Paul "LeoNerd" Evans | 2014-09-29 | 1 | -1/+0 |
| |/ / / | |||||
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-25 | 5 | -5/+30 |
| |\| | | |||||
* | | | | Extended docs about the registration/login flows | Paul "LeoNerd" Evans | 2014-09-29 | 1 | -23/+30 |
| | | | | |||||
* | | | | Reörder the specification sections, to move 'Registration and Login' first, ↵ | Paul "LeoNerd" Evans | 2014-09-29 | 1 | -315/+316 |
| | | | | | | | | | | | | | | | | where it logically belongs | ||||
* | | | | Huge whitespace hackery - reflow all (content) paragraphs at tw=80 | Paul "LeoNerd" Evans | 2014-09-29 | 1 | -389/+435 |
| | | | | |||||
* | | | | No longer need the Freenode verification key file | Paul "LeoNerd" Evans | 2014-09-29 | 1 | -1/+0 |
| |/ / |/| | | |||||
* | | | 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 ": ". | ||||
| | | * | SYN-75 Verify signatures on server to server transactions | Mark Haines | 2014-09-30 | 14 | -235/+245 |
| | | | | |||||
| | | * | Sign federation transactions | Mark Haines | 2014-09-24 | 8 | -10/+73 |
| | | | | |||||
| | | * | Fix a few pyflakes errors in the server_key_resource | Mark Haines | 2014-09-23 | 1 | -5/+1 |
| | | | | |||||
| | | * | Add a _matrix/key/v1 resource with the verification keys of the local server | Mark Haines | 2014-09-23 | 5 | -164/+104 |
| | | | | |||||
| | | * | Read signing keys using methods from syutil. convert keys that are in the ↵ | Mark Haines | 2014-09-23 | 1 | -9/+30 |
| | | | | | | | | | | | | | | | | wrong format | ||||
| | | * | fix grammatics | Matthew Hodgson | 2014-09-22 | 1 | -4/+4 |
| | | | | |||||
| | | * | Add section to explain how to sign events such that we can redact message ↵ | Mark Haines | 2014-09-22 | 1 | -1/+27 |
| | | | | | | | | | | | | | | | | contents | ||||
| | | * | Merge branch 'develop' into server2server_signing | Mark Haines | 2014-09-22 | 151 | -4730/+14728 |
| | | |\ | | |_|/ | |/| | |