summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Split out BaseMediaResource into MediaRepositoryErik Johnston2016-04-196-138/+180
* Merge pull request #734 from matrix-org/erikj/measureErik Johnston2016-04-182-8/+19
|\
| * 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_eventErik Johnston2016-04-151-1/+2
* | Merge pull request #732 from matrix-org/erikj/loginErik Johnston2016-04-181-5/+9
|\ \
| * | Simplify _check_passwordErik Johnston2016-04-151-5/+9
| |/
* | explicitly pass in the charset from Content-Type to lxml to fix cyrillic woes...Matthew Hodgson2016-04-151-6/+18
* | fix cyrillic URL previews by hardcoding all page decoding to UTF-8 for now, r...Matthew Hodgson2016-04-151-16/+8
|/
* Merge pull request #731 from matrix-org/erikj/timed_otuErik Johnston2016-04-151-1/+2
|\
| * Use SynapseError 504 for Timeout errorsErik Johnston2016-04-151-1/+2
|/
* Fix check_password rather than inverting the meaning of _check_local_password...Mark Haines2016-04-141-9/+12
* Merge pull request #729 from matrix-org/dbkr/fix_login_nonexistent_userDavid Baker2016-04-141-1/+1
|\
| * Fix login to error for nonexistent usersDavid Baker2016-04-141-1/+1
* | 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 specificationKegan Dougal2016-04-141-0/+5
|/ /
* | comment out 2c838f6459db35ad9812a83184d85a06ca5d940a due to risk of https://e...Matthew Hodgson2016-04-141-16/+16
* | Merge pull request #726 from matrix-org/erikj/push_metricErik Johnston2016-04-141-11/+15
|\ \ | |/ |/|
| * 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 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
|\ \
| * | 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
|\ \ | |/ |/|
| * 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
|\ \
| * | pep8David Baker2016-04-131-1/+1
| * | Only return unread notificationsDavid Baker2016-04-131-9/+50
* | | Merge pull request #718 from matrix-org/erikj/public_room_listErik Johnston2016-04-131-5/+8
|\ \ \
| * | | 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
|\ \ \ | |_|/ |/| |
| * | 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
|\
| * 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
| * 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
* | Merge pull request #717 from matrix-org/erikj/backfill_stateErik Johnston2016-04-122-15/+59
|\ \ | |/ |/|
| * 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
|\
| * Run unsafe proces in a loop until we've caught upDavid Baker2016-04-111-4/+11
| * Actually check if we;re processingDavid Baker2016-04-081-0/+2
| * Fix invite pushesDavid Baker2016-04-084-39/+58
| * 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
| * 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 dbkr/pushers_use_event_act...David Baker2016-04-0732-202/+776
| |\
| * | 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
| * | pep8David Baker2016-04-064-4/+8
| * | Make pushers use the event_push_actions table instead of listening on an even...David Baker2016-04-0613-130/+503
* | | PEP8Erik Johnston2016-04-111-1/+0
* | | Merge pull request #688 from matrix-org/matthew/preview_urlsMatthew Hodgson2016-04-1113-10/+952
|\ \ \
| * | | 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. de...Matthew Hodgson2016-04-086-31/+214
| * | | 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) expiringcache;...Matthew Hodgson2016-04-021-81/+121
| * | | | | 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, exper...Matthew Hodgson2016-01-245-1/+327
* | | | | | | | Merge pull request #677 from matrix-org/erikj/dns_cacheErik Johnston2016-04-082-19/+56
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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 in synapse so can be removedMark Haines2016-04-081-15/+0
* | | | | | | | | | Remove some unused functions (#711)Mark Haines2016-04-0815-485/+4
* | | | | | | | | | Merge pull request #710 from matrix-org/markjh/move_fireMark Haines2016-04-085-39/+24
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Move all the wrapper functions for distributor.fireMark Haines2016-04-085-39/+24
|/ / / / / / / / /
* | | | | | | | | Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_dataMark Haines2016-04-082-37/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Call profile handler get_displayname directly rather than using collect_prese...Mark Haines2016-04-072-37/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #701 from DoubleMalt/ldap-authErik Johnston2016-04-074-10/+134
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add myself to AUTHORS.rstChristoph Witzany2016-04-071-0/+3
| * | | | | | | | | 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 redactionsMark Haines2016-04-074-5/+54
|/ / / / / / / / /
* | | | | | | | | Merge pull request #704 from matrix-org/markh/slaveIIIMark Haines2016-04-072-1/+95
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add sensible __eq__ operators inside the tests.Mark Haines2016-04-072-10/+28
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | 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 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 eventsRichard van der Hoff2016-04-061-11/+40
* | | | | | | | Merge pull request #702 from matrix-org/markjh/slaveIIMark Haines2016-04-062-11/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 classMark Haines2016-04-0610-2/+485
* | | | | | | | Merge pull request #698 from matrix-org/erikj/port_script_fixErik Johnston2016-04-0613-86/+69
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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 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 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...Mark Haines2016-04-051-44/+55
* | | | | | | | Merge pull request #693 from matrix-org/erikj/backfill_selfErik Johnston2016-04-051-1/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | 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 invitesErik Johnston2016-04-054-16/+58
* | | | | | | | | Merge pull request #690 from matrix-org/erikj/memberErik Johnston2016-04-055-32/+155
|\| | | | | | | | | |_|/ / / / / / |/| | | | | | |
| * | | | | | | 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
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Use computed prev event idsErik Johnston2016-04-014-13/+41
| * | | | | | Remove state hack from _create_new_client_eventErik Johnston2016-04-011-43/+0
| * | | | | | Do checks for memberships before creating eventsErik Johnston2016-04-013-98/+151
* | | | | | | Merge pull request #686 from matrix-org/markjh/doc_stringsMark Haines2016-04-0114-169/+242
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use google style doc strings.Mark Haines2016-04-0114-169/+242
* | | | | | | Merge pull request #684 from matrix-org/markjh/backfill_id_genMark Haines2016-04-0111-61/+71
|\ \ \ \ \ \ \
| * | | | | | | Assert that the step != 0Mark Haines2016-04-011-0/+1
| * | | | | | | use google style doc stringsMark Haines2016-04-011-11/+12
| * | | | | | | Rename direction to step, apply checks consistentlyMark Haines2016-04-012-16/+16
| * | | | | | | Use a stream id generator for backfilled idsMark Haines2016-04-0111-61/+69
| |/ / / / / /
* | | | | | | Merge pull request #685 from matrix-org/erikj/sync_leaveErik Johnston2016-04-014-72/+85
|\ \ \ \ \ \ \
| * | | | | | | CommentErik Johnston2016-04-011-1/+1
| * | | | | | | Add concurrently_execute functionErik Johnston2016-04-014-75/+82
| * | | | | | | Filter rooms list before chunkingErik Johnston2016-04-011-6/+12
|/ / / / / / /
* | | | | | | Merge pull request #682 from matrix-org/markjh/fix_invalidateMark Haines2016-04-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix the invalidation of the names and aliases cacheMark Haines2016-04-011-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #681 from matrix-org/markjh/remove_outlierMark Haines2016-03-313-11/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove outlier parameter from compute_event_contextMark Haines2016-03-313-11/+7
|/ / / / / /
* | | | | | Merge pull request #680 from matrix-org/markjh/remove_is_new_stateMark Haines2016-03-313-56/+57
|\ \ \ \ \ \
| * | | | | | Move the check for backfilled outside the for loopMark Haines2016-03-311-5/+5
| * | | | | | Remove the is_new_state argument to persist event.Mark Haines2016-03-313-56/+57
* | | | | | | Merge pull request #679 from matrix-org/erikj/memberErik Johnston2016-03-313-603/+651
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Split out RoomMemberHandlerErik Johnston2016-03-313-603/+651
| |/ / / / /
* | | | | | Merge pull request #676 from matrix-org/markjh/replicate_stateIIIMark Haines2016-03-313-5/+128
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use a namedtuple rather than tuple unpackingMark Haines2016-03-312-12/+15
| * | | | | Add replication streams for ex outliers and current state resetsMark Haines2016-03-303-2/+113
| * | | | | Add a entry to current_state_resets table when the current state is resetMark Haines2016-03-301-0/+9
* | | | | | Line lengthErik Johnston2016-03-311-1/+3
* | | | | | Merge pull request #678 from matrix-org/dbkr/push_obey_enableDavid Baker2016-03-311-2/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Don't ignore the obey overlay if the rule has an enabled attribute of FalseDavid Baker2016-03-311-2/+3
|/ / / / /
* | | | | spell out more packagesMatthew Hodgson2016-03-301-8/+21
* | | | | typoMatthew Hodgson2016-03-301-1/+1
* | | | | Merge pull request #675 from matrix-org/markjh/replicate_stateIIMark Haines2016-03-304-12/+93
|\ \ \ \ \
| * | | | | return the state_group for backfillMark Haines2016-03-301-1/+2
| |/ / / /
| * / / / Add a replication stream for state groupsMark Haines2016-03-304-11/+91
|/ / / /
* | | | Merge pull request #674 from matrix-org/markjh/replicate_stateMark Haines2016-03-304-50/+60
|\ \ \ \
| * | | | Use a stream id generator to assign state group idsMark Haines2016-03-304-50/+60
* | | | | Merge pull request #673 from matrix-org/erikj/forgetErik Johnston2016-03-302-6/+54
|\ \ \ \ \
| * | | | | Only forget room if you were in the roomErik Johnston2016-03-301-1/+2
| * | | | | Remove spurious commentErik Johnston2016-03-301-1/+0
| * | | | | Require user to have left room to forget roomErik Johnston2016-03-302-6/+54
| |/ / / /
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-03-303-3/+71
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'release-v0.14.0' of github.com:matrix-org/synapse v0.14.0Erik Johnston2016-03-30180-5320/+6403
| |\ \ \ \
| | * | | | Bump version and changelogErik Johnston2016-03-302-1/+6
| | * | | | Bump version and changelog v0.14.0-rc2 github/release-v0.14.0 release-v0.14.0Erik Johnston2016-03-232-1/+22
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.14.0Erik Johnston2016-03-2345-474/+923
| | |\ \ \ \
| | * | | | | English v0.14.0-rc1Erik Johnston2016-03-151-1/+1
| | * | | | | Bump version and changelogErik Johnston2016-03-152-1/+40
| * | | | | | Merge pull request #672 from nikriek/new-authorErik Johnston2016-03-291-2/+5
| |\ \ \ \ \ \
| | * | | | | | Add new authorNiklas Riekenbrauck2016-03-291-2/+5
| |/ / / / / /
* | | | | | | Merge pull request #671 from nikriek/jwt-supportErik Johnston2016-03-294-1/+93
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add JWT supportNiklas Riekenbrauck2016-03-294-1/+93
|/ / / / / /
* | | | | | Merge pull request #668 from matrix-org/markjh/deduplicateMark Haines2016-03-244-2/+75
|\ \ \ \ \ \
| * | | | | | Fix typoMark Haines2016-03-241-1/+1
| * | | | | | Add a response cache for getting the public room listMark Haines2016-03-241-1/+11
| * | | | | | Deduplicate identical /sync requestsMark Haines2016-03-243-1/+64
|/ / / / / /
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-27 21:48:36 +0000