Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Add constant for throttle multiplier | David Baker | 2016-04-29 | 1 | -1/+2 | |
| * | | | | | | | | Remove unused function | David Baker | 2016-04-29 | 2 | -26/+0 | |
| * | | | | | | | | Remove unused arg | David Baker | 2016-04-29 | 1 | -2/+2 | |
| * | | | | | | | | Docstring | David Baker | 2016-04-29 | 1 | -0/+14 | |
| * | | | | | | | | Use explicit join | David Baker | 2016-04-29 | 1 | -3/+3 | |
| * | | | | | | | | Oops, actually specify the user id | David Baker | 2016-04-29 | 1 | -1/+3 | |
| * | | | | | | | | Remove unnecessary if | David Baker | 2016-04-29 | 1 | -1/+1 | |
| * | | | | | | | | Put spaces at start of line | David Baker | 2016-04-29 | 1 | -16/+16 | |
| * | | | | | | | | Try imports in config | David Baker | 2016-04-29 | 1 | -0/+7 | |
| * | | | | | | | | Use the constant | David Baker | 2016-04-29 | 1 | -1/+2 | |
| * | | | | | | | | Avoid `vars` builtin | David Baker | 2016-04-29 | 1 | -15/+15 | |
| * | | | | | | | | Use named parameter format | David Baker | 2016-04-29 | 1 | -14/+22 | |
| * | | | | | | | | Default enable email notifs to False | David Baker | 2016-04-29 | 1 | -1/+1 | |
| * | | | | | | | | Include res in the manifest | David Baker | 2016-04-29 | 1 | -0/+1 | |
| * | | | | | | | | pep8 | David Baker | 2016-04-29 | 1 | -1/+0 | |
| * | | | | | | | | Remove rather pointless get function | David Baker | 2016-04-29 | 1 | -9/+1 | |
| * | | | | | | | | Stop processing notifs once we've sent a mail | David Baker | 2016-04-29 | 1 | -0/+1 | |
| * | | | | | | | | Correct public_baseurl default | David Baker | 2016-04-29 | 1 | -2/+2 | |
| * | | | | | | | | Nicer get() shorthand | David Baker | 2016-04-29 | 1 | -3/+2 | |
| * | | | | | | | | Remove redundant docstring | David Baker | 2016-04-29 | 1 | -4/+0 | |
| * | | | | | | | | Correct default template and add text template | David Baker | 2016-04-29 | 1 | -1/+2 | |
| * | | | | | | | | Send mail notifs with a plaintext part too | David Baker | 2016-04-29 | 5 | -7/+50 | |
| * | | | | | | | | Add an email pusher for new users | David Baker | 2016-04-29 | 2 | -0/+27 | |
| * | | | | | | | | pep8 newline | David Baker | 2016-04-29 | 1 | -1/+1 | |
| * | | | | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 42 | -454/+1371 | |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | ||||||
| * | | | | | | | | Remove vector specific style | David Baker | 2016-04-28 | 1 | -14/+0 | |
| * | | | | | | | | Some basic css to make it halfway legible | David Baker | 2016-04-28 | 3 | -16/+58 | |
| * | | | | | | | | Fix notification link | David Baker | 2016-04-28 | 1 | -1/+1 | |
| * | | | | | | | | May as well always include room link | David Baker | 2016-04-28 | 1 | -4/+3 | |
| * | | | | | | | | Put back real delay before mailing | David Baker | 2016-04-28 | 1 | -1/+1 | |
| * | | | | | | | | Support file messages & fix plain text | David Baker | 2016-04-28 | 2 | -7/+6 | |
| * | | | | | | | | Support image notifs | David Baker | 2016-04-28 | 2 | -15/+33 | |
| * | | | | | | | | pep8 | David Baker | 2016-04-28 | 2 | -3/+6 | |
| * | | | | | | | | Only import email pusher if email notifs are on | David Baker | 2016-04-28 | 1 | -6/+8 | |
| * | | | | | | | | Handle room invites in email notifs | David Baker | 2016-04-28 | 3 | -13/+42 | |
| * | | | | | | | | Add the jinja template for individual notifs | David Baker | 2016-04-28 | 1 | -0/+32 | |
| * | | | | | | | | Linkify plain text messages too | David Baker | 2016-04-28 | 1 | -1/+12 | |
| * | | | | | | | | Run filter_events_for_client | David Baker | 2016-04-27 | 7 | -20/+24 | |
| * | | | | | | | | Make html messages work | David Baker | 2016-04-27 | 1 | -10/+21 | |
| * | | | | | | | | Better grammar for multiple messages in a room | David Baker | 2016-04-27 | 2 | -10/+33 | |
| * | | | | | | | | Hopefully all remaining bits for email notifs | David Baker | 2016-04-27 | 7 | -42/+195 | |
| * | | | | | | | | More variable calculation for email notifs | David Baker | 2016-04-25 | 3 | -19/+76 | |
| * | | | | | | | | Typo | David Baker | 2016-04-25 | 1 | -1/+1 | |
| * | | | | | | | | No we don't: it's just the display name | David Baker | 2016-04-22 | 1 | -1/+0 | |
| * | | | | | | | | Actually do UTF8 correctly | David Baker | 2016-04-22 | 1 | -1/+1 | |
| * | | | | | | | | Sort member events | David Baker | 2016-04-22 | 1 | -0/+4 | |
| * | | | | | | | | Mime part is binary so encode it first. | David Baker | 2016-04-22 | 1 | -1/+1 | |
| * | | | | | | | | Implement group-of-people names | David Baker | 2016-04-22 | 1 | -17/+14 | |
| * | | | | | | | | No inlineCallbacks necessary on this | David Baker | 2016-04-22 | 1 | -1/+0 | |
| * | | | | | | | | Add WIP email template files | David Baker | 2016-04-21 | 2 | -0/+20 | |
| * | | | | | | | | Flesh out email templating | David Baker | 2016-04-21 | 4 | -4/+208 | |
| * | | | | | | | | Generate mails from a template | David Baker | 2016-04-20 | 4 | -31/+49 | |
| * | | | | | | | | more pep8 | David Baker | 2016-04-20 | 1 | -1/+1 | |
| * | | | | | | | | Send a rather basic email notif | David Baker | 2016-04-20 | 6 | -12/+136 | |
| * | | | | | | | | Add single instance & logging stuff | David Baker | 2016-04-19 | 1 | -8/+39 | |
| * | | | | | | | | First bits of emailpusher | David Baker | 2016-04-19 | 7 | -8/+335 | |
* | | | | | | | | | Merge pull request #763 from matrix-org/erikj/ignore_user | Erik Johnston | 2016-05-10 | 4 | -9/+93 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 6 | -28/+23 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #773 from matrix-org/erikj/get_domian_from_id | Erik Johnston | 2016-05-09 | 6 | -28/+23 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 6 | -28/+23 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 13 | -58/+479 | |
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #764 from matrix-org/erikj/replication_logging | Erik Johnston | 2016-05-09 | 1 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Don't warn | Erik Johnston | 2016-05-05 | 1 | -2/+0 | |
| * | | | | | | | | | Add some log information at returned replication streams | Erik Johnston | 2016-05-05 | 1 | -0/+11 | |
* | | | | | | | | | | Merge pull request #772 from matrix-org/erikj/get_user_cache | Erik Johnston | 2016-05-09 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add cache to get_user_by_id | Erik Johnston | 2016-05-09 | 1 | -0/+3 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #770 from matrix-org/erikj/transaction_reactor | Erik Johnston | 2016-05-09 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Run transaction queue on reactor | Erik Johnston | 2016-05-09 | 1 | -0/+3 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #768 from matrix-org/erikj/queue_evens_persist | Erik Johnston | 2016-05-09 | 1 | -11/+149 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Remove unused import | Erik Johnston | 2016-05-06 | 1 | -1/+1 | |
| * | | | | | | | | | Pull loop one level up | Erik Johnston | 2016-05-06 | 1 | -36/+41 | |
| * | | | | | | | | | Queue events for persistence | Erik Johnston | 2016-05-06 | 1 | -11/+144 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #767 from matrix-org/erikj/transaction_txn | Erik Johnston | 2016-05-06 | 2 | -45/+122 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Pull prev txn from in memory | Erik Johnston | 2016-05-06 | 1 | -5/+13 | |
| * | | | | | | | | | Don't needlessly enter transaction | Erik Johnston | 2016-05-06 | 1 | -9/+9 | |
| * | | | | | | | | | Reduce database inserts when sending transactions | Erik Johnston | 2016-05-06 | 2 | -45/+114 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #765 from matrix-org/markjh/open_id | Mark Haines | 2016-05-05 | 7 | -2/+193 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Rename openid/token to openid/request_token | Mark Haines | 2016-05-05 | 1 | -2/+2 | |
| * | | | | | | | | Add an openidish mechanism for proving to third parties that you own a given ... | Mark Haines | 2016-05-05 | 7 | -2/+193 | |
|/ / / / / / / / | ||||||
| * | | | | | | | Add bulk fetch storage API | Erik Johnston | 2016-05-05 | 3 | -11/+26 | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-04 | 8 | -2/+117 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #762 from matrix-org/erikj/report_event | Erik Johnston | 2016-05-04 | 6 | -1/+106 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add primary key | Erik Johnston | 2016-05-04 | 1 | -1/+1 | |
| * | | | | | | | | Add timestamp and auto incrementing ID | Erik Johnston | 2016-05-04 | 4 | -1/+10 | |
| * | | | | | | | | Move event_id to path | Erik Johnston | 2016-05-04 | 1 | -4/+2 | |
| * | | | | | | | | Add /report endpoint | Erik Johnston | 2016-05-04 | 5 | -1/+99 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | starting point for doc on how log contexts are supposed to work | Matthew Hodgson | 2016-05-04 | 1 | -0/+10 | |
* | | | | | | | | Merge pull request #757 from matrix-org/erikj/event_auth_typo | Erik Johnston | 2016-05-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix typo in event_auth servlet path | Erik Johnston | 2016-04-29 | 1 | -1/+1 | |
| | |_|/ / / / | |/| | | | | | ||||||
| | * | | | | | Implement basic ignore user | Erik Johnston | 2016-05-04 | 4 | -9/+78 | |
| |/ / / / / |/| | | | | | ||||||
| | | * | | | add a url_preview_ip_range_whitelist config param so we can whitelist the mat... | Matthew Hodgson | 2016-05-01 | 3 | -7/+27 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge pull request #758 from matrix-org/dbkr/fix_password_reset | David Baker | 2016-04-29 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix password reset | David Baker | 2016-04-29 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Fix more typos in per-request metrics | Mark Haines | 2016-04-28 | 1 | -4/+5 | |
* | | | | Fix typo in request metrics | Mark Haines | 2016-04-28 | 1 | -1/+1 | |
* | | | | fix typo | Matthew Hodgson | 2016-04-28 | 1 | -1/+1 | |
* | | | | Merge pull request #756 from matrix-org/markjh/more_metrics | Mark Haines | 2016-04-28 | 9 | -47/+81 | |
|\ \ \ \ | ||||||
| * | | | | Add a comment explaining why automatic metric reporting is disabled for JsonR... | Mark Haines | 2016-04-28 | 1 | -0/+4 | |
| * | | | | Check if report_metrics is True | Mark Haines | 2016-04-28 | 1 | -3/+4 | |
| * | | | | Report per request metrics for all of the things using request_handler | Mark Haines | 2016-04-28 | 9 | -47/+76 | |
|/ / / / | ||||||
* | | | | Merge pull request #755 from matrix-org/markjh/right_direction | Mark Haines | 2016-04-27 | 2 | -3/+3 | |
|\ \ \ \ | ||||||
| * | | | | Fix backfill replication to advance the stream correctly | Mark Haines | 2016-04-27 | 2 | -3/+3 | |
* | | | | | Merge pull request #754 from matrix-org/markjh/check_for_nop | Mark Haines | 2016-04-27 | 3 | -2/+14 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Check that somethign has happend before running the selects | Mark Haines | 2016-04-27 | 3 | -2/+14 | |
|/ / / / | ||||||
* | | | | Actually start the pusher daemon | Mark Haines | 2016-04-26 | 1 | -0/+2 | |
* | | | | Fix typo in default pusher config | Mark Haines | 2016-04-26 | 1 | -1/+1 | |
* | | | | Merge pull request #753 from matrix-org/markjh/daemon_pusher | Mark Haines | 2016-04-26 | 1 | -4/+36 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Add a log context to the daemonized pusher | Mark Haines | 2016-04-26 | 1 | -1/+6 | |
| * | | | Optionally daemonize the pusher | Mark Haines | 2016-04-26 | 1 | -4/+31 | |
|/ / / | ||||||
* | | | Merge pull request #750 from matrix-org/erikj/jwt_optional | Erik Johnston | 2016-04-26 | 3 | -7/+23 | |
|\ \ \ | ||||||
| * | | | Make pyjwt dependency optional | Erik Johnston | 2016-04-25 | 3 | -7/+23 | |
* | | | | Merge pull request #752 from matrix-org/markjh/more_updates | Mark Haines | 2016-04-26 | 1 | -0/+8 | |
|\ \ \ \ | ||||||
| * | | | | Add a couple of update methods to the PusherSlaveStore | Mark Haines | 2016-04-26 | 1 | -0/+8 | |
|/ / / / | ||||||
* | | | | Merge pull request #751 from matrix-org/markjh/pusher_metrics_manhole | Mark Haines | 2016-04-26 | 2 | -3/+92 | |
|\ \ \ \ | ||||||
| * | | | | Remove the uncomments from the comments | Mark Haines | 2016-04-25 | 1 | -2/+2 | |
| * | | | | Add a metrics listener and a ssh listener to the pusher | Mark Haines | 2016-04-25 | 2 | -3/+92 | |
|/ / / / | ||||||
* | | | | Merge pull request #749 from matrix-org/markjh/split_manhole | Mark Haines | 2016-04-25 | 2 | -23/+52 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Move the listenTCP call outside the manhole function | Mark Haines | 2016-04-25 | 2 | -16/+14 | |
| * | | | Split out setting up the manhole to a separate file | Mark Haines | 2016-04-22 | 2 | -26/+57 | |
* | | | | Merge pull request #748 from matrix-org/markjh/split_out_site.py | Mark Haines | 2016-04-22 | 2 | -130/+149 | |
|\| | | | ||||||
| * | | | Merge branch 'develop' into markjh/split_out_site.py | Mark Haines | 2016-04-22 | 2 | -82/+105 | |
| |\ \ \ | |/ / / |/| | | | ||||||
* | | | | Merge pull request #747 from matrix-org/markjh/http_resource_tree | Mark Haines | 2016-04-22 | 2 | -82/+105 | |
|\ \ \ \ | ||||||
| * | | | | Split out create_resource_tree to a separate file | Mark Haines | 2016-04-22 | 2 | -82/+105 | |
|/ / / / | ||||||
| * / / | Move SynapseSite to its own file | Mark Haines | 2016-04-22 | 2 | -130/+149 | |
|/ / / | ||||||
* | | | Merge pull request #746 from matrix-org/markjh/split_out_pusher | Mark Haines | 2016-04-22 | 5 | -1/+217 | |
|\ \ \ | ||||||
| * | | | Optionally split out the pushers into a separate process | Mark Haines | 2016-04-21 | 5 | -1/+217 | |
* | | | | Merge pull request #745 from matrix-org/erikj/search-index | Erik Johnston | 2016-04-22 | 5 | -49/+250 | |
|\ \ \ \ | ||||||
| * | | | | Update port script | Erik Johnston | 2016-04-22 | 1 | -42/+81 | |
| * | | | | Simplify query and handle finishing correctly | Erik Johnston | 2016-04-22 | 2 | -17/+16 | |
| * | | | | Order NULLs first | Erik Johnston | 2016-04-21 | 2 | -5/+16 | |
| * | | | | Fix query | Erik Johnston | 2016-04-21 | 1 | -2/+2 | |
| * | | | | Use special UPDATE syntax | Erik Johnston | 2016-04-21 | 2 | -22/+14 | |
| * | | | | Typo | Erik Johnston | 2016-04-21 | 1 | -1/+1 | |
| * | | | | Need to do _background_update_progress_txn in actual transaction | Erik Johnston | 2016-04-21 | 1 | -6/+8 | |
| * | | | | Update progress when creating index | Erik Johnston | 2016-04-21 | 1 | -0/+7 | |
| * | | | | Fix SQL statement | Erik Johnston | 2016-04-21 | 1 | -3/+3 | |
| * | | | | Create index must be on a conn | Erik Johnston | 2016-04-21 | 1 | -6/+13 | |
| * | | | | Create index concurrently | Erik Johnston | 2016-04-21 | 2 | -6/+14 | |
| * | | | | Add missing run_upgrade | Erik Johnston | 2016-04-21 | 1 | -0/+4 | |
| * | | | | Optimise event_search in postgres | Erik Johnston | 2016-04-21 | 3 | -5/+137 | |
* | | | | | Merge pull request #687 from nikriek/jwt-fix | Erik Johnston | 2016-04-21 | 2 | -3/+8 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Fix issues with JWT login | Niklas Riekenbrauck | 2016-04-21 | 2 | -3/+8 | |
* | | | | | Merge pull request #743 from matrix-org/markjh/slave_pushers | Mark Haines | 2016-04-21 | 1 | -0/+52 | |
|\ \ \ \ \ | ||||||
| * | | | | | Replicate the pushers | Mark Haines | 2016-04-21 | 1 | -0/+52 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #744 from matrix-org/markjh/replication_remove_pusher | Mark Haines | 2016-04-21 | 2 | -3/+57 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add a replication endpoint for deleting pushers | Mark Haines | 2016-04-21 | 2 | -3/+57 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #742 from matrix-org/markjh/slave_event_push_actions | Mark Haines | 2016-04-21 | 2 | -0/+57 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Merge branch 'develop' into markjh/slave_event_push_actions | Mark Haines | 2016-04-21 | 3 | -86/+2 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | pip install new python dependencies in jenkins.sh | Mark Haines | 2016-04-21 | 3 | -86/+2 | |
| * | | | | Merge branch 'develop' into markjh/slave_event_push_actions | Mark Haines | 2016-04-21 | 2 | -0/+2 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Make jenkins install lxml | Erik Johnston | 2016-04-21 | 2 | -0/+2 | |
| * | | | | Replicate push actions | Mark Haines | 2016-04-21 | 2 | -0/+57 | |
|/ / / / | ||||||
* | | | | Merge pull request #740 from matrix-org/erikj/state_cache | Erik Johnston | 2016-04-20 | 1 | -3/+10 | |
|\ \ \ \ | ||||||
| * | | | | Always use state cache entry if it exists | Erik Johnston | 2016-04-20 | 1 | -3/+10 | |
|/ / / / | ||||||
* | | | | Add some logging to state resolve_events | Erik Johnston | 2016-04-20 | 1 | -0/+5 | |
* | | | | Merge pull request #739 from matrix-org/erikj/cache_get_state_groups_for_groups | Erik Johnston | 2016-04-19 | 1 | -3/+16 | |
|\ \ \ \ | ||||||
| * | | | | Add cache to _get_state_groups_from_groups | Erik Johnston | 2016-04-19 | 1 | -3/+16 | |
* | | | | | Merge pull request #738 from matrix-org/markjh/slaved_receipts | Mark Haines | 2016-04-19 | 4 | -3/+104 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Add a slaved receipts store | Mark Haines | 2016-04-19 | 4 | -3/+104 | |
* | | | | | Merge pull request #737 from matrix-org/erikj/spider_ssl_factory | Erik Johnston | 2016-04-19 | 1 | -1/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Make InsecureInterceptableContextFactory work with SpiderEndpoint | Erik Johnston | 2016-04-19 | 1 | -1/+4 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #736 from matrix-org/markjh/slave_invited_rooms_for_user | Mark Haines | 2016-04-19 | 2 | -2/+19 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Replicate get_invited_rooms_for_user | Mark Haines | 2016-04-19 | 2 | -2/+19 | |
|/ / / / | ||||||
* | | | | Add self.media_repo to PreviewUrlResource | Erik Johnston | 2016-04-19 | 1 | -0/+1 | |
* | | | | _make_dirs was moved to MediaRepository | Erik Johnston | 2016-04-19 | 1 | -1/+1 | |
* | | | | Add store to PreviewUrlResource | Erik Johnston | 2016-04-19 | 1 | -0/+1 | |
* | | | | Reorder imports | Erik Johnston | 2016-04-19 | 1 | -7/+8 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #735 from matrix-org/erikj/media_resource_cleanup | Erik Johnston | 2016-04-19 | 7 | -531/+580 | |
|\ \ \ | ||||||
| * | | | Move MediaRepository to media_repository module | Erik Johnston | 2016-04-19 | 5 | -489/+496 | |
| * | | | Split out BaseMediaResource into MediaRepository | Erik Johnston | 2016-04-19 | 6 | -138/+180 | |
|/ / / | ||||||
* | | | Merge pull request #734 from matrix-org/erikj/measure | Erik Johnston | 2016-04-18 | 2 | -8/+19 | |
|\ \ \ | ||||||
| * | | | Create log context in Measure if one doesn't exist | Erik Johnston | 2016-04-18 | 2 | -8/+19 | |
|/ / / | ||||||
* | | | Merge pull request #733 from matrix-org/erikj/make_member_timeout | Erik Johnston | 2016-04-18 | 1 | -1/+2 | |
|\ \ \ | ||||||
| * | | | Lower timeout for make_membership_event | Erik Johnston | 2016-04-15 | 1 | -1/+2 | |
* | | | | Merge pull request #732 from matrix-org/erikj/login | Erik Johnston | 2016-04-18 | 1 | -5/+9 | |
|\ \ \ \ | ||||||
| * | | | | Simplify _check_password | Erik Johnston | 2016-04-15 | 1 | -5/+9 | |
| |/ / / | ||||||
* | | | | explicitly pass in the charset from Content-Type to lxml to fix cyrillic woes... | Matthew Hodgson | 2016-04-15 | 1 | -6/+18 | |
* | | | | fix cyrillic URL previews by hardcoding all page decoding to UTF-8 for now, r... | Matthew Hodgson | 2016-04-15 | 1 | -16/+8 | |
|/ / / | ||||||
* | | | Merge pull request #731 from matrix-org/erikj/timed_otu | Erik Johnston | 2016-04-15 | 1 | -1/+2 | |
|\ \ \ | ||||||
| * | | | Use SynapseError 504 for Timeout errors | Erik Johnston | 2016-04-15 | 1 | -1/+2 | |
|/ / / | ||||||
* | | | Fix check_password rather than inverting the meaning of _check_local_password... | Mark Haines | 2016-04-14 | 1 | -9/+12 | |
* | | | Merge pull request #729 from matrix-org/dbkr/fix_login_nonexistent_user | David Baker | 2016-04-14 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Fix login to error for nonexistent users | David Baker | 2016-04-14 | 1 | -1/+1 | |
* | | | | fix urlparse import thinko breaking tiny URLs | Matthew Hodgson | 2016-04-14 | 1 | -5/+5 | |
* | | | | Merge pull request #727 from matrix-org/kegan/fix-asapi-reg | Kegsay | 2016-04-14 | 1 | -0/+5 | |
|\ \ \ \ | ||||||
| * | | | | Make v2_alpha reg follow the AS API specification | Kegan Dougal | 2016-04-14 | 1 | -0/+5 | |
|/ / / / | ||||||
* | | | | comment out 2c838f6459db35ad9812a83184d85a06ca5d940a due to risk of https://e... | Matthew Hodgson | 2016-04-14 | 1 | -16/+16 | |
* | | | | Merge pull request #726 from matrix-org/erikj/push_metric | Erik Johnston | 2016-04-14 | 1 | -11/+15 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Measure push action generator | Erik Johnston | 2016-04-14 | 1 | -11/+15 | |
|/ / / | ||||||
* | | | Merge pull request #725 from matrix-org/dbkr/push_only_joined | Erik Johnston | 2016-04-14 | 1 | -1/+13 | |
|\ \ \ | ||||||
| * | | | Don't push for everyone who ever sent an RR to the room | David Baker | 2016-04-14 | 1 | -1/+13 | |
* | | | | Add missing yield | Erik Johnston | 2016-04-14 | 1 | -1/+1 | |
* | | | | Rename log context | Erik Johnston | 2016-04-14 | 1 | -1/+1 | |
* | | | | Merge pull request #724 from matrix-org/erikj/push_measure | Erik Johnston | 2016-04-14 | 3 | -25/+50 | |
|\ \ \ \ | ||||||
| * | | | | Make send_badge private | Erik Johnston | 2016-04-14 | 1 | -2/+2 | |
| * | | | | Add desc arg | Erik Johnston | 2016-04-14 | 1 | -1/+5 | |
| * | | | | Add necessary logging contexts | Erik Johnston | 2016-04-14 | 1 | -24/+25 | |
| * | | | | Add index | Erik Johnston | 2016-04-14 | 1 | -0/+18 | |
| * | | | | Add extra Measure | Erik Johnston | 2016-04-14 | 1 | -14/+16 | |
|/ / / / | ||||||
* | | | | Fix query for get_unread_push_actions_for_user_in_range | Erik Johnston | 2016-04-14 | 1 | -1/+2 | |
* | | | | Merge pull request #721 from matrix-org/erikj/spider | Erik Johnston | 2016-04-14 | 4 | -38/+41 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Give install requirements | Erik Johnston | 2016-04-13 | 1 | -1/+7 | |
| * | | | Add back in helpful description for missing url_preview_ip_range_blacklist | Erik Johnston | 2016-04-13 | 1 | -1/+5 | |
| * | | | Sanitize the optional dependencies for spider API | Erik Johnston | 2016-04-13 | 4 | -38/+31 | |
* | | | | Merge pull request #722 from matrix-org/dbkr/only_unread_event_actions | David Baker | 2016-04-13 | 1 | -9/+50 | |
|\ \ \ \ | ||||||
| * | | | | pep8 | David Baker | 2016-04-13 | 1 | -1/+1 | |
| * | | | | Only return unread notifications | David Baker | 2016-04-13 | 1 | -9/+50 | |
* | | | | | Merge pull request #718 from matrix-org/erikj/public_room_list | Erik Johnston | 2016-04-13 | 1 | -5/+8 | |
|\ \ \ \ \ | ||||||
| * | | | | | Don't return empty public rooms | Erik Johnston | 2016-04-12 | 1 | -5/+8 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #720 from matrix-org/erikj/auth_chec | Erik Johnston | 2016-04-13 | 3 | -18/+35 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Measure Auth.check | Erik Johnston | 2016-04-13 | 1 | -47/+50 | |
| * | | | | Don't auto log failed auth checks | Erik Johnston | 2016-04-13 | 3 | -62/+76 | |
| |/ / / | ||||||
* / / / | Unused member variable | David Baker | 2016-04-12 | 1 | -1/+0 | |
|/ / / | ||||||
* | | | Update replication.rst | Mark Haines | 2016-04-12 | 1 | -1/+1 | |
* | | | Add some design documentation for replication | Mark Haines | 2016-04-12 | 1 | -0/+58 | |
* | | | Merge pull request #716 from matrix-org/dbkr/get_pushers | David Baker | 2016-04-12 | 2 | -17/+71 | |
|\ \ \ | ||||||
| * | | | Unneccessarywhitespaceisunnecessary | David Baker | 2016-04-12 | 1 | -1/+0 | |
| * | | | Oops, forgot the desc. | David Baker | 2016-04-12 | 1 | -1/+1 | |
| * | | | Make the /set part mandatory | David Baker | 2016-04-12 | 1 | -1/+1 | |
| * | | | Tidy up get_pusher functions | David Baker | 2016-04-12 | 1 | -32/+30 | |
| * | | | Mis-named function | David Baker | 2016-04-12 | 2 | -2/+2 | |
| * | | | Split into separate servlet classes | David Baker | 2016-04-12 | 1 | -11/+16 | |
| * | | | Add get endpoint for pushers | David Baker | 2016-04-11 | 2 | -1/+53 | |
* | | | | Merge pull request #717 from matrix-org/erikj/backfill_state | Erik Johnston | 2016-04-12 | 2 | -15/+59 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | More comments | Erik Johnston | 2016-04-12 | 1 | -0/+9 | |
| * | | | More comments | Erik Johnston | 2016-04-12 | 1 | -0/+6 | |
| * | | | Don't append to unused list | Erik Johnston | 2016-04-12 | 1 | -4/+0 | |
| * | | | Add back backfilled parameter that was removed | Erik Johnston | 2016-04-12 | 2 | -4/+7 | |
| * | | | Add comment | Erik Johnston | 2016-04-12 | 1 | -0/+1 | |
| * | | | Check if we've already backfilled events | Erik Johnston | 2016-04-12 | 2 | -7/+36 | |
|/ / / | ||||||
* | | | Fix the rule_id for .m.rule.invite_for_me (#715) | Mark Haines | 2016-04-11 | 1 | -1/+1 | |
* | | | Move the versionstring code out of app.homeserver into util | Mark Haines | 2016-04-11 | 3 | -83/+125 | |
* | | | Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions | David Baker | 2016-04-11 | 19 | -628/+680 | |
|\ \ \ | ||||||
| * | | | Run unsafe proces in a loop until we've caught up | David Baker | 2016-04-11 | 1 | -4/+11 | |
| * | | | Actually check if we;re processing | David Baker | 2016-04-08 | 1 | -0/+2 | |
| * | | | Fix invite pushes | David Baker | 2016-04-08 | 4 | -39/+58 | |
| * | | | Make sure max stream ordering only increases | David Baker | 2016-04-08 | 1 | -1/+1 | |
| * | | | Unsafe process should call itself if the max has changed | David Baker | 2016-04-08 | 1 | -0/+3 | |
| * | | | Comment why unsafe process is unsafe | David Baker | 2016-04-08 | 1 | -0/+5 | |
| * | | | Literally a dictionary | David Baker | 2016-04-07 | 1 | -17/+17 | |
| * | | | generate id in the main thread | David Baker | 2016-04-07 | 1 | -3/+3 | |
| * | | | Only pass in what we need | David Baker | 2016-04-07 | 2 | -11/+13 | |
| * | | | Oops, inequality fail | David Baker | 2016-04-07 | 1 | -1/+1 | |
| * | | | Wrap process in a flag so we don't process whist already processing. | David Baker | 2016-04-07 | 1 | -0/+9 | |
| * | | | indenting | David Baker | 2016-04-07 | 1 | -1/+1 | |
| * | | | defer.gatherResults rather than doing all the pokes in series | David Baker | 2016-04-07 | 1 | -2/+16 | |
| * | | | Add measure blocks | David Baker | 2016-04-07 | 1 | -5/+10 | |
| * | | | Add comments on min_stream_id | David Baker | 2016-04-07 | 2 | -0/+3 | |
| * | | | pep8 | David Baker | 2016-04-07 | 1 | -0/+1 | |
| * | | | Fix port script for changes merged from develop | David Baker | 2016-04-07 | 1 | -1/+4 |