summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Remove dead code.Erik Johnston2014-11-031-84/+0
|
* Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2014-11-0310-101/+172
|\ | | | | | | federation_authorization
| * Use python logger, not the twisted loggerErik Johnston2014-11-031-2/+1
| |
| * Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse into developErik Johnston2014-10-313-2/+18
| |\
| | * Bump version numbers and change logErik Johnston2014-10-313-2/+18
| |/
| * SYWEB-102: Fix desktop notification msg when a user with no display name ↵Kegan Dougal2014-10-311-3/+6
| | | | | | | | joins a room.
| * Factor out notification logic.Kegan Dougal2014-10-313-27/+39
| |
| * Add notification-service.js to handle binging/notifications. Shift logic to ↵Kegan Dougal2014-10-315-70/+108
| | | | | | | | this service.
| * SYWEB-45: Display the user_id of a user when hovering over their avatar next ↵Kegan Dougal2014-10-311-1/+1
| | | | | | | | to their messages.
| * SYWEB-63: Fix desktop notification message when notifying for an image.Kegan Dougal2014-10-311-0/+3
| |
* | Sign evnetsErik Johnston2014-10-312-0/+26
| |
* | Remove unused signature storage methodsErik Johnston2014-10-311-138/+1
| |
* | Remove unused sql file.Erik Johnston2014-10-311-31/+0
| |
* | Make prev_event signing work again.Erik Johnston2014-10-313-8/+18
| |
* | Remove more references to dead PDU tablesErik Johnston2014-10-314-94/+8
| |
* | Remove PDU tables.Erik Johnston2014-10-316-1230/+2
| |
* | Remove unused functions.Erik Johnston2014-10-311-90/+0
| |
* | Actually don't store any PDUsErik Johnston2014-10-313-14/+42
| |
* | old_state_events should be a dict not listErik Johnston2014-10-311-2/+4
| |
* | Don't store any PDUsErik Johnston2014-10-312-32/+33
| |
* | Move the impl of backfill to use events.Erik Johnston2014-10-313-5/+114
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2014-10-318-23/+356
|\| | | | | | | federation_authorization
| * SYWEB-12: You'll be needing this.Kegan Dougal2014-10-301-0/+216
| |
| * SYWEB-12: Minor layout tweaks.Kegan Dougal2014-10-301-1/+1
| |
| * SYWEB-12: UX tweaks.Kegan Dougal2014-10-301-1/+2
| |
| * SYWEB-12: Add ability to add new state events.Kegan Dougal2014-10-302-2/+21
| |
| * SYWEB-12: Allow edited state events to be submitted.Kegan Dougal2014-10-302-3/+10
| |
| * SYWEB-12: More formatting and tweaking of state event JSON.Kegan Dougal2014-10-305-16/+53
| | | | | | | | | | | | | | | | Use a proper elastic directive to make the <textarea> resize dynamically. Use an 'asjson' directive to turn an ngModel of a JSON object into a formatted JSON string so it can be displayed on the textarea. Also, deep copy the state events being displayed, else it actually alters the underlying data structures when playing around with the JSON in the textarea!
| * SYWEB-12: More formatting.Kegan Dougal2014-10-304-7/+32
| |
| * SYWEB-12: Format room info dialog better.Kegan Dougal2014-10-302-17/+38
| |
| * SYWEB-12: Store unknown state events so they are displayed in the Room Info ↵Kegan Dougal2014-10-301-0/+7
| | | | | | | | dialog.
* | Fix bug in redaction auth.Erik Johnston2014-10-311-2/+2
| | | | | | | | | | This caused a 500 when sending a redaction due to a typo in a method invocation.
* | Convert event ids to be of the form :example.comErik Johnston2014-10-306-28/+54
| |
* | Make federation return the old current state, so that we can use it to do authErik Johnston2014-10-302-10/+32
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2014-10-3055-205/+9733
|\| | | | | | | federation_authorization
| * SYWEB-12: Add a 'Room Info' button which displays all state content.Kegan Dougal2014-10-303-0/+61
| | | | | | | | Content displayed in a modal dialog. Currently only read-only.
| * Fix pep8 warningsMark Haines2014-10-3035-135/+179
| |
| * SYWEB-112: Use the right user ID when determining invites for display on the ↵Kegan Dougal2014-10-301-2/+9
| | | | | | | | recents list.
| * SYWEB-48: Better regex for binging on usernames.Kegan Dougal2014-10-291-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" Evans2014-10-291-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 Dougal2014-10-291-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" Evans2014-10-292-1/+17
| | | | | | | | responsible for any number of bug reports
| * Construct a source-specific 'SourcePaginationConfig' to pass into ↵Paul "LeoNerd" Evans2014-10-296-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 codePaul "LeoNerd" Evans2014-10-291-3/+0
| |
| * oops - fix css on desktopMatthew Hodgson2014-10-291-1/+0
| |
| * SYWEB-98: Handle incoming m.room.redaction events.Kegan Dougal2014-10-291-0/+39
| | | | | | | | UI for redactions is now complete.
| * SYWEB-98: Add redactEvent matrix API call.Kegan Dougal2014-10-293-2/+30
| |
| * SYWEB-98: Add a 'Redact' button to the event info modal dialog.Kegan Dougal2014-10-292-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 Dougal2014-10-292-1/+7
| |
| * Fix SYWEB-128 : Auto-scroll broken if not exactly at bottom of list.Kegan Dougal2014-10-291-1/+3
| | | | | | | | | | Added a small 10px buffer so if the list isn't quite at the bottom it still actually scrolls.
| * fix mobile CSS layoutMatthew Hodgson2014-10-282-4/+9
| |
| * Fix SYWEB-110 : Prevent room ID leaking by looking for an m.room.nameKegan Dougal2014-10-271-1/+11
| |
| * Remove duplicate join_event from create_roomMark Haines2014-10-271-5/+0
| |
| * Fix SYWEB-114 : Error message when trying to invite a user already in the room.Kegan Dougal2014-10-271-1/+1
| |
| * Don't clobber existing cssKegan Dougal2014-10-271-209/+0
| |
| * SYWEB-121: Have some bootstrap files.Kegan Dougal2014-10-272-0/+9457
| |
| * Implement SYWEB-121 : Display JSON when clicking messages.Kegan Dougal2014-10-274-12/+24
| | | | | | | | | | JSON is displayed as a modal dialog via AngularJS' bootstrap module, "ui.bootstrap".
| * HandleRoomMember: handle correctly prev_contentgiomfo2014-10-271-1/+1
| |
| * Fix SYWEB-109 : No error if HS rejects the username in registration.Kegan Dougal2014-10-271-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 Dougal2014-10-271-1/+0
| |
* | Fix SQL so that accepts we may want to persist events twice.Erik Johnston2014-10-302-25/+47
| |
* | Add a run_on_reactor functionErik Johnston2014-10-291-0/+7
| |
* | Start filling out and using new events tablesErik Johnston2014-10-298-93/+159
| |
* | Don't reference PDU when persisting eventErik Johnston2014-10-282-4/+5
| |
* | Begin implementing all the PDU storage stuff in Events landErik Johnston2014-10-289-42/+485
| |
* | Add transaction level logging and timing information. Add a _simple_delete ↵Erik Johnston2014-10-289-21/+91
| | | | | | | | method
* | Clean up LoggingTransactionErik Johnston2014-10-281-10/+4
| |
* | Add timer to LoggingTransactionErik Johnston2014-10-281-3/+10
| |
* | Remove duplicate importErik Johnston2014-10-271-1/+0
| |
* | Merge branch 'event_signing' of github.com:matrix-org/synapse into ↵Erik Johnston2014-10-2724-77/+580
|\ \ | | | | | | | | | | | | | | | | | | federation_authorization Conflicts: synapse/storage/__init__.py
| * | fix pyflakes warningsMark Haines2014-10-273-6/+6
| | |
| * | Merge branch 'develop' into event_signingMark Haines2014-10-2742-5581/+458
| |\|
| | * Test pyflakes jenikns integrationMark Haines2014-10-271-0/+1
| | |
| | * Fix pyflakes warningsMark Haines2014-10-274-4/+2
| | |
| * | Add script to hash exisitng historyMark Haines2014-10-171-0/+69
| | |
| * | Remove signatures from pdu when computing hashes to use for prev pdus, make ↵Mark Haines2014-10-172-2/+6
| | | | | | | | | | | | sure is_state is a boolean.
| * | Merge branch 'develop' into event_signingMark Haines2014-10-1721-849/+101
| |\ \ | | | | | | | | | | | | | | | | Conflicts: synapse/federation/replication.py
| * | | Rename 'meta' to 'unsigned'Mark Haines2014-10-174-17/+18
| | | |
| * | | move 'age' into 'meta' subdict so that it is clearer that it is not part of ↵Mark Haines2014-10-172-7/+19
| | | | | | | | | | | | | | | | the signed data
| * | | Hash the same content covered by the signature when referencing previous ↵Mark Haines2014-10-176-16/+84
| | | | | | | | | | | | | | | | PDUs rather than reusing the PDU content hashes
| * | | Include hashes of previous pdus when referencing themMark Haines2014-10-1611-31/+95
| | | |
| * | | Sign outgoing PDUs.Mark Haines2014-10-169-24/+62
| | | |
| * | | persist hashes and origin signatures for PDUsMark Haines2014-10-157-15/+135
| | | |
| * | | Merge branch 'develop' into event_signingMark Haines2014-10-155-3/+10
| |\ \ \
| * | | | Storage for pdu signaturesMark Haines2014-10-142-0/+126
| | | | |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2014-10-2757-6425/+563
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | federation_authorization Conflicts: synapse/federation/transport.py synapse/handlers/message.py
| * | | | Add log message if we can't enable ECC. Require pyopenssl>=0.14 since 0.13 ↵Mark Haines2014-10-242-1/+5
| | | | | | | | | | | | | | | | | | | | doesn't seem to have ECC
| * | | | Wrap preparing the database in a transaction. Otherwise it will take many ↵Mark Haines2014-10-241-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 Hodgson2014-10-243-9/+9
| | | | | | | | | | | | | | | | | | | | and fix the bug where kicks of unjoined users aren't displayed sensibly in the history
| * | | | Merge branch 'master' into developMark Haines2014-10-241-1/+1
| |\ \ \ \
| | * | | | Coturn's timestamps are in seconds, not millisecondsDavid Baker2014-10-211-1/+1
| | | | | |
| * | | | | Added pylint config file: ignore missing-docstring messages.Kegan Dougal2014-10-241-0/+280
| | | | | |
| * | | | | Added a param (--no-rate-limit) to demo/start.sh to disable the HS rate limitmanuroe2014-10-202-1/+11
| | | | | |
| * | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-10-208-12/+74
| |\| | | |
| | * | | | use a tagged version of syutil rather than masterMark Haines2014-10-201-1/+1
| | | | | |
| | * | | | Use https link to download syutil as not everyone has ssh access to github.Mark Haines2014-10-201-2/+3
| | | | | |
| | * | | | Add get_json method to 3pid http client. Better logging for errors in 3pid ↵Mark Haines2014-10-202-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | requests
| | * | | | Fix auto generating signing_keysMark Haines2014-10-181-1/+1
| | | | | |
| | * | | | improve changelog slightlyMatthew Hodgson2014-10-181-5/+7
| | | | | |
| | * | | | fix timestamps some moreMatthew Hodgson2014-10-173-5/+5
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse
| * | | | | more timestamp fixesMatthew Hodgson2014-10-173-5/+5
| | | | | |
| | * | | | Bump the other version v0.4.1Erik Johnston2014-10-181-1/+1
| | | | | |
| | * | | | Bump versionErik Johnston2014-10-181-1/+1
| | | | | |
| | * | | | Bunp to change log.Erik Johnston2014-10-181-0/+5
| | | | | |
| | * | | | Merge pull request #9 from matrix-org/developErik Johnston2014-10-182-4/+3
| | |\ \ \ \ | | |/ / / / | |/| | | | Fix issue with timestamps in webclient
| * | | | | fix webclient to know about right timestampsMatthew Hodgson2014-10-172-4/+3
| | | | | |
| * | | | | Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse into developErik Johnston2014-10-1725-5551/+73
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | | * | | I can't type apparentlyErik Johnston2014-10-172-2/+2
| | | | | |
| | | * | | Update changelong and upgradeErik Johnston2014-10-172-0/+15
| | | | | |
| | | * | | Merge branch 'release-v0.4.0' of github.com:matrix-org/synapseErik Johnston2014-10-1788-6704/+1645
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | Check that we have auth headers and fail nicelyErik Johnston2014-10-171-0/+5
| | | | | |
| | * | | | More log lines.Erik Johnston2014-10-171-7/+15
| | | | | |
| | * | | | add log line for checking verifying signaturesMark Haines2014-10-171-0/+1
| | | | | |
| | * | | | Bump syutil dependencyErik Johnston2014-10-171-2/+2
| | | | | |
| | * | | | Bump version and changelogErik Johnston2014-10-174-10/+12
| | | | | |
| | * | | | Bump database version number.Erik Johnston2014-10-172-1/+32
| | | | | |
| | * | | | Merge branch 'docs-restructuring' of github.com:matrix-org/synapse into developErik Johnston2014-10-1716-5531/+6
| |/| | | |
| | * | | | move swagger JSON from synapse project to matrix-doc projectMatthew Hodgson2014-10-098-1897/+0
| | | | | |
| | * | | | move matrix-generic content to new matrix-doc git projectMatthew Hodgson2014-10-099-3721/+6
| | | | | |
| | * | | | Add spec-additions.rst with info on recaptcha and common event fields.Kegan Dougal2014-10-091-0/+89
| | | | | |
| | * | | | Restructure specification sections.Kegan Dougal2014-10-091-837/+835
| | | | | |
| * | | | | keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating ↵Mark Haines2014-10-178-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | schema
| * | | | | SPEC-7: Rename 'ts' to 'origin_server_ts'Mark Haines2014-10-1716-42/+42
| | | | | |
| * | | | | SPEC-7: Don't stamp event contents with 'hsob_ts'Mark Haines2014-10-171-13/+3
| | | | | |
| * | | | | move gendoc into matrix-doc projectMatthew Hodgson2014-10-173-794/+0
| | | | | |
| * | | | | Remove warning since the end result is still $sanitize'dKegan Dougal2014-10-151-3/+1
| | | | | |
| * | | | | Add unsanitizedLinky filter to fix links in formatted messages.Kegan Dougal2014-10-152-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 Dougal2014-10-152-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | and 'formatted_body' keys on m.text messages
| * | | | | Add support for org.matrix.custom.text.htmlKegan Dougal2014-10-152-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" Evans2014-10-141-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 Haines2014-10-145-3/+10
| | |_|/ | |/| | | | | | | | | | from the transaction itself
| * | | remove debugging logging for signing requestsMark Haines2014-10-141-4/+0
| | | |
| * | | Note that this breaks federationErik Johnston2014-10-142-0/+9
| | | |
* | | | It doesn't want a dictErik Johnston2014-10-171-2/+0
| | | |
* | | | Fix bug where people could join private roomsErik Johnston2014-10-173-45/+63
| | | |
* | | | Use state groups to get current state. Make join dance actually work.Erik Johnston2014-10-1710-67/+226
| | | |
* | | | Finish implementing the new join dance.Erik Johnston2014-10-176-126/+222
| | | |
* | | | Start implementing the invite/join dance. Continue moving auth to use ↵Erik Johnston2014-10-164-22/+133
| | | | | | | | | | | | | | | | event.state_events
* | | | Begin making auth use event.old_state_eventsErik Johnston2014-10-1510-83/+115
| | | |
* | | | Add missing package storate.stateErik Johnston2014-10-151-0/+97
| | | |
* | | | Begin implementing state groups.Erik Johnston2014-10-143-3/+123
|/ / /
* | | Merge pull request #8 from matrix-org/server2server_signingMark Haines2014-10-1428-468/+786
|\ \ \ | | | | | | | | Server2server signing
| * | | typoeMatthew Hodgson2014-10-131-1/+1
| | | |
| * | | Better response message when signature is missing or unsupportedMark Haines2014-10-131-1/+1
| | | |
| * | | Respond with more helpful error messages for unsigned requestsMark Haines2014-10-136-10/+45
| | | |
| * | | Raise a SynapseError if the authorisation header is missing or malformedMark Haines2014-10-132-19/+31
| | | |
| * | | Remove debug logging, raise a proper SynapseError if the auth header is missingMark Haines2014-10-131-5/+4
| | | |
| * | | Verify signatures for server2server requestsMark Haines2014-10-135-25/+100
| | | |
| * | | SYN-75 sign at the request level rather than the transaction levelMark Haines2014-10-137-52/+70
| | | |
| * | | Merge branch 'develop' into server2server_signingMark Haines2014-10-131-11/+35
| |\ \ \ | |/ / / |/| | |
* | | | Replace on_send_callback with something a bit clearer so that we can sign ↵Mark Haines2014-10-131-11/+35
| | | | | | | | | | | | | | | | messages
| * | | Merge branch develop into server2server_signingMark Haines2014-10-1322-527/+911
| |\ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: synapse/app/homeserver.py
* | | | remove wishlist in favour of jiraMatthew Hodgson2014-10-121-9/+0
| | | |
* | | | Fixed test.Kegan Dougal2014-10-091-1/+0
| | | |
* | | | Still broken.Kegan Dougal2014-10-091-1/+2
| | | |
* | | | Break a test.Kegan Dougal2014-10-091-1/+1
| |/ / |/| |
* | | Fix unit test.Kegan Dougal2014-10-081-1/+1
| | |
* | | Break unit test.Kegan Dougal2014-10-081-1/+1
| | |
* | | Merge pull request #7 from matrix-org/paul/docErik Johnston2014-10-071-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" Evans2014-10-071-0/+8
|/ / / | | | | | | | | | are unliekly to work but nonlocal lookups will
* | | SPEC-3: First hack at defining some of the various event related conceptsErik Johnston2014-10-071-0/+53
| | |
* | | Add quick and dirty doc about state resolutionErik Johnston2014-10-061-0/+51
| | |
* | | Clarify how-to some more.Kegan Dougal2014-10-061-2/+3
| | |
* | | Update JSFiddles/how-to to support the new registration format.Kegan Dougal2014-10-063-3/+3
| | |
* | | Add more section headings.Kegan Dougal2014-10-061-5/+37
| | |
* | | Clarify room permission / power level information.Kegan Dougal2014-10-061-16/+19
| | |
* | | Add information about the initialSync API.Kegan Dougal2014-10-061-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 Dougal2014-10-061-0/+16
| | |
* | | More spec work.Kegan Dougal2014-10-031-14/+11
| | |
* | | Merge pull request #6 from matrix-org/paul/docErik Johnston2014-10-031-4/+26
|\ \ \ | | | | | | | | Clarify how m.room.alias event works
| * | | Clarify how m.room.alias event worksPaul "LeoNerd" Evans2014-10-031-4/+26
| | | |
* | | | Flesh out room alias section.Kegan Dougal2014-10-031-9/+29
|/ / /
* | | Add more information to TODOs. Explain m.room.join_rules.Kegan Dougal2014-10-031-12/+21
| | |
* | | Federation protocol URLs should have an H2 heading, not H1Paul "LeoNerd" Evans2014-10-021-1/+1
| | |
* | | Remove TODO note about VoIP events as they now have their own entire sectionPaul "LeoNerd" Evans2014-10-021-3/+0
| | |
* | | Merge pull request #5 from matrix-org/paul/docErik Johnston2014-10-021-8/+101
|\ \ \ | | | | | | | | Document the Profile system
| * | | Document the Profile systemPaul "LeoNerd" Evans2014-10-021-8/+101
| | | |
* | | | Merge pull request #4 from matrix-org/erikj-spec-changesPaul Evans2014-10-021-23/+24
|\ \ \ \ | | | | | | | | | | Erikj spec changes
| * | | | Add todo notesErik Johnston2014-10-021-0/+5
| | | | |
| * | | | Remove incorrect reasons for empty PDU lists.Erik Johnston2014-10-021-3/+1
| | | | |
| * | | | Remove note about assymetry of having left a room.Erik Johnston2014-10-021-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_levelErik Johnston2014-10-021-2/+2
| | | | |
| * | | | Don't use spaces in example room aliasErik Johnston2014-10-021-1/+1
| | | | |
| * | | | Fix default value and key names.Erik Johnston2014-10-021-3/+3
| | | | |
| * | | | Be less alarmist about not using an ID server.Erik Johnston2014-10-021-2/+2
| | | | |
| * | | | Alias lookups return a server list.Erik Johnston2014-10-021-1/+4
| | | | |
| * | | | All room state is currently shared.Erik Johnston2014-10-021-6/+5
| |/ / /
* | | | Fix pyflakes errorsMark Haines2014-10-022-9/+3
| | | |
* | | | Add a keyword argument to get_json to avoid retrying on DNS failures. Rather ↵Mark Haines2014-10-026-20/+16
| | | | | | | | | | | | | | | | than passing MatrixHttpClient.RETRY_DNS_LOOKUP_FAILURES as a fake query string parameter
* | | | Merge branch 'master' into developDavid Baker2014-10-023-4/+6
|\ \ \ \
| * | | | Fix ncorrect ports in documentation and add notes on how generate-config ↵David Baker2014-10-023-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 Haines2014-10-026-156/+163
| |/ / / |/| | | | | | | | | | | and talking to Capatcha servers
* | | | Merge branch 'master' into developMark Haines2014-10-021-82/+86
|\| | |
| * | | Trivial formatting fixes for README.Mark Haines2014-10-021-82/+86
| | | |
* | | | Merge remote-tracking branch 'origin/master' into developMark Haines2014-10-022-5/+8
|\| | |
| * | | Update README setup instructions to be correct. Make synapse spit out ↵David Baker2014-10-022-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 Baker2014-10-021-2/+2
| | |/ | |/|
* | | Make instructions synctl gives for generateing a config file actuall ↵David Baker2014-10-021-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 systemPaul "LeoNerd" Evans2014-10-011-0/+6
| | |
* | | Define the client and server APIs for PresencePaul "LeoNerd" Evans2014-10-011-9/+102
| | |
* | | Continue moving content out of docs/model/presence into the main spec; ↵Paul "LeoNerd" Evans2014-10-013-100/+24
| | | | | | | | | | | | delete model docs that are duplicated
* | | SPEC-25: Add details on how to prune redacted events.Erik Johnston2014-10-011-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" Evans2014-10-012-8/+20
| | | | | | | | | | | | to contain such features
* | | s/m.room.redacted/m.room.redaction/Erik Johnston2014-10-011-1/+1
| | |
* | | Nuke the entire 'Typing Notifications' spec section given as they don't ↵Paul "LeoNerd" Evans2014-10-011-16/+0
| | | | | | | | | | | | exist yet in the implementation
* | | remove "red", "blue" and "green" server_name mappingsMark Haines2014-10-011-7/+0
| | |
* | | Annotate all the 'TODO' marks as relating to either the specification itself ↵Paul "LeoNerd" Evans2014-09-301-50/+54
| | | | | | | | | | | | or the documentation thereof
| | * Merge branch 'develop' into server2server_signingMark Haines2014-09-3064-934/+2403
| | |\ | |_|/ |/| | | | | | | | | | | Conflicts: synapse/storage/__init__.py tests/rest/test_presence.py
* | | pyflakes cleanupErik Johnston2014-09-303-3/+1
| | |
* | | SYN-2: Allow server admins to delete room aliasesErik Johnston2014-09-304-21/+99
| | |
* | | Re-wrap content after latest additionsPaul "LeoNerd" Evans2014-09-291-25/+30
| | |
* | | Merge remote-tracking branch 'origin/develop' into developPaul "LeoNerd" Evans2014-09-2917-40/+335
|\ \ \
| * | | Add a 'Redactions' section.Erik Johnston2014-09-291-0/+17
| | | |
| * | | Add m.room.redacted in events listErik Johnston2014-09-291-0/+16
| | | |
| * | | Merge branch 'whois' of github.com:matrix-org/synapse into developErik Johnston2014-09-2916-40/+302
| |\ \ \
| | * | | Unbreak tests after changing storage APIErik Johnston2014-09-294-12/+53
| | | | |
| | * | | Update docstringErik Johnston2014-09-292-2/+3
| | | | |
| | * | | SYN-48: Delete dead codeErik Johnston2014-09-291-26/+0
| | | | |
| | * | | SYN-48: Fix typo. Get the whois for requested user rather tahan the requesterErik Johnston2014-09-291-1/+1
| | | | |
| | * | | SYN-48: Implement WHOIS rest servletErik Johnston2014-09-299-25/+190
| | | | |
| | * | | Add auth check to test if a user is an admin or not.Erik Johnston2014-09-292-0/+11
| | | | |
| | * | | SYN-48: Track User-Agents as well as IPs for client devices.Erik Johnston2014-09-294-5/+20
| | | | |
| | * | | Track the IP users connect with. Add an admin column to users table.Erik Johnston2014-09-269-12/+67
| | | | |
| * | | | No longer need the Freenode verification key filePaul "LeoNerd" Evans2014-09-291-1/+0
| |/ / /
| * | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-09-255-5/+30
| |\| |
* | | | Extended docs about the registration/login flowsPaul "LeoNerd" Evans2014-09-291-23/+30
| | | |
* | | | Reörder the specification sections, to move 'Registration and Login' first, ↵Paul "LeoNerd" Evans2014-09-291-315/+316
| | | | | | | | | | | | | | | | where it logically belongs
* | | | Huge whitespace hackery - reflow all (content) paragraphs at tw=80Paul "LeoNerd" Evans2014-09-291-389/+435
| | | |
* | | | No longer need the Freenode verification key filePaul "LeoNerd" Evans2014-09-291-1/+0
| |/ / |/| |
* | | Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse v0.3.4Erik Johnston2014-09-2546-233/+1297
|\ \ \
| * | | Just use a yaml list for turn serversDavid Baker2014-09-252-3/+3
| | | |
| * | | More change log linesErik Johnston2014-09-251-0/+3
| | | |
| * | | Bump version and changelogErik Johnston2014-09-253-2/+24
| |/ /
| * | Add realm to coturn options (it needs it).David Baker2014-09-251-1/+2
| | |
| * | Merge branch 'deletions' of github.com:matrix-org/synapse into developErik Johnston2014-09-2517-27/+531
| |\ \
| | * | Don't strip out null's in serialized events, as that is not need anymore and ↵Erik Johnston2014-09-251-1/+2
| | | | | | | | | | | | | | | | it's not in the spec (yet)
| | * | Don't strip of False values from events when serializingErik Johnston2014-09-251-1/+1
| | | |
| | * | Rename redaction test case to something helpfulErik Johnston2014-09-251-1/+1
| | | |
| | * | Add LIMIT to scalar subqueryErik Johnston2014-09-253-5/+10
| | | |
| | * | More tests.Erik Johnston2014-09-251-1/+82
| | | |
| | * | Add test for redactionsErik Johnston2014-09-251-0/+181
| | | |
| | * | Rename deletions to redactionsErik Johnston2014-09-2416-74/+77
| | | |
| | * | Make deleting deletes not undeleteErik Johnston2014-09-241-14/+4
| | | |
| | * | Fix bug where we didn't correctly pull out the event_id of the deletionErik Johnston2014-09-242-3/+8
| | | |
| | * | Fill out the prune_event method.Erik Johnston2014-09-241-6/+31
| | | |
| | * | Fix test.Erik Johnston2014-09-241-1/+1
| | | |
| | * | Add v4 deltas to current sql.Erik Johnston2014-09-243-1/+10
| | | |
| | * | Rename 'pruned' to 'pruned_because'Erik Johnston2014-09-233-3/+3
| | | |
| | * | SYN-12: Implement auth for deletion by adding a 'delete_level' on the ops ↵Erik Johnston2014-09-234-6/+43
| | | | | | | | | | | | | | | | | | | | | | | | levels event SYN-12 # comment Auth has been added.
| | * | Add prune_event methodErik Johnston2014-09-231-0/+39
| | | |