OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity
6,473 Commits
842 Branches
671 Tags
284 MiB
Commit Graph

6473 Commits (cb8a321bdd35278fc1214d2dd2c1a8163ce25871)

Author SHA1 Message Date
David Baker 8781083960 Better grammar for multiple messages in a room 
Say who the messages are from if there's no room name, otherwise it's a bit nonsensical
 2016-04-27 15:30:41 +01:00
David Baker fa12209c1b Hopefully all remaining bits for email notifs 
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
 2016-04-27 15:09:55 +01:00
Mark Haines c7c03bf303 Merge pull request #754 from matrix-org/markjh/check_for_nop 
Check that something has happend before running the selects
 2016-04-27 13:36:47 +01:00
Mark Haines 871357d539 Check that somethign has happend before running the selects 2016-04-27 11:54:13 +01:00
Mark Haines 71df327190 Actually start the pusher daemon 2016-04-26 17:07:09 +01:00
Mark Haines c9eab73f2a Fix typo in default pusher config 2016-04-26 17:06:18 +01:00
Mark Haines 47571d11db Merge pull request #753 from matrix-org/markjh/daemon_pusher 
Optionally daemonize the pusher
 2016-04-26 16:11:44 +01:00
Mark Haines b80b93ea0f Add a log context to the daemonized pusher 2016-04-26 15:57:28 +01:00
Mark Haines 6df5a6a833 Optionally daemonize the pusher 2016-04-26 15:37:41 +01:00
Erik Johnston 3306cf45ca Merge pull request #750 from matrix-org/erikj/jwt_optional 
Make pyjwt dependency optional
 2016-04-26 11:07:22 +01:00
Mark Haines c487c42492 Merge pull request #752 from matrix-org/markjh/more_updates 
Add a couple of update methods to the PusherSlaveStore
 2016-04-26 11:00:40 +01:00
Mark Haines 9c417c54d4 Add a couple of update methods to the PusherSlaveStore 2016-04-26 10:45:02 +01:00
Mark Haines 9843f2a657 Merge pull request #751 from matrix-org/markjh/pusher_metrics_manhole 
Add a metrics listener and a ssh listener to the pusher
 2016-04-26 10:35:51 +01:00
David Baker 7b4715bad7 More variable calculation for email notifs 
Include name of the person we're sending to and add summary text at the top giving an overview of what's happened.
 2016-04-25 18:27:04 +01:00
Mark Haines f15e9e8de4 Remove the uncomments from the comments 2016-04-25 17:56:24 +01:00
Mark Haines 72e2fafa20 Add a metrics listener and a ssh listener to the pusher 2016-04-25 17:34:25 +01:00
Mark Haines 233bf78ab4 Merge pull request #749 from matrix-org/markjh/split_manhole 
Split out setting up the manhole to a separate file
 2016-04-25 15:23:53 +01:00
Mark Haines f22f46f4f9 Move the listenTCP call outside the manhole function 2016-04-25 14:59:21 +01:00
David Baker 290f125a13 Typo 2016-04-25 14:42:59 +01:00
Erik Johnston 52ecbc2843 Make pyjwt dependency optional 2016-04-25 14:30:15 +01:00
David Baker 05e49ffbdf No we don't: it's just the display name 2016-04-22 18:44:17 +01:00
David Baker bd0f9c2065 Actually do UTF8 correctly 2016-04-22 18:42:00 +01:00
David Baker c5b3c6e101 Sort member events 
So names of people in a room are given in order
 2016-04-22 18:33:36 +01:00
David Baker 83bf65297a Mime part is binary so encode it first. 
Doesn't get character enocind right yet but makes it not error.
 2016-04-22 18:31:47 +01:00
David Baker e8701e64b9 Implement group-of-people names 2016-04-22 17:28:42 +01:00
David Baker c553797c4f No inlineCallbacks necessary on this 2016-04-22 17:27:54 +01:00
Mark Haines 5905f36f05 Split out setting up the manhole to a separate file 2016-04-22 17:09:15 +01:00
Mark Haines c3f8dbf6b5 Merge pull request #748 from matrix-org/markjh/split_out_site.py 
Move SynapseSite to its own file
 2016-04-22 17:08:21 +01:00
Mark Haines 62607d5452 Merge branch 'develop' into markjh/split_out_site.py 
Conflicts:
	synapse/app/homeserver.py
 2016-04-22 16:26:57 +01:00
Mark Haines e57df8fa86 Merge pull request #747 from matrix-org/markjh/http_resource_tree 
Split out create_resource_tree to a separate file
 2016-04-22 16:24:55 +01:00
Mark Haines e856036f4c Move SynapseSite to its own file 2016-04-22 16:09:55 +01:00
Mark Haines 9e7aa98c22 Split out create_resource_tree to a separate file 2016-04-22 15:40:51 +01:00
Mark Haines 2022ae0fb9 Merge pull request #746 from matrix-org/markjh/split_out_pusher 
Optionally split out the pushers into a separate process
 2016-04-22 11:34:08 +01:00
Erik Johnston 64ec3493c1 Merge pull request #745 from matrix-org/erikj/search-index 
Optimise event_search in postgres
 2016-04-22 11:23:49 +01:00
Erik Johnston 4063fe0283 Update port script 2016-04-22 10:35:53 +01:00
Erik Johnston 183cacac90 Simplify query and handle finishing correctly 2016-04-22 10:01:57 +01:00
David Baker 19d6b6cd7a Add WIP email template files 2016-04-21 19:22:53 +01:00
David Baker c10ed26c30 Flesh out email templating 
Mostly WIP porting the room name calculation logic from the web client so our room names in the email mirror the clients.
 2016-04-21 19:19:07 +01:00
Erik Johnston ae571810f2 Order NULLs first 2016-04-21 18:14:18 +01:00
Erik Johnston 3ddbb1687c Fix query 2016-04-21 18:02:36 +01:00
Erik Johnston 8fae3d7b1e Use special UPDATE syntax 2016-04-21 18:01:49 +01:00
Erik Johnston b57dcb4b51 Typo 2016-04-21 17:49:00 +01:00
Erik Johnston 26db18bc90 Need to do _background_update_progress_txn in actual transaction 2016-04-21 17:45:56 +01:00
Erik Johnston b9675ef6e6 Merge pull request #687 from nikriek/jwt-fix 
Fix issues with JWT login
 2016-04-21 17:42:25 +01:00
Erik Johnston e395eb1108 Update progress when creating index 2016-04-21 17:39:24 +01:00
Erik Johnston 3b0fa77f50 Fix SQL statement 2016-04-21 17:37:42 +01:00
Erik Johnston 129e403487 Create index must be on a conn 2016-04-21 17:35:51 +01:00
Mark Haines a3ac837599 Optionally split out the pushers into a separate process 2016-04-21 17:22:37 +01:00
Mark Haines 78741cf025 Merge pull request #743 from matrix-org/markjh/slave_pushers 
Replicate the pushers
 2016-04-21 17:21:29 +01:00
Erik Johnston 51bb339ab2 Create index concurrently 2016-04-21 17:16:11 +01:00