Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into erikj/groups_merged | David Baker | 2017-10-02 | 26 | -273/+930 |
|\ | |||||
| * | Merge pull request #2480 from matrix-org/rav/federation_client_logging | Richard van der Hoff | 2017-09-29 | 1 | -7/+6 |
| |\ | |||||
| | * | Improve logging of failures in matrixfederationclient | Richard van der Hoff | 2017-09-28 | 1 | -7/+6 |
| * | | Only log if we've removed media | Erik Johnston | 2017-09-28 | 1 | -2/+4 |
| |/ | |||||
| * | Handle SERVFAILs when doing AAAA lookups for federation (#2477) | Richard van der Hoff | 2017-09-28 | 1 | -5/+17 |
| * | Up the limits on number of url cache entries to delete at one time | Erik Johnston | 2017-09-28 | 1 | -2/+2 |
| * | Add old indices | Erik Johnston | 2017-09-28 | 1 | -0/+2 |
| * | Clear up expired url cache every 10s | Erik Johnston | 2017-09-28 | 1 | -1/+1 |
| * | Actually assign result to variable | Erik Johnston | 2017-09-28 | 1 | -1/+1 |
| * | Only pull out local media that were for url cache | Erik Johnston | 2017-09-28 | 1 | -1/+1 |
| * | Fix typo in url cache expiry timer | Erik Johnston | 2017-09-28 | 1 | -1/+1 |
| * | Merge pull request #2479 from matrix-org/erikj/expire_url_cache_thumbnails | Erik Johnston | 2017-09-28 | 1 | -31/+81 |
| |\ | |||||
| | * | Support new and old style media id formats | Erik Johnston | 2017-09-28 | 1 | -31/+81 |
| * | | Fix typo | Erik Johnston | 2017-09-28 | 1 | -3/+3 |
| |/ | |||||
| * | Change expires column to expires_ts | Erik Johnston | 2017-09-28 | 3 | -10/+29 |
| * | More brackets | Erik Johnston | 2017-09-28 | 1 | -1/+1 |
| * | Delete expired url cache data | Erik Johnston | 2017-09-28 | 5 | -5/+208 |
| * | Fix /joined_members to work with AS users | Erik Johnston | 2017-09-28 | 2 | -13/+26 |
| * | Fix bug where /joined_members didn't check user was in room | Erik Johnston | 2017-09-27 | 2 | -10/+38 |
| * | Don't test is spam_checker not None | David Baker | 2017-09-27 | 1 | -1/+7 |
| * | Remove unintentional debugging | David Baker | 2017-09-27 | 1 | -1/+0 |
| * | pep8 | David Baker | 2017-09-27 | 2 | -0/+2 |
| * | Forgot the new file again :( | David Baker | 2017-09-27 | 1 | -0/+35 |
| * | Make the spam checker a module | David Baker | 2017-09-26 | 5 | -23/+33 |
| * | unnecessary parens | David Baker | 2017-09-26 | 1 | -1/+1 |
| * | Add module_loader.py | David Baker | 2017-09-26 | 1 | -0/+41 |
| * | Factor out module loading to a separate place | David Baker | 2017-09-26 | 1 | -12/+10 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.23.0 v0.23.0-rc2 | Erik Johnston | 2017-09-26 | 2 | -6/+19 |
| |\ | |||||
| | * | Refactor to speed up incremental syncs | Erik Johnston | 2017-09-25 | 1 | -5/+18 |
| | * | Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-09-25 | 1 | -1/+1 |
| | |\ | |||||
| | * \ | Merge branch 'develop' into develop | Richard van der Hoff | 2017-09-25 | 32 | -755/+963 |
| | |\ \ | |||||
| | * | | | Fix iteration of requests_missing_keys; list doesn't have .values() | Kenny Keslar | 2017-07-26 | 1 | -1/+1 |
| * | | | | Bump changelog and version | Erik Johnston | 2017-09-26 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
| * | | | Bump version and changes | Erik Johnston | 2017-09-25 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Fix logcontxt leak in keyclient (#2465) | Richard van der Hoff | 2017-09-25 | 1 | -12/+5 |
| * | | Do an AAAA lookup on SRV record targets (#2462) | Richard van der Hoff | 2017-09-22 | 1 | -20/+96 |
| * | | fix thinko'd docstring | Matthew Hodgson | 2017-09-22 | 1 | -1/+1 |
| * | | Fix device list when rejoining room (#2461) | Erik Johnston | 2017-09-22 | 1 | -2/+14 |
| * | | Fix logcontexts in _check_sigs_and_hashes | Richard van der Hoff | 2017-09-20 | 2 | -60/+62 |
| * | | Fix logcontext handling in verify_json_objects_for_server | Richard van der Hoff | 2017-09-20 | 1 | -8/+12 |
| * | | Turn _start_key_lookups into an inlineCallbacks function | Richard van der Hoff | 2017-09-20 | 1 | -40/+37 |
| * | | Fix potential race in _start_key_lookups | Richard van der Hoff | 2017-09-20 | 1 | -5/+8 |
| * | | Add some comments to _start_key_lookups | Richard van der Hoff | 2017-09-20 | 1 | -0/+8 |
| * | | Consistency for how verify_request.deferred is called | Richard van der Hoff | 2017-09-20 | 1 | -13/+17 |
| * | | Factor out _start_key_lookups | Richard van der Hoff | 2017-09-20 | 1 | -7/+17 |
| * | | Replace `server_and_json` with `verify_requests` | Richard van der Hoff | 2017-09-20 | 1 | -3/+3 |
| * | | pull out handle_key_deferred to top level | Richard van der Hoff | 2017-09-20 | 1 | -43/+44 |
| * | | Fix incorrect key_ids in error message | Richard van der Hoff | 2017-09-20 | 1 | -1/+1 |
| * | | Invalidate signing key cache when we gat an update | Richard van der Hoff | 2017-09-20 | 1 | -17/+24 |
| * | | Remove redundant `preserve_fn` | Richard van der Hoff | 2017-09-20 | 1 | -2/+2 |
| * | | Fix concurrent server_key requests (#2458) | Richard van der Hoff | 2017-09-19 | 1 | -1/+3 |
| * | | Add a config option to block all room invites (#2457) | Richard van der Hoff | 2017-09-19 | 4 | -0/+43 |
| * | | add some comments to on_exchange_third_party_invite_request | Richard van der Hoff | 2017-09-19 | 1 | -0/+11 |
| * | | PoC for filtering spammy events (#2456) | Richard van der Hoff | 2017-09-19 | 3 | -17/+69 |
* | | | Add remove room API | Erik Johnston | 2017-09-26 | 6 | -1/+72 |
* | | | Add unique index to group_rooms table | Erik Johnston | 2017-09-26 | 2 | -3/+1 |
* | | | Add is_publicised to group summary | Erik Johnston | 2017-09-26 | 1 | -25/+31 |
* | | | Remove user from group summary when the leave the group | Erik Johnston | 2017-09-21 | 1 | -0/+8 |
* | | | Revert: Keep room_id's in group summary | Erik Johnston | 2017-09-21 | 1 | -0/+1 |
* | | | Keep room_id's in group summary | Erik Johnston | 2017-09-21 | 1 | -1/+0 |
* | | | Correctly return next token | Erik Johnston | 2017-09-20 | 1 | -1/+2 |
* | | | Fix initial sync | Erik Johnston | 2017-09-20 | 1 | -1/+9 |
* | | | Ensure that creator of group sees group down /sync | Erik Johnston | 2017-09-19 | 2 | -4/+31 |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged | Erik Johnston | 2017-09-19 | 24 | -546/+580 |
|\| | | |||||
| * | | Fix overzealous kicking of guest users (#2453) | Richard van der Hoff | 2017-09-19 | 1 | -1/+1 |
| * | | Clean up and document handling of logcontexts in Keyring (#2452) | Richard van der Hoff | 2017-09-18 | 1 | -28/+36 |
| * | | Merge pull request #2451 from matrix-org/erikj/add_state_to_timeline | Erik Johnston | 2017-09-18 | 2 | -3/+18 |
| |\ \ | |||||
| | * | | Don't filter out current state events from timeline | Erik Johnston | 2017-09-18 | 2 | -3/+18 |
| * | | | Merge pull request #2450 from matrix-org/dbkr/push_event_id_only | David Baker | 2017-09-18 | 1 | -0/+20 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Also include the room_id | David Baker | 2017-09-18 | 1 | -0/+1 |
| | * | | Use .get - it's much shorter | David Baker | 2017-09-18 | 1 | -1/+1 |
| | * | | Add support for event_id_only push format | David Baker | 2017-09-18 | 1 | -0/+19 |
| * | | | Correctly handle leaving room in /key/changes | Erik Johnston | 2017-09-18 | 1 | -13/+12 |
| |/ / | |||||
| * | | Fix typo | Erik Johnston | 2017-09-15 | 1 | -1/+1 |
| * | | Actually hook leave notifs up | Erik Johnston | 2017-09-14 | 1 | -2/+3 |
| * | | Handle joining/leaving rooms in /keys/changes | Erik Johnston | 2017-09-13 | 1 | -1/+38 |
| * | | Get left rooms | Erik Johnston | 2017-09-13 | 1 | -3/+32 |
| * | | In sync handle device lists for newly joined/left rooms | Erik Johnston | 2017-09-12 | 1 | -2/+10 |
| * | | Add left section to /keys/changes | Erik Johnston | 2017-09-08 | 3 | -11/+19 |
| * | | Send down device list change notif when member leaves/rejoins room | Erik Johnston | 2017-09-07 | 3 | -14/+55 |
| * | | Merge pull request #2288 from kyrias/bcrypt | Richard van der Hoff | 2017-08-23 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | python_dependencies: Use bcrypt module instead of py-bcrypt | Johannes Löthberg | 2017-06-17 | 1 | -1/+1 |
| * | | | Fix user_dir startup | Richard van der Hoff | 2017-08-16 | 1 | -1/+1 |
| * | | | Fix process startup | Richard van der Hoff | 2017-08-16 | 1 | -10/+13 |
| * | | | explain why CPU affinity is a good idea | Matthew Hodgson | 2017-08-15 | 1 | -0/+8 |
| * | | | Allow configuration of CPU affinity | Richard van der Hoff | 2017-08-15 | 5 | -1/+23 |
| * | | | Factor out common application start | Richard van der Hoff | 2017-08-15 | 11 | -464/+248 |
| * | | | fix english | hera | 2017-08-04 | 1 | -7/+7 |
| * | | | typo | hera | 2017-08-04 | 1 | -1/+1 |
| * | | | Reduce spammy log line in synchrotrons | Erik Johnston | 2017-08-02 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Increase cache hit ratio for push | Erik Johnston | 2017-07-14 | 1 | -0/+8 |
| * | | Add more metrics to push rule evaluation | Erik Johnston | 2017-07-13 | 1 | -2/+42 |
| * | | Push: Don't acquire lock unless necessary | Erik Johnston | 2017-07-13 | 1 | -0/+4 |
| * | | Use less DB for device list handling in sync | Erik Johnston | 2017-07-12 | 1 | -8/+7 |
* | | | Add user profiles to summary from group server | Erik Johnston | 2017-08-25 | 3 | -2/+30 |
* | | | Fix typos and reinherit | Erik Johnston | 2017-08-25 | 1 | -12/+6 |
* | | | Split out profile handler to fix tests | Erik Johnston | 2017-08-25 | 8 | -22/+30 |
* | | | Add remote profile cache | Erik Johnston | 2017-08-25 | 5 | -5/+237 |
* | | | Add _simple_update | Erik Johnston | 2017-08-25 | 1 | -19/+32 |
* | | | Merge pull request #2410 from matrix-org/erikj/groups_publicise | Erik Johnston | 2017-08-21 | 6 | -0/+197 |
|\ \ \ | |||||
| * | | | Use BOOLEAN rather than TEXT type | Erik Johnston | 2017-08-21 | 1 | -1/+1 |
| * | | | Fixup | Erik Johnston | 2017-08-11 | 2 | -9/+14 |
| * | | | Add bulk group publicised lookup API | Erik Johnston | 2017-08-09 | 5 | -0/+142 |
| * | | | Allow update group publicity | Erik Johnston | 2017-08-08 | 2 | -0/+43 |
| * | | | Store whether the user wants to publicise their membership of a group | Erik Johnston | 2017-08-08 | 3 | -0/+7 |
* | | | | Groups: Fix mising json.load in initial sync | Erik Johnston | 2017-08-21 | 1 | -1/+7 |
|/ / / | |||||
* | | | Remove stale TODO comments | Erik Johnston | 2017-08-04 | 1 | -10/+0 |
* | | | Update comment | Erik Johnston | 2017-07-24 | 1 | -2/+2 |
* | | | Use join rather than joined, etc. | Erik Johnston | 2017-07-24 | 1 | -2/+2 |
* | | | Fix all the typos | Erik Johnston | 2017-07-24 | 1 | -8/+7 |
* | | | Include users membership in group in summary API | Erik Johnston | 2017-07-24 | 2 | -0/+60 |
* | | | Check users/rooms are in group before adding to summary | Erik Johnston | 2017-07-24 | 1 | -0/+25 |
* | | | Correctly add joins to correct segment | Erik Johnston | 2017-07-24 | 1 | -1/+1 |
* | | | Merge pull request #2378 from matrix-org/erikj/group_sync_support | Erik Johnston | 2017-07-21 | 11 | -10/+281 |
|\ \ \ | |||||
| * | | | Add notifier | Erik Johnston | 2017-07-20 | 1 | -0/+1 |
| * | | | Fix replication. And notify | Erik Johnston | 2017-07-20 | 5 | -4/+119 |
| * | | | Remember to cast to bool | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| * | | | Fix bug in generating current token | Erik Johnston | 2017-07-20 | 1 | -0/+2 |
| * | | | Add groups to sync stream | Erik Johnston | 2017-07-20 | 7 | -6/+159 |
* | | | | Merge pull request #2377 from matrix-org/erikj/group_profile_update | Erik Johnston | 2017-07-20 | 5 | -0/+55 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Remove spurious content param | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| * | | | Check values are strings | Erik Johnston | 2017-07-20 | 1 | -1/+4 |
| * | | | Fix a storage desc | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| * | | | Add update group profile API | Erik Johnston | 2017-07-20 | 5 | -0/+52 |
* | | | | Fix typo | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
|/ / / | |||||
* | | | Comments | Erik Johnston | 2017-07-18 | 4 | -13/+24 |
* | | | Comments | Erik Johnston | 2017-07-18 | 2 | -103/+88 |
* | | | Fix permissions | Erik Johnston | 2017-07-18 | 1 | -2/+6 |
* | | | Add DELETE | Erik Johnston | 2017-07-18 | 1 | -0/+46 |
* | | | Add 'args' param to post_json | Erik Johnston | 2017-07-18 | 1 | -9/+15 |
* | | | Fix typos | Erik Johnston | 2017-07-18 | 3 | -12/+22 |
* | | | Correctly parse query params | Erik Johnston | 2017-07-18 | 1 | -19/+19 |
* | | | Update federation client pokes | Erik Johnston | 2017-07-18 | 1 | -13/+22 |
* | | | Add client apis | Erik Johnston | 2017-07-18 | 2 | -10/+188 |
* | | | Comments | Erik Johnston | 2017-07-18 | 2 | -15/+22 |
* | | | Use transport client directly | Erik Johnston | 2017-07-18 | 1 | -18/+25 |
* | | | Comment | Erik Johnston | 2017-07-18 | 1 | -0/+14 |
* | | | Remove sync stuff | Erik Johnston | 2017-07-18 | 2 | -29/+1 |
* | | | Add GroupID type | Erik Johnston | 2017-07-18 | 1 | -0/+5 |
* | | | Remove unused tables | Erik Johnston | 2017-07-18 | 1 | -7/+0 |
* | | | Remove sync stuff | Erik Johnston | 2017-07-18 | 2 | -70/+0 |
* | | | Add local group server support | Erik Johnston | 2017-07-17 | 10 | -2/+1248 |
* | | | Ensure category and role ids are non-null | Erik Johnston | 2017-07-14 | 1 | -0/+24 |
* | | | Add DEFAULT_ROLE_ID | Erik Johnston | 2017-07-14 | 1 | -4/+5 |
* | | | Correctly increment orders | Erik Johnston | 2017-07-14 | 1 | -2/+2 |
* | | | Remove unused functions | Erik Johnston | 2017-07-13 | 1 | -152/+0 |
* | | | Comments | Erik Johnston | 2017-07-13 | 2 | -12/+32 |
* | | | Remove TODO | Erik Johnston | 2017-07-13 | 1 | -1/+0 |
* | | | Add summary APIs to federation | Erik Johnston | 2017-07-13 | 1 | -11/+223 |
* | | | raise NotImplementedError | Erik Johnston | 2017-07-13 | 1 | -5/+2 |
* | | | Comments | Erik Johnston | 2017-07-12 | 3 | -5/+79 |
* | | | Simplify checking if admin | Erik Johnston | 2017-07-12 | 1 | -53/+19 |
* | | | Add group summary APIs | Erik Johnston | 2017-07-12 | 4 | -2/+970 |
* | | | Merge pull request #2352 from matrix-org/erikj/group_server_split | Erik Johnston | 2017-07-12 | 11 | -11/+1206 |
|\ \ \ | |/ / |/| | | |||||
| * | | Comment | Erik Johnston | 2017-07-12 | 1 | -1/+1 |
| * | | Move comment | Erik Johnston | 2017-07-11 | 1 | -2/+2 |
| * | | Add federation API for adding room to group | Erik Johnston | 2017-07-11 | 1 | -0/+18 |
| * | | Comment | Erik Johnston | 2017-07-11 | 1 | -5/+8 |
| * | | Typo | Erik Johnston | 2017-07-11 | 1 | -1/+1 |
| * | | Rename column to attestation_json | Erik Johnston | 2017-07-11 | 2 | -5/+5 |
| * | | Comments | Erik Johnston | 2017-07-11 | 3 | -5/+9 |
| * | | Comment | Erik Johnston | 2017-07-11 | 2 | -0/+26 |
| * | | Remove u/ requirement | Erik Johnston | 2017-07-11 | 1 | -2/+3 |
| * | | Lift out visibility parsing | Erik Johnston | 2017-07-11 | 1 | -20/+21 |
| * | | Comments | Erik Johnston | 2017-07-11 | 4 | -43/+132 |
| * | | Initial group server implementation | Erik Johnston | 2017-07-10 | 11 | -11/+1064 |
* | | | Merge pull request #2354 from krombel/reduce_static_sync_reply | Erik Johnston | 2017-07-11 | 1 | -16/+25 |
|\ \ \ | |||||
| * | | | split out reducing stuff; just make encode_* static | Krombel | 2017-07-11 | 1 | -35/+27 |
| * | | | fix test | Krombel | 2017-07-10 | 1 | -1/+3 |
| * | | | encode sync-response statically; omit empty objects from sync-response | Krombel | 2017-07-10 | 1 | -33/+48 |
* | | | | Merge pull request #2357 from matrix-org/erikj/push | Erik Johnston | 2017-07-11 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Don't compute push actions for backfilled events | Erik Johnston | 2017-07-11 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* / | | | Reduce log levels in tcp replication | Erik Johnston | 2017-07-11 | 1 | -2/+2 |
|/ / / | |||||
* | | | Include registration and as stores in frontend proxy | Erik Johnston | 2017-07-07 | 1 | -0/+4 |
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-07-07 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Bump version and changelog | Erik Johnston | 2017-07-06 | 1 | -1/+1 |
* | | | | Add a frontend proxy | Erik Johnston | 2017-07-07 | 2 | -0/+269 |
* | | | | Perf: Don't filter events for push | Erik Johnston | 2017-07-07 | 3 | -36/+21 |
| |/ / |/| | | |||||
* | | | Merge pull request #2342 from matrix-org/erikj/pusher_pool_instantiate | Erik Johnston | 2017-07-06 | 3 | -10/+11 |
|\| | | |||||
| * | | Fix bug where pusherpool didn't start and broke some rooms | Erik Johnston | 2017-07-06 | 3 | -10/+11 |
* | | | Merge pull request #2309 from matrix-org/erikj/user_ip_repl | Erik Johnston | 2017-07-06 | 4 | -11/+16 |
|\ \ \ | |||||
| * | | | Serialize user ip command as json | Erik Johnston | 2017-06-27 | 1 | -5/+9 |
| * | | | Fix up | Erik Johnston | 2017-06-27 | 3 | -6/+7 |
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-07-06 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Bump version and changelog github/release-v0.22.0 release-v0.22.0 | Erik Johnston | 2017-07-06 | 1 | -1/+1 |
| * | | | Bump version and changelog v0.22.0-rc2 | Erik Johnston | 2017-07-04 | 1 | -1/+1 |
* | | | | Merge pull request #2334 from matrix-org/erikj/refactor_transport_server | Erik Johnston | 2017-07-05 | 1 | -8/+16 |
|\ \ \ \ | |||||
| * | | | | Separate federation servlet into different lists | Erik Johnston | 2017-07-05 | 1 | -8/+16 |
| |/ / / | |||||
* | | | | Merge pull request #2332 from matrix-org/rav/fix_pushes | Richard van der Hoff | 2017-07-05 | 1 | -1/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix caching error in the push evaluator | Richard van der Hoff | 2017-07-05 | 1 | -1/+3 |
* | | | | Merge pull request #2330 from matrix-org/erikj/cache_size_factor | Erik Johnston | 2017-07-04 | 6 | -22/+7 |
|\ \ \ \ | |||||
| * | | | | Increase default cache factor size. | Erik Johnston | 2017-07-04 | 1 | -1/+1 |
| * | | | | Define CACHE_SIZE_FACTOR once | Erik Johnston | 2017-07-04 | 5 | -21/+6 |
* | | | | | Improve the error handling for bad invites received over federation | Mark Haines | 2017-06-30 | 1 | -2/+17 |
|/ / / / | |||||
* | | | | Make into list | Erik Johnston | 2017-06-29 | 1 | -1/+1 |
* | | | | Prefill forward extrems and event to state groups | Erik Johnston | 2017-06-29 | 2 | -2/+13 |
* | | | | Cache macaroon parse and validation | Erik Johnston | 2017-06-29 | 1 | -13/+60 |
* | | | | Use an ExpiringCache for storing registration sessions | Erik Johnston | 2017-06-29 | 2 | -11/+13 |
* | | | | Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-06-27 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Update version and changelog v0.22.0-rc1 | Erik Johnston | 2017-06-26 | 1 | -1/+1 |
* | | | | | Merge pull request #2308 from matrix-org/erikj/user_ip_repl | Erik Johnston | 2017-06-27 | 9 | -8/+111 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Make workers report to master for user ip updates | Erik Johnston | 2017-06-27 | 9 | -8/+111 |
* | | | | | Merge pull request #2307 from matrix-org/erikj/user_ip_batch | Erik Johnston | 2017-06-27 | 4 | -44/+100 |
|\| | | | | |||||
| * | | | | Fix up client ips to read from pending data | Erik Johnston | 2017-06-27 | 3 | -23/+61 |
| * | | | | Batch upsert user ips | Erik Johnston | 2017-06-27 | 2 | -21/+39 |
| |/ / / | |||||
* | | | | Merge pull request #2290 from matrix-org/erikj/ensure_round_trip | Erik Johnston | 2017-06-26 | 1 | -0/+9 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Remove unused variables | Erik Johnston | 2017-06-26 | 1 | -1/+1 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ensure_rou... | Erik Johnston | 2017-06-26 | 25 | -58/+527 |
| |\ \ \ | |||||
| * | | | | Reject local events that don't round trip the DB | Erik Johnston | 2017-06-19 | 1 | -0/+9 |
| | |_|/ | |/| | | |||||
* | | | | Fix up indices for users_who_share_rooms | Erik Johnston | 2017-06-26 | 1 | -1/+2 |
| |/ / |/| | | |||||
* | | | Merge pull request #2301 from xwiki-labs/push-redact-content | Erik Johnston | 2017-06-24 | 3 | -2/+48 |
|\ \ \ | |||||
| * | | | Change the config file generator to more descriptive explanation of push.reda... | Caleb James DeLisle | 2017-06-24 | 1 | -3/+11 |
| * | | | Fix TravisCI tests for PR #2301 - Fat finger mistake | Caleb James DeLisle | 2017-06-23 | 1 | -0/+37 |
| * | | | Fix TravisCI tests for PR #2301 | Caleb James DeLisle | 2017-06-23 | 3 | -42/+2 |
| * | | | Add configuration parameter to allow redaction of content from push messages ... | Caleb James DeLisle | 2017-06-23 | 3 | -2/+43 |
* | | | | Store URL cache preview downloads seperately | Erik Johnston | 2017-06-23 | 7 | -20/+94 |
|/ / / | |||||
* | | | Make some more params configurable | Erik Johnston | 2017-06-22 | 1 | -5/+8 |
* | | | Typo. ARGH. | Erik Johnston | 2017-06-22 | 1 | -1/+1 |
* | | | Fix thinko in unhandled user spam | Erik Johnston | 2017-06-22 | 1 | -2/+2 |
* | | | Merge branch 'master' into develop | Matthew Hodgson | 2017-06-22 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Bump version and changelog | Erik Johnston | 2017-06-15 | 1 | -1/+1 |
* | | | | Add desc | Erik Johnston | 2017-06-22 | 1 | -0/+1 |
* | | | | Merge pull request #2296 from matrix-org/erikj/dont_appserver_shar | Erik Johnston | 2017-06-21 | 4 | -18/+37 |
|\ \ \ \ | |||||
| * | | | | Initialise exclusive_user_regex | Erik Johnston | 2017-06-21 | 2 | -15/+22 |
| * | | | | Fix for workers | Erik Johnston | 2017-06-21 | 2 | -1/+4 |
| * | | | | Don't work out users who share room with appservice users | Erik Johnston | 2017-06-21 | 1 | -2/+11 |
* | | | | | Merge branch 'develop' into avoid_duplicate_filters | Krombel | 2017-06-21 | 67 | -475/+3482 |
|\| | | | | |||||
| * | | | | Handle thumbnail urls | Erik Johnston | 2017-06-19 | 1 | -12/+14 |
| * | | | | Add API to quarantine media | Erik Johnston | 2017-06-19 | 7 | -5/+119 |
| * | | | | Handle all cases of sending membership events | Erik Johnston | 2017-06-19 | 1 | -0/+5 |
| * | | | | Remove unused import | Erik Johnston | 2017-06-19 | 1 | -1/+1 |
| * | | | | Change to create new room and join other users | Erik Johnston | 2017-06-19 | 2 | -10/+70 |
| * | | | | Forget room | Erik Johnston | 2017-06-19 | 1 | -0/+2 |
| * | | | | Add shutdown room API | Erik Johnston | 2017-06-19 | 6 | -1/+134 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #2286 from matrix-org/erikj/split_out_user_dir | Erik Johnston | 2017-06-16 | 6 | -7/+328 |
| |\ \ \ | |||||
| | * | | | Initial worker impl | Erik Johnston | 2017-06-16 | 6 | -7/+328 |
| * | | | | Merge pull request #2280 from matrix-org/erikj/share_room_user_dir | Erik Johnston | 2017-06-16 | 5 | -60/+508 |
| |\| | | | |||||
| | * | | | Include users who share room with requester in user directory | Erik Johnston | 2017-06-15 | 3 | -26/+47 |
| | * | | | Implement updating users who share rooms on the fly | Erik Johnston | 2017-06-15 | 2 | -24/+235 |
| | * | | | Implement initial population of users who share rooms table | Erik Johnston | 2017-06-15 | 2 | -9/+193 |
| | * | | | Add DB schema for tracking users who share rooms | Erik Johnston | 2017-06-15 | 2 | -1/+33 |
| * | | | | allow Authorization header which handling got implemented in #1098 | Krombel | 2017-06-16 | 1 | -1/+1 |
| * | | | | Merge pull request #2281 from matrix-org/erikj/phone_home_stats | Erik Johnston | 2017-06-15 | 4 | -102/+88 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | * | | Typo | Erik Johnston | 2017-06-15 | 1 | -1/+3 |
| | * | | Add some more stats | Erik Johnston | 2017-06-15 | 3 | -0/+35 |
| | * | | Fix phone home stats | Erik Johnston | 2017-06-14 | 3 | -107/+56 |
| * | | | Fix user directory insertion due to missing room_id | Erik Johnston | 2017-06-13 | 2 | -4/+9 |
| * | | | Fix up sql | Erik Johnston | 2017-06-13 | 1 | -10/+12 |
| * | | | Fix user dir to not assume existence of user | Erik Johnston | 2017-06-13 | 1 | -22/+37 |
| * | | | Merge pull request #2274 from matrix-org/erikj/cache_is_host_joined | Erik Johnston | 2017-06-13 | 3 | -2/+7 |
| |\ \ \ |