| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | Fix warnings | Mark Haines | 2015-12-04 | 2 | -3/+13 | |
| | | * | | | | | Track the cpu used in the main thread by each logging context | Mark Haines | 2015-12-03 | 3 | -10/+72 | |
| | * | | | | | | 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 #414 from matrix-org/erikj/if_not_exists | Erik Johnston | 2015-12-03 | 1 | -1/+1 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Older versions of SQLite don't like IF NOT EXISTS in virtual tables | Erik Johnston | 2015-12-02 | 1 | -1/+1 | |
| | * | | | | | | Merge pull request #415 from matrix-org/daniel/endpoints | Daniel Wagner-Hall | 2015-12-03 | 6 | -35/+11 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Update endpoints to reflect current spec | Daniel Wagner-Hall | 2015-12-02 | 6 | -35/+11 | |
| | * | | | | | | | Merge pull request #418 from matrix-org/daniel/whois | Daniel Wagner-Hall | 2015-12-03 | 2 | -18/+12 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Fix implementation of /admin/whois | Daniel Wagner-Hall | 2015-12-02 | 2 | -18/+12 | |
| | | |/ / / / / / | ||||||
| | * | | | | | | | Merge pull request #417 from matrix-org/fix_db_v15_postgres | David Baker | 2015-12-02 | 1 | -12/+11 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Just replace the table definition with the one from full_schema 16 | David Baker | 2015-12-02 | 1 | -11/+10 | |
| | | * | | | | | | | Fix schema delta 15 on postgres in the very unlikley event that anyone upgrad... | David Baker | 2015-12-02 | 1 | -1/+1 | |
| | |/ / / / / / / | ||||||
| | * | | | | | | | Merge pull request #416 from matrix-org/markjh/idempotent_state | Mark Haines | 2015-12-02 | 1 | -0/+12 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | | * | | | | | | Make state updates in the C+S API idempotent | Mark Haines | 2015-12-02 | 1 | -0/+12 | |
| | |/ / / / / / | ||||||
| | * | | | | | | Merge pull request #412 from matrix-org/erikj/search | Erik Johnston | 2015-12-02 | 1 | -11/+36 | |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | | * | | | | | Throw if unrecognized DB type | Erik Johnston | 2015-12-02 | 1 | -1/+4 | |
| | | * | | | | | Fix so highlight matching works again | Erik Johnston | 2015-12-02 | 1 | -8/+13 | |
| | | * | | | | | Remove deuplication. Add comment about regex. | Erik Johnston | 2015-12-02 | 1 | -21/+11 | |
| | | * | | | | | Search: Add prefix matching support | Erik Johnston | 2015-12-02 | 1 | -5/+32 | |
| | * | | | | | | 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 | 11 | -69/+109 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | 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 | 45 | -243/+845 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Only fire user_joined_room on the distributor if the user has actually joined... | Mark Haines | 2015-12-01 | 1 | -4/+6 | |
| | * | | | | | | | | | | Merge pull request #413 from matrix-org/markjh/reuse_http_client | Mark Haines | 2015-12-02 | 3 | -18/+10 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | Reuse a single http client, rather than creating new ones | Mark Haines | 2015-12-02 | 3 | -18/+10 | |
| | | | |_|_|/ / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | | Merge pull request #411 from matrix-org/default_dont_notify | David Baker | 2015-12-02 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | Change the m.room.message rule to be disabled by default so we only notify fo... | David Baker | 2015-12-02 | 1 | -0/+1 | |
| | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | | Fix typo in collect_presencelike_data | Mark Haines | 2015-12-02 | 1 | -1/+1 | |
| | | |_|/ / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | | Merge pull request #409 from MadsRC/develop | Erik Johnston | 2015-12-02 | 2 | -0/+5 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | ||||||
| | | * | | | | | | | Added a single line to explain what the server_name is used for | Mads R. Christensen | 2015-12-02 | 1 | -0/+1 | |
| | | * | | | | | | | Added a few lines to better explain how to run Synapse on a FQDN that is not ... | Mads R. Christensen | 2015-12-02 | 1 | -0/+4 | |
| | * | | | | | | | | Merge pull request #408 from matrix-org/markjh/distributor_facade | Mark Haines | 2015-12-02 | 7 | -53/+78 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ | Merge branch 'develop' into markjh/distributor_facade | Mark Haines | 2015-12-01 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | 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 | |
| | * | | | | | | | | | various fixes - thanks to Mark White for pointing out you need to run synapse... | Matthew Hodgson | 2015-12-01 | 1 | -12/+13 | |
| | | |_|/ / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | | Fix definitions script | Mark Haines | 2015-12-01 | 1 | -1/+1 | |
| | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | | Merge pull request #392 from matrix-org/markjh/client_config | Mark Haines | 2015-12-01 | 11 | -25/+476 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 11 | -25/+476 | |
| | * | | | | | | | | Merge pull request #407 from MadsRC/develop | Matthew Hodgson | 2015-12-01 | 1 | -3/+4 | |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | ||||||
| | | * | | | | | | Added --report-status=yes|no as Synapse won't generate the config without it | Mads R. Christensen | 2015-12-01 | 1 | -2/+3 | |
| | | * | | | | | | Added libffi-devel in CentOS 7 installation requirements and fixed indentatio... | Mads R. Christensen | 2015-12-01 | 1 | -2/+2 | |
| | * | | | | | | | Merge pull request #400 from matrix-org/daniel/versioning | Daniel Wagner-Hall | 2015-12-01 | 27 | -117/+133 | |
| | |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| | | * | | | | | | Host /unstable and /r0 versions of r0 APIs | Daniel Wagner-Hall | 2015-12-01 | 27 | -117/+133 | |
| | |/ / / / / / | ||||||
| | * | | | | | | Merge pull request #404 from matrix-org/markjh/trivial_rename | Mark Haines | 2015-12-01 | 3 | -5/+5 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | rename the method in the tests as well | Mark Haines | 2015-12-01 | 1 | -3/+3 | |
| | | * | | | | | | Rename presence_handler.send_invite to presence_handler.send_presence_invite ... | Mark Haines | 2015-12-01 | 2 | -2/+2 | |
| | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | | Merge pull request #402 from matrix-org/markjh/event_formatting | Mark Haines | 2015-12-01 | 1 | -9/+7 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Only add the user_id if the sender is present | Mark Haines | 2015-12-01 | 1 | -1/+3 | |
| | | * | | | | | | Copy rather than move the fields to shuffle between a v1 and a v2 event. | Mark Haines | 2015-11-30 | 1 | -9/+5 | |
| | * | | | | | | | Merge pull request #403 from matrix-org/erikj/search-ts | Erik Johnston | 2015-12-01 | 4 | -84/+220 | |
| | |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | ||||||
| | | * | | | | | Tidy up a bit | Erik Johnston | 2015-12-01 | 1 | -8/+9 | |
| | | * | | | | | Allow paginating search ordered by recents | Erik Johnston | 2015-11-30 | 4 | -84/+219 | |
| | * | | | | | | Add options to definitions.py to fetch referrers and to output dot | Mark Haines | 2015-12-01 | 1 | -6/+39 | |
| | * | | | | | | Merge pull request #398 from matrix-org/markjh/jenkins_postgres | Mark Haines | 2015-12-01 | 1 | -1/+26 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Write the tap results for each database to different files when running sytest | Mark Haines | 2015-12-01 | 1 | -2/+2 | |
| | | * | | | | | | Set the port when running sytest under postgresql | Mark Haines | 2015-12-01 | 1 | -1/+1 | |
| | | * | | | | | | Use a PORT_BASE environment variable to configure the ports that sytest uses | Mark Haines | 2015-12-01 | 1 | -12/+4 | |
| | | * | | | | | | Run sytest against postgresql if appropriate databases exist for it to run ag... | Mark Haines | 2015-11-26 | 1 | -0/+33 | |
| | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | | Merge pull request #399 from matrix-org/erikj/search | Erik Johnston | 2015-12-01 | 2 | -22/+120 | |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | ||||||
| | | * / / / | Return words to highlight in search results | Erik Johnston | 2015-11-27 | 2 | -22/+120 | |
| | |/ / / / | ||||||
| | * | | | | Merge pull request #397 from matrix-org/erikj/redaction_inequality | Erik Johnston | 2015-11-26 | 1 | -1/+1 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Allow user to redact with an equal power | Erik Johnston | 2015-11-26 | 1 | -1/+1 | |
| | |/ / / / | ||||||
| | * | | | | Fix SQL for postgres again | Daniel Wagner-Hall | 2015-11-23 | 1 | -1/+1 | |
| | * | | | | Fix SQL for postgres | Daniel Wagner-Hall | 2015-11-23 | 1 | -1/+1 | |
| | * | | | | Remove size specifier for database column | Daniel Wagner-Hall | 2015-11-23 | 1 | -1/+3 | |
| | * | | | | 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 #396 from MadsRC/develop | Matthew Hodgson | 2015-11-21 | 2 | -0/+11 | |
| | |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | | * | | | | Added myself to AUTHORS.rst | Mads R. Christensen | 2015-11-20 | 1 | -0/+3 | |
| | | * | | | | Added prerequisite instructions for CentOS 7 | Mads R. Christensen | 2015-11-20 | 1 | -0/+8 | |
| | |/ / / / | ||||||
| | * | | | | Merge pull request #385 from matrix-org/daniel/forgetrooms | Mark Haines | 2015-11-20 | 6 | -5/+118 | |
| | |\ \ \ \ | ||||||
| | | * \ \ \ | Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into danie... | Daniel Wagner-Hall | 2015-11-19 | 18 | -87/+180 | |
| | | |\ \ \ \ | ||||||
| | | | * \ \ \ | Merge branch 'develop' into daniel/forgetrooms | Paul "LeoNerd" Evans | 2015-11-19 | 18 | -87/+180 | |
| | | | |\ \ \ \ | ||||||
| | | * | | | | | | Ignore forgotten rooms in v2 sync | Daniel Wagner-Hall | 2015-11-19 | 1 | -1/+1 | |
| | | |/ / / / / | ||||||
| | | * | | | | | Simplify code | Daniel Wagner-Hall | 2015-11-19 | 2 | -8/+6 | |
| | | * | | | | | Apply forgetting properly to historical events | Daniel Wagner-Hall | 2015-11-18 | 2 | -3/+41 | |
| | | * | | | | | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 6 | -4/+81 | |
| | * | | | | | | Merge pull request #395 from matrix-org/erikj/perspective_limiter | Erik Johnston | 2015-11-20 | 2 | -22/+21 | |
| | |\ \ \ \ \ \ | ||||||
| * | | | | | | | | Added info abou Martin Giess' auto-deployment process with vagrant/ansible | Oddvar Lovaas | 2015-12-14 | 1 | -0/+4 | |
| | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | | Merge pull request #426 from OlegGirko/fix_mock_import | Mark Haines | 2015-12-07 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Fix mock import in tests. | Oleg Girko | 2015-12-06 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge branch 'release-v0.11.1' of github.com:matrix-org/synapse v0.11.1 | Erik Johnston | 2015-11-20 | 22 | -114/+225 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'erikj/perspective_limiter' into release-v0.11.1 | Erik Johnston | 2015-11-20 | 2 | -22/+21 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | * | | | | | | Fix typo | Erik Johnston | 2015-11-20 | 2 | -3/+3 | |
| | | * | | | | | | Don't limit connections to perspective servers | Erik Johnston | 2015-11-20 | 2 | -22/+21 | |
| | | |/ / / / / | ||||||
| | * | | | | | | Mention report_stats in upgrade.rst | Erik Johnston | 2015-11-20 | 1 | -0/+13 | |
| | * | | | | | | Fix english | Erik Johnston | 2015-11-20 | 1 | -2/+2 | |
| | * | | | | | | Bump changes and version | Erik Johnston | 2015-11-20 | 2 | -1/+16 | |
| | |/ / / / / | ||||||
| | * | | | | | Merge pull request #394 from matrix-org/erikj/search | Erik Johnston | 2015-11-20 | 1 | -1/+54 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | 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 #389 from matrix-org/rav/flatten_sync_response | Richard van der Hoff | 2015-11-20 | 2 | -27/+17 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Merge branch 'develop' into rav/flatten_sync_response | Paul "LeoNerd" Evans | 2015-11-19 | 17 | -86/+162 | |
| | | |\| | | | | ||||||
| | | * | | | | | Put back the 'state.events' subobject | Richard van der Hoff | 2015-11-19 | 1 | -1/+1 | |
| | | * | | | | | v2 /sync: Rename the keys of the 'rooms' object to match member states | Richard van der Hoff | 2015-11-19 | 1 | -3/+3 | |
| | | * | | | | | Flatten the /sync response to remove the event_map | Richard van der Hoff | 2015-11-19 | 2 | -24/+14 | |
| | * | | | | | | Merge pull request #391 from matrix-org/erikj/remove_token_from_flow | Erik Johnston | 2015-11-20 | 1 | -1/+10 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Comment | Erik Johnston | 2015-11-20 | 1 | -0/+8 | |
| | | * | | | | | | Remove m.login.token from advertised flows. | Erik Johnston | 2015-11-19 | 1 | -1/+2 | |
| | |/ / / / / / |/| | | | | | | ||||||
| | * | | | | | | Merge pull request #393 from matrix-org/erikj/destination_retry_max | Erik Johnston | 2015-11-20 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| | | * | | | | | Use min and not max to set an upper bound on retry interval | Erik Johnston | 2015-11-20 | 1 | -2/+2 | |
| | |/ / / / / |/| | | | | | ||||||
| | * | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-19 | 2 | -1/+6 | |
| | |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | | Merge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse v0.11.0-r2 | Erik Johnston | 2015-11-19 | 4 | -28/+78 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Bump changes and version | Erik Johnston | 2015-11-19 | 2 | -1/+6 | |
| | * | | | | | | Merge branch 'erikj/fix_port_script' into hotfixes-v0.11.0-r2 | Erik Johnston | 2015-11-19 | 1 | -11/+44 | |
| | |\ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ | Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data | Mark Haines | 2015-11-19 | 11 | -49/+66 | |
| | | | |\ \ \ \ \ | ||||||
| | | | | * | | | | | Rename the database table | Mark Haines | 2015-11-18 | 1 | -0/+17 | |
| | | | | * | | | | | s/private_user_data/account_data/ | Mark Haines | 2015-11-18 | 10 | -49/+49 | |
| | | | | | |/ / / | | | | |/| | | | ||||||
| | | | * | | | | | Merge pull request #382 from matrix-org/daniel/macarooncleanup | Daniel Wagner-Hall | 2015-11-19 | 2 | -9/+18 | |
| | | | |\ \ \ \ \ | ||||||
| | | | | * | | | | | Take a boolean not a list of lambdas | Daniel Wagner-Hall | 2015-11-19 | 2 | -9/+18 | |
| | | | |/ / / / / | ||||||
| | | | * | | | | | Merge pull request #388 from matrix-org/erikj/messages | Erik Johnston | 2015-11-19 | 1 | -16/+28 | |
| | | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| | * | | | | | | | Comment | Erik Johnston | 2015-11-19 | 1 | -0/+2 | |
| | * | | | | | | | Split out text for missing config options. | Erik Johnston | 2015-11-18 | 1 | -16/+26 | |
| |/ / / / / / / | ||||||
| | | * | | | | | Merge pull request #387 from matrix-org/erikj/fix_port_script | Erik Johnston | 2015-11-19 | 1 | -11/+44 | |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | | ||||||
| | * | | | | | Spelling | Erik Johnston | 2015-11-19 | 1 | -1/+1 | |
| | * | | | | | Fix database port script to work with new event_search table | Erik Johnston | 2015-11-18 | 1 | -11/+44 | |
| | | * | | | | Merge pull request #381 from matrix-org/daniel/jenkins-sytest-cached | Daniel Wagner-Hall | 2015-11-18 | 1 | -2/+8 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | Share sytest clone across runs | Daniel Wagner-Hall | 2015-11-18 | 1 | -2/+8 | |
| | | |/ / / / | ||||||
| | | * | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-18 | 1 | -0/+3 | |
| | | |\ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | | Erik pointed out we should advise on the lack of included client | Oddvar Lovaas | 2015-11-18 | 1 | -0/+3 | |
| |/ / / / / | ||||||
| | * | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-18 | 3 | -1/+9 | |
| | |\ \ \ \ | |/ / / / |/| / / / | |/ / / | ||||||
| * | | | | Merge branch 'hotfixes-v0.11.0-r1' v0.11.0-r1 | Erik Johnston | 2015-11-18 | 7 | -8/+49 | |
| |\ \ \ \ | ||||||
| | * | | | | Change date | Erik Johnston | 2015-11-18 | 1 | -1/+1 | |
| | * | | | | Better change log | Erik Johnston | 2015-11-18 | 1 | -2/+2 | |
| | * | | | | Bump changelog and version | Erik Johnston | 2015-11-17 | 2 | -1/+7 | |
| * | | | | | adding link to apt repo | Oddvar Lovaas | 2015-11-18 | 1 | -0/+2 | |
| | | * | | | Merge pull request #384 from matrix-org/erikj/shorter_retries | Erik Johnston | 2015-11-17 | 5 | -7/+39 | |
| | | |\ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | | Update tests | Erik Johnston | 2015-11-17 | 3 | -0/+17 | |
| | * | | | | Add comment | Erik Johnston | 2015-11-17 | 1 | -0/+2 | |
| | * | | | | Only retry federation requests for a long time for background requests | Erik Johnston | 2015-11-17 | 2 | -7/+20 | |
| | | * | | | Merge branch 'hotfixes-v0.10.0-r1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-17 | 1 | -0/+3 | |
| | | |\ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | | Implement required method 'resumeProducing' | Erik Johnston | 2015-11-17 | 1 | -0/+3 | |
| |/ / / / | ||||||
| * | | | | Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse v0.11.0 | Erik Johnston | 2015-11-17 | 172 | -2810/+8255 | |
| |\ \ \ \ | ||||||
| | | * \ \ | Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-17 | 3 | -3/+17 | |
| | | |\ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | | Slightly more aggressive retry timers at HTTP level | Erik Johnston | 2015-11-17 | 1 | -2/+3 | |
| | * | | | | Bump changelog and version | Erik Johnston | 2015-11-17 | 2 | -1/+6 | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-17 | 10 | -45/+265 | |
| | |\| | | | ||||||
| | | * | | | Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserver | Erik Johnston | 2015-11-17 | 5 | -39/+199 | |
| | | |\ \ \ | ||||||
| | | | * | | | Always check guest = true in macaroons | Steven Hammerton | 2015-11-17 | 1 | -1/+2 | |
| | | | * | | | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-17 | 39 | -292/+1268 | |
| | | | |\ \ \ | ||||||
| | | | * | | | | Snakes not camels | Steven Hammerton | 2015-11-11 | 1 | -5/+5 | |
| | | | * | | | | Minor review fixes | Steven Hammerton | 2015-11-11 | 2 | -17/+14 | |
| | | | * | | | | Share more code between macaroon validation | Steven Hammerton | 2015-11-11 | 2 | -57/+17 | |
| | | | * | | | | Updates to fallback CAS login to do new token login | Steven Hammerton | 2015-11-06 | 1 | -26/+12 | |
| | | | * | | | | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-05 | 45 | -324/+1117 | |
| | | | |\ \ \ \ | ||||||
| | | | * | | | | | Allow hs to do CAS login completely and issue the client with a login token t... | Steven Hammerton | 2015-11-05 | 3 | -5/+218 | |
| | | | * | | | | | Add service URL to CAS config | Steven Hammerton | 2015-11-04 | 1 | -0/+3 | |
| | | * | | | | | | Merge pull request #380 from matrix-org/daniel/jenkins-sytest | Daniel Wagner-Hall | 2015-11-17 | 1 | -1/+22 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Run sytests on jenkins | Daniel Wagner-Hall | 2015-11-16 | 1 | -1/+22 | |
| | | * | | | | | | | Merge pull request #379 from matrix-org/daniel/jenkins | Daniel Wagner-Hall | 2015-11-17 | 2 | -4/+18 | |
| | | |\| | | | | | | | | |_|_|/ / / | | |/| | | | | | ||||||
| | | | * | | | | | Output results files on jenkins | Daniel Wagner-Hall | 2015-11-16 | 2 | -4/+18 | |
| | | |/ / / / / | ||||||
| | | * | | | | | Merge pull request #376 from matrix-org/daniel/jenkins | Daniel Wagner-Hall | 2015-11-16 | 3 | -1/+9 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | Pull out jenkins script into a checked in script | Daniel Wagner-Hall | 2015-11-13 | 3 | -1/+9 | |
| | | | | |_|/ / | | | |/| | | | ||||||
| | | * | | | | | Merge pull request #377 from matrix-org/paul/tiny-fixes | Paul Evans | 2015-11-13 | 1 | -0/+6 | |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| | | ||||||
| | | | * | | | Don't complain if /make_join response lacks 'prev_state' list (SYN-517) | Paul "LeoNerd" Evans | 2015-11-13 | 1 | -0/+6 | |
| | | | * | | | Merge branch 'develop' into paul/tiny-fixes | Paul "LeoNerd" Evans | 2015-11-13 | 100 | -1036/+3170 | |
| | | | |\ \ \ | | | |/ / / | | |/| | | | ||||||
| | | * | | | | Merge pull request #374 from matrix-org/daniel/guestleave | Daniel Wagner-Hall | 2015-11-13 | 1 | -3/+14 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | Allow guests to /room/:room_id/{join,leave} | Daniel Wagner-Hall | 2015-11-13 | 1 | -3/+14 | |
| | | |/ / / / | ||||||
| | | | * | | | Merge branch 'develop' into paul/tiny-fixes | Paul "LeoNerd" Evans | 2015-11-03 | 46 | -288/+1802 | |
| | | | |\ \ \ | ||||||
| | * | | | | | | Bump version and change log v0.11.0-rc2 | Erik Johnston | 2015-11-13 | 2 | -1/+9 | |
| | * | | | | | | Merge branch 'develop' into release-v0.11.0 | Erik Johnston | 2015-11-13 | 18 | -142/+474 | |
| | |\| | | | | | ||||||
| | | * | | | | | Implementation of state rollback in /sync | Richard van der Hoff | 2015-11-13 | 2 | -4/+69 | |
| | | * | | | | | Fix a few race conditions in the state calculation | Richard van der Hoff | 2015-11-13 | 2 | -60/+77 | |
| | | * | | | | | Make handlers.sync return a state dictionary, instead of an event list. | Richard van der Hoff | 2015-11-13 | 2 | -32/+40 | |
| | | * | | | | | Update some comments | Richard van der Hoff | 2015-11-13 | 4 | -14/+98 | |
| | | * | | | | | Merge pull request #369 from matrix-org/daniel/guestnonevents | Daniel Wagner-Hall | 2015-11-12 | 2 | -3/+20 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | Return non-room events from guest /events calls | Daniel Wagner-Hall | 2015-11-12 | 2 | -3/+20 | |
| | | * | | | | | | Merge pull request #368 from matrix-org/erikj/fix_federation_profile | Erik Johnston | 2015-11-12 | 3 | -6/+13 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Fix missing profile data in federation joins | Erik Johnston | 2015-11-12 | 3 | -6/+13 | |
| | | | |/ / / / / | ||||||
| | | * | | | | | | Merge pull request #366 from matrix-org/erikj/search_fix_sqlite_faster | Erik Johnston | 2015-11-12 | 1 | -3/+14 | |
| | | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | | * | | | | | Trailing whitespace | Erik Johnston | 2015-11-12 | 1 | -1/+1 | |
| | | | * | | | | | Expand comment | Erik Johnston | 2015-11-12 | 1 | -0/+6 | |
| | | | * | | | | | Comment | Erik Johnston | 2015-11-12 | 1 | -0/+2 | |
| | | | * | | | | | Fix SQL syntax | Erik Johnston | 2015-11-12 | 1 | -2/+3 | |
| | | | * | | | | | Use a (hopefully) more efficient SQL query for doing recency based room search | Erik Johnston | 2015-11-12 | 1 | -4/+6 | |
| | | * | | | | | | Fix an issue with ignoring power_level changes on divergent graphs | Richard van der Hoff | 2015-11-12 | 2 | -5/+104 | |
| | | * | | | | | | 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 | 2 | -24/+34 | |
| | | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | ||||||
| | | | * | | | | | | Allow guest access to room initialSync | Daniel Wagner-Hall | 2015-11-11 | 2 | -24/+34 | |
| | | * | | | | | | | Fix bug where assumed dict was namedtuple | Erik Johnston | 2015-11-12 | 1 | -1/+1 | |
| | | | |/ / / / / | | |/| | | | | | ||||||
| | | * | | | | | | Merge pull request #364 from matrix-org/daniel/guestdisplaynames | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Allow guests to set their display names | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+1 | |
| | | |/ / / / / / | ||||||
| | | * | | | | | | Merge pull request #363 from matrix-org/daniel/guestscanjoin | Daniel Wagner-Hall | 2015-11-12 | 1 | -12/+21 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Consider joined guest users as joined users | Daniel Wagner-Hall | 2015-11-12 | 1 | -12/+21 | |
| | | |/ / / / / / | ||||||
| | | * | | | | | | Merge pull request #362 from matrix-org/daniel/raceyraceyfunfun | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+5 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Fix race creating directories | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+5 | |
| | | |/ / / / / / | ||||||
| | | * | | | | | | Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-11 | 2 | -1/+17 | |
| | | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | | Update date v0.11.0-rc1 | Erik Johnston | 2015-11-11 | 1 | -1/+1 | |
| | * | | | | | | | Update CHANGES | Erik Johnston | 2015-11-11 | 1 | -1/+1 | |
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-11 | 2 | -5/+11 | |
| | |\| | | | | | | ||||||
| | | * | | | | | | Merge pull request #361 from matrix-org/daniel/guestcontext | Erik Johnston | 2015-11-11 | 2 | -5/+11 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Allow guests to access room context API | Daniel Wagner-Hall | 2015-11-11 | 2 | -5/+11 | |
| | | | |/ / / / / | ||||||
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-11 | 24 | -141/+738 | |
| | |\| | | | | | | ||||||
| | | * | | | | | | Merge pull request #359 from matrix-org/markjh/incremental_indexing | Erik Johnston | 2015-11-11 | 8 | -77/+492 | |
| | | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | | * | | | | | Fix param style to work on both sqlite and postgres | Mark Haines | 2015-11-11 | 1 | -2/+6 | |
| | | | * | | | | | Fix the background update | Mark Haines | 2015-11-11 | 3 | -17/+19 | |
| | | | * | | | | | Use a background task to update databases to use the full text search | Mark Haines | 2015-11-10 | 2 | -80/+28 | |
| | | | * | | | | | Test for background updates | Mark Haines | 2015-11-10 | 2 | -0/+79 | |
| | | | * | | | | | Run the background updates when starting synapse. | Mark Haines | 2015-11-10 | 4 | -10/+67 | |
| | | | * | | | | | Add background update task for reindexing event search | Mark Haines | 2015-11-09 | 1 | -2/+96 | |
| | | | * | | | | | Add storage module for tracking background updates. | Mark Haines | 2015-11-09 | 2 | -0/+231 | |
| | | * | | | | | | Merge pull request #358 from matrix-org/daniel/publicwritable | Daniel Wagner-Hall | 2015-11-11 | 4 | -29/+71 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Return world_readable and guest_can_join in /publicRooms | Daniel Wagner-Hall | 2015-11-10 | 4 | -29/+71 | |
| | | |/ / / / / / | ||||||
| | | * | | | | | | Merge pull request #355 from matrix-org/daniel/anonymouswriting | Daniel Wagner-Hall | 2015-11-10 | 7 | -12/+92 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 7 | -12/+92 | |
| | | |/ / / / / / | ||||||
| | | * | | | | | | Merge pull request #356 from matrix-org/daniel/3pidyetagain | Daniel Wagner-Hall | 2015-11-10 | 2 | -7/+4 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Get display name from identity server, not client | Daniel Wagner-Hall | 2015-11-09 | 2 | -7/+4 | |
| | | | |/ / / / / | ||||||
| | | * | | | | | | Merge pull request #357 from matrix-org/rav/SYN-516 | Mark Haines | 2015-11-09 | 1 | -4/+12 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Don't fiddle with results returned by event sources | Richard van der Hoff | 2015-11-09 | 1 | -4/+12 | |
| | | |/ / / / / / | ||||||
| | | * | | | | | | Add a couple of unit tests for room/<x>/messages | Richard van der Hoff | 2015-11-09 | 2 | -1/+57 | |
| | | * | | | | | | Merge pull request #354 from matrix-org/markjh/SYN-513 | Mark Haines | 2015-11-09 | 2 | -3/+2 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ | Merge branch 'develop' into markjh/SYN-513 | Mark Haines | 2015-11-09 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | | * | | | | | | | fix comedy important missing comma breaking recent-ordered FTS on sqlite | Matthew Hodgson | 2015-11-08 | 1 | -1/+1 | |
| | | * | | | | | | | add a key existence check to tags_by_room to avoid /events 500'ing when testi... | Matthew Hodgson | 2015-11-06 | 1 | -1/+2 | |
| | | | |/ / / / / | | |/| | | | | | ||||||
| | | | * | | | | | SYN-513: Include updates for rooms that have had all their tags deleted | Mark Haines | 2015-11-09 | 2 | -2/+2 | |
| | | |/ / / / / | ||||||
| | | * | | | | | Merge pull request #353 from matrix-org/daniel/oops | Daniel Wagner-Hall | 2015-11-06 | 1 | -1/+0 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | Remove accidentally added ID column | Daniel Wagner-Hall | 2015-11-06 | 1 | -1/+0 | |
| | | |/ / / / / | ||||||
| | | * | | | / | remove references to matrix.org/beta | Matthew Hodgson | 2015-11-06 | 1 | -7/+7 | |
| | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | | Remove anonymous access, since its not ready yet | Erik Johnston | 2015-11-05 | 1 | -2/+1 | |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-05 | 14 | -190/+249 | |
| | |\| | | | | ||||||
| | | * | | | | Merge pull request #350 from matrix-org/erikj/search | Erik Johnston | 2015-11-05 | 3 | -36/+288 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | 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 | |
| | | * | | | | | Exchange 3pid invites for m.room.member invites | Daniel Wagner-Hall | 2015-11-05 | 10 | -180/+230 | |
| | | * | | | | | Merge pull request #351 from matrix-org/daniel/fixtox | Daniel Wagner-Hall | 2015-11-05 | 1 | -3/+4 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | Fix tox config after fa1cf5ef34 | Daniel Wagner-Hall | 2015-11-05 | 1 | -3/+4 | |
| | | |/ / / / / | ||||||
| | | * | | | | | Merge pull request #340 from matrix-org/erikj/server_retries | Erik Johnston | 2015-11-05 | 2 | -4/+13 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | Retry dead servers a lot less often | Erik Johnston | 2015-11-02 | 2 | -4/+13 | |
| | | | | |_|/ / | | | |/| | | | ||||||
| | * | | | | | | Add PR | Erik Johnston | 2015-11-05 | 1 | -1/+1 | |
| | * | | | | | | Bump changelog and version number | Erik Johnston | 2015-11-05 | 2 | -1/+18 | |
| | | |_|/ / / | |/| | | | | ||||||
| | * | | | | | COMMENTS | Erik Johnston | 2015-11-05 | 1 | -4/+26 | |
| | * | | | | | Error handling | Erik Johnston | 2015-11-05 | 1 | -1/+8 | |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-11-05 | 67 | -491/+853 | |
| | |\| | | | | ||||||
| | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-05 | 55 | -490/+572 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | Open up /events to anonymous users for room events only | Daniel Wagner-Hall | 2015-11-05 | 20 | -82/+299 | |
| | | | * | | | | Merge pull request #347 from matrix-org/markjh/check_filter | Mark Haines | 2015-11-05 | 1 | -18/+2 | |
| | | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | ||||||
| | | | | * | | | Remove fields that are both unspecified and unused from the filter checks, ch... | Mark Haines | 2015-11-04 | 1 | -18/+2 | |
| | | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Daniel Wagner-Hall | 2015-11-04 | 12 | -231/+7 | |
| | | | |\ \ \ \ | ||||||
| | | | | * \ \ \ | Merge pull request #339 from matrix-org/daniel/removesomelies | Daniel Wagner-Hall | 2015-11-04 | 8 | -42/+7 | |
| | | | | |\ \ \ \ | ||||||
| | | | | | * \ \ \ | Merge branch 'develop' into daniel/removesomelies | Mark Haines | 2015-11-04 | 20 | -270/+579 | |
| | | | | | |\ \ \ \ | | | | | |/ / / / | | | | |/| | | | | ||||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |