| Commit message (Expand) | Author | Age | Files | Lines |
* | Use mRoomName on join notifications as well. | Kegan Dougal | 2014-11-06 | 1 | -1/+1 |
* | Add modelService test. Thin for now but will be expanded upon. | Kegan Dougal | 2014-11-06 | 1 | -0/+30 |
* | Factor out room name logic: mRoomName is the canonical source. | Kegan Dougal | 2014-11-06 | 2 | -14/+6 |
* | Use .not.toEqual instead of .toNotEqual which is in a newer version of Jasmine. | Kegan Dougal | 2014-11-06 | 1 | -1/+1 |
* | Start adding regression tests. First up, register-controller for SYWEB-109. | Kegan Dougal | 2014-11-06 | 2 | -1/+85 |
* | Fix broken tests which were previously skipped. | Kegan Dougal | 2014-11-06 | 2 | -13/+20 |
* | Add mRoomName and orderMembersList filter tests. Mark FIXME on broken tests f... | Kegan Dougal | 2014-11-06 | 1 | -3/+444 |
* | State *.js in karma.conf rather than *.* so *.js~ files are ignored. | Kegan Dougal | 2014-11-06 | 1 | -7/+7 |
* | Add duration filter unit tests. | Kegan Dougal | 2014-11-05 | 2 | -13/+52 |
* | Add a few eventHandlerService tests. | Kegan Dougal | 2014-11-05 | 1 | -0/+105 |
* | Finish matrixService unit tests. Add missing encodeURIComponent to path args. | Kegan Dougal | 2014-11-05 | 2 | -65/+234 |
* | Add more tests and a TODO. | Kegan Dougal | 2014-11-05 | 1 | -2/+55 |
* | Fix url decoding bugs with /redact and /send APIs. | Kegan Dougal | 2014-11-05 | 1 | -2/+2 |
* | Don't urlencode event types just yet so older HSes don't 500. | Kegan Dougal | 2014-11-05 | 2 | -3/+5 |
* | Be sure to urlencode/decode event types correctly in both the web client and HS. | Kegan Dougal | 2014-11-05 | 3 | -6/+6 |
* | Add a bunch more unit tests for matrixService. | Kegan Dougal | 2014-11-05 | 1 | -6/+191 |
* | URL encoding bugfix and add more tests. | Kegan Dougal | 2014-11-04 | 2 | -7/+41 |
* | Add matrix-service unit tests. Update angular-mocks. | Kegan Dougal | 2014-11-04 | 2 | -111/+261 |
* | SYN-112: Get pynacl from github instead of PyPI | Mark Haines | 2014-11-04 | 1 | -0/+1 |
* | Determine webclient path by the python module it is contained in | Mark Haines | 2014-11-04 | 2 | -2/+5 |
* | Update .gitignore to ignore config.js files in syweb/webclient. | Kegan Dougal | 2014-11-04 | 1 | -1/+1 |
* | Move webclient to a python module so that it can be installed | Mark Haines | 2014-11-04 | 75 | -1/+1 |
* | Merge pull request #11 from matrix-org/webclient-room-data-restructure | Kegsay | 2014-11-04 | 15 | -480/+542 |
|\ |
|
| * | SYWEB-116: Implement historical display name support. | Kegan Dougal | 2014-11-04 | 4 | -9/+12 |
| * | Rejig display names when paginating to lie less. | Kegan Dougal | 2014-11-04 | 3 | -13/+24 |
| * | Rejig order of checks/state updates/message insertions for m.room.member. Mar... | Kegan Dougal | 2014-11-03 | 1 | -26/+23 |
| * | Fix off-by-one bug when displaying display names / avatar urls when paginating. | Kegan Dougal | 2014-11-03 | 1 | -0/+7 |
| * | Backwards compat for old-style avatar_urls | Kegan Dougal | 2014-11-03 | 1 | -1/+2 |
| * | Reference the room_member key on messages which adjusts for current vs old_ro... | Kegan Dougal | 2014-11-03 | 2 | -8/+18 |
| * | Variable renaming, general cleanup. Don't feed state events from /initialSync... | Kegan Dougal | 2014-11-03 | 2 | -38/+29 |
| * | Fix broken redact enable logic. | Kegan Dougal | 2014-11-03 | 1 | -1/+1 |
| * | Fix hidden event keys being incorrectly shown in the even info dialog. | Kegan Dougal | 2014-11-03 | 1 | -1/+5 |
| * | Fix bug which prevented pagination from bumping the list down, causing infini... | Kegan Dougal | 2014-11-03 | 1 | -1/+1 |
| * | Fix bug which prevented room name invites appearing correctly. | Kegan Dougal | 2014-11-03 | 3 | -86/+47 |
| * | Fix bug which prevented the number of users being visible on the recents view. | Kegan Dougal | 2014-11-03 | 3 | -5/+4 |
| * | Remove events.rooms[room_id] entirely from event-handler-service. | Kegan Dougal | 2014-11-03 | 4 | -232/+59 |
| * | Make recents[controller/filter/html] use modelService. | Kegan Dougal | 2014-11-03 | 5 | -25/+66 |
| * | Make call stuff use modelService. | Kegan Dougal | 2014-11-03 | 2 | -5/+5 |
| * | Keep matrixService stateless and make matrixFilter use modelService. | Kegan Dougal | 2014-11-03 | 5 | -53/+53 |
| * | Prevent EventStreamService from knowing too much about the EventHandlerServic... | Kegan Dougal | 2014-11-03 | 2 | -21/+20 |
| * | Replace lots of .events.rooms[room_id] with .room | Kegan Dougal | 2014-10-31 | 4 | -16/+22 |
| * | room.html now displays messages from model-service. Add debugging fields. Hoo... | Kegan Dougal | 2014-10-31 | 5 | -17/+31 |
| * | Hook into more of event-handler-service and mimic its functions for now. | Kegan Dougal | 2014-10-31 | 2 | -68/+130 |
| * | Parse /initialSync data and populate the new data structures. | Kegan Dougal | 2014-10-31 | 2 | -4/+33 |
| * | Added model-service.js to store model data. | Kegan Dougal | 2014-10-31 | 4 | -2/+102 |
* | | Don't need this; should be on -g path. | Kegan Dougal | 2014-11-04 | 1 | -1/+0 |
* | | exclude tests | Mark Haines | 2014-11-04 | 1 | -1/+1 |
* | | Fix installation instructions in README | Mark Haines | 2014-11-04 | 2 | -25/+31 |
* | | Use phantomjs as the default browser and not chrome. | Kegan Dougal | 2014-11-04 | 2 | -7/+25 |
* | | Update karma.conf.js to A: actually run the tests, and B: generate JUnit XML. | Kegan Dougal | 2014-11-04 | 1 | -3/+13 |
* | | SYWEB-136: Send m.images according to the spec. | Kegan Dougal | 2014-11-04 | 2 | -4/+6 |
* | | SYWEB-133: JSON dialog now appears on dblclick to allow users to highlight text. | Kegan Dougal | 2014-11-04 | 1 | -1/+1 |
* | | Use python logger, not the twisted logger | Erik Johnston | 2014-11-03 | 1 | -2/+1 |
* | | Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-10-31 | 3 | -2/+18 |
|\ \
| |/
|/| |
|
| * | Bump version numbers and change log | Erik Johnston | 2014-10-31 | 3 | -2/+18 |
|/ |
|
* | SYWEB-102: Fix desktop notification msg when a user with no display name join... | Kegan Dougal | 2014-10-31 | 1 | -3/+6 |
* | Factor out notification logic. | Kegan Dougal | 2014-10-31 | 3 | -27/+39 |
* | Add notification-service.js to handle binging/notifications. Shift logic to t... | Kegan Dougal | 2014-10-31 | 5 | -70/+108 |
* | SYWEB-45: Display the user_id of a user when hovering over their avatar next ... | Kegan Dougal | 2014-10-31 | 1 | -1/+1 |
* | SYWEB-63: Fix desktop notification message when notifying for an image. | Kegan Dougal | 2014-10-31 | 1 | -0/+3 |
* | SYWEB-12: You'll be needing this. | Kegan Dougal | 2014-10-30 | 1 | -0/+216 |
* | SYWEB-12: Minor layout tweaks. | Kegan Dougal | 2014-10-30 | 1 | -1/+1 |
* | SYWEB-12: UX tweaks. | Kegan Dougal | 2014-10-30 | 1 | -1/+2 |
* | SYWEB-12: Add ability to add new state events. | Kegan Dougal | 2014-10-30 | 2 | -2/+21 |
* | SYWEB-12: Allow edited state events to be submitted. | Kegan Dougal | 2014-10-30 | 2 | -3/+10 |
* | SYWEB-12: More formatting and tweaking of state event JSON. | Kegan Dougal | 2014-10-30 | 5 | -16/+53 |
* | SYWEB-12: More formatting. | Kegan Dougal | 2014-10-30 | 4 | -7/+32 |
* | SYWEB-12: Format room info dialog better. | Kegan Dougal | 2014-10-30 | 2 | -17/+38 |
* | SYWEB-12: Store unknown state events so they are displayed in the Room Info d... | Kegan Dougal | 2014-10-30 | 1 | -0/+7 |
* | SYWEB-12: Add a 'Room Info' button which displays all state content. | Kegan Dougal | 2014-10-30 | 3 | -0/+61 |
* | 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 |
* | SYWEB-48: Better regex for binging on usernames. | Kegan Dougal | 2014-10-29 | 1 | -1/+28 |
* | Use floating-point rather than integer division to handle timeouts so that no... | Paul "LeoNerd" Evans | 2014-10-29 | 1 | -1/+1 |
* | SYWEB-127: Open event info modal dialog when the bubble is clicked. | Kegan Dougal | 2014-10-29 | 1 | -12/+11 |
* | Fix an off-by-one bug in presence event stream pagination; this might be resp... | Paul "LeoNerd" Evans | 2014-10-29 | 2 | -1/+17 |
* | Construct a source-specific 'SourcePaginationConfig' to pass into get_paginat... | Paul "LeoNerd" Evans | 2014-10-29 | 6 | -40/+43 |
* | 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 |
* | 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 |
* | 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 |
* | 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 |
* | 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 |
* | 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 do... | Mark Haines | 2014-10-24 | 2 | -1/+5 |
* | Wrap preparing the database in a transaction. Otherwise it will take many sec... | Mark Haines | 2014-10-24 | 1 | -3/+4 |
* | switch from the deprecated msg.content.prev to msg.prev_content.membership, a... | Matthew Hodgson | 2014-10-24 | 3 | -9/+9 |
* | 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 re... | Mark Haines | 2014-10-20 | 2 | -2/+41 |
| * | 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 |
| |\
| |/
|/| |
|
* | | 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 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 |
* | | | 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 |
* | | | Remove org.matrix.custom.text.html event type and replace it with 'format' an... | Kegan Dougal | 2014-10-15 | 2 | -3/+2 |
* | | | Add support for org.matrix.custom.text.html | Kegan Dougal | 2014-10-15 | 2 | -1/+3 |
* | | | Make sure to return an empty JSON object ({}) from presence PUT/POST requests... | Paul "LeoNerd" Evans | 2014-10-14 | 1 | -2/+2 |
* | | | SYN-103: Ignore the 'origin' key in received EDUs. Instead take the origin fr... | Mark Haines | 2014-10-14 | 5 | -3/+10 |
* | | | 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 |
|\ \ \ |
|
| * | | | 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 mes... | Mark Haines | 2014-10-13 | 1 | -11/+35 |
| * | | | Merge branch develop into server2server_signing | Mark Haines | 2014-10-13 | 22 | -527/+911 |
| |\ \ \
| |/ / /
|/| | | |
|
* | | | | 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 edits ar... | Paul "LeoNerd" Evans | 2014-10-07 | 1 | -0/+8 |
|/ / / |
|
* | | | 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 |
* | | | 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 | 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 | 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 |
|\ \ \ \ |
|
| * | | | | 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 |
| * | | | | 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 |
* | | | | 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 also... | David Baker | 2014-10-02 | 3 | -4/+6 |
* | | | | | Split PlainHttpClient into separate clients for talking to Identity servers a... | Mark Haines | 2014-10-02 | 6 | -156/+163 |
| |/ / /
|/| | | |
|
* | | | | 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 explana... | David Baker | 2014-10-02 | 2 | -5/+8 |
| * | | | 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 generate... | David Baker | 2014-10-02 | 1 | -2/+2 |
* | | | 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; delete... | Paul "LeoNerd" Evans | 2014-10-01 | 3 | -100/+24 |
* | | | SPEC-25: Add details on how to prune redacted events. | Erik Johnston | 2014-10-01 | 1 | -0/+30 |
* | | | Move documented but-unimplemented 'presence idle times' into a new document t... | Paul "LeoNerd" Evans | 2014-10-01 | 2 | -8/+20 |
* | | | 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 exist... | Paul "LeoNerd" Evans | 2014-10-01 | 1 | -16/+0 |
* | | | 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 |
| | * | Merge branch 'develop' into server2server_signing | Mark Haines | 2014-09-30 | 64 | -934/+2403 |
| | |\
| |_|/
|/| | |
|
* | | | 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 |
* | | | | 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 |
| | * | | 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 |