summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Fix setting the _clock in SQLBaseStoreMark Haines2016-06-021-0/+1
* Deduplicate presence entries in sync (#818)Mark Haines2016-06-021-0/+3
* Allow external processes to mark a user as syncing. (#812)Mark Haines2016-06-024-22/+174
* Merge pull request #817 from matrix-org/dbkr/split_out_auth_handlerDavid Baker2016-06-0210-24/+23
|\
| * Split out the auth handlerDavid Baker2016-06-0210-24/+23
* | Disable INCLUDE_ALL_UNREAD_NOTIFSErik Johnston2016-06-021-1/+2
* | Merge pull request #800 from matrix-org/erikj/sync_refactorErik Johnston2016-06-021-537/+607
|\ \
| * | Change short circuit pathErik Johnston2016-05-241-16/+26
| * | Don't send down all ephemeral eventsErik Johnston2016-05-241-1/+3
| * | Only work out newly_joined_users for incremental syncErik Johnston2016-05-241-6/+9
| * | Only include non-offline presence in initial syncErik Johnston2016-05-241-0/+3
| * | Spell builder correctlyErik Johnston2016-05-241-63/+63
| * | Inline function. Make load_filtered_recents privateErik Johnston2016-05-241-17/+7
| * | Add commentsErik Johnston2016-05-241-7/+105
| * | Shuffle things roomErik Johnston2016-05-241-37/+33
| * | Add back concurrently_executeErik Johnston2016-05-231-25/+9
| * | Refactor SyncHandlerErik Johnston2016-05-231-497/+481
* | | Merge pull request #814 from matrix-org/matthew/3pid_invite_authMatthew Hodgson2016-06-021-0/+18
|\ \ \
| * | | special case m.room.third_party_invite event auth to match invites, otherwise...Matthew Hodgson2016-06-011-0/+18
* | | | if an email pusher specifies a brand param, use itMatthew Hodgson2016-06-022-3/+8
| |_|/ |/| |
* | | Merge pull request #815 from matrix-org/dbkr/email_greeting_not_noneDavid Baker2016-06-021-0/+2
|\ \ \ | |/ / |/| |
| * | Use user_id in email greeting if display name is nullDavid Baker2016-06-021-0/+2
|/ /
* | Merge pull request #807 from matrix-org/erikj/push_rules_cacheErik Johnston2016-06-011-1/+2
|\ \
| * | Force booleanErik Johnston2016-05-311-1/+2
* | | Merge pull request #806 from matrix-org/erikj/hash_cacheErik Johnston2016-06-011-9/+16
|\ \ \
| * | | Cache get_event_reference_hashesErik Johnston2016-05-311-9/+16
* | | | Merge pull request #813 from matrix-org/dbkr/fix_room_list_spideringErik Johnston2016-06-011-1/+1
|\ \ \ \
| * | | | Fix room list spideringDavid Baker2016-06-011-1/+1
|/ / / /
* | | | Merge pull request #808 from matrix-org/dbkr/room_list_spiderDavid Baker2016-06-017-3/+153
|\ \ \ \
| * | | | Inject fake room list handler in testsDavid Baker2016-06-011-0/+2
| * | | | Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spiderDavid Baker2016-06-0112-53/+71
| |\ \ \ \
| * | | | | pep8David Baker2016-06-011-1/+3
| * | | | | Add cache to remote room listsDavid Baker2016-05-311-4/+30
| * | | | | Add vector.im to default secondary_directory_servers and add comment explaini...David Baker2016-05-311-0/+4
| * | | | | Apparently I am not permitted to have two blank lines hereDavid Baker2016-05-311-1/+0
| * | | | | Basic, un-cached support for secondary_directory_serversDavid Baker2016-05-315-3/+68
| * | | | | Fix c+p failDavid Baker2016-05-311-17/+0
| * | | | | Add federation room list servletDavid Baker2016-05-312-1/+70
* | | | | | Merge pull request #810 from matrix-org/dbkr/limit_email_notifsDavid Baker2016-06-011-2/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Limit number of notifications in an email notificationDavid Baker2016-06-011-2/+4
|/ / / / /
* | | | | handle emotes & notices correctly in email notifsMatthew Hodgson2016-05-312-2/+10
* | | | | Fix synapse/storage/schema/delta/30/as_users.pyMark Haines2016-05-311-2/+2
* | | | | Merge pull request #805 from matrix-org/erikj/push_rules_cacheErik Johnston2016-05-311-2/+8
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix typoErik Johnston2016-05-311-1/+1
| * | | | Change fixErik Johnston2016-05-312-5/+8
| * | | | Fix GET /push_rulesErik Johnston2016-05-311-0/+3
| | |/ / | |/| |
* | | | Merge pull request #804 from matrix-org/erikj/push_rules_cacheErik Johnston2016-05-312-9/+15
|\| | |
| * | | Add caches to bulk_get_push_rules*Erik Johnston2016-05-312-9/+15
* | | | Merge pull request #803 from matrix-org/markjh/liberate_appservice_handlerMark Haines2016-05-317-38/+36
|\ \ \ \ | |_|/ / |/| | |
| * | | Move the AS handler out of the Handlers object.Mark Haines2016-05-317-38/+36
|/ / /
* | | Merge pull request #802 from matrix-org/dbkr/split_room_list_handlerDavid Baker2016-05-313-3/+7
|\ \ \
| * | | Split out the room list handlerDavid Baker2016-05-313-3/+7
|/ / /
* | | Fix to allow start with postgresErik Johnston2016-05-271-2/+7
* | | Send down correct error response if user not foundErik Johnston2016-05-271-2/+7
* | | Merge pull request #795 from matrix-org/dbkr/delete_push_actions_after_a_monthDavid Baker2016-05-244-7/+94
|\ \ \ | |/ / |/| |
| * | Remove debug loggingDavid Baker2016-05-231-1/+0
| * | Oops, missing commaDavid Baker2016-05-201-1/+1
| * | Remove stale lineDavid Baker2016-05-201-2/+0
| * | Handle empty events tableDavid Baker2016-05-201-0/+3
| * | Make deleting push actions more efficientDavid Baker2016-05-203-13/+68
| * | Only delete push actions after 30 daysDavid Baker2016-05-202-6/+38
| |/
* | Check for presence of 'avatar_url' keyDavid Baker2016-05-241-1/+3
* | tweak mail notifsMatrix2016-05-241-6/+8
* | Merge pull request #799 from matrix-org/matthew/quieter-email-notifsDavid Baker2016-05-245-25/+79
|\ \
| * | catch thinko in presentable namesMatthew Hodgson2016-05-231-4/+15
| * | fix NPE in room orderingMatthew Hodgson2016-05-231-2/+2
| * | fix debug textMatthew Hodgson2016-05-232-2/+7
| * | consistency is the better part of valourMatthew Hodgson2016-05-231-1/+1
| * | Tune email notifs to make them quieter:Matthew Hodgson2016-05-232-18/+56
* | | Merge pull request #798 from negzi/bugfix_create_user_featureErik Johnston2016-05-242-13/+30
|\ \ \ | |/ / |/| |
| * | Fix set profile error with Requester.Negi Fazeli2016-05-232-13/+30
|/ /
* / Fix link to A-S specRichard van der Hoff2016-05-231-2/+1
|/
* Merge pull request #794 from matrix-org/kegan/join-with-server-nameKegsay2016-05-191-1/+4
|\
| * Allow clients to specify a server_name to avoid 'No known servers'Kegan Dougal2016-05-191-1/+4
|/
* Merge pull request #793 from matrix-org/matthew/one-push-badge-per-convoMatthew Hodgson2016-05-181-1/+3
|\
| * increment badge count per missed convo, not per msgMatthew Hodgson2016-05-181-1/+3
* | Add desc to get_presence_for_usersErik Johnston2016-05-181-0/+1
* | Merge pull request #792 from matrix-org/markjh/liberate_typing_handlerMark Haines2016-05-178-36/+27
|\ \
| * | Move typing handler out of the Handlers objectMark Haines2016-05-178-36/+27
|/ /
* | Merge pull request #791 from matrix-org/markjh/app_service_configMark Haines2016-05-172-103/+109
|\ \
| * | Move the functions for parsing app service configMark Haines2016-05-172-103/+109
|/ /
* | Merge pull request #790 from matrix-org/markjh/liberate_sync_handlerMark Haines2016-05-174-9/+11
|\ \
| * \ Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handlerMark Haines2016-05-177-25/+61
| |\ \ | |/ / |/| |
* | | Merge pull request #786 from matrix-org/matthew/email_notifs_tuningMatthew Hodgson2016-05-174-9/+46
|\ \ \ | | |/ | |/|
| * | tweak textMatthew Hodgson2016-05-161-2/+2
| * | tune email notifs, fix CSS a bit, and add debugging detailsMatthew Hodgson2016-05-164-9/+46
* | | Merge pull request #789 from matrix-org/markjh/member_cleanupMark Haines2016-05-178-174/+37
|\ \ \
| * | | Remove unused get_joined_rooms_for_userMark Haines2016-05-171-15/+0
| * | | Merge branch 'develop' into markjh/member_cleanupMark Haines2016-05-1714-37/+64
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #787 from matrix-org/markjh/liberate_presence_handlerMark Haines2016-05-1712-36/+49
|\ \ \ \
* \ \ \ \ Merge pull request #788 from matrix-org/markjh/domianMark Haines2016-05-176-19/+19
|\ \ \ \ \
* | | | | | Fix emailpusher importDavid Baker2016-05-161-1/+11
* | | | | | os.environ requires a stringErik Johnston2016-05-161-1/+1
* | | | | | Merge pull request #785 from matrix-org/erikj/cache_factor_synctlyErik Johnston2016-05-161-0/+4
|\ \ \ \ \ \
| * | | | | | Make synctl read a cache factor from config fileErik Johnston2016-05-161-0/+4
| | | | | | * Move SyncHandler out of the Handlers objectMark Haines2016-05-164-9/+11
| | | | | | * Merge branch 'markjh/liberate_presence_handler' into markjh/liberate_sync_han...Mark Haines2016-05-1612-36/+49
| | | | | |/| | | | | |/|/ | | | | |/| | | | |/| |
| | | * | | Don't inherit PresenceHandler from BaseHandler, remove references to self.hs ...Mark Haines2016-05-161-19/+21
| | | * | | Move the presence handler out of the Handlers objectMark Haines2016-05-1612-18/+29
| |_|/ / / |/| | | |
| | | * | Remove get_joined_rooms_for_user from RoomMemberHandlerMark Haines2016-05-163-11/+4
| | | * | get_room_members is unused nowMark Haines2016-05-162-36/+0
| | | * | Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_roomMark Haines2016-05-165-112/+33
| | |/ /
| | * / Spell "domain" correctlyMark Haines2016-05-166-19/+19
| |/ / |/| |
* | | Merge pull request #760 from matrix-org/matthew/preview_url_ip_whitelistMatthew Hodgson2016-05-164-42/+58
|\ \ \ | |/ / |/| |
| * | Clean up the blacklist/whitelist handling.Mark Haines2016-05-163-41/+37
| * | Merge branch 'develop' into matthew/preview_url_ip_whitelistMark Haines2016-05-1675-544/+3178
| |\ \ | |/ / |/| |
* | | fix logoMatrix2016-05-131-1/+1
| |/ |/|
* | rogue imgMatthew Hodgson2016-05-131-1/+0
* | fix matrix.to URLsMatthew Hodgson2016-05-131-2/+2
* | Assert that stream replicated stream positions are intsMark Haines2016-05-133-7/+7
* | Merge pull request #780 from matrix-org/dbkr/email_notifs_on_pusherMark Haines2016-05-133-12/+43
|\ \
| * | Manually expire broken caches like the who_forgot_in_roomMark Haines2016-05-131-0/+16
| * | Use the SlavedAccountDataStoreMark Haines2016-05-131-10/+3
| * | Merge branch 'develop' into dbkr/email_notifs_on_pusherMark Haines2016-05-1319-27/+511
| |\ \ | |/ / |/| |
* | | Merge pull request #783 from matrix-org/markjh/slave_account_dataMark Haines2016-05-132-0/+117
|\ \ \
| * | | Add a slaved datastore for account dataMark Haines2016-05-132-0/+117
* | | | Merge pull request #784 from matrix-org/markjh/receipts_fixMark Haines2016-05-131-4/+6
|\ \ \ \
| * | | | Allow receipts for events we haven't seen in the dbMark Haines2016-05-131-4/+6
|/ / / /
* | | | Merge pull request #741 from negzi/create_user_with_expiryErik Johnston2016-05-1310-9/+301
|\ \ \ \
| * | | | Create user with expiryNegi Fazeli2016-05-1310-9/+301
* | | | | Merge pull request #778 from matrix-org/erikj/add_pusherErik Johnston2016-05-132-4/+17
|\ \ \ \ \
| * | | | | SpellingErik Johnston2016-05-131-1/+1
| * | | | | Fixup add_pusherErik Johnston2016-05-132-4/+17
* | | | | | Merge pull request #769 from matrix-org/erikj/push_actions_deleteErik Johnston2016-05-132-9/+29
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/push_actio...Erik Johnston2016-05-0615-49/+433
| |\ \ \ \ \ \
| * | | | | | | Delete old pushersErik Johnston2016-05-032-9/+29
* | | | | | | | Merge pull request #779 from matrix-org/erikj/receiptsErik Johnston2016-05-131-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Use tree cache for get_linearized_receipts_for_roomErik Johnston2016-05-131-3/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #782 from matrix-org/erikj/remove_indicesErik Johnston2016-05-131-0/+38
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Remove topics tableErik Johnston2016-05-131-1/+0
| * | | | | | | Annotate the removed indicies with why they were removed.Mark Haines2016-05-131-18/+15
| * | | | | | | Remove unused indicesErik Johnston2016-05-131-0/+42
|/ / / / / / /
* | | | | | | Merge pull request #781 from matrix-org/markjh/replication_problemsMark Haines2016-05-132-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Log the stream IDs in an order that makes senseMark Haines2016-05-131-1/+1
| * | | | | | | Make sure we advance our stream positionMark Haines2016-05-131-0/+2
| |/ / / / / /
| | | | | * | Shift some of the state_group methods into the SlavedEventStoreMark Haines2016-05-132-45/+19
| | | | | * | Make email notifs work on the pusher synapseDavid Baker2016-05-132-0/+48
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #777 from matrix-org/markjh/move_filter_for_clientMark Haines2016-05-1311-215/+252
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | missed a spotMark Haines2016-05-121-1/+1
| * | | | | move filter_events_for_client out of base handlerMark Haines2016-05-1110-214/+251
|/ / / / /
* | | | | Merge pull request #776 from matrix-org/markjh/lazy_signing_keyMark Haines2016-05-111-2/+2
|\ \ \ \ \
| * | | | | Shuffle when we get the signing_key attribute.Mark Haines2016-05-111-2/+2
|/ / / / /
* | | | | Merge pull request #775 from matrix-org/erikj/password_hashErik Johnston2016-05-111-1/+4
|\ \ \ \ \
| * | | | | Correctly handle NULL password hashes from the databaseErik Johnston2016-05-111-1/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #774 from matrix-org/markjh/shuffle_base_handlerMark Haines2016-05-114-204/+214
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix typoMark Haines2016-05-111-1/+1
| * | | | Move _create_new_client_event and handle_new_client_event out of base handlerMark Haines2016-05-114-204/+214
|/ / / /
* | | | Pass through _get_state_group_for_eventsDavid Baker2016-05-101-0/+4
* | | | StateStore, not EventsStoreDavid Baker2016-05-101-2/+2
* | | | Cached functions must be accessed through the dictDavid Baker2016-05-101-1/+2
* | | | Pass though _get_state_group_for_eventsDavid Baker2016-05-101-0/+4
* | | | Pass through get_state_groupsDavid Baker2016-05-101-0/+4
* | | | Also pass through get_profile_displaynameDavid Baker2016-05-101-0/+4
* | | | Uncommit accidentally commited edit to cipher listDavid Baker2016-05-101-1/+1
* | | | Pass through get_events to pusher tooDavid Baker2016-05-101-0/+1
* | | | Pass through _get_event_txnDavid Baker2016-05-102-1/+2
* | | | unbreak schemaMatrix2016-05-102-0/+0
* | | | Merge pull request #759 from matrix-org/dbkr/email_notifsMatthew Hodgson2016-05-1031-34/+1470
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/email_notifsDavid Baker2016-05-1023-88/+619
| |\ \ \ \
| * | | | | More consistent config namingDavid Baker2016-05-102-2/+2
| * | | | | Add config option to not send email notifs for new usersDavid Baker2016-05-102-1/+8
| * | | | | Make pep8 happyDavid Baker2016-05-101-1/+1
| * | | | | Switch from CSS to Table layout for HTML mails so they work in Outlook ak...Matthew Hodgson2016-05-1013-302/+240
| * | | | | Switch from CSS to Table layout for HTML mails so they work in Outlook aka WordMatthew Hodgson2016-05-091-0/+7
| * | | | | better mail subject linesMatthew Hodgson2016-05-051-1/+1
| * | | | | fix layout; handle app naming in synapse, not jinjaMatthew Hodgson2016-05-057-22/+45
| * | | | | fix app brandingMatthew Hodgson2016-05-053-3/+3
| * | | | | pep8Matthew Hodgson2016-05-051-2/+4
| * | | | | fix room.txtMatthew Hodgson2016-05-051-4/+7
| * | | | | First cut at Vector-branded mail templatesMatthew Hodgson2016-05-057-0/+229
| * | | | | handle fragments correctly on mxc URLs.Matthew Hodgson2016-05-051-14/+45
| * | | | | spell out emailpusher full pathMatthew Hodgson2016-05-051-1/+1
| * | | | | Include no contextDavid Baker2016-05-041-1/+1
| * | | | | Add date header & message idDavid Baker2016-05-042-1/+4
| * | | | | Correct SQL statement for postgresDavid Baker2016-05-041-2/+3
| * | | | | Add db functions used for email to the pusher appDavid Baker2016-05-041-0/+12
| * | | | | pep8David Baker2016-05-041-0/+1
| * | | | | copyrightMatthew Hodgson2016-05-041-0/+22
| * | | | | fix assorted typos in default configMatthew Hodgson2016-05-041-3/+3
| * | | | | Unused importDavid Baker2016-05-041-1/+0
| * | | | | Catch all exceptions when creating a pusherDavid Baker2016-05-041-2/+2
| * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifsDavid Baker2016-04-291-0/+1
| |\ \ \ \ \
| * | | | | | Add constant for throttle multiplierDavid Baker2016-04-291-1/+2
| * | | | | | Remove unused functionDavid Baker2016-04-292-26/+0
| * | | | | | Remove unused argDavid Baker2016-04-291-2/+2
| * | | | | | DocstringDavid Baker2016-04-291-0/+14
| * | | | | | Use explicit joinDavid Baker2016-04-291-3/+3
| * | | | | | Oops, actually specify the user idDavid Baker2016-04-291-1/+3
| * | | | | | Remove unnecessary ifDavid Baker2016-04-291-1/+1
| * | | | | | Put spaces at start of lineDavid Baker2016-04-291-16/+16
| * | | | | | Try imports in configDavid Baker2016-04-291-0/+7
| * | | | | | Use the constantDavid Baker2016-04-291-1/+2
| * | | | | | Avoid `vars` builtinDavid Baker2016-04-291-15/+15
| * | | | | | Use named parameter formatDavid Baker2016-04-291-14/+22
| * | | | | | Default enable email notifs to FalseDavid Baker2016-04-291-1/+1
| * | | | | | Include res in the manifestDavid Baker2016-04-291-0/+1
| * | | | | | pep8David Baker2016-04-291-1/+0
| * | | | | | Remove rather pointless get functionDavid Baker2016-04-291-9/+1
| * | | | | | Stop processing notifs once we've sent a mailDavid Baker2016-04-291-0/+1
| * | | | | | Correct public_baseurl defaultDavid Baker2016-04-291-2/+2
| * | | | | | Nicer get() shorthandDavid Baker2016-04-291-3/+2
| * | | | | | Remove redundant docstringDavid Baker2016-04-291-4/+0
| * | | | | | Correct default template and add text templateDavid Baker2016-04-291-1/+2
| * | | | | | Send mail notifs with a plaintext part tooDavid Baker2016-04-295-7/+50
| * | | | | | Add an email pusher for new usersDavid Baker2016-04-292-0/+27
| * | | | | | pep8 newlineDavid Baker2016-04-291-1/+1
| * | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifsDavid Baker2016-04-2942-454/+1371
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Remove vector specific styleDavid Baker2016-04-281-14/+0
| * | | | | | Some basic css to make it halfway legibleDavid Baker2016-04-283-16/+58
| * | | | | | Fix notification linkDavid Baker2016-04-281-1/+1
| * | | | | | May as well always include room linkDavid Baker2016-04-281-4/+3
| * | | | | | Put back real delay before mailingDavid Baker2016-04-281-1/+1
| * | | | | | Support file messages & fix plain textDavid Baker2016-04-282-7/+6
| * | | | | | Support image notifsDavid Baker2016-04-282-15/+33
| * | | | | | pep8David Baker2016-04-282-3/+6
| * | | | | | Only import email pusher if email notifs are onDavid Baker2016-04-281-6/+8
| * | | | | | Handle room invites in email notifsDavid Baker2016-04-283-13/+42
| * | | | | | Add the jinja template for individual notifsDavid Baker2016-04-281-0/+32
| * | | | | | Linkify plain text messages tooDavid Baker2016-04-281-1/+12
| * | | | | | Run filter_events_for_clientDavid Baker2016-04-277-20/+24
| * | | | | | Make html messages workDavid Baker2016-04-271-10/+21
| * | | | | | Better grammar for multiple messages in a roomDavid Baker2016-04-272-10/+33
| * | | | | | Hopefully all remaining bits for email notifsDavid Baker2016-04-277-42/+195
| * | | | | | More variable calculation for email notifsDavid Baker2016-04-253-19/+76
| * | | | | | TypoDavid Baker2016-04-251-1/+1
| * | | | | | No we don't: it's just the display nameDavid Baker2016-04-221-1/+0
| * | | | | | Actually do UTF8 correctlyDavid Baker2016-04-221-1/+1
| * | | | | | Sort member eventsDavid Baker2016-04-221-0/+4
| * | | | | | Mime part is binary so encode it first.David Baker2016-04-221-1/+1
| * | | | | | Implement group-of-people namesDavid Baker2016-04-221-17/+14
| * | | | | | No inlineCallbacks necessary on thisDavid Baker2016-04-221-1/+0
| * | | | | | Add WIP email template filesDavid Baker2016-04-212-0/+20
| * | | | | | Flesh out email templatingDavid Baker2016-04-214-4/+208
| * | | | | | Generate mails from a templateDavid Baker2016-04-204-31/+49
| * | | | | | more pep8David Baker2016-04-201-1/+1
| * | | | | | Send a rather basic email notifDavid Baker2016-04-206-12/+136
| * | | | | | Add single instance & logging stuffDavid Baker2016-04-191-8/+39
| * | | | | | First bits of emailpusherDavid Baker2016-04-197-8/+335
* | | | | | | Merge pull request #763 from matrix-org/erikj/ignore_userErik Johnston2016-05-104-9/+93
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_userErik Johnston2016-05-096-28/+23
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #773 from matrix-org/erikj/get_domian_from_idErik Johnston2016-05-096-28/+23
|\ \ \ \ \ \ \
| * | | | | | | Add and use get_domian_from_idErik Johnston2016-05-096-28/+23
| | |_|_|_|/ / | |/| | | | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_userErik Johnston2016-05-0913-58/+479
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #764 from matrix-org/erikj/replication_loggingErik Johnston2016-05-091-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Don't warnErik Johnston2016-05-051-2/+0
| * | | | | | | Add some log information at returned replication streamsErik Johnston2016-05-051-0/+11
* | | | | | | | Merge pull request #772 from matrix-org/erikj/get_user_cacheErik Johnston2016-05-091-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add cache to get_user_by_idErik Johnston2016-05-091-0/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #770 from matrix-org/erikj/transaction_reactorErik Johnston2016-05-091-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Run transaction queue on reactorErik Johnston2016-05-091-0/+3
| |/ / / / / / /
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-05 10:57:10 +0000