Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1097 from matrix-org/erikj/replication_typing_rest | Erik Johnston | 2016-09-12 | 2 | -1/+11 |
|\ | |||||
| * | Comment | Erik Johnston | 2016-09-09 | 1 | -0/+3 |
| * | Correctly handle typing stream id resetting | Erik Johnston | 2016-09-09 | 1 | -1/+8 |
* | | Merge pull request #1095 from matrix-org/erikj/batch_edus | Erik Johnston | 2016-09-12 | 5 | -20/+60 |
|\ \ | |||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/batch_edus | Erik Johnston | 2016-09-09 | 9 | -33/+148 |
| |\ \ | |||||
| * | | | Fix incorrect attribute name | Erik Johnston | 2016-09-09 | 1 | -1/+1 |
| * | | | Comment | Erik Johnston | 2016-09-09 | 1 | -0/+1 |
| * | | | Add edu.type as part of key. Remove debug logging | Erik Johnston | 2016-09-09 | 1 | -2/+3 |
| * | | | Clobber EDUs in send queue | Erik Johnston | 2016-09-09 | 5 | -20/+58 |
* | | | | Merge pull request #1100 from VShell/fix-cas | Richard van der Hoff | 2016-09-09 | 1 | -5/+2 |
|\ \ \ \ | |||||
| * | | | | Conform better to the CAS protocol specification | Shell Turner | 2016-09-09 | 1 | -5/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1099 from matrix-org/dbkr/make_notif_highlight_query_fast | David Baker | 2016-09-09 | 2 | -1/+21 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge remote-tracking branch 'origin/develop' into dbkr/make_notif_highlight_... | David Baker | 2016-09-09 | 32 | -256/+967 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1096 from matrix-org/markjh/get_access_token | Mark Haines | 2016-09-09 | 6 | -27/+67 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Add helper function for getting access_tokens from requests | Mark Haines | 2016-09-09 | 6 | -27/+67 |
* | | | | Merge pull request #1091 from matrix-org/paul/third-party-lookup | Paul Evans | 2016-09-09 | 3 | -4/+72 |
|\ \ \ \ | |||||
| * | | | | Log if rejecting 3PE query metadata result due to type check | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -4/+11 |
| * | | | | Reject malformed 3PE query metadata results earlier in AS API handling code | Paul "LeoNerd" Evans | 2016-09-09 | 2 | -11/+15 |
| * | | | | Minor fixes from PR comments | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -2/+2 |
| * | | | | appease pep8 | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+2 |
| * | | | | Python isn't JavaScript; have to quote dict keys | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+1 |
| * | | | | Efficiency fix for lookups of a single protocol | Paul "LeoNerd" Evans | 2016-09-09 | 2 | -2/+7 |
| * | | | | Allow lookup of a single 3PE protocol query metadata | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -0/+21 |
| * | | | | Don't corrupt shared cache on subsequent protocol requests | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -0/+2 |
| * | | | | Collect up all the "instances" lists of individual AS protocol results into o... | Paul "LeoNerd" Evans | 2016-09-08 | 1 | -1/+29 |
* | | | | | Merge pull request #1094 from matrix-org/paul/get-state-whole-event | Paul Evans | 2016-09-09 | 1 | -2/+9 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Filter returned events for client-facing format | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -2/+3 |
| * | | | | Allow clients to specify the format a room state event is returned in | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+7 |
| | |/ / | |/| | | |||||
* | | | | Drop replication log levels | Erik Johnston | 2016-09-09 | 2 | -3/+2 |
* | | | | Merge pull request #1093 from matrix-org/erikj/dedupe_presence | Erik Johnston | 2016-09-09 | 1 | -0/+6 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Deduplicate presence in _update_states | Erik Johnston | 2016-09-09 | 1 | -0/+6 |
|/ / / | |||||
* | | | Merge pull request #1092 from matrix-org/erikj/transaction_queue_check | Erik Johnston | 2016-09-09 | 1 | -15/+16 |
|\ \ \ | |||||
| * | | | Check if destination is ready for retry earlier | Erik Johnston | 2016-09-09 | 1 | -15/+16 |
* | | | | Merge pull request #1089 from matrix-org/markjh/direct_to_device_stream | Mark Haines | 2016-09-09 | 4 | -4/+38 |
|\ \ \ \ | |||||
| * | | | | Use the previous MAX value if any to set the stream_id | Mark Haines | 2016-09-09 | 1 | -1/+2 |
| * | | | | Track the max_stream_device_id in a separate table, since we delete from the ... | Mark Haines | 2016-09-09 | 4 | -4/+37 |
* | | | | | Merge pull request #1090 from matrix-org/erikj/transaction_queue_check | Erik Johnston | 2016-09-09 | 1 | -122/+134 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Fix tightloop on sending transaction | Erik Johnston | 2016-09-09 | 1 | -122/+134 |
|/ / / / | |||||
* | | | | Merge pull request #1088 from matrix-org/erikj/transaction_queue_check | Erik Johnston | 2016-09-09 | 1 | -38/+41 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Correctly guard against multiple concurrent transactions | Erik Johnston | 2016-09-09 | 1 | -38/+41 |
* | | | | Merge pull request #1087 from matrix-org/markjh/reapply_delta | Mark Haines | 2016-09-09 | 1 | -1/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Just move the schema and add some DROPs | Mark Haines | 2016-09-09 | 2 | -35/+4 |
| * | | | Only catch databas errors | Mark Haines | 2016-09-08 | 1 | -1/+1 |
| * | | | Add a stub run_upgrade | Mark Haines | 2016-09-08 | 1 | -0/+4 |
| * | | | Reapply 34/device_outbox in 35/device_outbox_again.py since the schema was bu... | Mark Haines | 2016-09-08 | 1 | -0/+30 |
* | | | | Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-09-09 | 3 | -3/+10 |
|\ \ \ \ | |||||
| * | | | | Bump changelog and version | Erik Johnston | 2016-09-09 | 2 | -2/+9 |
| * | | | | Reduce batch size to be under SQL limit | Erik Johnston | 2016-09-09 | 1 | -1/+1 |
* | | | | | Update last_device_stream_id_by_dest if there is nothing to send | Erik Johnston | 2016-09-09 | 1 | -0/+1 |
* | | | | | Merge pull request #1081 from matrix-org/dbkr/notifications_only_highlight | Matthew Hodgson | 2016-09-09 | 2 | -2/+10 |
|\ \ \ \ \ | |||||
* \ \ \ \ \ | Merge pull request #1080 from matrix-org/dbkr/fix_notifications_api_with_from | David Baker | 2016-09-08 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fix /notifications API when used with `from` param | David Baker | 2016-09-08 | 1 | -1/+1 |
* | | | | | | Merge pull request #1085 from matrix-org/erikj/reindex_state_groups | Erik Johnston | 2016-09-08 | 3 | -2/+57 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reindex_st... | Erik Johnston | 2016-09-08 | 3 | -24/+63 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1084 from matrix-org/markjh/direct_to_device_wildcard | Mark Haines | 2016-09-08 | 1 | -18/+36 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Support wildcard device_ids for direct to device messages | Mark Haines | 2016-09-08 | 1 | -18/+36 |
* | | | | | | | Merge pull request #1082 from matrix-org/erikj/remote_public_rooms | Erik Johnston | 2016-09-08 | 2 | -6/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use parse_string | Erik Johnston | 2016-09-08 | 1 | -2/+2 |
| * | | | | | | | Add server param to /publicRooms | Erik Johnston | 2016-09-08 | 2 | -5/+26 |
| | | * | | | | | Add delta file | Erik Johnston | 2016-09-08 | 1 | -0/+20 |
| | | * | | | | | Reindex state_groups_state after pruning | Erik Johnston | 2016-09-08 | 2 | -2/+37 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-09-08 | 2 | -1/+38 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge branch 'release-v0.17.2' of github.com:matrix-org/synapse v0.17.2 | Erik Johnston | 2016-09-08 | 60 | -673/+1836 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Bump version and changelog | Erik Johnston | 2016-09-08 | 2 | -1/+10 |
| | * | | | | | | Mention get_pdu bug v0.17.2-rc1 | Erik Johnston | 2016-09-05 | 1 | -0/+2 |
| | * | | | | | | Typo | Erik Johnston | 2016-09-05 | 1 | -1/+1 |
| | * | | | | | | Bump changelog and version | Erik Johnston | 2016-09-05 | 2 | -1/+27 |
* | | | | | | | | Merge pull request #1083 from matrix-org/erikj/check_origin | Erik Johnston | 2016-09-08 | 2 | -1/+15 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Check the user_id for presence/typing matches origin | Erik Johnston | 2016-09-08 | 2 | -1/+15 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1074 from matrix-org/markjh/direct_to_device_federation | Mark Haines | 2016-09-08 | 11 | -71/+456 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' into markjh/direct_to_device_federation | Mark Haines | 2016-09-08 | 13 | -132/+542 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add a new method to enqueue the device messages rather than sending a dummy EDU | Mark Haines | 2016-09-07 | 3 | -7/+20 |
| * | | | | | | | Fix the stream change cache to work over replication | Mark Haines | 2016-09-07 | 2 | -1/+12 |
| * | | | | | | | Move the check for federated device_messages. | Mark Haines | 2016-09-07 | 1 | -11/+15 |
| * | | | | | | | Add stream change caches for device messages | Mark Haines | 2016-09-07 | 3 | -1/+53 |
| * | | | | | | | Comment the add_messages storage functions | Mark Haines | 2016-09-07 | 1 | -8/+16 |
| * | | | | | | | Fix unit tests | Mark Haines | 2016-09-06 | 1 | -0/+8 |
| * | | | | | | | Send device messages over federation | Mark Haines | 2016-09-06 | 7 | -48/+179 |
| * | | | | | | | Add storage methods for federated device messages | Mark Haines | 2016-09-06 | 1 | -7/+132 |
| * | | | | | | | Add tables for federated device messages | Mark Haines | 2016-09-06 | 1 | -0/+38 |
| * | | | | | | | Move _add_messages_to_device_inbox_txn into a separate method | Mark Haines | 2016-09-06 | 1 | -37/+32 |
| | |/ / / / / | |/| | | | | | |||||
| | | | | | * | Add index to event_push_actions | David Baker | 2016-09-09 | 2 | -1/+21 |
| | | | | |/ | |||||
| | | | | * | Implement `only=highlight` on `/notifications` | David Baker | 2016-09-08 | 2 | -2/+10 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Log delta files we're applying | Erik Johnston | 2016-09-08 | 1 | -2/+2 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #1079 from matrix-org/erikj/state_seqscan | Erik Johnston | 2016-09-08 | 1 | -0/+4 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Temporarily disable sequential scans for state fetching | Erik Johnston | 2016-09-08 | 1 | -0/+4 |
|/ / / | |||||
* | | | Merge pull request #1077 from matrix-org/markjh/device_logging | Mark Haines | 2016-09-07 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | Log the types and values when failing to store devices | Mark Haines | 2016-09-07 | 1 | -2/+6 |
| |/ / | |||||
* | | | Merge pull request #1076 from matrix-org/erikj/state_storage | Erik Johnston | 2016-09-07 | 1 | -5/+10 |
|\ \ \ | |||||
| * | | | Comment | Erik Johnston | 2016-09-07 | 1 | -0/+4 |
| * | | | Add appopriate framing clause | Erik Johnston | 2016-09-07 | 1 | -0/+1 |
| * | | | Use windowing function to make use of index | Erik Johnston | 2016-09-07 | 1 | -5/+5 |
|/ / / | |||||
* | | | Merge pull request #1065 from matrix-org/erikj/state_storage | Erik Johnston | 2016-09-07 | 8 | -73/+482 |
|\ \ \ | |||||
| * | | | Scale the batch size so that we're not bitten by the minimum | Erik Johnston | 2016-09-05 | 1 | -1/+5 |
| * | | | Correctly handle reindexing state groups that already have an edge | Erik Johnston | 2016-09-05 | 1 | -0/+19 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage | Erik Johnston | 2016-09-05 | 5 | -60/+35 |
| |\ \ \ | |||||
| * | | | | Take value in a better way | Erik Johnston | 2016-09-05 | 2 | -3/+3 |
| * | | | | Comment about sqlite and WITH RECURSIVE | Erik Johnston | 2016-09-05 | 1 | -0/+4 |
| * | | | | Correctly delete old state groups in purge history API | Erik Johnston | 2016-09-05 | 2 | -20/+80 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage | Erik Johnston | 2016-09-05 | 3 | -4/+12 |
| |\ \ \ \ | |||||
| * | | | | | Add comments | Erik Johnston | 2016-09-05 | 2 | -41/+43 |
| * | | | | | Add upgrade script that will slowly prune state_groups_state entries | Erik Johnston | 2016-09-05 | 3 | -75/+223 |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage | Erik Johnston | 2016-09-02 | 6 | -15/+59 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage | Erik Johnston | 2016-09-02 | 14 | -84/+230 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Limit the length of state chains | Erik Johnston | 2016-09-02 | 2 | -43/+106 |
| * | | | | | | | Move to storing state_groups_state as deltas | Erik Johnston | 2016-09-01 | 5 | -62/+172 |
* | | | | | | | | Merge pull request #1073 from matrix-org/erikj/presence_fiddle | Erik Johnston | 2016-09-06 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Record counts of state changes | Erik Johnston | 2016-09-06 | 1 | -0/+4 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1072 from matrix-org/erikj/presence_fiddle | Erik Johnston | 2016-09-06 | 1 | -12/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Short circuit if presence is the same | Erik Johnston | 2016-09-06 | 1 | -0/+3 |
| * | | | | | | | | Fiddle should_notify to better report stats | Erik Johnston | 2016-09-06 | 1 | -12/+7 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1071 from matrix-org/erikj/pdf_fix | Erik Johnston | 2016-09-05 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add quotes and be explicity about script-src | Erik Johnston | 2016-09-05 | 1 | -1/+2 |
| * | | | | | | | Allow PDF to be rendered from media repo | Erik Johnston | 2016-09-05 | 1 | -1/+7 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1070 from matrix-org/erikj/presence_stats | Erik Johnston | 2016-09-05 | 1 | -0/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Record why we have chosen to notify | Erik Johnston | 2016-09-05 | 1 | -0/+8 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #1069 from matrix-org/erikj/host_find | Erik Johnston | 2016-09-05 | 2 | -46/+17 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Use get_joined_users_from_context instead of manually looking up hosts | Erik Johnston | 2016-09-05 | 2 | -46/+17 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1068 from matrix-org/erikj/bulk_push | Erik Johnston | 2016-09-05 | 2 | -14/+10 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/bulk_push | Erik Johnston | 2016-09-05 | 1 | -0/+6 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1067 from matrix-org/markjh/idempotent | Mark Haines | 2016-09-05 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix membership changes to be idempotent | Mark Haines | 2016-09-02 | 1 | -0/+6 |
| | * | | | | | Remove unused imports | Erik Johnston | 2016-09-05 | 1 | -1/+0 |
| | * | | | | | Only fetch local pushers | Erik Johnston | 2016-09-05 | 1 | -1/+3 |
| | * | | | | | Make bulk_get_push_rules_for_room use get_joined_users_from_context cache | Erik Johnston | 2016-09-05 | 2 | -13/+8 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1066 from matrix-org/markjh/direct_to_device_lowerbound | Mark Haines | 2016-09-02 | 2 | -4/+6 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Only return new device messages in /sync | Mark Haines | 2016-09-02 | 2 | -4/+6 |
| |/ / / / | |||||
* | | | | | Explicitly specify state_key for history_visibility fetching | Erik Johnston | 2016-09-02 | 1 | -1/+2 |
* | | | | | Merge pull request #1064 from matrix-org/erikj/on_receive_check | Erik Johnston | 2016-09-02 | 1 | -6/+18 |
|\ \ \ \ \ | |||||
| * | | | | | Comment on when auth chain and state are None | Erik Johnston | 2016-09-02 | 1 | -0/+3 |
| * | | | | | Comment | Erik Johnston | 2016-09-02 | 1 | -0/+3 |
| * | | | | | Only check if host is in room if we have state and auth_chain | Erik Johnston | 2016-09-02 | 1 | -6/+12 |
| | |_|/ / | |/| | | | |||||
* | | | | | Docstrings | Erik Johnston | 2016-09-02 | 1 | -0/+4 |
* | | | | | Merge pull request #1063 from matrix-org/erikj/pull_out_ids_only | Erik Johnston | 2016-09-02 | 2 | -6/+30 |
|\ \ \ \ \ | |||||
| * | | | | | Only pull out IDs from DB for /state_ids/ request | Erik Johnston | 2016-09-02 | 2 | -6/+30 |
| |/ / / / | |||||
* | / / / | Bump max_entries on get_destination_retry_timings | Erik Johnston | 2016-09-02 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #1062 from matrix-org/markjh/direct_to_device_synchrotron | Mark Haines | 2016-09-02 | 2 | -1/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'develop' into markjh/direct_to_device_synchrotron | Mark Haines | 2016-09-02 | 28 | -234/+430 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1061 from matrix-org/erikj/linearize_resolution | Erik Johnston | 2016-09-01 | 1 | -56/+59 |
|\ \ \ \ | |||||
| * | | | | Linearize state resolution to help caches | Erik Johnston | 2016-09-01 | 1 | -56/+59 |
|/ / / / | |||||
* | | | | Fix typo in log line | Erik Johnston | 2016-09-01 | 1 | -1/+1 |
* | | | | Merge branch 'erikj/pdu_check' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-09-01 | 1 | -5/+5 |
|\ \ \ \ | |||||
| * | | | | Ensure we only return a validated pdu in get_pdu | Erik Johnston | 2016-09-01 | 1 | -5/+5 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'release-v0.17.1' of github.com:matrix-org/synapse v0.17.1 | Erik Johnston | 2016-08-24 | 98 | -1434/+3281 |
| |\ \ \ | |||||
* | \ \ \ | Merge pull request #1060 from matrix-org/erikj/state_ids | Erik Johnston | 2016-09-01 | 16 | -173/+217 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Use state_groups table to test existence | Erik Johnston | 2016-08-31 | 1 | -1/+1 |
| * | | | | Handle the fact that workers can't generate state groups | Erik Johnston | 2016-08-31 | 2 | -27/+60 |
| * | | | | Always specify state_group so that its in the cache | Erik Johnston | 2016-08-31 | 1 | -0/+2 |
| * | | | | Add storage function to SlaveStore | Erik Johnston | 2016-08-31 | 1 | -0/+1 |
| * | | | | Correctly handle the difference between prev and current state | Erik Johnston | 2016-08-31 | 12 | -69/+102 |
| * | | | | Generate state group ids in state layer | Erik Johnston | 2016-08-31 | 3 | -19/+24 |
| * | | | | Make _state_groups_id_gen a normal IdGenerator | Erik Johnston | 2016-08-30 | 3 | -48/+40 |
| * | | | | Remove state replication stream | Erik Johnston | 2016-08-30 | 1 | -23/+1 |
* | | | | | Lower get_linearized_receipts_for_room cache size | Erik Johnston | 2016-08-31 | 1 | -1/+1 |
* | | | | | Merge pull request #1053 from Takios/develop | Erik Johnston | 2016-08-31 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Add prerequisites to install on openSUSE to README | Fabian Niepelt | 2016-08-30 | 1 | -0/+6 |
* | | | | | | Merge pull request #1059 from matrix-org/erikj/sent_transaction_delete | Erik Johnston | 2016-08-31 | 2 | -0/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Clean up old sent transactions | Erik Johnston | 2016-08-31 | 2 | -0/+34 |
* | | | | | | | Merge pull request #1057 from matrix-org/erikj/fix_email_name | Erik Johnston | 2016-08-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix email notifs by adding missing param | Erik Johnston | 2016-08-30 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #1058 from matrix-org/markjh/direct_to_device_synchrotron | Mark Haines | 2016-08-31 | 4 | -4/+81 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #1056 from matrix-org/kegan/appservice-url-is-optional | Kegsay | 2016-08-30 | 2 | -1/+28 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | flake8 | Kegan Dougal | 2016-08-30 | 1 | -2/+3 |
| * | | | | | | Use None instead of the empty string | Kegan Dougal | 2016-08-30 | 2 | -9/+16 |
| * | | | | | | Flake8 | Kegan Dougal | 2016-08-30 | 2 | -1/+3 |
| * | | | | | | Allow application services to have an optional 'url' | Kegan Dougal | 2016-08-30 | 2 | -0/+17 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1055 from matrix-org/erikj/occaisonally_persist | Erik Johnston | 2016-08-30 | 1 | -0/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Check correct variable | Erik Johnston | 2016-08-30 | 1 | -1/+1 |
| * | | | | | | Occaisonally persist unpersisted presence updates | Erik Johnston | 2016-08-30 | 1 | -0/+28 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #1054 from matrix-org/erikj/presence_noop_online | Erik Johnston | 2016-08-30 | 2 | -1/+53 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't notify for online -> online transitions. | Erik Johnston | 2016-08-30 | 2 | -1/+53 |
| |/ / / / / | |||||
* / / / / / | Remove FUD over psql | Matthew Hodgson | 2016-08-30 | 1 | -3/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #1051 from matrix-org/erikj/fix_push_names | Erik Johnston | 2016-08-30 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix push room names for rooms with only an alias | Erik Johnston | 2016-08-30 | 1 | -1/+1 |
* | | | | | | Merge pull request #1052 from matrix-org/erikj/noop_new_device_message | Erik Johnston | 2016-08-30 | 1 | -10/+15 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Comment about message deletion | Erik Johnston | 2016-08-30 | 1 | -0/+3 |
| * | | | | | Fix check | Erik Johnston | 2016-08-30 | 1 | -2/+1 |
| * | | | | | Noop get_new_messages_for_device if token hasn't changed | Erik Johnston | 2016-08-30 | 1 | -9/+12 |
|/ / / / / | |||||
| | | | * | Fix up the calls to the notifier for device messages | Mark Haines | 2016-09-01 | 2 | -1/+4 |
| | |_|/ | |/| | | |||||
| * | | | Return the current stream position from add_messages_to_device_inbox | Mark Haines | 2016-08-31 | 1 | -1/+4 |
| * | | | Add a replication stream for direct to device messages | Mark Haines | 2016-08-31 | 4 | -3/+77 |
|/ / / | |||||
* | | | Merge pull request #1049 from matrix-org/erikj/presence_users_in_room | Erik Johnston | 2016-08-30 | 14 | -68/+55 |
|\ \ \ | |||||
| * | | | Add to slave store | Erik Johnston | 2016-08-30 | 1 | -0/+5 |
| * | | | Fix unit tests | Erik Johnston | 2016-08-26 | 2 | -41/+6 |
| * | | | Use state handler instead of get_users_in_room/get_joined_hosts | Erik Johnston | 2016-08-26 | 12 | -27/+44 |
* | | | | Merge pull request #1050 from matrix-org/erikj/fix_device_sync | Erik Johnston | 2016-08-30 | 2 | -0/+32 |
|\ \ \ \ | |||||
| * | | | | Add new direct message storage functions to slave store | Erik Johnston | 2016-08-30 | 2 | -0/+32 |
|/ / / / | |||||
* | | | | warn people to avoid running a HS media repository on the same domain as anot... | Matthew Hodgson | 2016-08-27 | 1 | -0/+15 |
* | | | | Merge pull request #1046 from matrix-org/markjh/direct_to_device | Mark Haines | 2016-08-26 | 10 | -6/+309 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device | Mark Haines | 2016-08-26 | 27 | -450/+866 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1048 from matrix-org/erikj/fix_mail_name | Erik Johnston | 2016-08-26 | 1 | -19/+20 |
|\ \ \ \ | |||||
| * | | | | Fix room name in email notifs | Erik Johnston | 2016-08-26 | 1 | -19/+20 |
|/ / / / | |||||
* | | | | Merge pull request #1047 from matrix-org/erikj/state_ids | Erik Johnston | 2016-08-26 | 22 | -417/+822 |
|\ \ \ \ | |||||
| * | | | | Add is_host_joined to slave storage | Erik Johnston | 2016-08-26 | 2 | -3/+6 |
| * | | | | Typo | Erik Johnston | 2016-08-26 | 1 | -1/+0 |
| * | | | | Make None optional | Erik Johnston | 2016-08-26 | 1 | -1/+1 |
| * | | | | Measure _filter_events_for_server | Erik Johnston | 2016-08-26 | 1 | -0/+2 |
| * | | | | Don't pull out full state for _filter_events_for_server | Erik Johnston | 2016-08-26 | 1 | -1/+25 |
| * | | | | Cache check_host_in_room | Erik Johnston | 2016-08-26 | 2 | -14/+41 |
| * | | | | Add measure on check_host_in_room | Erik Johnston | 2016-08-26 | 1 | -11/+12 |
| * | | | | Fix tests | Erik Johnston | 2016-08-26 | 1 | -5/+46 |
| * | | | | Add new state storage funcs to replication | Erik Johnston | 2016-08-26 | 1 | -0/+3 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids | Erik Johnston | 2016-08-26 | 8 | -15/+77 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1043 from matrix-org/erikj/backfill_fix | Erik Johnston | 2016-08-26 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Fix None check in backfill | Erik Johnston | 2016-08-25 | 1 | -1/+3 |
* | | | | | | Merge pull request #1044 from matrix-org/paul/third-party-lookup | Paul Evans | 2016-08-25 | 5 | -13/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Just sprintf the 'kind' argument into uri directly | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -3/+1 |
| * | | | | | | Move ThirdPartyEntityKind into api.constants so the expectation becomes that ... | Paul "LeoNerd" Evans | 2016-08-25 | 4 | -9/+7 |
| * | | | | | | Root the 3PE lookup API within /_matrix/app/unstable instead of at toplevel | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -3/+16 |
| * | | | | | | APP_SERVICE_PREFIX is never used; don't bother | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -1/+0 |
|/ / / / / / | |||||
| | * | | | | Make sync not pull out full state | Erik Johnston | 2016-08-25 | 2 | -34/+74 |
| | * | | | | Fix up push to use get_current_state_ids | Erik Johnston | 2016-08-25 | 4 | -57/+87 |
| | * | | | | Pull out full state less | Erik Johnston | 2016-08-25 | 2 | -10/+15 |
| | * | | | | Add desc | Erik Johnston | 2016-08-25 | 1 | -1/+2 |
| | * | | | | Replace context.current_state with context.current_state_ids | Erik Johnston | 2016-08-25 | 15 | -270/+435 |
| | * | | | | Pull out event ids rather than full events for state | Erik Johnston | 2016-08-25 | 4 | -55/+119 |
| |/ / / / | |||||
| | * | | | More 0_0 in tests | Mark Haines | 2016-08-25 | 1 | -2/+2 |
| | * | | | Merge branch 'develop' into markjh/direct_to_device | Mark Haines | 2016-08-25 | 22 | -103/+238 |
| | |\ \ \ | |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #1041 from matrix-org/paul/third-party-lookup | Paul Evans | 2016-08-25 | 4 | -4/+56 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | appease pep8 | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -3/+2 |
| * | | | | Don't need toplevel cache on 3PE lookup metadata any more | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -8/+0 |
| * | | | | Implement a ResponseCache around 3PE lookup metadata lookups | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -11/+21 |
| * | | | | Kill PROTOCOL_META since I'm not using it any more | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -7/+0 |
| * | | | | Actually query over AS API for 3PE lookup metadata | Paul "LeoNerd" Evans | 2016-08-25 | 2 | -13/+21 |
| * | | | | Move static knowledge of protocol metadata into AS handler; cache the result | Paul "LeoNerd" Evans | 2016-08-24 | 2 | -22/+25 |
| * | | | | Declare 'gitter' known protocol, with user lookup | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -0/+3 |
| * | | | | Initial hack at the 3PN protocols metadata lookup API | Paul "LeoNerd" Evans | 2016-08-24 | 3 | -0/+44 |
| * | | | | Move 3PU/3PL lookup APIs into /thirdparty containing entity | Paul "LeoNerd" Evans | 2016-08-24 | 2 | -4/+4 |
* | | | | | Merge branch 'release-v0.17.1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-08-24 | 2 | -1/+48 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Bump changelog and version | Erik Johnston | 2016-08-24 | 2 | -1/+15 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.1 | Erik Johnston | 2016-08-24 | 21 | -106/+194 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1042 from matrix-org/erikj/preserve_log_contexts | Erik Johnston | 2016-08-24 | 17 | -98/+134 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Remove tracer | Erik Johnston | 2016-08-24 | 1 | -2/+1 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/preserve_l... | Erik Johnston | 2016-08-24 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Preserve some logcontexts | Erik Johnston | 2016-08-24 | 18 | -99/+136 |
| | * | | | Bump changelog and version v0.17.1-rc1 | Erik Johnston | 2016-08-22 | 2 | -1/+34 |
| | | * | | Add some TODOs | Mark Haines | 2016-08-25 | 1 | -0/+4 |
| | | * | | Fix the deduplication of incoming direct-to-device messages | Mark Haines | 2016-08-25 | 2 | -1/+16 |
| | | * | | Add store-and-forward direct-to-device messaging | Mark Haines | 2016-08-25 | 9 | -4/+288 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #1040 from matrix-org/erikj/pagination | Erik Johnston | 2016-08-24 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/pagination | Erik Johnston | 2016-08-24 | 2 | -2/+13 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1039 from matrix-org/kegan/join-with-custom-content | Kegsay | 2016-08-23 | 2 | -2/+13 |
|\ \ \ \ | |||||
| * | | | | Pass through user-supplied content in /join/$room_id | Kegan Dougal | 2016-08-23 | 2 | -2/+13 |
|/ / / / | |||||
| * / / | Add None checks to backfill | Erik Johnston | 2016-08-24 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #1038 from matrix-org/erikj/receved_txn_purge | Erik Johnston | 2016-08-23 | 2 | -4/+45 |
|\ \ \ | |/ / |/| | | |||||
| * | | Delete old received_transactions | Erik Johnston | 2016-08-22 | 2 | -4/+45 |
* | | | Merge pull request #1028 from matrix-org/dbkr/notifications_api | Erik Johnston | 2016-08-22 | 4 | -0/+156 |
|\ \ \ | |||||
| * \ \ | Merge branch 'develop' into dbkr/notifications_api | Matthew Hodgson | 2016-08-20 | 24 | -91/+750 |
| |\ \ \ | |||||
| * | | | | Explicit join | David Baker | 2016-08-18 | 1 | -2/+2 |
| * | | | | Use tuple comparison | David Baker | 2016-08-18 | 1 | -4/+3 |