| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Handle room invites in email notifs | David Baker | 2016-04-28 | 3 | -13/+42 |
| | | |||||
| * | Add the jinja template for individual notifs | David Baker | 2016-04-28 | 1 | -0/+32 |
| | | |||||
| * | Linkify plain text messages too | David Baker | 2016-04-28 | 1 | -1/+12 |
| | | |||||
| * | Run filter_events_for_client | David Baker | 2016-04-27 | 7 | -20/+24 |
| | | | | | so we don't accidentally mail out events people shouldn't see | ||||
| * | Make html messages work | David Baker | 2016-04-27 | 1 | -10/+21 |
| | | |||||
| * | Better grammar for multiple messages in a room | David Baker | 2016-04-27 | 2 | -10/+33 |
| | | | | | Say who the messages are from if there's no room name, otherwise it's a bit nonsensical | ||||
| * | Hopefully all remaining bits for email notifs | David Baker | 2016-04-27 | 7 | -42/+195 |
| | | | | | Add public facing base url to the server so synapse knows what URL to use when converting mxc to http urls for use in emails | ||||
| * | More variable calculation for email notifs | David Baker | 2016-04-25 | 3 | -19/+76 |
| | | | | | Include name of the person we're sending to and add summary text at the top giving an overview of what's happened. | ||||
| * | Typo | David Baker | 2016-04-25 | 1 | -1/+1 |
| | | |||||
| * | No we don't: it's just the display name | David Baker | 2016-04-22 | 1 | -1/+0 |
| | | |||||
| * | Actually do UTF8 correctly | David Baker | 2016-04-22 | 1 | -1/+1 |
| | | |||||
| * | Sort member events | David Baker | 2016-04-22 | 1 | -0/+4 |
| | | | | | So names of people in a room are given in order | ||||
| * | Mime part is binary so encode it first. | David Baker | 2016-04-22 | 1 | -1/+1 |
| | | | | | Doesn't get character enocind right yet but makes it not error. | ||||
| * | Implement group-of-people names | David Baker | 2016-04-22 | 1 | -17/+14 |
| | | |||||
| * | No inlineCallbacks necessary on this | David Baker | 2016-04-22 | 1 | -1/+0 |
| | | |||||
| * | Add WIP email template files | David Baker | 2016-04-21 | 2 | -0/+20 |
| | | |||||
| * | Flesh out email templating | David Baker | 2016-04-21 | 4 | -4/+208 |
| | | | | | Mostly WIP porting the room name calculation logic from the web client so our room names in the email mirror the clients. | ||||
| * | Generate mails from a template | David Baker | 2016-04-20 | 4 | -31/+49 |
| | | |||||
| * | more pep8 | David Baker | 2016-04-20 | 1 | -1/+1 |
| | | |||||
| * | Send a rather basic email notif | David Baker | 2016-04-20 | 6 | -12/+136 |
| | | | | | Also pep8 fixes | ||||
| * | Add single instance & logging stuff | David Baker | 2016-04-19 | 1 | -8/+39 |
| | | | | | Copy the stuff over from http pusher that prevents multiple instances of process running at once and sets up logging and measure blocks. | ||||
| * | First bits of emailpusher | David Baker | 2016-04-19 | 7 | -8/+335 |
| | | | | | Mostly logic of when to send an email | ||||
| * | Merge pull request #735 from matrix-org/erikj/media_resource_cleanup | Erik Johnston | 2016-04-19 | 7 | -531/+580 |
| |\ | | | | | Split out BaseMediaResource into MediaRepository | ||||
| | * | Move MediaRepository to media_repository module | Erik Johnston | 2016-04-19 | 5 | -489/+496 |
| | | | |||||
| | * | Split out BaseMediaResource into MediaRepository | Erik Johnston | 2016-04-19 | 6 | -138/+180 |
| |/ | | | | | | | | | This is so that a single MediaRepository can be shared across all resources, rather than having a "copy" per resource. In particular this allows us to guard against both the thumbnail and download resource triggering a download of remote content at the same time. | ||||
| * | Merge pull request #734 from matrix-org/erikj/measure | Erik Johnston | 2016-04-18 | 2 | -8/+19 |
| |\ | | | | | Create log context in Measure if one doesn't exist | ||||
| | * | Create log context in Measure if one doesn't exist | Erik Johnston | 2016-04-18 | 2 | -8/+19 |
| |/ | |||||
| * | Merge pull request #733 from matrix-org/erikj/make_member_timeout | Erik Johnston | 2016-04-18 | 1 | -1/+2 |
| |\ | | | | | Lower timeout for make_membership_event | ||||
| | * | Lower timeout for make_membership_event | Erik Johnston | 2016-04-15 | 1 | -1/+2 |
| | | | | | | | | | | | Calls to make_membership_event are done in response to client requests, and so should not be retried over long timeframes. | ||||
| * | | Merge pull request #732 from matrix-org/erikj/login | Erik Johnston | 2016-04-18 | 1 | -5/+9 |
| |\ \ | | | | | | | Simplify _check_password | ||||
| | * | | Simplify _check_password | Erik Johnston | 2016-04-15 | 1 | -5/+9 |
| | |/ | |||||
| * | | explicitly pass in the charset from Content-Type to lxml to fix cyrillic ↵ | Matthew Hodgson | 2016-04-15 | 1 | -6/+18 |
| | | | | | | | | | woes better | ||||
| * | | fix cyrillic URL previews by hardcoding all page decoding to UTF-8 for now, ↵ | Matthew Hodgson | 2016-04-15 | 1 | -16/+8 |
| |/ | | | | rather than relying on lxml's heuristics which seem to get it wrong | ||||
| * | Merge pull request #731 from matrix-org/erikj/timed_otu | Erik Johnston | 2016-04-15 | 1 | -1/+2 |
| |\ | | | | | Use SynapseError 504 for Timeout errors | ||||
| | * | Use SynapseError 504 for Timeout errors | Erik Johnston | 2016-04-15 | 1 | -1/+2 |
| |/ | |||||
| * | Fix check_password rather than inverting the meaning of ↵ | Mark Haines | 2016-04-14 | 1 | -9/+12 |
| | | | | | _check_local_password (#730) | ||||
| * | Merge pull request #729 from matrix-org/dbkr/fix_login_nonexistent_user | David Baker | 2016-04-14 | 1 | -1/+1 |
| |\ | | | | | Fix login to error for nonexistent users | ||||
| | * | Fix login to error for nonexistent users | David Baker | 2016-04-14 | 1 | -1/+1 |
| | | | | | | | | | Fixes SYN-680 | ||||
| * | | fix urlparse import thinko breaking tiny URLs | Matthew Hodgson | 2016-04-14 | 1 | -5/+5 |
| | | | |||||
| * | | Merge pull request #727 from matrix-org/kegan/fix-asapi-reg | Kegsay | 2016-04-14 | 1 | -0/+5 |
| |\ \ | | | | | | | Make v2_alpha reg follow the AS API specification | ||||
| | * | | Make v2_alpha reg follow the AS API specification | Kegan Dougal | 2016-04-14 | 1 | -0/+5 |
| |/ / | | | | | | | | | | | The spec is clear the key should be 'user' not 'username' and this is indeed the case for v1. This is not true for v2_alpha though, which is what this commit is fixing. | ||||
| * | | comment out 2c838f6459db35ad9812a83184d85a06ca5d940a due to risk of ↵ | Matthew Hodgson | 2016-04-14 | 1 | -16/+16 |
| | | | | | | | | | https://en.wikipedia.org/wiki/Billion_laughs attacks - thanks @torhve | ||||
| * | | Merge pull request #726 from matrix-org/erikj/push_metric | Erik Johnston | 2016-04-14 | 1 | -11/+15 |
| |\ \ | |/ |/| | Measure push action generator | ||||
| | * | Measure push action generator | Erik Johnston | 2016-04-14 | 1 | -11/+15 |
| |/ | |||||
| * | Merge pull request #725 from matrix-org/dbkr/push_only_joined | Erik Johnston | 2016-04-14 | 1 | -1/+13 |
| |\ | | | | | Don't push for everyone who ever sent an RR to the room | ||||
| | * | Don't push for everyone who ever sent an RR to the room | David Baker | 2016-04-14 | 1 | -1/+13 |
| | | | |||||
| * | | Add missing yield | Erik Johnston | 2016-04-14 | 1 | -1/+1 |
| | | | |||||
| * | | Rename log context | Erik Johnston | 2016-04-14 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #724 from matrix-org/erikj/push_measure | Erik Johnston | 2016-04-14 | 3 | -25/+50 |
| |\ \ | | | | | | | Add push index. Add extra Measure | ||||
| | * | | Make send_badge private | Erik Johnston | 2016-04-14 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add desc arg | Erik Johnston | 2016-04-14 | 1 | -1/+5 |
| | | | | |||||
| | * | | Add necessary logging contexts | Erik Johnston | 2016-04-14 | 1 | -24/+25 |
| | | | | |||||
| | * | | Add index | Erik Johnston | 2016-04-14 | 1 | -0/+18 |
| | | | | |||||
| | * | | Add extra Measure | Erik Johnston | 2016-04-14 | 1 | -14/+16 |
| |/ / | |||||
| * | | Fix query for get_unread_push_actions_for_user_in_range | Erik Johnston | 2016-04-14 | 1 | -1/+2 |
| | | | |||||
| * | | Merge pull request #721 from matrix-org/erikj/spider | Erik Johnston | 2016-04-14 | 4 | -38/+41 |
| |\ \ | |/ |/| | Sanitize the optional dependencies for spider API | ||||
| | * | Give install requirements | Erik Johnston | 2016-04-13 | 1 | -1/+7 |
| | | | |||||
| | * | Add back in helpful description for missing url_preview_ip_range_blacklist | Erik Johnston | 2016-04-13 | 1 | -1/+5 |
| | | | |||||
| | * | Sanitize the optional dependencies for spider API | Erik Johnston | 2016-04-13 | 4 | -38/+31 |
| | | | |||||
| * | | Merge pull request #722 from matrix-org/dbkr/only_unread_event_actions | David Baker | 2016-04-13 | 1 | -9/+50 |
| |\ \ | | | | | | | Only return unread notifications | ||||
| | * | | pep8 | David Baker | 2016-04-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | Only return unread notifications | David Baker | 2016-04-13 | 1 | -9/+50 |
| | | | | | | | | | | | | | Make get_unread_push_actions_for_user_in_range only return unread event actions, being more true to its name. Done in two separate sql queries to get actions after a read receipt and those in a room wiht no receipt at all. SQL queries by Erik. | ||||
| * | | | Merge pull request #718 from matrix-org/erikj/public_room_list | Erik Johnston | 2016-04-13 | 1 | -5/+8 |
| |\ \ \ | | | | | | | | | Don't return empty public rooms | ||||
| | * | | | Don't return empty public rooms | Erik Johnston | 2016-04-12 | 1 | -5/+8 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #720 from matrix-org/erikj/auth_chec | Erik Johnston | 2016-04-13 | 3 | -18/+35 |
| |\ \ \ | |_|/ |/| | | Don't auto log failed auth checks | ||||
| | * | | Measure Auth.check | Erik Johnston | 2016-04-13 | 1 | -47/+50 |
| | | | | |||||
| | * | | Don't auto log failed auth checks | Erik Johnston | 2016-04-13 | 3 | -62/+76 |
| | |/ | |||||
| * / | Unused member variable | David Baker | 2016-04-12 | 1 | -1/+0 |
| |/ | |||||
| * | Update replication.rst | Mark Haines | 2016-04-12 | 1 | -1/+1 |
| | | |||||
| * | Add some design documentation for replication | Mark Haines | 2016-04-12 | 1 | -0/+58 |
| | | |||||
| * | Merge pull request #716 from matrix-org/dbkr/get_pushers | David Baker | 2016-04-12 | 2 | -17/+71 |
| |\ | | | | | Add get endpoint for pushers | ||||
| | * | Unneccessarywhitespaceisunnecessary | David Baker | 2016-04-12 | 1 | -1/+0 |
| | | | |||||
| | * | Oops, forgot the desc. | David Baker | 2016-04-12 | 1 | -1/+1 |
| | | | |||||
| | * | Make the /set part mandatory | David Baker | 2016-04-12 | 1 | -1/+1 |
| | | | |||||
| | * | Tidy up get_pusher functions | David Baker | 2016-04-12 | 1 | -32/+30 |
| | | | | | | | | | Decodes pushers rows on the main thread rather than the db thread and uses _simple_select_list. Also do the same to the function I copied and factor out the duplication into a helper function. | ||||
| | * | Mis-named function | David Baker | 2016-04-12 | 2 | -2/+2 |
| | | | |||||
| | * | Split into separate servlet classes | David Baker | 2016-04-12 | 1 | -11/+16 |
| | | | |||||
| | * | Add get endpoint for pushers | David Baker | 2016-04-11 | 2 | -1/+53 |
| | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/308 | ||||
| * | | Merge pull request #717 from matrix-org/erikj/backfill_state | Erik Johnston | 2016-04-12 | 2 | -15/+59 |
| |\ \ | |/ |/| | Check if we've already backfilled events | ||||
| | * | More comments | Erik Johnston | 2016-04-12 | 1 | -0/+9 |
| | | | |||||
| | * | More comments | Erik Johnston | 2016-04-12 | 1 | -0/+6 |
| | | | |||||
| | * | Don't append to unused list | Erik Johnston | 2016-04-12 | 1 | -4/+0 |
| | | | |||||
| | * | Add back backfilled parameter that was removed | Erik Johnston | 2016-04-12 | 2 | -4/+7 |
| | | | |||||
| | * | Add comment | Erik Johnston | 2016-04-12 | 1 | -0/+1 |
| | | | |||||
| | * | Check if we've already backfilled events | Erik Johnston | 2016-04-12 | 2 | -7/+36 |
| |/ | |||||
| * | Fix the rule_id for .m.rule.invite_for_me (#715) | Mark Haines | 2016-04-11 | 1 | -1/+1 |
| | | |||||
| * | Move the versionstring code out of app.homeserver into util | Mark Haines | 2016-04-11 | 3 | -83/+125 |
| | | |||||
| * | Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions | David Baker | 2016-04-11 | 19 | -628/+680 |
| |\ | | | | | Change pushers to use the event_actions table | ||||
| | * | Run unsafe proces in a loop until we've caught up | David Baker | 2016-04-11 | 1 | -4/+11 |
| | | | | | | | | | and wrap unsafe process in a try block | ||||
| | * | Actually check if we;re processing | David Baker | 2016-04-08 | 1 | -0/+2 |
| | | | |||||
| | * | Fix invite pushes | David Baker | 2016-04-08 | 4 | -39/+58 |
| | | | | | | | | | | | | | * If the event is an invite event, add the invitee to list of user we run push rules for (if they have a pusher etc) * Move invite_for_me to be higher prio than member events otherwise member events matches them * Spell override right | ||||
| | * | Make sure max stream ordering only increases | David Baker | 2016-04-08 | 1 | -1/+1 |
| | | | |||||
| | * | Unsafe process should call itself if the max has changed | David Baker | 2016-04-08 | 1 | -0/+3 |
| | | | |||||
| | * | Comment why unsafe process is unsafe | David Baker | 2016-04-08 | 1 | -0/+5 |
| | | | |||||
| | * | Literally a dictionary | David Baker | 2016-04-07 | 1 | -17/+17 |
| | | | |||||
| | * | generate id in the main thread | David Baker | 2016-04-07 | 1 | -3/+3 |
| | | | |||||
| | * | Only pass in what we need | David Baker | 2016-04-07 | 2 | -11/+13 |
| | | | |||||
| | * | Oops, inequality fail | David Baker | 2016-04-07 | 1 | -1/+1 |
| | | | |||||
| | * | Wrap process in a flag so we don't process whist already processing. | David Baker | 2016-04-07 | 1 | -0/+9 |
| | | | |||||
| | * | indenting | David Baker | 2016-04-07 | 1 | -1/+1 |
| | | | |||||
| | * | defer.gatherResults rather than doing all the pokes in series | David Baker | 2016-04-07 | 1 | -2/+16 |
| | | | |||||
| | * | Add measure blocks | David Baker | 2016-04-07 | 1 | -5/+10 |
| | | | |||||
| | * | Add comments on min_stream_id | David Baker | 2016-04-07 | 2 | -0/+3 |
| | | | | | | | | | saying that the min stream id won't be completely accurate all the time | ||||
| | * | pep8 | David Baker | 2016-04-07 | 1 | -0/+1 |
| | | | |||||
| | * | Fix port script for changes merged from develop | David Baker | 2016-04-07 | 1 | -1/+4 |
| | | | |||||
| | * | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2016-04-07 | 32 | -202/+776 |
| | |\ | | | | | | | | | | dbkr/pushers_use_event_actions | ||||
| | * | | Remove code that's now been obsoleted or moved elsewhere | David Baker | 2016-04-07 | 3 | -454/+9 |
| | | | | |||||
| | * | | Send badge count pushes. | David Baker | 2016-04-07 | 4 | -24/+71 |
| | | | | | | | | | | | | | Also fix bugs with retrying. | ||||
| | * | | pep8 | David Baker | 2016-04-06 | 4 | -4/+8 |
| | | | | |||||
| | * | | Make pushers use the event_push_actions table instead of listening on an ↵ | David Baker | 2016-04-06 | 13 | -130/+503 |
| | | | | | | | | | | | | | | | | | | | | | | event stream & running the rules again. Sytest passes, but remaining to do: * Make badges work again * Remove old, unused code | ||||
| * | | | PEP8 | Erik Johnston | 2016-04-11 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge pull request #688 from matrix-org/matthew/preview_urls | Matthew Hodgson | 2016-04-11 | 13 | -10/+952 |
| |\ \ \ | | | | | | | | | URL previewing support | ||||
| | * | | | fix typos and needless try/except from PR review | Matthew Hodgson | 2016-04-11 | 1 | -143/+140 |
| | | | | | |||||
| | * | | | actually throw meaningful errors | Matthew Hodgson | 2016-04-08 | 2 | -14/+40 |
| | | | | | |||||
| | * | | | Fix pep8 warning | Mark Haines | 2016-04-08 | 1 | -3/+4 |
| | | | | | |||||
| | * | | | move local_media_repository_url_cache.sql to schema v31 | Matthew Hodgson | 2016-04-08 | 1 | -0/+0 |
| | | | | | |||||
| | * | | | fix typo | Matthew Hodgson | 2016-04-08 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | fix error checking for new SQL | Matthew Hodgson | 2016-04-08 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | more PR feedback | Matthew Hodgson | 2016-04-08 | 1 | -4/+8 |
| | | | | | |||||
| | * | | | fix SQL based on PR feedback | Matthew Hodgson | 2016-04-08 | 1 | -2/+4 |
| | | | | | |||||
| | * | | | Add more doc | Matthew Hodgson | 2016-04-08 | 2 | -1/+4 |
| | | | | | |||||
| | * | | | Add doc | Matthew Hodgson | 2016-04-08 | 2 | -1/+23 |
| | | | | | |||||
| | * | | | Add url_preview_enabled config option to turn on/off preview_url endpoint. ↵ | Matthew Hodgson | 2016-04-08 | 6 | -31/+214 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | defaults to off. Add url_preview_ip_range_blacklist to let admins specify internal IP ranges that must not be spidered. Add url_preview_url_blacklist to let admins specify URL patterns that must not be spidered. Implement a custom SpiderEndpoint and associated support classes to implement url_preview_ip_range_blacklist Add commentary and generally address PR feedback | ||||
| | * | | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-07 | 42 | -402/+1396 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-04 | 41 | -997/+1563 |
| | |\ \ \ \ | |||||
| | * | | | | | report image size (bytewise) in OG meta | Matthew Hodgson | 2016-04-03 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | char encoding | Matthew Hodgson | 2016-04-03 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | pep8 | Matthew Hodgson | 2016-04-03 | 4 | -60/+85 |
| | | | | | | | |||||
| | * | | | | | fix etag typing error. fix timestamp typing error | Matthew Hodgson | 2016-04-03 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | rebase all image URLs | Matthew Hodgson | 2016-04-03 | 1 | -4/+4 |
| | | | | | | | |||||
| | * | | | | | remove stale todo | Matthew Hodgson | 2016-04-03 | 1 | -3/+0 |
| | | | | | | | |||||
| | * | | | | | Ensure only one download for a given URL is active at a time | Matthew Hodgson | 2016-04-03 | 1 | -1/+18 |
| | | | | | | | |||||
| | * | | | | | add a persistent cache of URL lookups, and fix up the in-memory one to work | Matthew Hodgson | 2016-04-03 | 4 | -14/+137 |
| | | | | | | | |||||
| | * | | | | | support gzip compression, and don't pass through error msgs | Matthew Hodgson | 2016-04-02 | 2 | -5/+11 |
| | | | | | | | |||||
| | * | | | | | how was _respond_default_thumbnail ever meant to work? | Matthew Hodgson | 2016-04-02 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | pass back SVGs as their own thumbnails | Matthew Hodgson | 2016-04-02 | 1 | -0/+20 |
| | | | | | | | |||||
| | * | | | | | handle missing dimensions without crashing | Matthew Hodgson | 2016-04-02 | 1 | -4/+13 |
| | | | | | | | |||||
| | * | | | | | make meta comparisons case insensitive | Matthew Hodgson | 2016-04-02 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | refactor calc_og; spider image URLs; fix xpath; add a (broken) ↵ | Matthew Hodgson | 2016-04-02 | 1 | -81/+121 |
| | | | | | | | | | | | | | | | | | | | | | | | | | expiringcache; loads of other fixes | ||||
| | * | | | | | fix assorted redirect, unicode and screenscraping bugs | Matthew Hodgson | 2016-04-01 | 1 | -78/+96 |
| | | | | | | | |||||
| | * | | | | | handle spidered relative images correctly | Matthew Hodgson | 2016-03-31 | 2 | -3/+13 |
| | | | | | | | |||||
| | * | | | | | prevent choking on invalid utf-8, and handle image thumbnailing smarter | Matthew Hodgson | 2016-03-31 | 1 | -5/+18 |
| | | | | | | | |||||
| | * | | | | | synthesise basig OG metadata from pages lacking it | Matthew Hodgson | 2016-03-31 | 1 | -0/+47 |
| | | | | | | | |||||
| | * | | | | | sync in changes from matrixfederationclient | Matthew Hodgson | 2016-03-31 | 1 | -2/+6 |
| | | | | | | | |||||
| | * | | | | | handle requests with missing content-length headers (e.g. YouTube) | Matthew Hodgson | 2016-03-31 | 2 | -9/+28 |
| | | | | | | | |||||
| | * | | | | | spell out more packages | Matthew Hodgson | 2016-03-30 | 1 | -8/+21 |
| | | | | | | | |||||
| | * | | | | | fix bugs | Matthew Hodgson | 2016-03-29 | 1 | -5/+6 |
| | | | | | | | |||||
| | * | | | | | implement redirects | Matthew Hodgson | 2016-03-29 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | debug | Matthew Hodgson | 2016-03-29 | 1 | -3/+2 |
| | | | | | | | |||||
| | * | | | | | make it work | Matthew Hodgson | 2016-03-29 | 4 | -57/+80 |
| | | | | | | | |||||
| | * | | | | | make it build | Matthew Hodgson | 2016-03-29 | 3 | -9/+11 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-03-29 | 29 | -319/+616 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | typo | Matthew Hodgson | 2016-03-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-03-27 | 217 | -7055/+8696 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | typo | Matthew Hodgson | 2016-03-25 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | initial WIP of a tentative preview_url endpoint - incomplete, untested, ↵ | Matthew Hodgson | 2016-01-24 | 5 | -1/+327 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | experimental, etc. just putting it here for safekeeping for now | ||||
| * | | | | | | | | Merge pull request #677 from matrix-org/erikj/dns_cache | Erik Johnston | 2016-04-08 | 2 | -19/+56 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Read from DNS cache if within TTL | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cache | Erik Johnston | 2016-04-07 | 60 | -1250/+2294 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | | Tests | Erik Johnston | 2016-04-06 | 1 | -2/+29 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Allow clock to be passed in to func | Erik Johnston | 2016-03-31 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Read from DNS cache if within TTL | Erik Johnston | 2016-03-31 | 2 | -17/+27 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #707 from matrix-org/markjh/remove_changed_presencelike_data | Erik Johnston | 2016-04-08 | 1 | -15/+0 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | changed_presencelike_data isn't observed anywhere so can be removed | ||||
| | * | | | | | | | | | changed_presencelike_data isn't observed anywhere in synapse so can be removed | Mark Haines | 2016-04-08 | 1 | -15/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Remove some unused functions (#711) | Mark Haines | 2016-04-08 | 15 | -485/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove some unused functions * get_room_events_stream is only used in tests * is_exclusive_room might actually be something we want | ||||
| * | | | | | | | | | | Merge pull request #710 from matrix-org/markjh/move_fire | Mark Haines | 2016-04-08 | 5 | -39/+24 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Move all the wrapper functions for distributor.fire | ||||
| | * | | | | | | | | | Move all the wrapper functions for distributor.fire | Mark Haines | 2016-04-08 | 5 | -39/+24 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the functions inside the distributor and import them where needed. This reduces duplication and makes it possible for flake8 to detect when the functions aren't used in a given file. | ||||
| * | | | | | | | | | Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_data | Mark Haines | 2016-04-08 | 2 | -37/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Call profile handler get_displayname directly | ||||
| | * | | | | | | | | | Call profile handler get_displayname directly rather than using ↵ | Mark Haines | 2016-04-07 | 2 | -37/+1 |
| | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | collect_presencelike_data | ||||
| * | | | | | | | | | Merge pull request #701 from DoubleMalt/ldap-auth | Erik Johnston | 2016-04-07 | 4 | -10/+134 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add LDAP authentication | ||||
| | * | | | | | | | | | Add myself to AUTHORS.rst | Christoph Witzany | 2016-04-07 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Witzany <christoph@web.crofting.com> | ||||
| | * | | | | | | | | | fix check for failed authentication | Christoph Witzany | 2016-04-06 | 1 | -2/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | remove line | Christoph Witzany | 2016-04-06 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | make tests for ldap more specific to not be fooled by Mocks | Christoph Witzany | 2016-04-06 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | output ldap version for info and to pacify pep8 | Christoph Witzany | 2016-04-06 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | conditionally import ldap | Christoph Witzany | 2016-04-06 | 2 | -3/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | fix pep8 | Christoph Witzany | 2016-04-06 | 1 | -2/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | fix exception handling | Christoph Witzany | 2016-04-06 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | code style | Christoph Witzany | 2016-04-06 | 1 | -6/+13 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | cleanup | Christoph Witzany | 2016-04-06 | 1 | -5/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | add tls property and twist my head around twisted | Christoph Witzany | 2016-04-06 | 1 | -15/+29 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | add tls property | Christoph Witzany | 2016-04-06 | 1 | -6/+10 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | move LDAP authentication to AuthenticationHandler | Christoph Witzany | 2016-04-06 | 2 | -61/+48 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Introduce LDAP authentication | Christoph Witzany | 2016-04-06 | 4 | -1/+111 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #706 from matrix-org/markjh/slaveIV | Mark Haines | 2016-04-07 | 4 | -5/+54 |
| |\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | Add tests for redactions | ||||
| | * | | | | | | | | | Add tests for redactions | Mark Haines | 2016-04-07 | 4 | -5/+54 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #704 from matrix-org/markh/slaveIII | Mark Haines | 2016-04-07 | 2 | -1/+95 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add tests for get_latest_event_ids_in_room and get_current_state | ||||
| | * | | | | | | | | | Add sensible __eq__ operators inside the tests. | Mark Haines | 2016-04-07 | 2 | -10/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than adding them globally. This limits the changes to only affect the tests. | ||||
| | * | | | | | | | | | Add tests for get_latest_event_ids_in_room and get_current_state | Mark Haines | 2016-04-07 | 3 | -0/+76 |
| | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #700 from matrix-org/erikj/deduplicate_joins | Erik Johnston | 2016-04-07 | 4 | -2/+125 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Deduplicate membership changes | ||||
| | * | | | | | | | | Rename things | Erik Johnston | 2016-04-07 | 1 | -5/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Log contexts and squash things together | Erik Johnston | 2016-04-07 | 1 | -17/+15 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add comment | Erik Johnston | 2016-04-07 | 1 | -0/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Deduplicate joins | Erik Johnston | 2016-04-07 | 4 | -1/+118 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #703 from matrix-org/erikj/member | Erik Johnston | 2016-04-07 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Set profile information when joining rooms remotely | ||||
| | * | | | | | | | | Set profile information when joining rooms remotely | Erik Johnston | 2016-04-07 | 1 | -0/+5 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #699 from matrix-org/rav/show_own_leave_event | Richard van der Hoff | 2016-04-06 | 1 | -11/+40 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Let users see their own leave events | ||||
| | * | | | | | | | Let users see their own leave events | Richard van der Hoff | 2016-04-06 | 1 | -11/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... otherwise clients get confused. Fixes https://matrix.org/jira/browse/SYN-662, https://github.com/vector-im/vector-web/issues/368 | ||||
| * | | | | | | | | Merge pull request #702 from matrix-org/markjh/slaveII | Mark Haines | 2016-04-06 | 2 | -11/+67 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Test that room membership is replicated | ||||
| | * | | | | | | | | Test that room membership is replicated | Mark Haines | 2016-04-06 | 2 | -11/+67 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #697 from matrix-org/markjh/slaveI | Mark Haines | 2016-04-06 | 10 | -2/+485 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Add a slaved events store class | ||||
| | * | | | | | | | Add a slaved events store class | Mark Haines | 2016-04-06 | 10 | -2/+485 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test to check that get_room_names_and_aliases does the same thing on both the master and on the slave data store. | ||||
| * | | | | | | | | Merge pull request #698 from matrix-org/erikj/port_script_fix | Erik Johnston | 2016-04-06 | 13 | -86/+69 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Don't require config to create database | ||||
| | * | | | | | | | Don't require config to create database | Erik Johnston | 2016-04-06 | 13 | -86/+69 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #694 from matrix-org/markjh/caches | Mark Haines | 2016-04-06 | 2 | -33/+34 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Move _get_cache_dict into the SQLBaseStore | ||||
| | * | | | | | | | | Move _get_cache_dict into the SQLBaseStore | Mark Haines | 2016-04-06 | 2 | -33/+34 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #695 from matrix-org/markjh/cachesII | Mark Haines | 2016-04-06 | 4 | -26/+29 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Make the cache objects be per instance rather than being global | ||||
| | * | | | | | | | Make the cache objects be per instance rather than being global | Mark Haines | 2016-04-06 | 4 | -26/+29 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #692 from matrix-org/markjh/replicate_reshuffle | Mark Haines | 2016-04-05 | 1 | -44/+55 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Separate generating the replication response... | ||||
| | * | | | | | | | Separate generating the replication response... | Mark Haines | 2016-04-05 | 1 | -44/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from doing the http request parsing to make it easier to write unit tests for replication. | ||||
| * | | | | | | | | Merge pull request #693 from matrix-org/erikj/backfill_self | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Don't backfill from self | ||||
| | * | | | | | | | Don't backfill from self | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #691 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 4 | -16/+58 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix stuck invites | ||||
| | * | | | | | | | | Fix stuck invites | Erik Johnston | 2016-04-05 | 4 | -16/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If rejecting a remote invite fails with an error response don't fail the entire request; instead mark the invite as locally rejected. This fixes the bug where users can get stuck invites which they can neither accept nor reject. | ||||
| * | | | | | | | | | Merge pull request #690 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 5 | -32/+155 |
| |\| | | | | | | | | |_|/ / / / / / |/| | | | | | | | Store invites in a separate table. | ||||
| | * | | | | | | | Docs and indents | Erik Johnston | 2016-04-04 | 3 | -14/+31 |
| | | | | | | | | | |||||
| | * | | | | | | | Add upgrade path, rename table | Erik Johnston | 2016-04-04 | 2 | -6/+20 |
| | | | | | | | | | |||||
| | * | | | | | | | Store invites in a separate table. | Erik Johnston | 2016-04-04 | 5 | -32/+124 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #689 from matrix-org/erikj/member | Erik Johnston | 2016-04-04 | 6 | -154/+192 |
| |\| | | | | | | | |_|_|_|_|_|/ |/| | | | | | | Do checks for memberships before creating events | ||||
| | * | | | | | | Use computed prev event ids | Erik Johnston | 2016-04-01 | 4 | -13/+41 |
| | | | | | | | | |||||
| | * | | | | | | Remove state hack from _create_new_client_event | Erik Johnston | 2016-04-01 | 1 | -43/+0 |
| | | | | | | | | |||||
| | * | | | | | | Do checks for memberships before creating events | Erik Johnston | 2016-04-01 | 3 | -98/+151 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #686 from matrix-org/markjh/doc_strings | Mark Haines | 2016-04-01 | 14 | -169/+242 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Use google style doc strings. | ||||
| | * | | | | | | Use google style doc strings. | Mark Haines | 2016-04-01 | 14 | -169/+242 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pycharm supports them so there is no need to use the other format. Might as well convert the existing strings to reduce the risk of people accidentally cargo culting the wrong doc string format. | ||||
| * | | | | | | | Merge pull request #684 from matrix-org/markjh/backfill_id_gen | Mark Haines | 2016-04-01 | 11 | -61/+71 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use a stream id generator for backfilled ids | ||||
| | * | | | | | | | Assert that the step != 0 | Mark Haines | 2016-04-01 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | use google style doc strings | Mark Haines | 2016-04-01 | 1 | -11/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | Rename direction to step, apply checks consistently | Mark Haines | 2016-04-01 | 2 | -16/+16 |
| | | | | | | | | | |||||
| | * | | | | | | | Use a stream id generator for backfilled ids | Mark Haines | 2016-04-01 | 11 | -61/+69 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #685 from matrix-org/erikj/sync_leave | Erik Johnston | 2016-04-01 | 4 | -72/+85 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add concurrently_execute function | ||||
| | * | | | | | | | Comment | Erik Johnston | 2016-04-01 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Add concurrently_execute function | Erik Johnston | 2016-04-01 | 4 | -75/+82 |
| | | | | | | | | | |||||
| | * | | | | | | | Filter rooms list before chunking | Erik Johnston | 2016-04-01 | 1 | -6/+12 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #682 from matrix-org/markjh/fix_invalidate | Mark Haines | 2016-04-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix the invalidation of the names and aliases cache | ||||
| | * | | | | | | | Fix the invalidation of the names and aliases cache | Mark Haines | 2016-04-01 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #681 from matrix-org/markjh/remove_outlier | Mark Haines | 2016-03-31 | 3 | -11/+7 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Remove outlier parameter from compute_event_context | ||||
| | * | | | | | | Remove outlier parameter from compute_event_context | Mark Haines | 2016-03-31 | 3 | -11/+7 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | Use event.internal_metadata.is_outlier instead. | ||||
| * | | | | | | Merge pull request #680 from matrix-org/markjh/remove_is_new_state | Mark Haines | 2016-03-31 | 3 | -56/+57 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove the is_new_state argument to persist event. | ||||
| | * | | | | | | Move the check for backfilled outside the for loop | Mark Haines | 2016-03-31 | 1 | -5/+5 |
| | | | | | | | | |||||
| | * | | | | | | Remove the is_new_state argument to persist event. | Mark Haines | 2016-03-31 | 3 | -56/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the checks for whether an event is new state inside persist event itself. This was harder than expected because there wasn't enough information passed to persist event to correctly handle invites from remote servers for new rooms. | ||||
| * | | | | | | | Merge pull request #679 from matrix-org/erikj/member | Erik Johnston | 2016-03-31 | 3 | -603/+651 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Split out RoomMemberHandler | ||||
| | * | | | | | | Split out RoomMemberHandler | Erik Johnston | 2016-03-31 | 3 | -603/+651 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #676 from matrix-org/markjh/replicate_stateIII | Mark Haines | 2016-03-31 | 3 | -5/+128 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add replication streams for ex outliers and current state resets | ||||
| | * | | | | | Use a namedtuple rather than tuple unpacking | Mark Haines | 2016-03-31 | 2 | -12/+15 |
| | | | | | | | |||||
| | * | | | | | Add replication streams for ex outliers and current state resets | Mark Haines | 2016-03-30 | 3 | -2/+113 |
| | | | | | | | |||||
| | * | | | | | Add a entry to current_state_resets table when the current state is reset | Mark Haines | 2016-03-30 | 1 | -0/+9 |
| | | | | | | | |||||
| * | | | | | | Line length | Erik Johnston | 2016-03-31 | 1 | -1/+3 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #678 from matrix-org/dbkr/push_obey_enable | David Baker | 2016-03-31 | 1 | -2/+3 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Don't ignore the obey overlay if the rule has an enabled attribute of False | ||||
| | * | | | | | Don't ignore the obey overlay if the rule has an enabled attribute of False | David Baker | 2016-03-31 | 1 | -2/+3 |
| |/ / / / / | | | | | | | | | | | | | | | | Fixes https://github.com/vector-im/vector-web/issues/1244 | ||||
| * | | | | | spell out more packages | Matthew Hodgson | 2016-03-30 | 1 | -8/+21 |
| | | | | | | |||||
| * | | | | | typo | Matthew Hodgson | 2016-03-30 | 1 | -1/+1 |
| | | | | | | |||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |