| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | Use _simple_select_many for _get_state_group_for_events | Erik Johnston | 2016-02-10 | 1 | -1/+1 |
* | Only calculate initial sync for 10 rooms at a time | Erik Johnston | 2016-02-10 | 1 | -24/+29 |
* | Atomically persit push actions when we persist the event | Erik Johnston | 2016-02-09 | 2 | -11/+11 |
* | Pass in current state to push action handler | Erik Johnston | 2016-02-09 | 1 | -18/+13 |
* | Remove dead code | Erik Johnston | 2016-02-09 | 1 | -12/+0 |
* | Don't load all ephemeral state for a room on every sync | Erik Johnston | 2016-02-09 | 1 | -14/+6 |
* | Fix unit tests | Erik Johnston | 2016-02-09 | 1 | -1/+4 |
* | Measure some /sync related things | Erik Johnston | 2016-02-09 | 2 | -150/+162 |
* | Fix up logcontexts | Erik Johnston | 2016-02-08 | 7 | -87/+57 |
* | Allocate guest user IDs numericcally | Daniel Wagner-Hall | 2016-02-05 | 1 | -19/+36 |
* | Merge pull request #555 from matrix-org/erikj/logcontext | Erik Johnston | 2016-02-03 | 1 | -0/+10 |
|\ |
|
| * | Allowing tagging log contexts | Erik Johnston | 2016-02-03 | 1 | -0/+10 |
* | | Merge pull request #554 from matrix-org/erikj/event_push | Erik Johnston | 2016-02-03 | 1 | -4/+2 |
|\ \ |
|
| * | | Change event_push_actions_rm_tokens schema | Erik Johnston | 2016-02-03 | 1 | -4/+2 |
| |/ |
|
* | | PEP8 | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
* | | Remove unused method | Erik Johnston | 2016-02-03 | 1 | -8/+0 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_roo... | Erik Johnston | 2016-02-03 | 7 | -77/+117 |
|\| |
|
| * | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 6 | -7/+7 |
| * | s/get_room_changes_for_user/get_membership_changes_for_user/ | Erik Johnston | 2016-02-02 | 2 | -2/+2 |
| * | Merge pull request #545 from matrix-org/erikj/sync | Erik Johnston | 2016-02-02 | 1 | -66/+99 |
| |\ |
|
| | * | Comments | Erik Johnston | 2016-02-01 | 1 | -5/+6 |
| | * | Move state calculations from rest to handler | Erik Johnston | 2016-02-01 | 1 | -66/+98 |
| * | | Pass make_guest whne we autogen a user ID | David Baker | 2016-02-02 | 1 | -1/+3 |
| * | | WARN if we get a topo token instead of stream. | Erik Johnston | 2016-02-02 | 1 | -1/+6 |
* | | | Change the way we do public room list fetching | Erik Johnston | 2016-02-02 | 1 | -23/+63 |
|/ / |
|
* | | Order things correctly | Erik Johnston | 2016-02-01 | 1 | -1/+1 |
* | | Switch over /events to use per room caches | Erik Johnston | 2016-02-01 | 1 | -5/+20 |
|/ |
|
* | Add missing param to the log line | Mark Haines | 2016-01-29 | 1 | -1/+2 |
* | Merge remote-tracking branch 'origin/develop' into markjh/3pid | Mark Haines | 2016-01-29 | 2 | -253/+187 |
|\ |
|
| * | Don't work out unread_notifs_for_room_id unless needed | Erik Johnston | 2016-01-29 | 1 | -11/+12 |
| * | Change load limit params | Erik Johnston | 2016-01-28 | 1 | -2/+2 |
| * | Amalgamate incremental and full sync for user | Erik Johnston | 2016-01-28 | 1 | -40/+16 |
| * | Allow paginating backwards from stream token | Erik Johnston | 2016-01-28 | 1 | -6/+9 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync | Erik Johnston | 2016-01-28 | 1 | -22/+21 |
| |\ |
|
| * | | Use the same path for incremental with gap or without gap | Erik Johnston | 2016-01-27 | 1 | -208/+144 |
| * | | Add cache to room stream | Erik Johnston | 2016-01-27 | 1 | -12/+30 |
* | | | Add config option for setting the trusted id servers, disabling checking the ... | Mark Haines | 2016-01-29 | 1 | -8/+17 |
| |/
|/| |
|
* | | Make it possible to paginate forwards from stream tokens | Richard van der Hoff | 2016-01-27 | 1 | -22/+21 |
|/ |
|
* | Federation: drop events which cause SynapseErrors | Richard van der Hoff | 2016-01-27 | 1 | -1/+7 |
* | Merge pull request #524 from matrix-org/erikj/sync | Erik Johnston | 2016-01-25 | 1 | -41/+141 |
|\ |
|
| * | PEP8 | Erik Johnston | 2016-01-25 | 1 | -1/+0 |
| * | Remove weird stuff | Erik Johnston | 2016-01-25 | 1 | -6/+0 |
| * | Move logic from rest/ to handlers/ | Erik Johnston | 2016-01-25 | 1 | -41/+148 |
* | | Underscores are allowed in user ids | Erik Johnston | 2016-01-22 | 1 | -1/+1 |
|/ |
|
* | Only fetch events for rooms and receipts | Erik Johnston | 2016-01-21 | 1 | -3/+3 |
* | Don't explode when given a unicode username in /register/ | Erik Johnston | 2016-01-20 | 1 | -3/+2 |
* | Allow non-guests to peek on rooms using /events | Daniel Wagner-Hall | 2016-01-20 | 5 | -58/+57 |
* | Merge pull request #506 from matrix-org/erikj/push_fast | Erik Johnston | 2016-01-19 | 1 | -28/+22 |
|\ |
|
| * | Only compute unread notifications for rooms we send down stream | Erik Johnston | 2016-01-19 | 1 | -28/+22 |
* | | Don't use form of get_state_for_events with None state_key | Erik Johnston | 2016-01-19 | 1 | -6/+13 |
|/ |
|
* | Add regex cache. Only caculate push actions for users that have sent read rec... | Erik Johnston | 2016-01-19 | 2 | -2/+2 |
* | Use all_ephemeral_by_room in incremental_sync_with_gap_for_room | Erik Johnston | 2016-01-19 | 1 | -3/+5 |
* | Return highlight_count in /sync | Erik Johnston | 2016-01-19 | 1 | -6/+36 |
* | Re-enable urnead notifications | Erik Johnston | 2016-01-18 | 2 | -10/+6 |
* | Allow filtering events for multiple users at once | Erik Johnston | 2016-01-18 | 1 | -39/+54 |
* | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 3 | -16/+100 |
* | Remove unused parameters | Daniel Wagner-Hall | 2016-01-15 | 2 | -16/+8 |
* | M_INVALID_USERNAME to be consistent with the parameter name | David Baker | 2016-01-15 | 1 | -1/+1 |
* | Add specific error code for invalid user names. | David Baker | 2016-01-14 | 1 | -1/+2 |
* | Merge branch 'release-v0.12.1' into develop | Richard van der Hoff | 2016-01-14 | 1 | -12/+23 |
|\ |
|
| * | Add 'event' result to 'context' endpoint | Richard van der Hoff | 2016-01-13 | 1 | -12/+23 |
| * | Skip, rather than erroring, invalid guest requests | Daniel Wagner-Hall | 2016-01-13 | 4 | -19/+4 |
* | | Use logger not logging | Erik Johnston | 2016-01-14 | 1 | -2/+2 |
* | | Don't change signature. Return empty list | Erik Johnston | 2016-01-13 | 1 | -2/+2 |
* | | Temporarily disable notification branch | Erik Johnston | 2016-01-13 | 2 | -7/+11 |
* | | Merge pull request #480 from matrix-org/erikj/guest_event_tightloop | Erik Johnston | 2016-01-13 | 1 | -7/+0 |
|\ \ |
|
| * | | Dont fire user_joined_room when guest hits /events | Erik Johnston | 2016-01-12 | 1 | -7/+0 |
* | | | Don't include old left rooms | Erik Johnston | 2016-01-12 | 1 | -1/+5 |
|/ / |
|
* | | Merge pull request #456 from matrix-org/store_event_actions | David Baker | 2016-01-08 | 4 | -1/+80 |
|\ \ |
|
| * | | comma style | David Baker | 2016-01-06 | 1 | -1/+1 |
| * | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-06 | 1 | -107/+47 |
| |\ \ |
|
| * | | | Add is_guest flag to users db to track whether a user is a guest user or not.... | David Baker | 2016-01-06 | 3 | -9/+9 |
| * | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-05 | 6 | -35/+53 |
| |\ \ \ |
|
| * | | | | comma | David Baker | 2016-01-04 | 1 | -1/+1 |
| * | | | | Add unread_notif_count in incremental_sync_with_gap | David Baker | 2016-01-04 | 1 | -0/+8 |
| * | | | | Rename event-actions to event_push_actions as per PR request | David Baker | 2016-01-04 | 1 | -1/+1 |
| * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-04 | 1 | -1/+24 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| * | | | | Address minor PR issues | David Baker | 2016-01-04 | 2 | -4/+4 |
| * | | | | Fix merge fail with anon access stuff | David Baker | 2015-12-22 | 1 | -2/+2 |
| * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-22 | 2 | -47/+128 |
| |\ \ \ \ |
|
| * | | | | | Add some comments to areas that could be optimised. | David Baker | 2015-12-22 | 1 | -0/+3 |
| * | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-21 | 6 | -43/+140 |
| |\ \ \ \ \ |
|
| * | | | | | | Only run pushers for users on this hs! | David Baker | 2015-12-21 | 2 | -2/+2 |
| * | | | | | | pep8 | David Baker | 2015-12-21 | 1 | -3/+3 |
| * | | | | | | Make unread notification count sending work: put the correct count in increme... | David Baker | 2015-12-18 | 1 | -11/+37 |
| * | | | | | | still very WIP, but now sends unread_notifications_count in the room object o... | David Baker | 2015-12-16 | 1 | -0/+26 |
| * | | | | | | Having consulted The Erikle, this should go at the end of on_receive_pdu, oth... | David Baker | 2015-12-10 | 1 | -11/+6 |
| * | | | | | | Very first cut of calculating actions for events as they come in. Doesn't sto... | David Baker | 2015-12-10 | 2 | -1/+22 |
* | | | | | | | Use logger not logging | Erik Johnston | 2016-01-07 | 1 | -2/+2 |
* | | | | | | | copyrights | Matthew Hodgson | 2016-01-07 | 13 | -13/+13 |
| |_|_|_|_|/
|/| | | | | |
|
* | | | | | | Pass whether the user was a guest to some of the event streams | Mark Haines | 2016-01-06 | 1 | -5/+3 |
* | | | | | | Guest users must be joined to a room to see it in /sync | Mark Haines | 2016-01-06 | 1 | -103/+49 |
| |_|_|_|/
|/| | | | |
|
* | | | | | Skip, rather than erroring, invalid guest requests | Daniel Wagner-Hall | 2016-01-05 | 4 | -19/+4 |
* | | | | | Allow guests to upgrade their accounts | Daniel Wagner-Hall | 2016-01-05 | 4 | -15/+32 |
* | | | | | Return /sync when something under the 'leave' key has changed | Erik Johnston | 2016-01-05 | 1 | -1/+1 |
* | | | | | Use named args | Erik Johnston | 2016-01-05 | 1 | -2/+2 |
* | | | | | Support inviting 3pids in /createRoom | Erik Johnston | 2016-01-05 | 1 | -0/+16 |
| |_|_|/
|/| | | |
|
* | | | | Move the doc string to the public facing method | Mark Haines | 2015-12-22 | 1 | -16/+17 |
* | | | | Add a cache for initialSync responses that expires after 5 minutes | Mark Haines | 2015-12-22 | 1 | -1/+23 |
| |_|/
|/| | |
|
* | | | Include the list of bad room ids in the error | Mark Haines | 2015-12-22 | 1 | -2/+8 |
* | | | Use a list comprehension | Mark Haines | 2015-12-22 | 1 | -3/+4 |
* | | | Hook up read receipts and typing notifications for guest access | Mark Haines | 2015-12-22 | 1 | -13/+11 |
* | | | Merge branch 'develop' into markjh/guest_access | Mark Haines | 2015-12-22 | 1 | -2/+21 |
|\ \ \ |
|
| * | | | Return room avatar URLs in /publicRooms | Daniel Wagner-Hall | 2015-12-21 | 1 | -2/+21 |
| | |/
| |/| |
|
* | | | Allow guest access to /sync | Mark Haines | 2015-12-22 | 1 | -46/+98 |
* | | | Allow guest access if the user provides a list of rooms in the filter | Mark Haines | 2015-12-22 | 1 | -0/+1 |
|/ / |
|
* | | Merge pull request #450 from matrix-org/matthew/no-identicons | Matthew Hodgson | 2015-12-18 | 1 | -19/+3 |
|\ \ |
|
| * | | fix indentation level | Matthew Hodgson | 2015-12-17 | 1 | -3/+3 |
| * | | stop generating default identicons. reverts most of 582019f870adbc4a8a8a9ef97... | Matthew Hodgson | 2015-12-17 | 1 | -19/+3 |
* | | | Merge branch 'release-v0.12.0' into develop | David Baker | 2015-12-18 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Fix typo that broke registration on the mobile clients | David Baker | 2015-12-18 | 1 | -1/+1 |
* | | | | Add display_name to 3pid invite in m.room.member invites | Daniel Wagner-Hall | 2015-12-17 | 1 | -1/+31 |
| |/ /
|/| | |
|
* | | | Strip address and such out of 3pid invites | Daniel Wagner-Hall | 2015-12-17 | 1 | -1/+12 |
|/ / |
|
* | | Give the IS a bunch more 3pid invite context | Daniel Wagner-Hall | 2015-12-16 | 1 | -7/+60 |
* | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-16 | 1 | -3/+8 |
|\ \ |
|
| * | | Fix a race between started/stopped stream | Mark Haines | 2015-12-14 | 1 | -3/+8 |
* | | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-14 | 1 | -4/+12 |
|\| | |
|
| * | | Do the /sync in parallel accross the rooms like /initialSync does | Mark Haines | 2015-12-11 | 1 | -4/+12 |
* | | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-12 | 1 | -1/+1 |
|\| | |
|
| * | | Add caches for whether a room has been forgotten by a user | Mark Haines | 2015-12-10 | 1 | -1/+1 |
| |/ |
|
* | | Merge pull request #435 from matrix-org/erikj/search | Erik Johnston | 2015-12-11 | 1 | -1/+7 |
|\ \ |
|
| * | | Include approximate count of search results | Erik Johnston | 2015-12-11 | 1 | -1/+7 |
| |/ |
|
* / | Ensure that the event that gets persisted is the one that was signed | Paul "LeoNerd" Evans | 2015-12-10 | 1 | -6/+6 |
|/ |
|
* | Merge pull request #405 from matrix-org/erikj/search-ts | Erik Johnston | 2015-12-08 | 1 | -6/+4 |
|\ |
|
| * | Change the result tict to be a list | Erik Johnston | 2015-12-01 | 1 | -6/+4 |
* | | Only include the archived rooms if a include_leave flag in set in the filter | Mark Haines | 2015-12-04 | 1 | -6/+6 |
* | | Merge pull request #419 from matrix-org/markjh/reuse_captcha_client | Mark Haines | 2015-12-03 | 1 | -4/+2 |
|\ \ |
|
| * | | Reuse the captcha client rather than creating a new one for each request | Mark Haines | 2015-12-03 | 1 | -4/+2 |
* | | | Flatten devices into a dict, not a list | Daniel Wagner-Hall | 2015-12-03 | 1 | -4/+3 |
|/ / |
|
* | | Merge pull request #418 from matrix-org/daniel/whois | Daniel Wagner-Hall | 2015-12-03 | 1 | -17/+11 |
|\ \ |
|
| * | | Fix implementation of /admin/whois | Daniel Wagner-Hall | 2015-12-02 | 1 | -17/+11 |
* | | | Make state updates in the C+S API idempotent | Mark Haines | 2015-12-02 | 1 | -0/+12 |
|/ / |
|
* | | Merge pull request #410 from matrix-org/markjh/edu_frequency | Mark Haines | 2015-12-02 | 2 | -5/+15 |
|\ \ |
|
| * | | Use the context returned by _handle_new_event | Mark Haines | 2015-12-02 | 1 | -4/+1 |
| * | | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-02 | 1 | -1/+1 |
| |\ \ |
|
| * | | | Add comments | Mark Haines | 2015-12-02 | 2 | -0/+6 |
| * | | | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-02 | 8 | -56/+90 |
| |\ \ \ |
|
| * | | | | Only fire user_joined_room if the membership has changed | Mark Haines | 2015-12-01 | 1 | -3/+8 |
| * | | | | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-01 | 5 | -91/+173 |
| |\ \ \ \ |
|
| * | | | | | Only fire user_joined_room on the distributor if the user has actually joined... | Mark Haines | 2015-12-01 | 1 | -4/+6 |
* | | | | | | Reuse a single http client, rather than creating new ones | Mark Haines | 2015-12-02 | 1 | -9/+5 |
| |_|_|/ /
|/| | | | |
|
* | | | | | Fix typo in collect_presencelike_data | Mark Haines | 2015-12-02 | 1 | -1/+1 |
| |_|/ /
|/| | | |
|
* | | | | Merge pull request #408 from matrix-org/markjh/distributor_facade | Mark Haines | 2015-12-02 | 7 | -53/+78 |
|\ \ \ \ |
|
| * | | | | Wrap calls to distributor.fire in appropriately named functions so that stati... | Mark Haines | 2015-12-01 | 7 | -53/+78 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #406 from matrix-org/erikj/search | Erik Johnston | 2015-12-02 | 1 | -3/+12 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Search: Don't disregard grouping info in pagination tokens | Erik Johnston | 2015-12-01 | 1 | -3/+12 |
* | | | | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 3 | -22/+111 |
|/ / / |
|
* | | | Merge pull request #404 from matrix-org/markjh/trivial_rename | Mark Haines | 2015-12-01 | 1 | -1/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | Rename presence_handler.send_invite to presence_handler.send_presence_invite ... | Mark Haines | 2015-12-01 | 1 | -1/+1 |
| |/ |
|
* | | Tidy up a bit | Erik Johnston | 2015-12-01 | 1 | -8/+9 |
* | | Allow paginating search ordered by recents | Erik Johnston | 2015-11-30 | 1 | -68/+60 |
|/ |
|
* | Return words to highlight in search results | Erik Johnston | 2015-11-27 | 1 | -3/+16 |
* | Merge pull request #375 from matrix-org/daniel/guestroominitialsync | Daniel Wagner-Hall | 2015-11-23 | 1 | -10/+15 |
|\ |
|
| * | Clean up room initialSync for guest users | Daniel Wagner-Hall | 2015-11-13 | 1 | -10/+15 |
* | | Merge pull request #385 from matrix-org/daniel/forgetrooms | Mark Haines | 2015-11-20 | 2 | -1/+12 |
|\ \ |
|
| * \ | Merge branch 'develop' into daniel/forgetrooms | Paul "LeoNerd" Evans | 2015-11-19 | 4 | -24/+24 |
| |\ \ |
|
| * | | | Simplify code | Daniel Wagner-Hall | 2015-11-19 | 1 | -1/+1 |
| * | | | Apply forgetting properly to historical events | Daniel Wagner-Hall | 2015-11-18 | 1 | -1/+9 |
| * | | | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 1 | -0/+3 |
* | | | | Add option to include the current room state | Erik Johnston | 2015-11-20 | 1 | -0/+24 |
* | | | | Optionally include historic profile info | Erik Johnston | 2015-11-20 | 1 | -1/+30 |
| |/ /
|/| | |
|
* | | | Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data | Mark Haines | 2015-11-19 | 3 | -23/+23 |
|\ \ \ |
|
| * | | | s/private_user_data/account_data/ | Mark Haines | 2015-11-18 | 3 | -23/+23 |
| |/ / |
|
* / / | Take a boolean not a list of lambdas | Daniel Wagner-Hall | 2015-11-19 | 1 | -1/+1 |
|/ / |
|
* | | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-17 | 6 | -140/+278 |
|\| |
|
| * | Fix a few race conditions in the state calculation | Richard van der Hoff | 2015-11-13 | 1 | -60/+63 |
| * | Make handlers.sync return a state dictionary, instead of an event list. | Richard van der Hoff | 2015-11-13 | 1 | -31/+39 |
| * | Update some comments | Richard van der Hoff | 2015-11-13 | 2 | -10/+30 |
| * | Fix missing profile data in federation joins | Erik Johnston | 2015-11-12 | 2 | -5/+9 |
| * | Merge pull request #367 from matrix-org/daniel/readafterleave | Daniel Wagner-Hall | 2015-11-12 | 1 | -10/+11 |
| |\ |
|
| | * | Tweak guest access permissions | Daniel Wagner-Hall | 2015-11-12 | 1 | -10/+11 |
| * | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync | Daniel Wagner-Hall | 2015-11-12 | 1 | -23/+32 |
| |\ \
| | |/
| |/| |
|
| | * | Allow guest access to room initialSync | Daniel Wagner-Hall | 2015-11-11 | 1 | -23/+32 |
| * | | Consider joined guest users as joined users | Daniel Wagner-Hall | 2015-11-12 | 1 | -12/+21 |
| * | | Allow guests to access room context API | Daniel Wagner-Hall | 2015-11-11 | 1 | -3/+9 |
| |/ |
|
| * | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 5 | -9/+81 |
| * | Merge pull request #356 from matrix-org/daniel/3pidyetagain | Daniel Wagner-Hall | 2015-11-10 | 1 | -5/+3 |
| |\ |
|
| | * | Get display name from identity server, not client | Daniel Wagner-Hall | 2015-11-09 | 1 | -5/+3 |
| * | | Don't fiddle with results returned by event sources | Richard van der Hoff | 2015-11-09 | 1 | -4/+12 |
| * | | SYN-513: Include updates for rooms that have had all their tags deleted | Mark Haines | 2015-11-09 | 1 | -1/+1 |
| |/ |
|
* | | Minor review fixes | Steven Hammerton | 2015-11-11 | 1 | -4/+4 |
* | | Share more code between macaroon validation | Steven Hammerton | 2015-11-11 | 1 | -48/+7 |
* | | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-05 | 11 | -91/+357 |
|\| |
|
| * | Merge pull request #350 from matrix-org/erikj/search | Erik Johnston | 2015-11-05 | 1 | -18/+183 |
| |\ |
|
| | * | Be explicit about what we're doing | Erik Johnston | 2015-11-05 | 1 | -1/+1 |
| | * | Remove redundant test | Erik Johnston | 2015-11-05 | 1 | -1/+0 |
| | * | Increment by one, not five | Erik Johnston | 2015-11-05 | 1 | -1/+1 |
| | * | COMMENTS | Erik Johnston | 2015-11-05 | 1 | -4/+26 |