summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Remove the uncomments from the commentsMark Haines2016-04-251-2/+2
|
* Add a metrics listener and a ssh listener to the pusherMark Haines2016-04-252-3/+92
|
* Merge pull request #749 from matrix-org/markjh/split_manholeMark Haines2016-04-252-23/+52
|\ | | | | Split out setting up the manhole to a separate file
| * Move the listenTCP call outside the manhole functionMark Haines2016-04-252-16/+14
| |
| * Split out setting up the manhole to a separate fileMark Haines2016-04-222-26/+57
| |
* | Merge pull request #748 from matrix-org/markjh/split_out_site.pyMark Haines2016-04-222-130/+149
|\| | | | | Move SynapseSite to its own file
| * Merge branch 'develop' into markjh/split_out_site.pyMark Haines2016-04-222-82/+105
| |\ | |/ |/| | | | | Conflicts: synapse/app/homeserver.py
* | Merge pull request #747 from matrix-org/markjh/http_resource_treeMark Haines2016-04-222-82/+105
|\ \ | | | | | | Split out create_resource_tree to a separate file
| * | Split out create_resource_tree to a separate fileMark Haines2016-04-222-82/+105
|/ /
| * Move SynapseSite to its own fileMark Haines2016-04-222-130/+149
|/
* Merge pull request #746 from matrix-org/markjh/split_out_pusherMark Haines2016-04-225-1/+217
|\ | | | | Optionally split out the pushers into a separate process
| * Optionally split out the pushers into a separate processMark Haines2016-04-215-1/+217
| |
* | Merge pull request #745 from matrix-org/erikj/search-indexErik Johnston2016-04-225-49/+250
|\ \ | | | | | | Optimise event_search in postgres
| * | Update port scriptErik Johnston2016-04-221-42/+81
| | |
| * | Simplify query and handle finishing correctlyErik Johnston2016-04-222-17/+16
| | |
| * | Order NULLs firstErik Johnston2016-04-212-5/+16
| | |
| * | Fix queryErik Johnston2016-04-211-2/+2
| | |
| * | Use special UPDATE syntaxErik Johnston2016-04-212-22/+14
| | |
| * | TypoErik Johnston2016-04-211-1/+1
| | |
| * | Need to do _background_update_progress_txn in actual transactionErik Johnston2016-04-211-6/+8
| | |
| * | Update progress when creating indexErik Johnston2016-04-211-0/+7
| | |
| * | Fix SQL statementErik Johnston2016-04-211-3/+3
| | |
| * | Create index must be on a connErik Johnston2016-04-211-6/+13
| | |
| * | Create index concurrentlyErik Johnston2016-04-212-6/+14
| | |
| * | Add missing run_upgradeErik Johnston2016-04-211-0/+4
| | |
| * | Optimise event_search in postgresErik Johnston2016-04-213-5/+137
| | |
* | | Merge pull request #687 from nikriek/jwt-fixErik Johnston2016-04-212-3/+8
|\ \ \ | |_|/ |/| | Fix issues with JWT login
| * | Fix issues with JWT loginNiklas Riekenbrauck2016-04-212-3/+8
| | |
* | | Merge pull request #743 from matrix-org/markjh/slave_pushersMark Haines2016-04-211-0/+52
|\ \ \ | | | | | | | | Replicate the pushers
| * | | Replicate the pushersMark Haines2016-04-211-0/+52
| | |/ | |/|
* | | Merge pull request #744 from matrix-org/markjh/replication_remove_pusherMark Haines2016-04-212-3/+57
|\ \ \ | | | | | | | | Add a replication endpoint for deleting pushers
| * | | Add a replication endpoint for deleting pushersMark Haines2016-04-212-3/+57
| |/ /
* | | Merge pull request #742 from matrix-org/markjh/slave_event_push_actionsMark Haines2016-04-212-0/+57
|\ \ \ | |/ / |/| | Replicate push actions
| * | Merge branch 'develop' into markjh/slave_event_push_actionsMark Haines2016-04-213-86/+2
| |\ \ | |/ / |/| |
* | | pip install new python dependencies in jenkins.shMark Haines2016-04-213-86/+2
| | |
| * | Merge branch 'develop' into markjh/slave_event_push_actionsMark Haines2016-04-212-0/+2
| |\ \ | |/ / |/| |
* | | Make jenkins install lxmlErik Johnston2016-04-212-0/+2
| | |
| * | Replicate push actionsMark Haines2016-04-212-0/+57
|/ /
* | Merge pull request #740 from matrix-org/erikj/state_cacheErik Johnston2016-04-201-3/+10
|\ \ | | | | | | Always use state cache entry if it exists
| * | Always use state cache entry if it existsErik Johnston2016-04-201-3/+10
|/ / | | | | | | Also check if the resolved state matches an existing state group.
* | Add some logging to state resolve_eventsErik Johnston2016-04-201-0/+5
| |
* | Merge pull request #739 from matrix-org/erikj/cache_get_state_groups_for_groupsErik Johnston2016-04-191-3/+16
|\ \ | | | | | | Add cache to _get_state_groups_from_groups
| * | Add cache to _get_state_groups_from_groupsErik Johnston2016-04-191-3/+16
| | |
* | | Merge pull request #738 from matrix-org/markjh/slaved_receiptsMark Haines2016-04-194-3/+104
|\ \ \ | |/ / |/| | Add a slaved receipts store
| * | Add a slaved receipts storeMark Haines2016-04-194-3/+104
| | |
* | | Merge pull request #737 from matrix-org/erikj/spider_ssl_factoryErik Johnston2016-04-191-1/+4
|\ \ \ | | | | | | | | Use tls_server_context_factory for SpiderEndpoint
| * | | Make InsecureInterceptableContextFactory work with SpiderEndpointErik Johnston2016-04-191-1/+4
| |/ /
* | | Merge pull request #736 from matrix-org/markjh/slave_invited_rooms_for_userMark Haines2016-04-192-2/+19
|\ \ \ | |/ / |/| | Replicate get_invited_rooms_for_user
| * | Replicate get_invited_rooms_for_userMark Haines2016-04-192-2/+19
|/ /
* | Add self.media_repo to PreviewUrlResourceErik Johnston2016-04-191-0/+1
| |
* | _make_dirs was moved to MediaRepositoryErik Johnston2016-04-191-1/+1
| |
* | Add store to PreviewUrlResourceErik Johnston2016-04-191-0/+1
| |
* | Reorder importsErik Johnston2016-04-191-7/+8
| |
* | Merge pull request #735 from matrix-org/erikj/media_resource_cleanupErik Johnston2016-04-197-531/+580
|\ \ | | | | | | Split out BaseMediaResource into MediaRepository
| * | Move MediaRepository to media_repository moduleErik Johnston2016-04-195-489/+496
| | |
| * | Split out BaseMediaResource into MediaRepositoryErik Johnston2016-04-196-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/measureErik Johnston2016-04-182-8/+19
|\ \ | | | | | | Create log context in Measure if one doesn't exist
| * | Create log context in Measure if one doesn't existErik Johnston2016-04-182-8/+19
|/ /
* | Merge pull request #733 from matrix-org/erikj/make_member_timeoutErik Johnston2016-04-181-1/+2
|\ \ | | | | | | Lower timeout for make_membership_event
| * | Lower timeout for make_membership_eventErik Johnston2016-04-151-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/loginErik Johnston2016-04-181-5/+9
|\ \ \ | | | | | | | | Simplify _check_password
| * | | Simplify _check_passwordErik Johnston2016-04-151-5/+9
| |/ /
* | | explicitly pass in the charset from Content-Type to lxml to fix cyrillic ↵Matthew Hodgson2016-04-151-6/+18
| | | | | | | | | | | | woes better
* | | fix cyrillic URL previews by hardcoding all page decoding to UTF-8 for now, ↵Matthew Hodgson2016-04-151-16/+8
|/ / | | | | | | rather than relying on lxml's heuristics which seem to get it wrong
* | Merge pull request #731 from matrix-org/erikj/timed_otuErik Johnston2016-04-151-1/+2
|\ \ | | | | | | Use SynapseError 504 for Timeout errors
| * | Use SynapseError 504 for Timeout errorsErik Johnston2016-04-151-1/+2
|/ /
* | Fix check_password rather than inverting the meaning of ↵Mark Haines2016-04-141-9/+12
| | | | | | | | _check_local_password (#730)
* | Merge pull request #729 from matrix-org/dbkr/fix_login_nonexistent_userDavid Baker2016-04-141-1/+1
|\ \ | | | | | | Fix login to error for nonexistent users
| * | Fix login to error for nonexistent usersDavid Baker2016-04-141-1/+1
| | | | | | | | | | | | Fixes SYN-680
* | | fix urlparse import thinko breaking tiny URLsMatthew Hodgson2016-04-141-5/+5
| | |
* | | Merge pull request #727 from matrix-org/kegan/fix-asapi-regKegsay2016-04-141-0/+5
|\ \ \ | | | | | | | | Make v2_alpha reg follow the AS API specification
| * | | Make v2_alpha reg follow the AS API specificationKegan Dougal2016-04-141-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 Hodgson2016-04-141-16/+16
| | | | | | | | | | | | https://en.wikipedia.org/wiki/Billion_laughs attacks - thanks @torhve
* | | Merge pull request #726 from matrix-org/erikj/push_metricErik Johnston2016-04-141-11/+15
|\ \ \ | |/ / |/| | Measure push action generator
| * | Measure push action generatorErik Johnston2016-04-141-11/+15
|/ /
* | Merge pull request #725 from matrix-org/dbkr/push_only_joinedErik Johnston2016-04-141-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 roomDavid Baker2016-04-141-1/+13
| | |
* | | Add missing yieldErik Johnston2016-04-141-1/+1
| | |
* | | Rename log contextErik Johnston2016-04-141-1/+1
| | |
* | | Merge pull request #724 from matrix-org/erikj/push_measureErik Johnston2016-04-143-25/+50
|\ \ \ | | | | | | | | Add push index. Add extra Measure
| * | | Make send_badge privateErik Johnston2016-04-141-2/+2
| | | |
| * | | Add desc argErik Johnston2016-04-141-1/+5
| | | |
| * | | Add necessary logging contextsErik Johnston2016-04-141-24/+25
| | | |
| * | | Add indexErik Johnston2016-04-141-0/+18
| | | |
| * | | Add extra MeasureErik Johnston2016-04-141-14/+16
|/ / /
* | | Fix query for get_unread_push_actions_for_user_in_rangeErik Johnston2016-04-141-1/+2
| | |
* | | Merge pull request #721 from matrix-org/erikj/spiderErik Johnston2016-04-144-38/+41
|\ \ \ | |/ / |/| | Sanitize the optional dependencies for spider API
| * | Give install requirementsErik Johnston2016-04-131-1/+7
| | |
| * | Add back in helpful description for missing url_preview_ip_range_blacklistErik Johnston2016-04-131-1/+5
| | |
| * | Sanitize the optional dependencies for spider APIErik Johnston2016-04-134-38/+31
| | |
* | | Merge pull request #722 from matrix-org/dbkr/only_unread_event_actionsDavid Baker2016-04-131-9/+50
|\ \ \ | | | | | | | | Only return unread notifications
| * | | pep8David Baker2016-04-131-1/+1
| | | |
| * | | Only return unread notificationsDavid Baker2016-04-131-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_listErik Johnston2016-04-131-5/+8
|\ \ \ \ | | | | | | | | | | Don't return empty public rooms
| * | | | Don't return empty public roomsErik Johnston2016-04-121-5/+8
| | |/ / | |/| |
* | | | Merge pull request #720 from matrix-org/erikj/auth_checErik Johnston2016-04-133-18/+35
|\ \ \ \ | |_|/ / |/| | | Don't auto log failed auth checks
| * | | Measure Auth.checkErik Johnston2016-04-131-47/+50
| | | |
| * | | Don't auto log failed auth checksErik Johnston2016-04-133-62/+76
| |/ /
* / / Unused member variableDavid Baker2016-04-121-1/+0
|/ /
* | Update replication.rstMark Haines2016-04-121-1/+1
| |
* | Add some design documentation for replicationMark Haines2016-04-121-0/+58
| |
* | Merge pull request #716 from matrix-org/dbkr/get_pushersDavid Baker2016-04-122-17/+71
|\ \ | | | | | | Add get endpoint for pushers
| * | UnneccessarywhitespaceisunnecessaryDavid Baker2016-04-121-1/+0
| | |
| * | Oops, forgot the desc.David Baker2016-04-121-1/+1
| | |
| * | Make the /set part mandatoryDavid Baker2016-04-121-1/+1
| | |
| * | Tidy up get_pusher functionsDavid Baker2016-04-121-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 functionDavid Baker2016-04-122-2/+2
| | |
| * | Split into separate servlet classesDavid Baker2016-04-121-11/+16
| | |
| * | Add get endpoint for pushersDavid Baker2016-04-112-1/+53
| | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/308
* | | Merge pull request #717 from matrix-org/erikj/backfill_stateErik Johnston2016-04-122-15/+59
|\ \ \ | |/ / |/| | Check if we've already backfilled events
| * | More commentsErik Johnston2016-04-121-0/+9
| | |
| * | More commentsErik Johnston2016-04-121-0/+6
| | |
| * | Don't append to unused listErik Johnston2016-04-121-4/+0
| | |
| * | Add back backfilled parameter that was removedErik Johnston2016-04-122-4/+7
| | |
| * | Add commentErik Johnston2016-04-121-0/+1
| | |
| * | Check if we've already backfilled eventsErik Johnston2016-04-122-7/+36
|/ /
* | Fix the rule_id for .m.rule.invite_for_me (#715)Mark Haines2016-04-111-1/+1
| |
* | Move the versionstring code out of app.homeserver into utilMark Haines2016-04-113-83/+125
| |
* | Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actionsDavid Baker2016-04-1119-628/+680
|\ \ | | | | | | Change pushers to use the event_actions table
| * | Run unsafe proces in a loop until we've caught upDavid Baker2016-04-111-4/+11
| | | | | | | | | | | | and wrap unsafe process in a try block
| * | Actually check if we;re processingDavid Baker2016-04-081-0/+2
| | |
| * | Fix invite pushesDavid Baker2016-04-084-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 increasesDavid Baker2016-04-081-1/+1
| | |
| * | Unsafe process should call itself if the max has changedDavid Baker2016-04-081-0/+3
| | |
| * | Comment why unsafe process is unsafeDavid Baker2016-04-081-0/+5
| | |
| * | Literally a dictionaryDavid Baker2016-04-071-17/+17
| | |
| * | generate id in the main threadDavid Baker2016-04-071-3/+3
| | |
| * | Only pass in what we needDavid Baker2016-04-072-11/+13
| | |
| * | Oops, inequality failDavid Baker2016-04-071-1/+1
| | |
| * | Wrap process in a flag so we don't process whist already processing.David Baker2016-04-071-0/+9
| | |
| * | indentingDavid Baker2016-04-071-1/+1
| | |
| * | defer.gatherResults rather than doing all the pokes in seriesDavid Baker2016-04-071-2/+16
| | |
| * | Add measure blocksDavid Baker2016-04-071-5/+10
| | |
| * | Add comments on min_stream_idDavid Baker2016-04-072-0/+3
| | | | | | | | | | | | saying that the min stream id won't be completely accurate all the time
| * | pep8David Baker2016-04-071-0/+1
| | |
| * | Fix port script for changes merged from developDavid Baker2016-04-071-1/+4
| | |
| * | Merge remote-tracking branch 'origin/develop' into ↵David Baker2016-04-0732-202/+776
| |\ \ | | | | | | | | | | | | dbkr/pushers_use_event_actions
| * | | Remove code that's now been obsoleted or moved elsewhereDavid Baker2016-04-073-454/+9
| | | |
| * | | Send badge count pushes.David Baker2016-04-074-24/+71
| | | | | | | | | | | | | | | | Also fix bugs with retrying.
| * | | pep8David Baker2016-04-064-4/+8
| | | |
| * | | Make pushers use the event_push_actions table instead of listening on an ↵David Baker2016-04-0613-130/+503
| | | | | | | | | | | | | | | | | | | | | | | | | | | | event stream & running the rules again. Sytest passes, but remaining to do: * Make badges work again * Remove old, unused code
* | | | PEP8Erik Johnston2016-04-111-1/+0
| | | |
* | | | Merge pull request #688 from matrix-org/matthew/preview_urlsMatthew Hodgson2016-04-1113-10/+952
|\ \ \ \ | | | | | | | | | | URL previewing support
| * | | | fix typos and needless try/except from PR reviewMatthew Hodgson2016-04-111-143/+140
| | | | |
| * | | | actually throw meaningful errorsMatthew Hodgson2016-04-082-14/+40
| | | | |
| * | | | Fix pep8 warningMark Haines2016-04-081-3/+4
| | | | |
| * | | | move local_media_repository_url_cache.sql to schema v31Matthew Hodgson2016-04-081-0/+0
| | | | |
| * | | | fix typoMatthew Hodgson2016-04-081-1/+1
| | | | |
| * | | | fix error checking for new SQLMatthew Hodgson2016-04-081-2/+2
| | | | |
| * | | | more PR feedbackMatthew Hodgson2016-04-081-4/+8
| | | | |
| * | | | fix SQL based on PR feedbackMatthew Hodgson2016-04-081-2/+4
| | | | |
| * | | | Add more docMatthew Hodgson2016-04-082-1/+4
| | | | |
| * | | | Add docMatthew Hodgson2016-04-082-1/+23
| | | | |
| * | | | Add url_preview_enabled config option to turn on/off preview_url endpoint. ↵Matthew Hodgson2016-04-086-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_urlsMatthew Hodgson2016-04-0742-402/+1396
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-04-0441-997/+1563
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | report image size (bytewise) in OG metaMatthew Hodgson2016-04-031-0/+2
| | | | | |
| * | | | | char encodingMatthew Hodgson2016-04-031-0/+1
| | | | | |
| * | | | | pep8Matthew Hodgson2016-04-034-60/+85
| | | | | |
| * | | | | fix etag typing error. fix timestamp typing errorMatthew Hodgson2016-04-031-2/+2
| | | | | |
| * | | | | rebase all image URLsMatthew Hodgson2016-04-031-4/+4
| | | | | |
| * | | | | remove stale todoMatthew Hodgson2016-04-031-3/+0
| | | | | |
| * | | | | Ensure only one download for a given URL is active at a timeMatthew Hodgson2016-04-031-1/+18
| | | | | |
| * | | | | add a persistent cache of URL lookups, and fix up the in-memory one to workMatthew Hodgson2016-04-034-14/+137
| | | | | |
| * | | | | support gzip compression, and don't pass through error msgsMatthew Hodgson2016-04-022-5/+11
| | | | | |
| * | | | | how was _respond_default_thumbnail ever meant to work?Matthew Hodgson2016-04-021-0/+2
| | | | | |
| * | | | | pass back SVGs as their own thumbnailsMatthew Hodgson2016-04-021-0/+20
| | | | | |
| * | | | | handle missing dimensions without crashingMatthew Hodgson2016-04-021-4/+13
| | | | | |
| * | | | | make meta comparisons case insensitiveMatthew Hodgson2016-04-021-2/+2
| | | | | |
| * | | | | refactor calc_og; spider image URLs; fix xpath; add a (broken) ↵Matthew Hodgson2016-04-021-81/+121
| | | | | | | | | | | | | | | | | | | | | | | | expiringcache; loads of other fixes
| * | | | | fix assorted redirect, unicode and screenscraping bugsMatthew Hodgson2016-04-011-78/+96
| | | | | |
| * | | | | handle spidered relative images correctlyMatthew Hodgson2016-03-312-3/+13
| | | | | |
| * | | | | prevent choking on invalid utf-8, and handle image thumbnailing smarterMatthew Hodgson2016-03-311-5/+18
| | | | | |
| * | | | | synthesise basig OG metadata from pages lacking itMatthew Hodgson2016-03-311-0/+47
| | | | | |
| * | | | | sync in changes from matrixfederationclientMatthew Hodgson2016-03-311-2/+6
| | | | | |
| * | | | | handle requests with missing content-length headers (e.g. YouTube)Matthew Hodgson2016-03-312-9/+28
| | | | | |
| * | | | | spell out more packagesMatthew Hodgson2016-03-301-8/+21
| | | | | |
| * | | | | fix bugsMatthew Hodgson2016-03-291-5/+6
| | | | | |
| * | | | | implement redirectsMatthew Hodgson2016-03-291-3/+3
| | | | | |
| * | | | | debugMatthew Hodgson2016-03-291-3/+2
| | | | | |
| * | | | | make it workMatthew Hodgson2016-03-294-57/+80
| | | | | |
| * | | | | make it buildMatthew Hodgson2016-03-293-9/+11
| | | | | |
| * | | | | Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-03-2929-319/+616
| |\ \ \ \ \
| | * | | | | typoMatthew Hodgson2016-03-291-1/+1
| | | | | | |
| * | | | | | Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-03-27217-7055/+8696
| |\ \ \ \ \ \
| | * | | | | | typoMatthew Hodgson2016-03-251-1/+1
| | | | | | | |
| * | | | | | | initial WIP of a tentative preview_url endpoint - incomplete, untested, ↵Matthew Hodgson2016-01-245-1/+327
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | experimental, etc. just putting it here for safekeeping for now
* | | | | | | | Merge pull request #677 from matrix-org/erikj/dns_cacheErik Johnston2016-04-082-19/+56
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Read from DNS cache if within TTL
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cacheErik Johnston2016-04-0760-1250/+2294
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | TestsErik Johnston2016-04-061-2/+29
| | | | | | | | |
| * | | | | | | | Allow clock to be passed in to funcErik Johnston2016-03-311-3/+3
| | | | | | | | |
| * | | | | | | | Read from DNS cache if within TTLErik Johnston2016-03-312-17/+27
| | | | | | | | |
* | | | | | | | | Merge pull request #707 from matrix-org/markjh/remove_changed_presencelike_dataErik Johnston2016-04-081-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 removedMark Haines2016-04-081-15/+0
| | | | | | | | | |
* | | | | | | | | | Remove some unused functions (#711)Mark Haines2016-04-0815-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_fireMark Haines2016-04-085-39/+24
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Move all the wrapper functions for distributor.fire
| * | | | | | | | | Move all the wrapper functions for distributor.fireMark Haines2016-04-085-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_dataMark Haines2016-04-082-37/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Call profile handler get_displayname directly
| * | | | | | | | | Call profile handler get_displayname directly rather than using ↵Mark Haines2016-04-072-37/+1
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | collect_presencelike_data
* | | | | | | | | Merge pull request #701 from DoubleMalt/ldap-authErik Johnston2016-04-074-10/+134
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add LDAP authentication
| * | | | | | | | | Add myself to AUTHORS.rstChristoph Witzany2016-04-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Witzany <christoph@web.crofting.com>
| * | | | | | | | | fix check for failed authenticationChristoph Witzany2016-04-061-2/+4
| | | | | | | | | |
| * | | | | | | | | remove lineChristoph Witzany2016-04-061-1/+0
| | | | | | | | | |
| * | | | | | | | | make tests for ldap more specific to not be fooled by MocksChristoph Witzany2016-04-061-3/+3
| | | | | | | | | |
| * | | | | | | | | output ldap version for info and to pacify pep8Christoph Witzany2016-04-061-0/+2
| | | | | | | | | |
| * | | | | | | | | conditionally import ldapChristoph Witzany2016-04-062-3/+5
| | | | | | | | | |
| * | | | | | | | | fix pep8Christoph Witzany2016-04-061-2/+1
| | | | | | | | | |
| * | | | | | | | | fix exception handlingChristoph Witzany2016-04-061-2/+2
| | | | | | | | | |
| * | | | | | | | | code styleChristoph Witzany2016-04-061-6/+13
| | | | | | | | | |
| * | | | | | | | | cleanupChristoph Witzany2016-04-061-5/+0
| | | | | | | | | |
| * | | | | | | | | add tls property and twist my head around twistedChristoph Witzany2016-04-061-15/+29
| | | | | | | | | |
| * | | | | | | | | add tls propertyChristoph Witzany2016-04-061-6/+10
| | | | | | | | | |
| * | | | | | | | | move LDAP authentication to AuthenticationHandlerChristoph Witzany2016-04-062-61/+48
| | | | | | | | | |
| * | | | | | | | | Introduce LDAP authenticationChristoph Witzany2016-04-064-1/+111
| | | | | | | | | |
* | | | | | | | | | Merge pull request #706 from matrix-org/markjh/slaveIVMark Haines2016-04-074-5/+54
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Add tests for redactions
| * | | | | | | | | Add tests for redactionsMark Haines2016-04-074-5/+54
|/ / / / / / / / /
* | | | | | | | | Merge pull request #704 from matrix-org/markh/slaveIIIMark Haines2016-04-072-1/+95
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add tests for get_latest_event_ids_in_room and get_current_state
| * | | | | | | | | Add sensible __eq__ operators inside the tests.Mark Haines2016-04-072-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_stateMark Haines2016-04-073-0/+76
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #700 from matrix-org/erikj/deduplicate_joinsErik Johnston2016-04-074-2/+125
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Deduplicate membership changes
| * | | | | | | | Rename thingsErik Johnston2016-04-071-5/+5
| | | | | | | | |
| * | | | | | | | Log contexts and squash things togetherErik Johnston2016-04-071-17/+15
| | | | | | | | |
| * | | | | | | | Add commentErik Johnston2016-04-071-0/+8
| | | | | | | | |
| * | | | | | | | Deduplicate joinsErik Johnston2016-04-074-1/+118
| | | | | | | | |
* | | | | | | | | Merge pull request #703 from matrix-org/erikj/memberErik Johnston2016-04-071-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Set profile information when joining rooms remotely
| * | | | | | | | Set profile information when joining rooms remotelyErik Johnston2016-04-071-0/+5
|/ / / / / / / /
* | | | | | | | Merge pull request #699 from matrix-org/rav/show_own_leave_eventRichard van der Hoff2016-04-061-11/+40
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Let users see their own leave events
| * | | | | | | Let users see their own leave eventsRichard van der Hoff2016-04-061-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/slaveIIMark Haines2016-04-062-11/+67
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Test that room membership is replicated
| * | | | | | | | Test that room membership is replicatedMark Haines2016-04-062-11/+67
|/ / / / / / / /
* | | | | | | | Merge pull request #697 from matrix-org/markjh/slaveIMark Haines2016-04-0610-2/+485
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Add a slaved events store class
| * | | | | | | Add a slaved events store classMark Haines2016-04-0610-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_fixErik Johnston2016-04-0613-86/+69
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Don't require config to create database
| * | | | | | | Don't require config to create databaseErik Johnston2016-04-0613-86/+69
| | | | | | | |
* | | | | | | | Merge pull request #694 from matrix-org/markjh/cachesMark Haines2016-04-062-33/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move _get_cache_dict into the SQLBaseStore
| * | | | | | | | Move _get_cache_dict into the SQLBaseStoreMark Haines2016-04-062-33/+34
| |/ / / / / / /
* | | | | | | | Merge pull request #695 from matrix-org/markjh/cachesIIMark Haines2016-04-064-26/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Make the cache objects be per instance rather than being global
| * | | | | | | Make the cache objects be per instance rather than being globalMark Haines2016-04-064-26/+29
|/ / / / / / /
* | | | | | | Merge pull request #692 from matrix-org/markjh/replicate_reshuffleMark Haines2016-04-051-44/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Separate generating the replication response...
| * | | | | | | Separate generating the replication response...Mark Haines2016-04-051-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_selfErik Johnston2016-04-051-1/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Don't backfill from self
| * | | | | | | Don't backfill from selfErik Johnston2016-04-051-1/+4
| | | | | | | |
* | | | | | | | Merge pull request #691 from matrix-org/erikj/memberErik Johnston2016-04-054-16/+58
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix stuck invites
| * | | | | | | | Fix stuck invitesErik Johnston2016-04-054-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/memberErik Johnston2016-04-055-32/+155
|\| | | | | | | | | |_|/ / / / / / |/| | | | | | | Store invites in a separate table.
| * | | | | | | Docs and indentsErik Johnston2016-04-043-14/+31
| | | | | | | |
| * | | | | | | Add upgrade path, rename tableErik Johnston2016-04-042-6/+20
| | | | | | | |
| * | | | | | | Store invites in a separate table.Erik Johnston2016-04-045-32/+124
| | | | | | | |
* | | | | | | | Merge pull request #689 from matrix-org/erikj/memberErik Johnston2016-04-046-154/+192
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | | Do checks for memberships before creating events
| * | | | | | Use computed prev event idsErik Johnston2016-04-014-13/+41
| | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-14 23:53:42 +0000