Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 35 | -323/+1188 |
|\ | |||||
| * | Fix more typos in per-request metrics | Mark Haines | 2016-04-28 | 1 | -4/+5 |
| * | Fix typo in request metrics | Mark Haines | 2016-04-28 | 1 | -1/+1 |
| * | fix typo | Matthew Hodgson | 2016-04-28 | 1 | -1/+1 |
| * | Add a comment explaining why automatic metric reporting is disabled for JsonR... | Mark Haines | 2016-04-28 | 1 | -0/+4 |
| * | Check if report_metrics is True | Mark Haines | 2016-04-28 | 1 | -3/+4 |
| * | Report per request metrics for all of the things using request_handler | Mark Haines | 2016-04-28 | 9 | -47/+76 |
| * | Merge pull request #755 from matrix-org/markjh/right_direction | Mark Haines | 2016-04-27 | 2 | -3/+3 |
| |\ | |||||
| | * | Fix backfill replication to advance the stream correctly | Mark Haines | 2016-04-27 | 2 | -3/+3 |
| * | | Check that somethign has happend before running the selects | Mark Haines | 2016-04-27 | 3 | -2/+14 |
| |/ | |||||
| * | Actually start the pusher daemon | Mark Haines | 2016-04-26 | 1 | -0/+2 |
| * | Fix typo in default pusher config | Mark Haines | 2016-04-26 | 1 | -1/+1 |
| * | Add a log context to the daemonized pusher | Mark Haines | 2016-04-26 | 1 | -1/+6 |
| * | Optionally daemonize the pusher | Mark Haines | 2016-04-26 | 1 | -4/+31 |
| * | Merge pull request #750 from matrix-org/erikj/jwt_optional | Erik Johnston | 2016-04-26 | 3 | -7/+23 |
| |\ | |||||
| | * | Make pyjwt dependency optional | Erik Johnston | 2016-04-25 | 3 | -7/+23 |
| * | | Add a couple of update methods to the PusherSlaveStore | Mark Haines | 2016-04-26 | 1 | -0/+8 |
| * | | Remove the uncomments from the comments | Mark Haines | 2016-04-25 | 1 | -2/+2 |
| * | | Add a metrics listener and a ssh listener to the pusher | Mark Haines | 2016-04-25 | 2 | -3/+92 |
| * | | Move the listenTCP call outside the manhole function | Mark Haines | 2016-04-25 | 2 | -16/+14 |
| * | | Split out setting up the manhole to a separate file | Mark Haines | 2016-04-22 | 2 | -26/+57 |
| |/ | |||||
| * | Merge branch 'develop' into markjh/split_out_site.py | Mark Haines | 2016-04-22 | 2 | -82/+105 |
| |\ | |||||
| | * | Split out create_resource_tree to a separate file | Mark Haines | 2016-04-22 | 2 | -82/+105 |
| * | | Move SynapseSite to its own file | Mark Haines | 2016-04-22 | 2 | -130/+149 |
| |/ | |||||
| * | Merge pull request #746 from matrix-org/markjh/split_out_pusher | Mark Haines | 2016-04-22 | 5 | -1/+217 |
| |\ | |||||
| | * | Optionally split out the pushers into a separate process | Mark Haines | 2016-04-21 | 5 | -1/+217 |
| * | | Merge pull request #745 from matrix-org/erikj/search-index | Erik Johnston | 2016-04-22 | 4 | -7/+169 |
| |\ \ | |||||
| | * | | Simplify query and handle finishing correctly | Erik Johnston | 2016-04-22 | 2 | -17/+16 |
| | * | | Order NULLs first | Erik Johnston | 2016-04-21 | 2 | -5/+16 |
| | * | | Fix query | Erik Johnston | 2016-04-21 | 1 | -2/+2 |
| | * | | Use special UPDATE syntax | Erik Johnston | 2016-04-21 | 2 | -22/+14 |
| | * | | Typo | Erik Johnston | 2016-04-21 | 1 | -1/+1 |
| | * | | Need to do _background_update_progress_txn in actual transaction | Erik Johnston | 2016-04-21 | 1 | -6/+8 |
| | * | | Update progress when creating index | Erik Johnston | 2016-04-21 | 1 | -0/+7 |
| | * | | Fix SQL statement | Erik Johnston | 2016-04-21 | 1 | -3/+3 |
| | * | | Create index must be on a conn | Erik Johnston | 2016-04-21 | 1 | -6/+13 |
| | * | | Create index concurrently | Erik Johnston | 2016-04-21 | 2 | -6/+14 |
| | * | | Add missing run_upgrade | Erik Johnston | 2016-04-21 | 1 | -0/+4 |
| | * | | Optimise event_search in postgres | Erik Johnston | 2016-04-21 | 3 | -5/+137 |
| * | | | Merge pull request #687 from nikriek/jwt-fix | Erik Johnston | 2016-04-21 | 2 | -3/+8 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Fix issues with JWT login | Niklas Riekenbrauck | 2016-04-21 | 2 | -3/+8 |
| * | | | Merge pull request #743 from matrix-org/markjh/slave_pushers | Mark Haines | 2016-04-21 | 1 | -0/+52 |
| |\ \ \ | |||||
| | * | | | Replicate the pushers | Mark Haines | 2016-04-21 | 1 | -0/+52 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #744 from matrix-org/markjh/replication_remove_pusher | Mark Haines | 2016-04-21 | 2 | -3/+57 |
| |\ \ \ | |||||
| | * | | | Add a replication endpoint for deleting pushers | Mark Haines | 2016-04-21 | 2 | -3/+57 |
| | |/ / | |||||
| * / / | Replicate push actions | Mark Haines | 2016-04-21 | 1 | -0/+14 |
| |/ / | |||||
| * | | Always use state cache entry if it exists | Erik Johnston | 2016-04-20 | 1 | -3/+10 |
| * | | Add some logging to state resolve_events | Erik Johnston | 2016-04-20 | 1 | -0/+5 |
| * | | Merge pull request #739 from matrix-org/erikj/cache_get_state_groups_for_groups | Erik Johnston | 2016-04-19 | 1 | -3/+16 |
| |\ \ | |||||
| | * | | Add cache to _get_state_groups_from_groups | Erik Johnston | 2016-04-19 | 1 | -3/+16 |
| * | | | Merge pull request #738 from matrix-org/markjh/slaved_receipts | Mark Haines | 2016-04-19 | 1 | -0/+61 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Add a slaved receipts store | Mark Haines | 2016-04-19 | 1 | -0/+61 |
| * | | | Merge pull request #737 from matrix-org/erikj/spider_ssl_factory | Erik Johnston | 2016-04-19 | 1 | -1/+4 |
| |\ \ \ | |||||
| | * | | | Make InsecureInterceptableContextFactory work with SpiderEndpoint | Erik Johnston | 2016-04-19 | 1 | -1/+4 |
| | |/ / | |||||
| * / / | Replicate get_invited_rooms_for_user | Mark Haines | 2016-04-19 | 1 | -2/+7 |
| |/ / | |||||
| * | | Add self.media_repo to PreviewUrlResource | Erik Johnston | 2016-04-19 | 1 | -0/+1 |
| * | | _make_dirs was moved to MediaRepository | Erik Johnston | 2016-04-19 | 1 | -1/+1 |
| * | | Add store to PreviewUrlResource | Erik Johnston | 2016-04-19 | 1 | -0/+1 |
| * | | Reorder imports | Erik Johnston | 2016-04-19 | 1 | -7/+8 |
* | | | May as well always include room link | David Baker | 2016-04-28 | 1 | -4/+3 |
* | | | Put back real delay before mailing | David Baker | 2016-04-28 | 1 | -1/+1 |
* | | | Support file messages & fix plain text | David Baker | 2016-04-28 | 1 | -2/+3 |
* | | | Support image notifs | David Baker | 2016-04-28 | 1 | -11/+25 |
* | | | pep8 | David Baker | 2016-04-28 | 2 | -3/+6 |
* | | | Only import email pusher if email notifs are on | David Baker | 2016-04-28 | 1 | -6/+8 |
* | | | Handle room invites in email notifs | David Baker | 2016-04-28 | 2 | -8/+33 |
* | | | 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 |
* | | | 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 |
* | | | Hopefully all remaining bits for email notifs | David Baker | 2016-04-27 | 4 | -23/+161 |
* | | | More variable calculation for email notifs | David Baker | 2016-04-25 | 2 | -18/+74 |
* | | | 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 |
* | | | Mime part is binary so encode it first. | David Baker | 2016-04-22 | 1 | -1/+1 |
* | | | 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 |
* | | | Flesh out email templating | David Baker | 2016-04-21 | 4 | -4/+208 |
* | | | 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 |
* | | | Add single instance & logging stuff | David Baker | 2016-04-19 | 1 | -8/+39 |
* | | | First bits of emailpusher | David Baker | 2016-04-19 | 7 | -8/+335 |
|/ / | |||||
* | | 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 |
* | | Create log context in Measure if one doesn't exist | Erik Johnston | 2016-04-18 | 1 | -6/+17 |
* | | 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 | Erik Johnston | 2016-04-15 | 1 | -1/+2 |
* | | | Merge pull request #732 from matrix-org/erikj/login | Erik Johnston | 2016-04-18 | 1 | -5/+9 |
|\ \ \ | |||||
| * | | | Simplify _check_password | Erik Johnston | 2016-04-15 | 1 | -5/+9 |
| |/ / | |||||
* | | | explicitly pass in the charset from Content-Type to lxml to fix cyrillic woes... | Matthew Hodgson | 2016-04-15 | 1 | -6/+18 |
* | | | fix cyrillic URL previews by hardcoding all page decoding to UTF-8 for now, r... | Matthew Hodgson | 2016-04-15 | 1 | -16/+8 |
|/ / | |||||
* | | Use SynapseError 504 for Timeout errors | Erik Johnston | 2016-04-15 | 1 | -1/+2 |
* | | Fix check_password rather than inverting the meaning of _check_local_password... | Mark Haines | 2016-04-14 | 1 | -9/+12 |
* | | 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 | David Baker | 2016-04-14 | 1 | -1/+1 |
* | | | fix urlparse import thinko breaking tiny URLs | Matthew Hodgson | 2016-04-14 | 1 | -5/+5 |
* | | | Make v2_alpha reg follow the AS API specification | Kegan Dougal | 2016-04-14 | 1 | -0/+5 |
* | | | comment out 2c838f6459db35ad9812a83184d85a06ca5d940a due to risk of https://e... | Matthew Hodgson | 2016-04-14 | 1 | -16/+16 |
* | | | 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 | 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 |
* | | | 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 |
|\ \ \ | |/ / |/| | | |||||
| * | | 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 |
|\ \ \ | |||||
| * | | | pep8 | David Baker | 2016-04-13 | 1 | -1/+1 |
| * | | | Only return unread notifications | David Baker | 2016-04-13 | 1 | -9/+50 |
* | | | | 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 | 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 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | 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 |
|/ / | |||||
* | | Merge pull request #716 from matrix-org/dbkr/get_pushers | David Baker | 2016-04-12 | 2 | -17/+71 |
|\ \ | |||||
| * | | 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 |
| * | | 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 |
* | | | 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 |
|\ \ | |||||
| * | | Run unsafe proces in a loop until we've caught up | David Baker | 2016-04-11 | 1 | -4/+11 |
| * | | 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 |
| * | | 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 |
| * | | 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 dbkr/pushers_use_event_act... | David Baker | 2016-04-07 | 25 | -190/+513 |
| |\ \ | |||||
| * | | | 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 |
| * | | | pep8 | David Baker | 2016-04-06 | 4 | -4/+8 |
| * | | | Make pushers use the event_push_actions table instead of listening on an even... | David Baker | 2016-04-06 | 13 | -130/+503 |
* | | | | PEP8 | Erik Johnston | 2016-04-11 | 1 | -1/+0 |
* | | | | Merge pull request #688 from matrix-org/matthew/preview_urls | Matthew Hodgson | 2016-04-11 | 10 | -9/+852 |
|\ \ \ \ | |||||
| * | | | | 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 url_preview_enabled config option to turn on/off preview_url endpoint. de... | Matthew Hodgson | 2016-04-08 | 6 | -31/+214 |
| * | | | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-07 | 33 | -388/+998 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-04 | 37 | -992/+1463 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | 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) expiringcache;... | Matthew Hodgson | 2016-04-02 | 1 | -81/+121 |
| * | | | | | 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 |
| * | | | | | 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 | 3 | -56/+79 |
| * | | | | | 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 | 143 | -4288/+6913 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | typo | Matthew Hodgson | 2016-03-25 | 1 | -1/+1 |
| * | | | | | | | initial WIP of a tentative preview_url endpoint - incomplete, untested, exper... | Matthew Hodgson | 2016-01-24 | 4 | -1/+253 |
* | | | | | | | | Merge pull request #677 from matrix-org/erikj/dns_cache | Erik Johnston | 2016-04-08 | 1 | -17/+24 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cache | Erik Johnston | 2016-04-07 | 51 | -1236/+2026 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | 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 | 1 | -16/+23 |
* | | | | | | | | | 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 in synapse so can be removed | Mark Haines | 2016-04-08 | 1 | -15/+0 |
* | | | | | | | | | | Remove some unused functions (#711) | Mark Haines | 2016-04-08 | 11 | -219/+0 |
* | | | | | | | | | | Move all the wrapper functions for distributor.fire | Mark Haines | 2016-04-08 | 5 | -39/+24 |
|/ / / / / / / / / | |||||
* | | | | | | | | | 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 rather than using collect_prese... | Mark Haines | 2016-04-07 | 2 | -37/+1 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #701 from DoubleMalt/ldap-auth | Erik Johnston | 2016-04-07 | 3 | -10/+131 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 |
* | | | | | | | | | | Add tests for redactions | Mark Haines | 2016-04-07 | 2 | -3/+3 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #704 from matrix-org/markh/slaveIII | Mark Haines | 2016-04-07 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add sensible __eq__ operators inside the tests. | Mark Haines | 2016-04-07 | 1 | -9/+0 |
| * | | | | | | | | | Add tests for get_latest_event_ids_in_room and get_current_state | Mark Haines | 2016-04-07 | 2 | -0/+14 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #700 from matrix-org/erikj/deduplicate_joins | Erik Johnston | 2016-04-07 | 3 | -2/+81 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | 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 | 3 | -1/+74 |
* | | | | | | | | | 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 | Richard van der Hoff | 2016-04-06 | 1 | -11/+40 |
* | | | | | | | | Test that room membership is replicated | Mark Haines | 2016-04-06 | 1 | -3/+4 |
* | | | | | | | | Merge pull request #697 from matrix-org/markjh/slaveI | Mark Haines | 2016-04-06 | 6 | -2/+286 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add a slaved events store class | Mark Haines | 2016-04-06 | 6 | -2/+286 |
* | | | | | | | | Merge pull request #698 from matrix-org/erikj/port_script_fix | Erik Johnston | 2016-04-06 | 10 | -74/+60 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Don't require config to create database | Erik Johnston | 2016-04-06 | 10 | -74/+60 |
* | | | | | | | | Merge pull request #694 from matrix-org/markjh/caches | Mark Haines | 2016-04-06 | 2 | -33/+34 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move _get_cache_dict into the SQLBaseStore | Mark Haines | 2016-04-06 | 2 | -33/+34 |
| |/ / / / / / / |