summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Update aliases event after deletionErik Johnston2016-03-172-7/+48
* pep8David Baker2016-03-161-1/+2
* time_msec()David Baker2016-03-161-1/+1
* string with symbols is a bit too symboly.David Baker2016-03-161-1/+1
* Replace other time.time().David Baker2016-03-161-2/+1
* Use hs get_clock instead of time.time()David Baker2016-03-161-2/+2
* take extra return val from check_auth in account tooDavid Baker2016-03-161-1/+1
* pep8 & remove debug loggingDavid Baker2016-03-162-5/+6
* Make registration idempotent: if you specify the same session, make it give y...David Baker2016-03-162-13/+74
* Add a comment to offer a hint to an explanation for why we have a unique cons...Mark Haines2016-03-161-0/+1
* Fix a couple of errors when deleting pushersMark Haines2016-03-151-2/+2
* Merge branch 'develop' into markjh/pushers_streamMark Haines2016-03-154-29/+53
|\
| * Remove needless PreserveLoggingContextErik Johnston2016-03-151-5/+4
| * Persist rejection of invites over federationErik Johnston2016-03-151-1/+17
| * Add config to create guest account on 3pid inviteErik Johnston2016-03-142-25/+36
| * Return list, not generator.Erik Johnston2016-03-141-3/+1
* | Hook up adding a pusher to the notifier for replication.Mark Haines2016-03-152-0/+12
* | Add replication stream for pushersMark Haines2016-03-155-18/+106
|/
* Fix regression where synapse checked whether push rules were valid JSON befor...Mark Haines2016-03-142-6/+19
* Merge pull request #642 from matrix-org/erikj/logoutErik Johnston2016-03-113-15/+113
|\
| * Thats not how transactions work.Erik Johnston2016-03-111-13/+16
| * Implement logoutErik Johnston2016-03-113-14/+109
* | Use parse_json_object_from_request to parse JSON out of request bodiesMark Haines2016-03-1110-88/+45
|/
* Fix SQL statementErik Johnston2016-03-111-1/+1
* Merge pull request #641 from matrix-org/dbkr/fix_change_passwordErik Johnston2016-03-114-30/+32
|\
| * more pep8David Baker2016-03-111-1/+1
| * Make select more sensible when dseleting access tokens, rename pusher deletio...David Baker2016-03-113-7/+5
| * Delete old, unused methods and rename new one to just be `user_delete_access_...David Baker2016-03-112-16/+3
| * Dear PyCharm, please indent sensibly for me. Thx.David Baker2016-03-112-3/+3
| * Fix cache invalidation so deleting access tokens (which we did when changing ...David Baker2016-03-114-17/+34
* | Merge pull request #640 from matrix-org/erikj/keyclient_hostErik Johnston2016-03-111-0/+3
|\ \
| * | Make key client send a Host headerErik Johnston2016-03-111-0/+3
* | | Merge pull request #635 from matrix-org/erikj/sync_orderErik Johnston2016-03-111-3/+6
|\ \ \ | |_|/ |/| |
| * | Add commentErik Johnston2016-03-091-0/+3
| * | Return the correct token formErik Johnston2016-03-091-1/+1
| * | Use topological orders for initial sync timelineErik Johnston2016-03-091-2/+2
* | | Store appservice ID on registerDaniel Wagner-Hall2016-03-102-7/+38
* | | Update users table in a batched mannerErik Johnston2016-03-101-9/+14
| |/ |/|
* | Register endpoint returns refresh_tokenblide2016-03-101-5/+8
|/
* Merge pull request #634 from matrix-org/erikj/pin_saml2_versionErik Johnston2016-03-091-1/+1
|\
| * Pin pysaml2 version to 3.xErik Johnston2016-03-091-1/+1
* | Add a parse_json_object functionMark Haines2016-03-0911-121/+97
|/
* Ensure integer is an integerErik Johnston2016-03-091-1/+1
* Merge pull request #632 from matrix-org/markjh/py3v2Mark Haines2016-03-0817-22/+22
|\
| * Fix relative imports so they work in both py3 and py27Mark Haines2016-03-0817-22/+22
* | Merge branch 'develop' into daniel/ickDaniel Wagner-Hall2016-03-0837-299/+802
|\ \
| * \ Merge pull request #630 from matrix-org/dbkr/post_urlencoded_encode_paramsDavid Baker2016-03-081-2/+15
| |\ \ | | |/ | |/|
| | * pep8David Baker2016-03-081-2/+5
| | * Encode unicode objects given to post_urlencode* otherwise urllib.urlencode ch...David Baker2016-03-081-2/+12
| * | Merge pull request #631 from matrix-org/markjh/py3v1Mark Haines2016-03-088-10/+10
| |\ \
| | * | Use syntax that works on both py2.7 and py3Mark Haines2016-03-078-10/+10
| | |/
| * / Send the user ID matching the guest access token, since there is no Matrix AP...David Baker2016-03-072-2/+7
| |/
| * Merge pull request #626 from matrix-org/erikj/visibilityErik Johnston2016-03-071-0/+26
| |\
| | * Send history visibility on boundary changesErik Johnston2016-03-041-0/+26
| * | Merge pull request #618 from matrix-org/markjh/pushrule_streamMark Haines2016-03-0413-189/+477
| |\ \
| | * | Prefill from the correct streamMark Haines2016-03-041-1/+1
| | * | prefill the push rules stream change cacheMark Haines2016-03-041-2/+9
| | * | s/stream_ordering/event_stream_ordering/ in pushMark Haines2016-03-043-27/+31
| | * | /FNARG/dMark Haines2016-03-041-1/+0
| | * | Merge branch 'develop' into markjh/pushrule_streamMark Haines2016-03-0427-119/+356
| | |\|
| | * | Hook up the push rules stream to account_data in /syncMark Haines2016-03-044-69/+85
| | * | Move the code for formatting push rules into a separate functionMark Haines2016-03-032-86/+116
| | * | Hook up the push rules to the notifierMark Haines2016-03-035-18/+43
| | * | Hook push rules up to the replication APIMark Haines2016-03-022-2/+32
| | * | Add a stream for push rule updatesMark Haines2016-03-015-74/+251
| * | | Merge pull request #625 from matrix-org/erikj/kick_ban_syncErik Johnston2016-03-041-3/+9
| |\ \ \
| | * | | Always include kicks and bans in full /syncErik Johnston2016-03-041-3/+9
| | | |/ | | |/|
| * | | SpellingErik Johnston2016-03-041-1/+1
| * | | Add profile information to invitesErik Johnston2016-03-043-3/+17
| |/ /
| * | Merge pull request #598 from Rugvip/invite-stateErik Johnston2016-03-043-7/+44
| |\ \
| | * | config,handlers/_base: added homeserver config for what state is included in ...Patrik Oldsberg2016-03-043-7/+44
| * | | Merge pull request #596 from Rugvip/createErik Johnston2016-03-041-0/+6
| |\ \ \ | | |/ / | |/| |
| | * | handlers/_base: don't allow room create event to be changedPatrik Oldsberg2016-02-231-0/+6
| * | | Merge pull request #610 from Rugvip/unique-userErik Johnston2016-03-041-0/+1
| |\ \ \
| | * | | handlers/register: make sure another user id is generated when a collision oc...Patrik Oldsberg2016-02-291-0/+1
| * | | | Merge pull request #623 from matrix-org/rav/fix_createroom_raceRichard van der Hoff2016-03-041-1/+1
| |\ \ \ \
| | * | | | Make sure we add all invited members before returning from createRoomRichard van der Hoff2016-03-041-1/+1
| * | | | | Merge pull request #614 from matrix-org/erikj/alias_deleteErik Johnston2016-03-044-10/+51
| |\ \ \ \ \
| | * | | | | Allow alias creators to delete aliasesErik Johnston2016-03-014-10/+51
| * | | | | | Merge remote-tracking branch 'origin/develop' into rav/SYN-642Richard van der Hoff2016-03-0317-90/+193
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #621 from matrix-org/daniel/ratelimitingDaniel Wagner-Hall2016-03-039-63/+95
| | |\ \ \ \ \
| | | * | | | | Pass whole requester to ratelimitingDaniel Wagner-Hall2016-03-039-63/+95
| | * | | | | | Merge pull request #619 from matrix-org/dbkr/dont_use_checkpwErik Johnston2016-03-031-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Stop using checkpw as it seems to have vanished from bcrypt. Use `bcrypt.hash...David Baker2016-03-021-1/+1
| * | | | | | | Merge branch 'develop' into rav/SYN-642Richard van der Hoff2016-03-0323-84/+667
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Fix typoRichard van der Hoff2016-03-031-1/+1
| * | | | | | | Move arg default to the start of the functionRichard van der Hoff2016-03-021-2/+3
| * | | | | | | fix pyflakes quibbleRichard van der Hoff2016-03-021-1/+2
| * | | | | | | Address review commentsRichard van der Hoff2016-03-022-8/+17
| * | | | | | | Fix pyflakes warningRichard van der Hoff2016-03-011-1/+1
| * | | | | | | Handle rejections of invites from local users locallyRichard van der Hoff2016-03-012-8/+31
| | |_|_|/ / / | |/| | | | |
* | | | | | | Idempotent-ise schema update scriptDaniel Wagner-Hall2016-03-081-1/+5
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #571 from matrix-org/daniel/asidsDaniel Wagner-Hall2016-03-037-26/+97
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Mark AS users with their AS's IDDaniel Wagner-Hall2016-02-117-27/+98
* | | | | | Merge pull request #616 from matrix-org/matthew/800x600Matthew Hodgson2016-03-021-0/+3
|\ \ \ \ \ \
| * | | | | | add 800x600 thumbnails to make vector look prettier (and anyone else who like...Matthew Hodgson2016-03-021-0/+3
* | | | | | | Merge pull request #612 from matrix-org/erikj/cache_sizeErik Johnston2016-03-024-3/+15
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Limit stream change cache size tooErik Johnston2016-03-011-1/+5
| * | | | | | Move cache size fiddling to descriptors only. Fix testsErik Johnston2016-03-011-2/+2
| * | | | | | Add enviroment variable SYNAPSE_CACHE_FACTOR, default it to 0.1Erik Johnston2016-03-013-2/+10
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #489 from matrix-org/markjh/replicationMark Haines2016-03-0111-2/+583
|\ \ \ \ \ \
| * | | | | | Add a /replication API for extracting the updates that happened onMark Haines2016-03-0111-2/+583
| |/ / / / /
* | | | | | Merge pull request #613 from matrix-org/markjh/yieldMark Haines2016-03-0112-77/+52
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Load the current id in the IdGenerator constructorMark Haines2016-03-0112-77/+52
| | |_|/ / | |/| | |
* | | | | Reraise exceptionErik Johnston2016-03-011-0/+1
* | | | | Correct cache miss detectionErik Johnston2016-03-011-1/+1
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/expiring_c...Erik Johnston2016-03-0111-30/+227
|\| | | |
| * | | | Merge pull request #607 from matrix-org/dbkr/send_inviter_member_eventDavid Baker2016-02-261-1/+7
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/send_inviter_member_e...David Baker2016-02-261-2/+4
| | |\ \ \ \
| | * | | | | Send the invier's member event in room invite state so the invitee has their ...David Baker2016-02-251-1/+7
| * | | | | | Add support for changing the actions for default rulesMark Haines2016-02-263-11/+102
| | |/ / / / | |/| | | |
| * | | | | Fix to appease the PEP8 dragonGergely Polonkai2016-02-261-1/+3
| * | | | | Add error codes for malformed/bad JSON in /loginGergely Polonkai2016-02-261-2/+2
| |/ / / /
| * | | | Make sure we return a JSON object when returning the values of specif…Mark Haines2016-02-251-1/+3
| * | | | Merge branch 'develop' into markjh/dead_codeMark Haines2016-02-244-0/+91
| |\ \ \ \
| | * | | | Generate guest access token on 3pid invitesDaniel Wagner-Hall2016-02-244-0/+91
| * | | | | Remove unused get_rule_attr methodMark Haines2016-02-241-8/+0
| |/ / / /
| * | | | Ignore invalid POST bodies when joining roomsDaniel Wagner-Hall2016-02-241-2/+12
| * | | | Merge pull request #603 from matrix-org/erikj/presenceErik Johnston2016-02-231-6/+9
| |\ \ \ \
| | * | | | Create a new stream_id per presence updateErik Johnston2016-02-231-6/+9
* | | | | | Report size of ExpiringCacheErik Johnston2016-02-231-2/+13
|/ / / / /
* | | | | Check presence token interval is less than 100, rather than the token itselfErik Johnston2016-02-231-4/+4
* | | | | Merge pull request #602 from matrix-org/erikj/presenceErik Johnston2016-02-232-19/+61
|\| | | |
| * | | | Handle get_all_entities_changed returning NoneErik Johnston2016-02-231-0/+3
| * | | | Add commentsErik Johnston2016-02-231-0/+4
| * | | | Change the way we figure out presence updates for small deltasErik Johnston2016-02-232-17/+52
* | | | | Allow third_party_signed to be specified on /joinDaniel Wagner-Hall2016-02-237-54/+196
* | | | | Merge pull request #600 from matrix-org/erikj/presenceErik Johnston2016-02-231-26/+30
|\| | | |
| * | | | Don't include defer.returnValue in Measure blockErik Johnston2016-02-231-9/+12
| * | | | Measure PresenceEventSource.get_new_eventsErik Johnston2016-02-231-34/+35
* | | | | handlers/sync: style fix, line too longPatrik Oldsberg2016-02-231-1/+5
* | | | | Pick up currently_active across federationErik Johnston2016-02-231-0/+1
* | | | | handlers/sync: fix SyncResult not counting account_data change when convertin...Patrik Oldsberg2016-02-231-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #587 from matrix-org/rav/guest_access_after_room_joinRichard van der Hoff2016-02-223-16/+41
|\ \ \ \ | |/ / / |/| | |
| * | | address review commentsRichard van der Hoff2016-02-221-7/+2
| * | | Interpret unknown visibilities the same as sharedRichard van der Hoff2016-02-191-11/+13
| * | | Merge branch 'develop' into rav/guest_access_after_room_joinRichard van der Hoff2016-02-1938-1631/+1598
| |\ \ \
| * | | | Allow guest users access to messages in rooms they have joinedRichard van der Hoff2016-02-193-14/+42
* | | | | Remove superfluous call to get_state_at when we already have an event for tha...Erik Johnston2016-02-221-4/+12
* | | | | Correctly filter statesErik Johnston2016-02-191-2/+2
* | | | | Only send presence updates to remote hosts if user is oursErik Johnston2016-02-191-2/+10
* | | | | Add Measures to presenceErik Johnston2016-02-191-57/+62
| |/ / / |/| | |
* | | | Add presence metricErik Johnston2016-02-191-0/+3
* | | | Remove spurious extra metricsErik Johnston2016-02-191-1/+0
* | | | Merge pull request #586 from matrix-org/erikj/presenceErik Johnston2016-02-192-6/+32
|\ \ \ \
| * | | | Don't set currently_active for remote presenceErik Johnston2016-02-191-6/+12
| * | | | More metricsErik Johnston2016-02-191-0/+6
| * | | | Add presence metricsErik Johnston2016-02-192-0/+14
* | | | | Merge pull request #582 from matrix-org/erikj/presenceErik Johnston2016-02-1922-1123/+1122
|\| | | |
| * | | | "You are not..."Erik Johnston2016-02-181-1/+1
| * | | | Close cursorErik Johnston2016-02-181-0/+1
| * | | | Remove unused param from get_max_tokenErik Johnston2016-02-186-13/+11
| * | | | WheelTimer: Don't scan list, use index.Erik Johnston2016-02-181-5/+8
| * | | | Remove invalid arg.Erik Johnston2016-02-181-1/+0
| * | | | Add unit testErik Johnston2016-02-181-93/+187
| * | | | Add stuff pulled from the DB to the cacheErik Johnston2016-02-181-2/+4
| * | | | PEP8Erik Johnston2016-02-181-2/+2
| * | | | Prefix TS fields with _tsErik Johnston2016-02-184-43/+44
| * | | | Remove status_msg when going offline. Don't offline -> online if you send a m...Erik Johnston2016-02-181-5/+15
| * | | | Check presence state is a valid oneErik Johnston2016-02-182-1/+6
| * | | | Move if statementErik Johnston2016-02-181-8/+8
| * | | | CommentErik Johnston2016-02-181-0/+2
| * | | | Remove spurious commentErik Johnston2016-02-171-1/+0
| * | | | Initial cutErik Johnston2016-02-1715-1134/+931
| * | | | Add wheeltimer implErik Johnston2016-02-171-0/+88
* | | | | Merge pull request #573 from matrix-org/erikj/sync_fixErik Johnston2016-02-181-5/+12
|\ \ \ \ \
| * | | | | Mitigate against incorrect old state in /sync.Erik Johnston2016-02-121-5/+12
| | |_|/ / | |/| | |
* | | | | Remove dead code for setting device specific rules.Mark Haines2016-02-1810-141/+45
* | | | | Review commentsDaniel Wagner-Hall2016-02-183-7/+7
* | | | | Merge branch 'develop' into daniel/roomcleanupincrementalDaniel Wagner-Hall2016-02-174-85/+92
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #580 from Rugvip/developErik Johnston2016-02-171-1/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | api/filtering: don't assume that event content will always be a dictPatrik Oldsberg2016-02-171-1/+4
| * | | | client/v1/room: include event_id in response to state event PUT, in accordanc...Patrik Oldsberg2016-02-171-2/+2
| |/ / /
| * | | Fix typo in request validation for adding push rules.Mark Haines2016-02-161-1/+1
| * | | Make adding push rules idempotentMark Haines2016-02-161-82/+86
* | | | Some cleanupDaniel Wagner-Hall2016-02-172-69/+61
* | | | Respond to federated invite with non-empty contextDaniel Wagner-Hall2016-02-173-46/+65
* | | | Some cleanup, some TODOs, more to doDaniel Wagner-Hall2016-02-161-68/+60
* | | | Some cleanupDaniel Wagner-Hall2016-02-162-23/+30
* | | | Tidy? up room creation event sendingDaniel Wagner-Hall2016-02-161-63/+72
* | | | Add commentDaniel Wagner-Hall2016-02-161-1/+1
* | | | Merge branch 'develop' into daniel/roomcleanupincrementalDaniel Wagner-Hall2016-02-161-3/+3
|\| | |
| * | | Simplify room creation codeDaniel Wagner-Hall2016-02-152-55/+31
* | | | Branch off member and non member sendsDaniel Wagner-Hall2016-02-155-74/+99
* | | | Simplify room creation codeDaniel Wagner-Hall2016-02-152-52/+28
* | | | Use update_membership for profile updatesDaniel Wagner-Hall2016-02-152-20/+12
* | | | Use update_membership to kick guestsDaniel Wagner-Hall2016-02-152-16/+19
* | | | Reuse update_membership from /joinDaniel Wagner-Hall2016-02-152-19/+14
* | | | Inline _do_local_membership_updateDaniel Wagner-Hall2016-02-151-18/+7
* | | | Inline _do_join as it now only has one callerDaniel Wagner-Hall2016-02-151-48/+47
* | | | Merge implementation of /join by alias or IDDaniel Wagner-Hall2016-02-155-70/+71
* | | | Merge some room joining codepathsDaniel Wagner-Hall2016-02-152-5/+11
|/ / /
* | | Revert "Merge two of the room join codepaths"Daniel Wagner-Hall2016-02-125-73/+69
* | | Merge two of the room join codepathsDaniel Wagner-Hall2016-02-125-69/+73
* | | Catch the exceptions thrown by twisted when you write to a closed connectionMark Haines2016-02-125-11/+33
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-02-121-1/+1
|\| |
| * | Bump version and changelogErik Johnston2016-02-111-1/+1
| * | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-02-111-1/+1
| |\ \
| | * | Bump version and changelogErik Johnston2016-02-111-1/+1
* | | | Enforce user_id exclusivity for AS registrationsDaniel Wagner-Hall2016-02-111-5/+12
|/ / /
* / / Fix SYN-627, events are in incorrect room in /syncErik Johnston2016-02-111-1/+1
|/ /
* | Return events in correct order for /eventsErik Johnston2016-02-112-8/+12
* | Add some paranoia loggingErik Johnston2016-02-111-0/+10
|/
* 0.13.1 v0.13.1Matthew Hodgson2016-02-101-1/+1
* Merge branch 'master' of git+ssh://github.com/matrix-org/synapseMatthew Hodgson2016-02-10257-2954/+4782
|\
| * Bump version and changelogErik Johnston2016-02-101-1/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0Erik Johnston2016-02-1077-1065/+1540
| |\
| | * Batch fetch _get_state_groups_from_groupsErik Johnston2016-02-101-32/+34
| | * Use _simple_select_many for _get_state_group_for_eventsErik Johnston2016-02-102-17/+11
| | * Only calculate initial sync for 10 rooms at a timeErik Johnston2016-02-101-24/+29
| | * Merge pull request #566 from matrix-org/erikj/logcontextErik Johnston2016-02-101-16/+13
| | |\
| | | * Remove commentErik Johnston2016-02-101-1/+1
| | | * s/parent_context/previous_context/Erik Johnston2016-02-101-9/+9
| | | * Set parent context on instansiationErik Johnston2016-02-101-2/+7
| | | * Don't bother copying records on parent contextErik Johnston2016-02-091-8/+0
| | * | Merge pull request #568 from matrix-org/erikj/unread_notifErik Johnston2016-02-107-89/+66
| | |\ \
| | | * | Rename functionsErik Johnston2016-02-102-4/+4
| | | * | Atomically persit push actions when we persist the eventErik Johnston2016-02-096-65/+49
| | | * | Pass in current state to push action handlerErik Johnston2016-02-093-27/+20
| | * | | Merge pull request #565 from matrix-org/erikj/macaroon_configErik Johnston2016-02-092-16/+30
| | |\ \ \
| | | * | | Derive macaroon_secret_key from signing key.Erik Johnston2016-02-082-16/+30
| | * | | | Change a log from debug to infoErik Johnston2016-02-091-1/+1
| | | |/ / | | |/| |
| | * | | Remove dead codeErik Johnston2016-02-091-12/+0
| | * | | Invalidate get_last_receipt_event_id_for_user cacheErik Johnston2016-02-091-0/+5
| | * | | Don't load all ephemeral state for a room on every syncErik Johnston2016-02-092-14/+20
| | * | | Fix unit testsErik Johnston2016-02-092-5/+9
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2016-02-093-6/+6
| | |\ \ \
| | | * | | Revert "Reject additional path segments"Daniel Wagner-Hall2016-02-093-6/+6
| | | | |/ | | | |/|
| | * | | Measure some /sync related thingsErik Johnston2016-02-092-150/+162
| | * | | Revert to putting it around the entire blockErik Johnston2016-02-091-124/+124
| | * | | Don't create new logging contextErik Johnston2016-02-091-12/+15
| | |/ /
| | * | Fix bug in util.metrics.MeasureErik Johnston2016-02-091-1/+3
| | * | Create new context when measuringErik Johnston2016-02-091-2/+5
| | * | Don't measure across event stream call, as it lasts for a long time.Erik Johnston2016-02-091-124/+124
| | * | Change logcontext warns to debugErik Johnston2016-02-091-3/+3
| | |/
| | * Merge pull request #564 from matrix-org/erikj/logcontextErik Johnston2016-02-0831-229/+356
| | |\
| | | * Fix up logcontextsErik Johnston2016-02-0831-229/+356
| | * | Merge pull request #562 from matrix-org/erikj/push_metricErik Johnston2016-02-083-31/+149
| | |\|
| | | * Add metrics to pushersErik Johnston2016-02-083-31/+149
| | * | Reject additional path segmentsDaniel Wagner-Hall2016-02-083-6/+6
| | |/
| | * Allocate guest user IDs numericcallyDaniel Wagner-Hall2016-02-052-19/+72
| | * Host /media/r0 as well as /media/v1Daniel Wagner-Hall2016-02-052-3/+6
| | * Error if macaroon key is missing from configDaniel Wagner-Hall2016-02-054-23/+57
| | * Merge pull request #557 from matrix-org/dbkr/profile_dont_return_nullDavid Baker2016-02-041-6/+17
| | |\
| | | * No braces hereDavid Baker2016-02-031-1/+1
| | | * Don't return null if profile display name / avatar url isn't set: omit them i...David Baker2016-02-031-6/+17
| | * | Actually return something sensibleErik Johnston2016-02-031-1/+1
| | * | Remove old log lineErik Johnston2016-02-031-2/+0
| | * | We return dicts now.Erik Johnston2016-02-031-1/+1
| | * | Add descriptionsErik Johnston2016-02-034-1/+5
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-26 02:12:54 +0000