Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #2611 from matrix-org/dbkr/port_script_drop_nuls | Richard van der Hoff | 2017-10-31 | 1 | -7/+19 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Make the port script drop NUL values in all tables | David Baker | 2017-10-31 | 1 | -7/+19 | |
|/ / / / | ||||||
* | | | | Merge pull request #2609 from matrix-org/rav/refactor_login | David Baker | 2017-10-31 | 2 | -57/+78 | |
|\ \ \ \ | ||||||
| * | | | | Refactor some logic from LoginRestServlet into AuthHandler | Richard van der Hoff | 2017-10-31 | 2 | -57/+78 | |
* | | | | | Merge pull request #2607 from matrix-org/rav/cleanup_ldap_hacks | Richard van der Hoff | 2017-10-31 | 1 | -20/+19 | |
|\ \ \ \ \ | ||||||
| * | | | | | Clean up backwards-compat hacks for ldap | Richard van der Hoff | 2017-10-31 | 1 | -20/+19 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2608 from matrix-org/rav/password_provider_doc | David Baker | 2017-10-31 | 1 | -0/+39 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Start some documentation on password providers | Richard van der Hoff | 2017-10-31 | 1 | -0/+39 | |
|/ / / / | ||||||
* | | | | Merge pull request #2605 from matrix-org/luke/fix-group-creation-error-wording | Richard van der Hoff | 2017-10-30 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix wording on group creation error | Luke Barnard | 2017-10-30 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | fix typo | Matthew Hodgson | 2017-10-29 | 1 | -1/+1 | |
* | | | | move url_previews to MD as RST does my head in | Matthew Hodgson | 2017-10-29 | 1 | -0/+2 | |
* | | | | Merge pull request #2599 from matrix-org/erikj/groups_invite | Erik Johnston | 2017-10-27 | 1 | -1/+4 | |
|\ \ \ \ | ||||||
| * | | | | Fix typo when checking if user is invited to group | Erik Johnston | 2017-10-27 | 1 | -1/+4 | |
|/ / / / | ||||||
* | | | | Fix bad merge | Erik Johnston | 2017-10-27 | 1 | -1/+3 | |
* | | | | Merge branch 'erikj/attestation_jitter' of github.com:matrix-org/synapse into... | Erik Johnston | 2017-10-27 | 1 | -1/+11 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Add jitter to validity period of attestations | Erik Johnston | 2017-10-27 | 1 | -1/+12 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'erikj/attestation_local_fix' of github.com:matrix-org/synapse i... | Erik Johnston | 2017-10-27 | 3 | -9/+36 | |
|\ \ \ | ||||||
| * | | | Import logger | Erik Johnston | 2017-10-27 | 1 | -0/+5 | |
| * | | | Fixup | Erik Johnston | 2017-10-27 | 2 | -5/+5 | |
| * | | | Remove incorrect attestations | Erik Johnston | 2017-10-27 | 2 | -0/+19 | |
| * | | | Log if we try to do attestations for our own user and group | Erik Johnston | 2017-10-27 | 1 | -2/+8 | |
| * | | | Don't generate group attestations for local users | Erik Johnston | 2017-10-27 | 1 | -2/+3 | |
| |/ / | ||||||
* | | | Merge pull request #2595 from matrix-org/erikj/attestation_commnet | Erik Johnston | 2017-10-27 | 1 | -0/+22 | |
|\ \ \ | ||||||
| * | | | Add comment about attestations | Erik Johnston | 2017-10-27 | 1 | -0/+22 | |
* | | | | Merge pull request #2591 from matrix-org/rav/device_delete_auth | Richard van der Hoff | 2017-10-27 | 1 | -5/+8 | |
|\ \ \ \ | ||||||
| * | | | | Device deletion: check UI auth matches access token | Richard van der Hoff | 2017-10-27 | 1 | -5/+8 | |
* | | | | | Merge pull request #2589 from matrix-org/rav/as_deactivate_account | Richard van der Hoff | 2017-10-27 | 2 | -17/+33 | |
|\ \ \ \ \ | ||||||
| * | | | | | Allow ASes to deactivate their own users | Richard van der Hoff | 2017-10-27 | 2 | -17/+33 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #2582 from matrix-org/luke/group-is-public | Luke Barnard | 2017-10-27 | 6 | -98/+190 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Request is_public from database | Luke Barnard | 2017-10-27 | 1 | -1/+3 | |
| * | | | | group is dict | Luke Barnard | 2017-10-27 | 1 | -1/+1 | |
| * | | | | Create groups with is_public = True | Luke Barnard | 2017-10-27 | 1 | -0/+1 | |
| * | | | | Fix create_group to pass requester_user_id | Luke Barnard | 2017-10-27 | 1 | -1/+1 | |
| * | | | | Correct logic for checking private group membership | Luke Barnard | 2017-10-27 | 1 | -1/+1 | |
| * | | | | Make it work | Luke Barnard | 2017-10-26 | 1 | -1/+1 | |
| * | | | | Recreate groups table instead of adding column | Luke Barnard | 2017-10-26 | 1 | -2/+16 | |
| * | | | | Awful hack to get default true | Luke Barnard | 2017-10-26 | 1 | -1/+2 | |
| * | | | | Add groups table to BOOLEAN_COLUMNS in synapse_port_db | Luke Barnard | 2017-10-26 | 1 | -0/+1 | |
| * | | | | Bump schema version to 46 | Luke Barnard | 2017-10-26 | 1 | -1/+1 | |
| * | | | | delint | Luke Barnard | 2017-10-26 | 2 | -15/+67 | |
| * | | | | Add is_public to groups table to allow for private groups | Luke Barnard | 2017-10-26 | 3 | -95/+116 | |
* | | | | | Merge pull request #2586 from matrix-org/rav/frontend_proxy_auth_header | Richard van der Hoff | 2017-10-27 | 2 | -28/+87 | |
|\ \ \ \ \ | ||||||
| * | | | | | Docstring for post_urlencoded_get_json | Richard van der Hoff | 2017-10-27 | 1 | -0/+11 | |
| * | | | | | Front-end proxy: pass through auth header | Richard van der Hoff | 2017-10-26 | 1 | -0/+7 | |
| * | | | | | SimpleHTTPClient: add support for headers | Richard van der Hoff | 2017-10-26 | 1 | -28/+69 | |
* | | | | | | Merge pull request #2585 from matrix-org/rav/unstable_to_r0 | Richard van der Hoff | 2017-10-27 | 1 | -2/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Support /keys/upload on /r0 as well as /unstable | Richard van der Hoff | 2017-10-26 | 1 | -2/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2584 from matrix-org/rav/fix_httpclient_logcontexts | Richard van der Hoff | 2017-10-27 | 1 | -10/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix logcontext leaks in httpclient | Richard van der Hoff | 2017-10-26 | 1 | -10/+9 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2574 from matrix-org/erikj/room_list_fixes | Erik Johnston | 2017-10-27 | 4 | -11/+22 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Update room_list.py | Erik Johnston | 2017-10-26 | 1 | -1/+1 | |
| * | | | | | Do logcontexts outside ResponseCache | Erik Johnston | 2017-10-25 | 5 | -13/+21 | |
| * | | | | | Add logging and fix log contexts for publicRooms | Erik Johnston | 2017-10-25 | 2 | -1/+4 | |
* | | | | | | spell out need for libxml2 for lxml to work | Matthew Hodgson | 2017-10-27 | 1 | -1/+3 | |
* | | | | | | Merge pull request #2581 from matrix-org/rav/fix_init_with_no_logfile | Richard van der Hoff | 2017-10-26 | 1 | -1/+5 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Fix error when running synapse with no logfile | Richard van der Hoff | 2017-10-26 | 1 | -1/+5 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #2579 from krombel/move_unstable_to_r0 | Richard van der Hoff | 2017-10-26 | 5 | -27/+13 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | add release endpoints for /thirdparty | Krombel | 2017-10-26 | 1 | -7/+4 | |
| * | | | | register some /unstable endpoints in /r0 as well | Krombel | 2017-10-26 | 4 | -20/+9 | |
|/ / / / | ||||||
* | | | | Merge pull request #2578 from matrix-org/rav/code_style_imports | Richard van der Hoff | 2017-10-26 | 1 | -46/+113 | |
|\ \ \ \ | ||||||
| * | | | | Document import rules | Richard van der Hoff | 2017-10-26 | 1 | -0/+44 | |
| * | | | | code_style: more formatting | Richard van der Hoff | 2017-10-26 | 1 | -34/+57 | |
| * | | | | code_style.rst: a couple of tidyups | Richard van der Hoff | 2017-10-26 | 1 | -9/+9 | |
| |/ / / | ||||||
* | | | | Merge pull request #2577 from matrix-org/erikj/fix_port | Erik Johnston | 2017-10-26 | 1 | -0/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fix port script | Erik Johnston | 2017-10-26 | 1 | -0/+1 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-10-25 | 2 | -1/+9 | |
|\| | | ||||||
| * | | Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse v0.24.1 | Erik Johnston | 2017-10-24 | 64 | -159/+219 | |
| |\ \ | ||||||
| | * | | Bump version and changelog release-v0.24.1 | Erik Johnston | 2017-10-24 | 2 | -1/+9 | |
| | |/ | ||||||
* | / | tip for generating tls_fingerprints | Matthew Hodgson | 2017-10-24 | 1 | -0/+6 | |
| |/ |/| | ||||||
* | | Merge pull request #2567 from matrix-org/erikj/group_fed_update_profile | Erik Johnston | 2017-10-24 | 2 | -11/+31 | |
|\ \ | ||||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_... | Erik Johnston | 2017-10-24 | 57 | -135/+171 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #2568 from matrix-org/rav/pep8 | Richard van der Hoff | 2017-10-23 | 55 | -100/+97 | |
|\ \ \ | ||||||
| * | | | fix vars named `l` | Richard van der Hoff | 2017-10-23 | 2 | -7/+4 | |
| * | | | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 54 | -93/+93 | |
|/ / / | ||||||
* | | | Merge pull request #2566 from matrix-org/rav/media_logcontext_leak | Richard van der Hoff | 2017-10-23 | 1 | -1/+4 | |
|\ \ \ | ||||||
| * | | | Fix a logcontext leak in the media repo | Richard van der Hoff | 2017-10-23 | 1 | -1/+4 | |
* | | | | Merge pull request #2561 from matrix-org/rav/id_checking | Richard van der Hoff | 2017-10-23 | 4 | -34/+70 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Validate group ids when parsing | Richard van der Hoff | 2017-10-21 | 3 | -17/+45 | |
| * | | | Allow = in mxids and groupids | Richard van der Hoff | 2017-10-20 | 3 | -5/+4 | |
| * | | | Disallow capital letters in userids | Richard van der Hoff | 2017-10-20 | 3 | -16/+25 | |
| | * | | Correctly wire in update group profile over federation | Erik Johnston | 2017-10-23 | 2 | -11/+31 | |
| |/ / |/| | | ||||||
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-10-23 | 3 | -1/+45 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse v0.24.0 | Erik Johnston | 2017-10-23 | 83 | -571/+6538 | |
| |\ \ | ||||||
| | * | | Bump version and changelog release-v0.24.0 | Erik Johnston | 2017-10-23 | 2 | -1/+7 | |
| | * | | Correctly bump version v0.24.0-rc1 | Erik Johnston | 2017-10-19 | 1 | -1/+1 | |
| | * | | Update changelog | Erik Johnston | 2017-10-19 | 1 | -0/+1 | |
| | * | | Bump version and changelog | Erik Johnston | 2017-10-19 | 2 | -1/+36 | |
| | |/ | ||||||
| * | | Merge pull request #2540 from 4nd3r/patch-1 | Richard van der Hoff | 2017-10-16 | 1 | -0/+2 | |
| |\ \ | ||||||
| | * | | make it absolutely clear that Purge History API does not remove all traces of... | Ander Punnar | 2017-10-14 | 1 | -0/+2 | |
| |/ / | ||||||
* | | | Merge pull request #2560 from matrix-org/rav/kill_pointless_method | Richard van der Hoff | 2017-10-23 | 6 | -12/+8 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Remove pointless create() method | Richard van der Hoff | 2017-10-20 | 6 | -12/+8 | |
|/ / | ||||||
* | | Merge pull request #2559 from matrix-org/erikj/group_id_validation | Erik Johnston | 2017-10-19 | 3 | -3/+46 | |
|\ \ | ||||||
| * | | Flake8 | Erik Johnston | 2017-10-19 | 2 | -6/+4 | |
| * | | Add missing file... | Erik Johnston | 2017-10-19 | 1 | -0/+36 | |
| * | | Add config to enable group creation | Erik Johnston | 2017-10-19 | 2 | -3/+12 | |
* | | | Merge pull request #2558 from matrix-org/erikj/group_id_validation | Erik Johnston | 2017-10-19 | 1 | -1/+19 | |
|\| | | ||||||
| * | | Enforce sensible group IDs | Erik Johnston | 2017-10-19 | 1 | -1/+19 | |
|/ / | ||||||
* | | Fix typo | Erik Johnston | 2017-10-19 | 1 | -1/+1 | |
* | | Fix typo in group attestation handling | Erik Johnston | 2017-10-19 | 2 | -2/+3 | |
* | | Merge pull request #2557 from matrix-org/erikj/media_tumbnails | Erik Johnston | 2017-10-19 | 1 | -2/+5 | |
|\ \ | ||||||
| * | | Fix typo in thumbnail generation | Erik Johnston | 2017-10-19 | 1 | -2/+5 | |
|/ / | ||||||
* | | Fix typo | Erik Johnston | 2017-10-19 | 1 | -1/+1 | |
* | | Merge pull request #2553 from matrix-org/rav/fix_500_on_event_send | Richard van der Hoff | 2017-10-18 | 1 | -1/+0 | |
|\ \ | ||||||
| * | | Fix 500 error when we get an error handling a PDU | Richard van der Hoff | 2017-10-17 | 1 | -1/+0 | |
* | | | Merge pull request #2552 from matrix-org/rav/fix_500_on_dodgy_powerlevels | Richard van der Hoff | 2017-10-17 | 1 | -3/+3 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Fix 500 error when fields missing from power_levels event | Richard van der Hoff | 2017-10-17 | 1 | -3/+3 | |
* | | | Doc some more dynamic Homeserver methods | Richard van der Hoff | 2017-10-17 | 1 | -0/+8 | |
* | | | Merge pull request #2550 from krombel/fix_thumbnail_2548 | Erik Johnston | 2017-10-17 | 1 | -2/+2 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | fix thumbnailing (#2548) | Krombel | 2017-10-17 | 1 | -2/+2 | |
* | | | Improve error handling for missing files (#2551) | Richard van der Hoff | 2017-10-17 | 3 | -17/+33 | |
* | | | Merge pull request #2546 from matrix-org/rav/remove_dead_event_injector | Richard van der Hoff | 2017-10-17 | 1 | -76/+0 | |
|\ \ \ | ||||||
| * | | | Remove dead class | Richard van der Hoff | 2017-10-17 | 1 | -76/+0 | |
| |/ / | ||||||
* | | | Merge pull request #2547 from matrix-org/rav/test_make_deferred_yieldable | Richard van der Hoff | 2017-10-17 | 1 | -0/+38 | |
|\ \ \ | ||||||
| * | | | Fix name of test_logcontext | Richard van der Hoff | 2017-10-17 | 1 | -0/+0 | |
| * | | | Add some tests for make_deferred_yieldable | Richard van der Hoff | 2017-10-17 | 1 | -0/+38 | |
| |/ / | ||||||
* | | | Merge pull request #2549 from matrix-org/rav/event_persist_logcontexts | Richard van der Hoff | 2017-10-17 | 2 | -7/+22 | |
|\ \ \ | ||||||
| * | | | Fix logcontext handling for persist_events | Richard van der Hoff | 2017-10-17 | 2 | -7/+22 | |
| |/ / | ||||||
* | | | Merge pull request #2545 from matrix-org/dbkr/auto_join_rooms | David Baker | 2017-10-17 | 3 | -0/+42 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Fix test | David Baker | 2017-10-17 | 1 | -0/+1 | |
| * | | pep8 | David Baker | 2017-10-17 | 1 | -1/+2 | |
| * | | Add config option to auto-join new users to rooms | David Baker | 2017-10-16 | 2 | -0/+40 | |
* | | | Merge pull request #2544 from matrix-org/luke/groups-invited-users | Luke Barnard | 2017-10-16 | 6 | -1/+102 | |
|\ \ \ | ||||||
| * | | | Delint | Luke Barnard | 2017-10-16 | 3 | -1/+3 | |
| * | | | Make it work. Warn about lack of user profile | Luke Barnard | 2017-10-16 | 1 | -2/+2 | |
| * | | | _create_rererouter for get_invited_users_in_group | Luke Barnard | 2017-10-16 | 1 | -17/+2 | |
| * | | | Merge branch 'develop' into luke/groups-invited-users | Luke Barnard | 2017-10-16 | 1 | -1/+1 | |
| |\ \ \ | |/ / / |/| | | | ||||||
* | | | | Merge pull request #2543 from matrix-org/luke/fix-on-group-invite-no-profile | Luke Barnard | 2017-10-16 | 1 | -2/+5 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
* | | | | Merge pull request #2542 from matrix-org/dbkr/room_notif_no_glob | David Baker | 2017-10-16 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Omit the *s for @room notifications | David Baker | 2017-10-16 | 1 | -1/+1 | |
|/ / / / | ||||||
| | * / | Implement GET /groups/$groupId/invited_users | Luke Barnard | 2017-10-16 | 6 | -1/+115 | |
| |/ / | ||||||
| * / | Log a warning when no profile for invited member | Luke Barnard | 2017-10-16 | 1 | -2/+5 | |
|/ / | ||||||
* | | Merge pull request #2538 from matrix-org/erikj/media_backup | Erik Johnston | 2017-10-13 | 6 | -200/+309 | |
|\ \ | ||||||
| * | | Add try/finally block to close t_byte_source | Erik Johnston | 2017-10-13 | 1 | -24/+41 | |
| * | | Remove old comment | Erik Johnston | 2017-10-13 | 1 | -1/+0 | |
| * | | Don't reuse source but instead copy from primary media store to backup | Erik Johnston | 2017-10-13 | 2 | -22/+9 | |
| * | | PEP8 | Erik Johnston | 2017-10-13 | 1 | -1/+1 | |
| * | | Move type into key | Erik Johnston | 2017-10-13 | 1 | -3/+3 | |
| * | | Comment | Erik Johnston | 2017-10-13 | 1 | -1/+1 | |
| * | | Remove spurious addition | Erik Johnston | 2017-10-13 | 1 | -4/+0 | |
| * | | Don't needlessly rename variable | Erik Johnston | 2017-10-13 | 1 | -13/+13 | |
| * | | Add paths back in... | Erik Johnston | 2017-10-13 | 1 | -4/+4 | |
| * | | Remove unnecessary diff | Erik Johnston | 2017-10-13 | 1 | -3/+1 | |
| * | | Make things be absolute paths again | Erik Johnston | 2017-10-13 | 1 | -7/+7 | |
| * | | s/write_to_file/write_to_file_and_backup/ | Erik Johnston | 2017-10-13 | 1 | -5/+5 | |
| * | | Fix up | Erik Johnston | 2017-10-13 | 2 | -43/+32 | |
| * | | Fix up thumbnailing function | Erik Johnston | 2017-10-13 | 3 | -75/+73 | |
| * | | Fix typo | Erik Johnston | 2017-10-13 | 1 | -1/+1 | |
| * | | Fix up comments | Erik Johnston | 2017-10-13 | 1 | -2/+26 | |
| * | | Move makedirs to thread | Erik Johnston | 2017-10-13 | 1 | -2/+1 | |
| * | | Use make_deferred_yieldable | Erik Johnston | 2017-10-13 | 1 | -7/+7 | |
| * | | Fix comments | Erik Johnston | 2017-10-12 | 2 | -1/+4 | |
| * | | Don't close prematurely.. | Erik Johnston | 2017-10-12 | 1 | -2/+5 | |
| * | | getvalue closes buffer | Erik Johnston | 2017-10-12 | 1 | -11/+10 | |
| * | | Get len before close | Erik Johnston | 2017-10-12 | 1 | -6/+11 | |
| * | | Don't close file prematurely | Erik Johnston | 2017-10-12 | 2 | -8/+18 | |
| * | | Copy everything to backup | Erik Johnston | 2017-10-12 | 5 | -77/+151 | |
| * | | Typo | Erik Johnston | 2017-10-12 | 1 | -1/+1 | |
| * | | Remove dead code | Erik Johnston | 2017-10-12 | 1 | -3/+0 | |
| * | | Fix typos | Erik Johnston | 2017-10-12 | 1 | -20/+26 | |
| * | | Fix typo | Erik Johnston | 2017-10-12 | 1 | -1/+1 | |
| * | | Basic implementation of backup media store | Erik Johnston | 2017-10-12 | 4 | -126/+131 | |
* | | | oops | Matthew Hodgson | 2017-10-13 | 1 | -1/+1 | |
* | | | fix copyright to companies which actually exist(ed) | Matthew Hodgson | 2017-10-13 | 1 | -1/+1 | |
|/ / | ||||||
* | | log when we get an exception handling replication updates | hera | 2017-10-12 | 1 | -1/+5 | |
* | | Merge pull request #2531 from matrix-org/dbkr/spamcheck_error_messages | David Baker | 2017-10-12 | 1 | -2/+6 | |
|\ \ | ||||||
| * | | fix isinstance | David Baker | 2017-10-11 | 1 | -1/+1 | |
| * | | Allow error strings from spam checker | David Baker | 2017-10-11 | 1 | -2/+6 | |
* | | | Merge pull request #2532 from matrix-org/rav/fix_linearizer | Richard van der Hoff | 2017-10-11 | 2 | -6/+46 | |
|\ \ \ | ||||||
| * | | | Fix stackoverflow and logcontexts from linearizer | Richard van der Hoff | 2017-10-11 | 2 | -6/+46 | |
* | | | | Merge pull request #2529 from matrix-org/rav/fix_transaction_failure_handling | Richard van der Hoff | 2017-10-11 | 1 | -2/+3 | |
|\ \ \ \ | ||||||
| * | | | | log pdu_failures from incoming transactions | Richard van der Hoff | 2017-10-11 | 1 | -2/+3 | |
| |/ / / | ||||||
* | | | | Merge pull request #2515 from matrix-org/rav/fix_receipt_logcontext | Richard van der Hoff | 2017-10-11 | 1 | -0/+51 | |
|\ \ \ \ | ||||||
| * | | | | logformatter: fix AttributeError | Richard van der Hoff | 2017-10-11 | 1 | -3/+11 | |
| * | | | | Fancy logformatter to format exceptions better | Richard van der Hoff | 2017-10-09 | 1 | -0/+43 | |
* | | | | | Fix fetching remote summaries | Erik Johnston | 2017-10-11 | 1 | -2/+2 | |
* | | | | | Merge pull request #2533 from matrix-org/erikj/fix_group_repl | Erik Johnston | 2017-10-11 | 1 | -7/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | peeeeeeeeep8888888888888888888888888888 | Erik Johnston | 2017-10-11 | 1 | -1/+1 | |
| * | | | | | Fix group stream replication | Erik Johnston | 2017-10-11 | 1 | -7/+7 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2530 from matrix-org/rav/fix_receipt_logcontext | Richard van der Hoff | 2017-10-11 | 1 | -0/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix a logcontext leak in read receipt handling | Richard van der Hoff | 2017-10-11 | 1 | -0/+4 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Fix typo in invite to group | Erik Johnston | 2017-10-11 | 1 | -1/+1 | |
* | | | | | Fix typo | Erik Johnston | 2017-10-11 | 1 | -1/+1 | |
* | | | | | Fix attestations to check correct server name | Erik Johnston | 2017-10-11 | 1 | -10/+20 | |
| |_|/ / |/| | | | ||||||
* | | | | Fix schema delta versions | Erik Johnston | 2017-10-11 | 3 | -1/+1 | |
* | | | | Merge pull request #2466 from matrix-org/erikj/groups_merged | Erik Johnston | 2017-10-11 | 35 | -66/+4793 | |
|\ \ \ \ | ||||||
| * | | | | Validate room ids | Erik Johnston | 2017-10-11 | 1 | -1/+5 | |
| * | | | | Don't corrupt cache | Erik Johnston | 2017-10-05 | 1 | -0/+1 | |
| * | | | | Merge branch 'develop' into erikj/groups_merged | David Baker | 2017-10-02 | 31 | -299/+1177 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge pull request #2472 from matrix-org/erikj/groups_rooms | Erik Johnston | 2017-09-26 | 7 | -4/+73 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | 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 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #2471 from matrix-org/erikj/group_summary_publicised | Erik Johnston | 2017-09-26 | 1 | -25/+31 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | 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 | |
| * | | | | | Merge pull request #2454 from matrix-org/erikj/groups_sync_creator | Erik Johnston | 2017-09-19 | 2 | -4/+31 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | 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 | 39 | -592/+1313 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge pull request #2430 from matrix-org/erikj/groups_profile_cache | Erik Johnston | 2017-08-25 | 3 | -2/+30 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Add user profiles to summary from group server | Erik Johnston | 2017-08-25 | 3 | -2/+30 | |
| * | | | | | | | Merge pull request #2429 from matrix-org/erikj/groups_profile_cache | Erik Johnston | 2017-08-25 | 15 | -47/+292 | |
| |\| | | | | | | ||||||
| | * | | | | | | Fix typos and reinherit | Erik Johnston | 2017-08-25 | 1 | -12/+6 | |
| | * | | | | | | Split out profile handler to fix tests | Erik Johnston | 2017-08-25 | 11 | -29/+35 | |
| | * | | | | | | 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 | |
| * | | | | | | | Merge pull request #2426 from matrix-org/erikj/groups_fix_sync | Erik Johnston | 2017-08-21 | 1 | -1/+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 | |
| * | | | | | | Merge pull request #2382 from matrix-org/erikj/group_privilege | Erik Johnston | 2017-07-24 | 2 | -1/+85 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | 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 | 12 | -12/+283 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | 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 | 8 | -8/+161 | |
| * | | | | | | | 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 | |
| * | | | | | | | Merge pull request #2374 from matrix-org/erikj/group_server_local | Erik Johnston | 2017-07-20 | 11 | -34/+1457 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | 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 |