Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #780 from matrix-org/dbkr/email_notifs_on_pusher | Mark Haines | 2016-05-13 | 3 | -12/+43 |
|\ | | | | | Make email notifs work on the pusher synapse | ||||
| * | Manually expire broken caches like the who_forgot_in_room | Mark Haines | 2016-05-13 | 1 | -0/+16 |
| | | |||||
| * | Use the SlavedAccountDataStore | Mark Haines | 2016-05-13 | 1 | -10/+3 |
| | | |||||
| * | Merge branch 'develop' into dbkr/email_notifs_on_pusher | Mark Haines | 2016-05-13 | 19 | -27/+511 |
| |\ | |/ |/| | |||||
* | | Merge pull request #783 from matrix-org/markjh/slave_account_data | Mark Haines | 2016-05-13 | 2 | -0/+117 |
|\ \ | | | | | | | Add a slaved datastore for account data | ||||
| * | | Add a slaved datastore for account data | Mark Haines | 2016-05-13 | 2 | -0/+117 |
| | | | |||||
* | | | Merge pull request #784 from matrix-org/markjh/receipts_fix | Mark Haines | 2016-05-13 | 1 | -4/+6 |
|\ \ \ | | | | | | | | | Allow receipts for events we haven't seen in the db | ||||
| * | | | Allow receipts for events we haven't seen in the db | Mark Haines | 2016-05-13 | 1 | -4/+6 |
|/ / / | |||||
* | | | Merge pull request #741 from negzi/create_user_with_expiry | Erik Johnston | 2016-05-13 | 10 | -9/+301 |
|\ \ \ | | | | | | | | | Create user with expiry | ||||
| * | | | Create user with expiry | Negi Fazeli | 2016-05-13 | 10 | -9/+301 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com> | ||||
* | | | | Merge pull request #778 from matrix-org/erikj/add_pusher | Erik Johnston | 2016-05-13 | 2 | -4/+17 |
|\ \ \ \ | | | | | | | | | | | Fixup add_pusher | ||||
| * | | | | Spelling | Erik Johnston | 2016-05-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixup add_pusher | Erik Johnston | 2016-05-13 | 2 | -4/+17 |
| | | | | | |||||
* | | | | | Merge pull request #769 from matrix-org/erikj/push_actions_delete | Erik Johnston | 2016-05-13 | 2 | -9/+29 |
|\ \ \ \ \ | | | | | | | | | | | | | Delete old pushers | ||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-05-06 | 15 | -49/+433 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | erikj/push_actions_delete | ||||
| * | | | | | | Delete old pushers | Erik Johnston | 2016-05-03 | 2 | -9/+29 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #779 from matrix-org/erikj/receipts | Erik Johnston | 2016-05-13 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use tree cache for get_linearized_receipts_for_room | ||||
| * | | | | | | | Use tree cache for get_linearized_receipts_for_room | Erik Johnston | 2016-05-13 | 1 | -3/+3 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #782 from matrix-org/erikj/remove_indices | Erik Johnston | 2016-05-13 | 1 | -0/+38 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Remove unused indices | ||||
| * | | | | | | Remove topics table | Erik Johnston | 2016-05-13 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Annotate the removed indicies with why they were removed. | Mark Haines | 2016-05-13 | 1 | -18/+15 |
| | | | | | | | |||||
| * | | | | | | Remove unused indices | Erik Johnston | 2016-05-13 | 1 | -0/+42 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This includes removing both unused indices and indices that are subsets of other indices. | ||||
* | | | | | | Merge pull request #781 from matrix-org/markjh/replication_problems | Mark Haines | 2016-05-13 | 2 | -1/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix a bug in replication that was causing the pusher to tight loop | ||||
| * | | | | | | Log the stream IDs in an order that makes sense | Mark Haines | 2016-05-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Make sure we advance our stream position | Mark Haines | 2016-05-13 | 1 | -0/+2 |
| |/ / / / / | |||||
| | | | | * | Shift some of the state_group methods into the SlavedEventStore | Mark Haines | 2016-05-13 | 2 | -45/+19 |
| | | | | | | |||||
| | | | | * | Make email notifs work on the pusher synapse | David Baker | 2016-05-13 | 2 | -0/+48 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | Plus general bugfix to email notif code | ||||
* | | | | | Merge pull request #777 from matrix-org/markjh/move_filter_for_client | Mark Haines | 2016-05-13 | 11 | -215/+252 |
|\ \ \ \ \ | |/ / / / |/| | | | | move filter_events_for_client out of base handler | ||||
| * | | | | missed a spot | Mark Haines | 2016-05-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | move filter_events_for_client out of base handler | Mark Haines | 2016-05-11 | 10 | -214/+251 |
|/ / / / | |||||
* | | | | Merge pull request #776 from matrix-org/markjh/lazy_signing_key | Mark Haines | 2016-05-11 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Shuffle when we get the signing_key attribute. | ||||
| * | | | | Shuffle when we get the signing_key attribute. | Mark Haines | 2016-05-11 | 1 | -2/+2 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wait until we sign a message to get the signing key from the homeserver config. This means that the message handler can be created without having a signing key in the config which means that separate processes like the pusher that don't send messages and don't need to sign them can still access the handlers. | ||||
* | | | | Merge pull request #775 from matrix-org/erikj/password_hash | Erik Johnston | 2016-05-11 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Correctly handle NULL password hashes from the database | ||||
| * | | | | Correctly handle NULL password hashes from the database | Erik Johnston | 2016-05-11 | 1 | -1/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #774 from matrix-org/markjh/shuffle_base_handler | Mark Haines | 2016-05-11 | 4 | -204/+214 |
|\ \ \ \ | |/ / / |/| | | | Shuffle some methods out of base handler | ||||
| * | | | Fix typo | Mark Haines | 2016-05-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | Move _create_new_client_event and handle_new_client_event out of base handler | Mark Haines | 2016-05-11 | 4 | -204/+214 |
|/ / / | |||||
* | | | Pass through _get_state_group_for_events | David Baker | 2016-05-10 | 1 | -0/+4 |
| | | | |||||
* | | | StateStore, not EventsStore | David Baker | 2016-05-10 | 1 | -2/+2 |
| | | | |||||
* | | | Cached functions must be accessed through the dict | David Baker | 2016-05-10 | 1 | -1/+2 |
| | | | |||||
* | | | Pass though _get_state_group_for_events | David Baker | 2016-05-10 | 1 | -0/+4 |
| | | | |||||
* | | | Pass through get_state_groups | David Baker | 2016-05-10 | 1 | -0/+4 |
| | | | |||||
* | | | Also pass through get_profile_displayname | David Baker | 2016-05-10 | 1 | -0/+4 |
| | | | |||||
* | | | Uncommit accidentally commited edit to cipher list | David Baker | 2016-05-10 | 1 | -1/+1 |
| | | | |||||
* | | | Pass through get_events to pusher too | David Baker | 2016-05-10 | 1 | -0/+1 |
| | | | |||||
* | | | Pass through _get_event_txn | David Baker | 2016-05-10 | 2 | -1/+2 |
| | | | |||||
* | | | unbreak schema | Matrix | 2016-05-10 | 2 | -0/+0 |
| | | | |||||
* | | | Merge pull request #759 from matrix-org/dbkr/email_notifs | Matthew Hodgson | 2016-05-10 | 31 | -34/+1470 |
|\ \ \ | | | | | | | | | Send email notifications for missed messages | ||||
| * \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 23 | -88/+619 |
| |\ \ \ | |||||
| * | | | | More consistent config naming | David Baker | 2016-05-10 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Add config option to not send email notifs for new users | David Baker | 2016-05-10 | 2 | -1/+8 |
| | | | | | |||||
| * | | | | Make pep8 happy | David Baker | 2016-05-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Switch from CSS to Table layout for HTML mails so they work in Outlook ↵ | Matthew Hodgson | 2016-05-10 | 13 | -302/+240 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aka Word Remove templates-vector and theme templates with variables instead Switch to matrix.to URLs by default for links | ||||
| * | | | | Switch from CSS to Table layout for HTML mails so they work in Outlook aka Word | Matthew Hodgson | 2016-05-09 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove templates-vector and theme templates with variables instead Switch to matrix.to URLs by default for links | ||||
| * | | | | better mail subject lines | Matthew Hodgson | 2016-05-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix layout; handle app naming in synapse, not jinja | Matthew Hodgson | 2016-05-05 | 7 | -22/+45 |
| | | | | | |||||
| * | | | | fix app branding | Matthew Hodgson | 2016-05-05 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | pep8 | Matthew Hodgson | 2016-05-05 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | fix room.txt | Matthew Hodgson | 2016-05-05 | 1 | -4/+7 |
| | | | | | |||||
| * | | | | First cut at Vector-branded mail templates | Matthew Hodgson | 2016-05-05 | 7 | -0/+229 |
| | | | | | |||||
| * | | | | handle fragments correctly on mxc URLs. | Matthew Hodgson | 2016-05-05 | 1 | -14/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switch to vector.im permalinks as matrix.to isn't ready yet. merge overlapping notifications together. give one message of context after a notification (in the unlikely event it exists, but it's possible thanks to throttling). include name of app in mail templates | ||||
| * | | | | spell out emailpusher full path | Matthew Hodgson | 2016-05-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Include no context | David Baker | 2016-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | until we can de-dup between the context and other notifs | ||||
| * | | | | Add date header & message id | David Baker | 2016-05-04 | 2 | -1/+4 |
| | | | | | |||||
| * | | | | Correct SQL statement for postgres | David Baker | 2016-05-04 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | In standard sql, join binds tighter than comma, so we were joining on the wrong table. Postgres follows the standard (apparently). | ||||
| * | | | | Add db functions used for email to the pusher app | David Baker | 2016-05-04 | 1 | -0/+12 |
| | | | | | |||||
| * | | | | pep8 | David Baker | 2016-05-04 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | copyright | Matthew Hodgson | 2016-05-04 | 1 | -0/+22 |
| | | | | | |||||
| * | | | | fix assorted typos in default config | Matthew Hodgson | 2016-05-04 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Unused import | David Baker | 2016-05-04 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Catch all exceptions when creating a pusher | David Baker | 2016-05-04 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | If they registered with an email address and email notifs are enabled on the HS | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | so we don't accidentally mail out events people shouldn't see | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | Say who the messages are from if there's no room name, otherwise it's a bit nonsensical | ||||
| * | | | | | Hopefully all remaining bits for email notifs | David Baker | 2016-04-27 | 7 | -42/+195 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add public facing base url to the server so synapse knows what URL to use when converting mxc to http urls for use in emails | ||||
| * | | | | | More variable calculation for email notifs | David Baker | 2016-04-25 | 3 | -19/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | Include name of the person we're sending to and add summary text at the top giving an overview of what's happened. | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | So names of people in a room are given in order | ||||
| * | | | | | Mime part is binary so encode it first. | David Baker | 2016-04-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Doesn't get character enocind right yet but makes it not error. | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | Mostly WIP porting the room name calculation logic from the web client so our room names in the email mirror the clients. | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also pep8 fixes | ||||
| * | | | | | Add single instance & logging stuff | David Baker | 2016-04-19 | 1 | -8/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | Copy the stuff over from http pusher that prevents multiple instances of process running at once and sets up logging and measure blocks. | ||||
| * | | | | | First bits of emailpusher | David Baker | 2016-04-19 | 7 | -8/+335 |
| | | | | | | | | | | | | | | | | | | | | | | | | Mostly logic of when to send an email | ||||
* | | | | | | Merge pull request #763 from matrix-org/erikj/ignore_user | Erik Johnston | 2016-05-10 | 4 | -9/+93 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Implement basic ignore user API | ||||
| * | | | | | 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_domain_from_id | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add some log information at returned replication streams | ||||
| * | | | | | | 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 | ||||
| * | | | | | | | 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 | ||||
| * | | | | | | | Run transaction queue on reactor | Erik Johnston | 2016-05-09 | 1 | -0/+3 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that any CPU work that happens doesn't block message sending. | ||||
* | | | | | | | Merge pull request #768 from matrix-org/erikj/queue_evens_persist | Erik Johnston | 2016-05-09 | 1 | -11/+149 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Queue events by room for persistence | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Reduce database inserts when sending transactions | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add an openidish mechanism for proving that you own a given user_id | ||||
| * | | | | | 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 |
|/ / / / / | | | | | | | | | | | | | | | | user_id | ||||
| * | | | | 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 /report endpoint | ||||
| * | | | | | 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 | ||||
| * | | | | 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 |
| |/ / |/| | | |||||
* | | | Merge pull request #758 from matrix-org/dbkr/fix_password_reset | David Baker | 2016-04-29 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Fix password reset | ||||
| * | | Fix password reset | David Baker | 2016-04-29 | 1 | -0/+1 |
|/ / | | | | | | | Default requester to None, otherwise it isn't defined when resetting using email auth | ||||
* | | 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 |
|\ \ | | | | | | | Report per request metrics for all of the things using request_handler | ||||
| * | | Add a comment explaining why automatic metric reporting is disabled for ↵ | Mark Haines | 2016-04-28 | 1 | -0/+4 |
| | | | | | | | | | | | | JsonResource | ||||
| * | | 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 | ||||
| * | | 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 something has happend before running the selects | ||||
| * | | 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 |
|\ \ | | | | | | | Optionally daemonize the pusher | ||||
| * | | 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 | ||||
| * | | 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 | ||||
| * | | | 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 |
|\ \ \ | | | | | | | | | Add a metrics listener and a ssh listener to the pusher | ||||
| * | | | 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 |
|\ \ \ | |/ / |/| | | Split out setting up the manhole to a separate file | ||||
| * | | 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 |
|\| | | | | | | | | Move SynapseSite to its own file | ||||
| * | | Merge branch 'develop' into markjh/split_out_site.py | Mark Haines | 2016-04-22 | 2 | -82/+105 |
| |\ \ | |/ / |/| | | | | | | | | Conflicts: synapse/app/homeserver.py | ||||
* | | | 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 | ||||
| * | | | 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 | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | Optimise event_search in postgres | ||||
| * | | | 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 | ||||
| * | | | 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 | ||||
| * | | | | 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 | ||||
| * | | | | 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 |
|\ \ \ \ | |/ / / |/| | | | Replicate push actions | ||||
| * | | | 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 | ||||
| * | | | Always use state cache entry if it exists | Erik Johnston | 2016-04-20 | 1 | -3/+10 |
|/ / / | | | | | | | | | | Also check if the resolved state matches an existing state group. | ||||
* | | | 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 | ||||
| * | | | 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 | ||||
| * | | | 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 |
|\ \ \ \ | | | | | | | | | | | Use tls_server_context_factory for SpiderEndpoint | ||||
| * | | | | 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 | ||||
| * | | | 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 |
|\ \ | | | | | | | Split out BaseMediaResource into MediaRepository | ||||
| * | | 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 |
|/ / | | | | | | | | | | | | | | | | | This is so that a single MediaRepository can be shared across all resources, rather than having a "copy" per resource. In particular this allows us to guard against both the thumbnail and download resource triggering a download of remote content at the same time. | ||||
* | | 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 | ||||
| * | | 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 | ||||
| * | | Lower timeout for make_membership_event | Erik Johnston | 2016-04-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | Calls to make_membership_event are done in response to client requests, and so should not be retried over long timeframes. | ||||
* | | | Merge pull request #732 from matrix-org/erikj/login | Erik Johnston | 2016-04-18 | 1 | -5/+9 |
|\ \ \ | | | | | | | | | Simplify _check_password | ||||
| * | | | Simplify _check_password | Erik Johnston | 2016-04-15 | 1 | -5/+9 |
| |/ / | |||||
* | | | explicitly pass in the charset from Content-Type to lxml to fix cyrillic ↵ | Matthew Hodgson | 2016-04-15 | 1 | -6/+18 |
| | | | | | | | | | | | | woes better | ||||
* | | | fix cyrillic URL previews by hardcoding all page decoding to UTF-8 for now, ↵ | Matthew Hodgson | 2016-04-15 | 1 | -16/+8 |
|/ / | | | | | | | rather than relying on lxml's heuristics which seem to get it wrong | ||||
* | | Merge pull request #731 from matrix-org/erikj/timed_otu | Erik Johnston | 2016-04-15 | 1 | -1/+2 |
|\ \ | | | | | | | Use SynapseError 504 for Timeout errors |