| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | Merge pull request #800 from matrix-org/erikj/sync_refactor | Erik Johnston | 2016-06-02 | 1 | -537/+607 |
| |\ \ |
|
| | * | | Change short circuit path | Erik Johnston | 2016-05-24 | 1 | -16/+26 |
| | * | | Don't send down all ephemeral events | Erik Johnston | 2016-05-24 | 1 | -1/+3 |
| | * | | Only work out newly_joined_users for incremental sync | Erik Johnston | 2016-05-24 | 1 | -6/+9 |
| | * | | Only include non-offline presence in initial sync | Erik Johnston | 2016-05-24 | 1 | -0/+3 |
| | * | | Spell builder correctly | Erik Johnston | 2016-05-24 | 1 | -63/+63 |
| | * | | Inline function. Make load_filtered_recents private | Erik Johnston | 2016-05-24 | 1 | -17/+7 |
| | * | | Add comments | Erik Johnston | 2016-05-24 | 1 | -7/+105 |
| | * | | Shuffle things room | Erik Johnston | 2016-05-24 | 1 | -37/+33 |
| | * | | Add back concurrently_execute | Erik Johnston | 2016-05-23 | 1 | -25/+9 |
| | * | | Refactor SyncHandler | Erik Johnston | 2016-05-23 | 1 | -497/+481 |
* | | | | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 3 | -4/+2 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Split out the auth handler | David Baker | 2016-06-02 | 2 | -3/+1 |
| |/ / |
|
| * | | Fix room list spidering | David Baker | 2016-06-01 | 1 | -1/+1 |
* | | | Email unsubscribing that may in theory, work | David Baker | 2016-06-02 | 1 | -0/+5 |
|/ / |
|
* | | Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider | David Baker | 2016-06-01 | 3 | -22/+7 |
|\ \ |
|
| * | | Move the AS handler out of the Handlers object. | Mark Haines | 2016-05-31 | 3 | -22/+7 |
* | | | Add cache to remote room lists | David Baker | 2016-05-31 | 1 | -4/+30 |
* | | | Basic, un-cached support for secondary_directory_servers | David Baker | 2016-05-31 | 1 | -1/+32 |
|/ / |
|
* | | Split out the room list handler | David Baker | 2016-05-31 | 1 | -2/+1 |
* | | Send down correct error response if user not found | Erik Johnston | 2016-05-27 | 1 | -2/+7 |
* | | Fix set profile error with Requester. | Negi Fazeli | 2016-05-23 | 1 | -4/+5 |
|/ |
|
* | Move typing handler out of the Handlers object | Mark Haines | 2016-05-17 | 2 | -20/+15 |
* | Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handler | Mark Haines | 2016-05-17 | 1 | -15/+0 |
|\ |
|
| * | Remove unused get_joined_rooms_for_user | Mark Haines | 2016-05-17 | 1 | -15/+0 |
| * | Merge branch 'develop' into markjh/member_cleanup | Mark Haines | 2016-05-17 | 5 | -25/+25 |
| |\ |
|
| | * | Merge pull request #787 from matrix-org/markjh/liberate_presence_handler | Mark Haines | 2016-05-17 | 5 | -25/+25 |
| | |\ |
|
* | | | | Move SyncHandler out of the Handlers object | Mark Haines | 2016-05-16 | 2 | -7/+5 |
* | | | | Merge branch 'markjh/liberate_presence_handler' into markjh/liberate_sync_han... | Mark Haines | 2016-05-16 | 5 | -25/+25 |
|\ \ \ \
| |/ / /
|/| | /
| | |/
| |/| |
|
| * | | Don't inherit PresenceHandler from BaseHandler, remove references to self.hs ... | Mark Haines | 2016-05-16 | 1 | -19/+21 |
| * | | Move the presence handler out of the Handlers object | Mark Haines | 2016-05-16 | 5 | -7/+5 |
* | | | Remove get_joined_rooms_for_user from RoomMemberHandler | Mark Haines | 2016-05-16 | 3 | -11/+4 |
* | | | Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_room | Mark Haines | 2016-05-16 | 3 | -67/+27 |
| |/
|/| |
|
* | | Spell "domain" correctly | Mark Haines | 2016-05-16 | 3 | -8/+8 |
|/ |
|
* | Merge pull request #741 from negzi/create_user_with_expiry | Erik Johnston | 2016-05-13 | 2 | -2/+55 |
|\ |
|
| * | Create user with expiry | Negi Fazeli | 2016-05-13 | 2 | -2/+55 |
* | | missed a spot | Mark Haines | 2016-05-12 | 1 | -1/+1 |
* | | move filter_events_for_client out of base handler | Mark Haines | 2016-05-11 | 5 | -204/+29 |
* | | Shuffle when we get the signing_key attribute. | Mark Haines | 2016-05-11 | 1 | -2/+2 |
* | | Merge pull request #775 from matrix-org/erikj/password_hash | Erik Johnston | 2016-05-11 | 1 | -1/+4 |
|\ \ |
|
| * | | Correctly handle NULL password hashes from the database | Erik Johnston | 2016-05-11 | 1 | -1/+4 |
| |/ |
|
* | | Fix typo | Mark Haines | 2016-05-11 | 1 | -1/+1 |
* | | Move _create_new_client_event and handle_new_client_event out of base handler | Mark Haines | 2016-05-11 | 4 | -204/+214 |
|/ |
|
* | Merge pull request #759 from matrix-org/dbkr/email_notifs | Matthew Hodgson | 2016-05-10 | 5 | -12/+12 |
|\ |
|
| * | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 3 | -16/+10 |
| |\ |
|
| * \ | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 1 | -1/+1 |
| |\ \ |
|
| * | | | Run filter_events_for_client | David Baker | 2016-04-27 | 5 | -12/+12 |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 3 | -15/+9 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 3 | -15/+9 |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 1 | -1/+1 |
|\| | | |
|
| * | | | Reduce database inserts when sending transactions | Erik Johnston | 2016-05-06 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | Add bulk fetch storage API | Erik Johnston | 2016-05-05 | 2 | -8/+4 |
* | | | Implement basic ignore user | Erik Johnston | 2016-05-04 | 2 | -6/+42 |
|/ / |
|
* / | fix typo | Matthew Hodgson | 2016-04-28 | 1 | -1/+1 |
|/ |
|
* | Simplify _check_password | Erik Johnston | 2016-04-15 | 1 | -5/+9 |
* | Fix check_password rather than inverting the meaning of _check_local_password... | Mark Haines | 2016-04-14 | 1 | -9/+12 |
* | Fix login to error for nonexistent users | David Baker | 2016-04-14 | 1 | -1/+1 |
* | Merge pull request #718 from matrix-org/erikj/public_room_list | Erik Johnston | 2016-04-13 | 1 | -5/+8 |
|\ |
|
| * | Don't return empty public rooms | Erik Johnston | 2016-04-12 | 1 | -5/+8 |
* | | Don't auto log failed auth checks | Erik Johnston | 2016-04-13 | 2 | -9/+31 |
|/ |
|
* | More comments | Erik Johnston | 2016-04-12 | 1 | -0/+9 |
* | More comments | Erik Johnston | 2016-04-12 | 1 | -0/+6 |
* | Don't append to unused list | Erik Johnston | 2016-04-12 | 1 | -4/+0 |
* | Add back backfilled parameter that was removed | Erik Johnston | 2016-04-12 | 1 | -1/+3 |
* | Add comment | Erik Johnston | 2016-04-12 | 1 | -0/+1 |
* | Check if we've already backfilled events | Erik Johnston | 2016-04-12 | 1 | -7/+20 |
* | Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions | David Baker | 2016-04-11 | 3 | -6/+32 |
|\ |
|
| * | Add comments on min_stream_id | David Baker | 2016-04-07 | 1 | -0/+1 |
| * | Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_act... | David Baker | 2016-04-07 | 3 | -12/+49 |
| |\ |
|
| * | | Send badge count pushes. | David Baker | 2016-04-07 | 1 | -4/+17 |
| * | | Make pushers use the event_push_actions table instead of listening on an even... | David Baker | 2016-04-06 | 2 | -2/+14 |
* | | | Merge pull request #707 from matrix-org/markjh/remove_changed_presencelike_data | Erik Johnston | 2016-04-08 | 1 | -15/+0 |
|\ \ \ |
|
| * | | | changed_presencelike_data isn't observed anywhere in synapse so can be removed | Mark Haines | 2016-04-08 | 1 | -15/+0 |
* | | | | Remove some unused functions (#711) | Mark Haines | 2016-04-08 | 2 | -42/+0 |
* | | | | Move all the wrapper functions for distributor.fire | Mark Haines | 2016-04-08 | 4 | -38/+3 |
|/ / / |
|
* | | | Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_data | Mark Haines | 2016-04-08 | 2 | -37/+1 |
|\ \ \ |
|
| * | | | Call profile handler get_displayname directly rather than using collect_prese... | Mark Haines | 2016-04-07 | 2 | -37/+1 |
* | | | | Merge pull request #701 from DoubleMalt/ldap-auth | Erik Johnston | 2016-04-07 | 1 | -9/+77 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | fix check for failed authentication | Christoph Witzany | 2016-04-06 | 1 | -2/+4 |
| * | | | remove line | Christoph Witzany | 2016-04-06 | 1 | -1/+0 |
| * | | | make tests for ldap more specific to not be fooled by Mocks | Christoph Witzany | 2016-04-06 | 1 | -3/+3 |
| * | | | output ldap version for info and to pacify pep8 | Christoph Witzany | 2016-04-06 | 1 | -0/+2 |
| * | | | conditionally import ldap | Christoph Witzany | 2016-04-06 | 1 | -2/+5 |
| * | | | fix pep8 | Christoph Witzany | 2016-04-06 | 1 | -2/+1 |
| * | | | fix exception handling | Christoph Witzany | 2016-04-06 | 1 | -2/+2 |
| * | | | code style | Christoph Witzany | 2016-04-06 | 1 | -6/+13 |
| * | | | add tls property and twist my head around twisted | Christoph Witzany | 2016-04-06 | 1 | -15/+29 |
| * | | | move LDAP authentication to AuthenticationHandler | Christoph Witzany | 2016-04-06 | 1 | -6/+48 |
* | | | | Merge pull request #700 from matrix-org/erikj/deduplicate_joins | Erik Johnston | 2016-04-07 | 1 | -0/+31 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Deduplicate joins | Erik Johnston | 2016-04-07 | 1 | -0/+31 |
* | | | | Set profile information when joining rooms remotely | Erik Johnston | 2016-04-07 | 1 | -0/+5 |
|/ / / |
|
* / / | Let users see their own leave events | Richard van der Hoff | 2016-04-06 | 1 | -11/+40 |
|/ / |
|
* | | Merge pull request #693 from matrix-org/erikj/backfill_self | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
|\ \
| |/
|/| |
|
| * | Don't backfill from self | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
* | | Merge pull request #691 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 2 | -15/+37 |
|\ \ |
|
| * | | Fix stuck invites | Erik Johnston | 2016-04-05 | 2 | -15/+37 |
* | | | Merge pull request #690 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
|\| | |
|
| * | | Docs and indents | Erik Johnston | 2016-04-04 | 1 | -1/+4 |
| * | | Store invites in a separate table. | Erik Johnston | 2016-04-04 | 1 | -1/+1 |
* | | | Merge pull request #689 from matrix-org/erikj/member | Erik Johnston | 2016-04-04 | 3 | -149/+169 |
|\| | |
|
| * | | Use computed prev event ids | Erik Johnston | 2016-04-01 | 3 | -13/+25 |
| * | | Remove state hack from _create_new_client_event | Erik Johnston | 2016-04-01 | 1 | -43/+0 |
| * | | Do checks for memberships before creating events | Erik Johnston | 2016-04-01 | 1 | -93/+144 |
* | | | Merge pull request #686 from matrix-org/markjh/doc_strings | Mark Haines | 2016-04-01 | 5 | -72/+101 |
|\ \ \
| |/ /
|/| | |
|
| * | | Use google style doc strings. | Mark Haines | 2016-04-01 | 5 | -72/+101 |
* | | | Add concurrently_execute function | Erik Johnston | 2016-04-01 | 3 | -74/+51 |
* | | | Filter rooms list before chunking | Erik Johnston | 2016-04-01 | 1 | -6/+12 |
* | | | Remove outlier parameter from compute_event_context | Mark Haines | 2016-03-31 | 2 | -9/+5 |
|/ / |
|
* | | Merge pull request #680 from matrix-org/markjh/remove_is_new_state | Mark Haines | 2016-03-31 | 1 | -16/+4 |
|\ \ |
|
| * | | Remove the is_new_state argument to persist event. | Mark Haines | 2016-03-31 | 1 | -16/+4 |
| |/ |
|
* / | Split out RoomMemberHandler | Erik Johnston | 2016-03-31 | 3 | -603/+651 |
|/ |
|
* | Line length | Erik Johnston | 2016-03-31 | 1 | -1/+3 |
* | Only forget room if you were in the room | Erik Johnston | 2016-03-30 | 1 | -1/+2 |
* | Require user to have left room to forget room | Erik Johnston | 2016-03-30 | 1 | -6/+16 |
* | Add a response cache for getting the public room list | Mark Haines | 2016-03-24 | 1 | -1/+11 |
* | Deduplicate identical /sync requests | Mark Haines | 2016-03-24 | 1 | -1/+15 |
* | Ensure all old public rooms have aliases | Erik Johnston | 2016-03-23 | 1 | -4/+5 |
* | Ensure published rooms have public join rules | Erik Johnston | 2016-03-23 | 1 | -0/+7 |
* | Comment | Erik Johnston | 2016-03-23 | 1 | -0/+3 |
* | Don't require alias in public room list. | Erik Johnston | 2016-03-23 | 1 | -14/+13 |
* | Merge pull request #657 from matrix-org/erikj/roomlist | Erik Johnston | 2016-03-22 | 1 | -0/+22 |
|\ |
|
| * | Doc string | Erik Johnston | 2016-03-22 | 1 | -0/+6 |
| * | an invalide is something else... | Matthew Hodgson | 2016-03-22 | 1 | -1/+1 |
| * | Add published room list edit API | Erik Johnston | 2016-03-21 | 1 | -0/+16 |
* | | Remove unused backfilled parameter from persist_event | Mark Haines | 2016-03-21 | 1 | -23/+15 |
* | | remove unused current_state variable from on_receive_pdu | Mark Haines | 2016-03-21 | 1 | -2/+0 |
|/ |
|
* | Merge pull request #652 from matrix-org/erikj/delete_alias | Erik Johnston | 2016-03-18 | 1 | -6/+47 |
|\ |
|
| * | Check canonical alias event exists | Erik Johnston | 2016-03-17 | 1 | -1/+2 |
| * | Update aliases event after deletion | Erik Johnston | 2016-03-17 | 1 | -6/+46 |
* | | Merge pull request #650 from matrix-org/dbkr/register_idempotent_with_username | David Baker | 2016-03-17 | 2 | -1/+25 |
|\ \ |
|
| * | | Make registration idempotent, part 2: be idempotent if the client specifies a... | David Baker | 2016-03-16 | 2 | -1/+25 |
| |/ |
|
* | | Remove another unused function from presence | Mark Haines | 2016-03-17 | 1 | -4/+0 |
* | | Remove dead code left over from presence changes | Mark Haines | 2016-03-17 | 2 | -74/+0 |
|/ |
|
* | pep8 | David Baker | 2016-03-16 | 1 | -1/+2 |
* | time_msec() | David Baker | 2016-03-16 | 1 | -1/+1 |
* | string with symbols is a bit too symboly. | David Baker | 2016-03-16 | 1 | -1/+1 |
* | Replace other time.time(). | David Baker | 2016-03-16 | 1 | -2/+1 |
* | Use hs get_clock instead of time.time() | David Baker | 2016-03-16 | 1 | -2/+2 |
* | pep8 & remove debug logging | David Baker | 2016-03-16 | 1 | -1/+1 |
* | Make registration idempotent: if you specify the same session, make it give y... | David Baker | 2016-03-16 | 1 | -12/+48 |
* | Remove needless PreserveLoggingContext | Erik Johnston | 2016-03-15 | 1 | -5/+4 |
* | Persist rejection of invites over federation | Erik Johnston | 2016-03-15 | 1 | -1/+17 |
* | Add config to create guest account on 3pid invite | Erik Johnston | 2016-03-14 | 1 | -25/+32 |
* | Make select more sensible when dseleting access tokens, rename pusher deletio... | David Baker | 2016-03-11 | 1 | -1/+1 |
* | Delete old, unused methods and rename new one to just be `user_delete_access_... | David Baker | 2016-03-11 | 1 | -1/+1 |
* | Dear PyCharm, please indent sensibly for me. Thx. | David Baker | 2016-03-11 | 1 | -2/+2 |
* | Fix cache invalidation so deleting access tokens (which we did when changing ... | David Baker | 2016-03-11 | 1 | -4/+9 |
* | Store appservice ID on register | Daniel Wagner-Hall | 2016-03-10 | 1 | -1/+4 |
* | Merge pull request #631 from matrix-org/markjh/py3v1 | Mark Haines | 2016-03-08 | 2 | -2/+2 |
|\ |
|
| * | Use syntax that works on both py2.7 and py3 | Mark Haines | 2016-03-07 | 2 | -2/+2 |
* | | Send the user ID matching the guest access token, since there is no Matrix AP... | David Baker | 2016-03-07 | 1 | -0/+5 |
|/ |
|
* | Merge pull request #626 from matrix-org/erikj/visibility | Erik Johnston | 2016-03-07 | 1 | -0/+26 |
|\ |
|
| * | Send history visibility on boundary changes | Erik Johnston | 2016-03-04 | 1 | -0/+26 |
* | | Merge pull request #618 from matrix-org/markjh/pushrule_stream | Mark Haines | 2016-03-04 | 2 | -2/+24 |
|\ \ |
|
| * | | Merge branch 'develop' into markjh/pushrule_stream | Mark Haines | 2016-03-04 | 10 | -80/+162 |
| |\| |
|
| * | | Hook up the push rules stream to account_data in /sync | Mark Haines | 2016-03-04 | 1 | -0/+22 |
| * | | Hook up the push rules to the notifier | Mark Haines | 2016-03-03 | 1 | -2/+2 |
* | | | Merge pull request #625 from matrix-org/erikj/kick_ban_sync | Erik Johnston | 2016-03-04 | 1 | -3/+9 |
|\ \ \ |
|
| * | | | Always include kicks and bans in full /sync | Erik Johnston | 2016-03-04 | 1 | -3/+9 |
| | |/
| |/| |
|
* | | | Spelling | Erik Johnston | 2016-03-04 | 1 | -1/+1 |
* | | | Add profile information to invites | Erik Johnston | 2016-03-04 | 1 | -2/+15 |
|/ / |
|
* | | Merge pull request #598 from Rugvip/invite-state | Erik Johnston | 2016-03-04 | 1 | -6/+2 |
|\ \ |
|
| * | | config,handlers/_base: added homeserver config for what state is included in ... | Patrik Oldsberg | 2016-03-04 | 1 | -6/+2 |
* | | | Merge pull request #596 from Rugvip/create | Erik Johnston | 2016-03-04 | 1 | -0/+6 |
|\ \ \
| |/ /
|/| | |
|
| * | | handlers/_base: don't allow room create event to be changed | Patrik Oldsberg | 2016-02-23 | 1 | -0/+6 |
* | | | Merge pull request #610 from Rugvip/unique-user | Erik Johnston | 2016-03-04 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | handlers/register: make sure another user id is generated when a collision oc... | Patrik Oldsberg | 2016-02-29 | 1 | -0/+1 |
* | | | | Merge pull request #623 from matrix-org/rav/fix_createroom_race | Richard van der Hoff | 2016-03-04 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Make sure we add all invited members before returning from createRoom | Richard van der Hoff | 2016-03-04 | 1 | -1/+1 |
* | | | | | Merge pull request #614 from matrix-org/erikj/alias_delete | Erik Johnston | 2016-03-04 | 1 | -6/+21 |
|\ \ \ \ \ |
|
| * | | | | | Allow alias creators to delete aliases | Erik Johnston | 2016-03-01 | 1 | -6/+21 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge remote-tracking branch 'origin/develop' into rav/SYN-642 | Richard van der Hoff | 2016-03-03 | 7 | -57/+85 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Merge pull request #621 from matrix-org/daniel/ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 6 | -56/+84 |
| |\ \ \ \ |
|
| | * | | | | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 6 | -56/+84 |
| * | | | | | Stop using checkpw as it seems to have vanished from bcrypt. Use `bcrypt.hash... | David Baker | 2016-03-02 | 1 | -1/+1 |
| |/ / / / |
|
* | | | | | Merge branch 'develop' into rav/SYN-642 | Richard van der Hoff | 2016-03-03 | 3 | -2/+37 |
|\| | | | |
|
| * | | | | Merge pull request #612 from matrix-org/erikj/cache_size | Erik Johnston | 2016-03-02 | 2 | -2/+4 |
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | * | | | Add enviroment variable SYNAPSE_CACHE_FACTOR, default it to 0.1 | Erik Johnston | 2016-03-01 | 2 | -2/+4 |
| | |/ / |
|
| * / / | Add a /replication API for extracting the updates that happened on | Mark Haines | 2016-03-01 | 2 | -0/+33 |
| |/ / |
|
* | | | Fix typo | Richard van der Hoff | 2016-03-03 | 1 | -1/+1 |
* | | | Move arg default to the start of the function | Richard van der Hoff | 2016-03-02 | 1 | -2/+3 |
* | | | fix pyflakes quibble | Richard van der Hoff | 2016-03-02 | 1 | -1/+2 |
* | | | Address review comments | Richard van der Hoff | 2016-03-02 | 2 | -8/+17 |
* | | | Fix pyflakes warning | Richard van der Hoff | 2016-03-01 | 1 | -1/+1 |
* | | | Handle rejections of invites from local users locally | Richard van der Hoff | 2016-03-01 | 2 | -8/+31 |
|/ / |
|
* | | Send the invier's member event in room invite state so the invitee has their ... | David Baker | 2016-02-25 | 1 | -1/+7 |
* | | Generate guest access token on 3pid invites | Daniel Wagner-Hall | 2016-02-24 | 2 | -0/+23 |
* | | Check presence token interval is less than 100, rather than the token itself | Erik Johnston | 2016-02-23 | 1 | -4/+4 |
* | | Merge pull request #602 from matrix-org/erikj/presence | Erik Johnston | 2016-02-23 | 1 | -19/+45 |
|\ \ |
|
| * | | Handle get_all_entities_changed returning None | Erik Johnston | 2016-02-23 | 1 | -0/+3 |
| * | | Add comments | Erik Johnston | 2016-02-23 | 1 | -0/+4 |
| * | | Change the way we figure out presence updates for small deltas | Erik Johnston | 2016-02-23 | 1 | -17/+36 |
* | | | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 2 | -29/+131 |
* | | | Merge pull request #600 from matrix-org/erikj/presence | Erik Johnston | 2016-02-23 | 1 | -26/+30 |
|\| | |
|
| * | | Don't include defer.returnValue in Measure block | Erik Johnston | 2016-02-23 | 1 | -9/+12 |
| * | | Measure PresenceEventSource.get_new_events | Erik Johnston | 2016-02-23 | 1 | -34/+35 |
* | | | handlers/sync: style fix, line too long | Patrik Oldsberg | 2016-02-23 | 1 | -1/+5 |
* | | | Pick up currently_active across federation | Erik Johnston | 2016-02-23 | 1 | -0/+1 |
* | | | handlers/sync: fix SyncResult not counting account_data change when convertin... | Patrik Oldsberg | 2016-02-23 | 1 | -1/+1 |
| |/
|/| |
|
* | | Merge pull request #587 from matrix-org/rav/guest_access_after_room_join | Richard van der Hoff | 2016-02-22 | 2 | -15/+40 |
|\ \
| |/
|/| |
|
| * | address review comments | Richard van der Hoff | 2016-02-22 | 1 | -7/+2 |
| * | Interpret unknown visibilities the same as shared | Richard van der Hoff | 2016-02-19 | 1 | -11/+13 |
| * | Merge branch 'develop' into rav/guest_access_after_room_join | Richard van der Hoff | 2016-02-19 | 9 | -1348/+1160 |
| |\ |
|
| * | | Allow guest users access to messages in rooms they have joined | Richard van der Hoff | 2016-02-19 | 2 | -13/+41 |
* | | | Remove superfluous call to get_state_at when we already have an event for tha... | Erik Johnston | 2016-02-22 | 1 | -4/+12 |
* | | | Correctly filter states | Erik Johnston | 2016-02-19 | 1 | -2/+2 |
* | | | Only send presence updates to remote hosts if user is ours | Erik Johnston | 2016-02-19 | 1 | -2/+10 |
* | | | Add Measures to presence | Erik Johnston | 2016-02-19 | 1 | -57/+62 |
| |/
|/| |
|
* | | Add presence metric | Erik Johnston | 2016-02-19 | 1 | -0/+3 |
* | | Remove spurious extra metrics | Erik Johnston | 2016-02-19 | 1 | -1/+0 |
* | | Merge pull request #586 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 1 | -6/+26 |
|\ \ |
|
| * | | Don't set currently_active for remote presence | Erik Johnston | 2016-02-19 | 1 | -6/+12 |
| * | | More metrics | Erik Johnston | 2016-02-19 | 1 | -0/+6 |
| * | | Add presence metrics | Erik Johnston | 2016-02-19 | 1 | -0/+8 |
* | | | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 5 | -1028/+784 |
|\| | |
|
| * | | Remove invalid arg. | Erik Johnston | 2016-02-18 | 1 | -1/+0 |
| * | | Add unit test | Erik Johnston | 2016-02-18 | 1 | -93/+187 |
| * | | Add stuff pulled from the DB to the cache | Erik Johnston | 2016-02-18 | 1 | -2/+4 |
| * | | PEP8 | Erik Johnston | 2016-02-18 | 1 | -2/+2 |
| * | | Prefix TS fields with _ts | Erik Johnston | 2016-02-18 | 1 | -27/+27 |
| * | | Remove status_msg when going offline. Don't offline -> online if you send a m... | Erik Johnston | 2016-02-18 | 1 | -5/+15 |
| * | | Check presence state is a valid one | Erik Johnston | 2016-02-18 | 1 | -0/+6 |
| * | | Move if statement | Erik Johnston | 2016-02-18 | 1 | -8/+8 |
| * | | Comment | Erik Johnston | 2016-02-18 | 1 | -0/+2 |
| * | | Remove spurious comment | Erik Johnston | 2016-02-17 | 1 | -1/+0 |
| * | | Initial cut | Erik Johnston | 2016-02-17 | 5 | -1050/+694 |
| |/ |
|
* | | Merge pull request #573 from matrix-org/erikj/sync_fix | Erik Johnston | 2016-02-18 | 1 | -5/+12 |
|\ \ |
|
| * | | Mitigate against incorrect old state in /sync. | Erik Johnston | 2016-02-12 | 1 | -5/+12 |
* | | | Review comments | Daniel Wagner-Hall | 2016-02-18 | 3 | -7/+7 |
* | | | Some cleanup | Daniel Wagner-Hall | 2016-02-17 | 1 | -66/+58 |
* | | | Respond to federated invite with non-empty context | Daniel Wagner-Hall | 2016-02-17 | 2 | -42/+61 |
* | | | Some cleanup, some TODOs, more to do | Daniel Wagner-Hall | 2016-02-16 | 1 | -68/+60 |
* | | | Some cleanup | Daniel Wagner-Hall | 2016-02-16 | 2 | -23/+30 |
* | | | Tidy? up room creation event sending | Daniel Wagner-Hall | 2016-02-16 | 1 | -63/+72 |
* | | | Add comment | Daniel Wagner-Hall | 2016-02-16 | 1 | -1/+1 |
* | | | Merge branch 'develop' into daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-16 | 1 | -3/+3 |
|\ \ \
| | |/
| |/| |
|
| * | | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -40/+28 |
* | | | Branch off member and non member sends | Daniel Wagner-Hall | 2016-02-15 | 4 | -69/+83 |
* | | | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -37/+25 |
* | | | Use update_membership for profile updates | Daniel Wagner-Hall | 2016-02-15 | 2 | -20/+12 |
* | | | Use update_membership to kick guests | Daniel Wagner-Hall | 2016-02-15 | 2 | -16/+19 |
* | | | Reuse update_membership from /join | Daniel Wagner-Hall | 2016-02-15 | 1 | -3/+9 |
* | | | Inline _do_local_membership_update | Daniel Wagner-Hall | 2016-02-15 | 1 | -18/+7 |
* | | | Inline _do_join as it now only has one caller | Daniel Wagner-Hall | 2016-02-15 | 1 | -48/+47 |
* | | | Merge implementation of /join by alias or ID | Daniel Wagner-Hall | 2016-02-15 | 3 | -33/+32 |
* | | | Merge some room joining codepaths | Daniel Wagner-Hall | 2016-02-15 | 1 | -4/+10 |
|/ / |
|
* | | Revert "Merge two of the room join codepaths" | Daniel Wagner-Hall | 2016-02-12 | 2 | -44/+11 |
* | | Merge two of the room join codepaths | Daniel Wagner-Hall | 2016-02-12 | 2 | -11/+44 |
* | | Enforce user_id exclusivity for AS registrations | Daniel Wagner-Hall | 2016-02-11 | 1 | -5/+12 |
|/ |
|
* | Return events in correct order for /events | Erik Johnston | 2016-02-11 | 1 | -0/+1 |