Erik Johnston
|
108434e53d
|
Merge pull request #775 from matrix-org/erikj/password_hash
Correctly handle NULL password hashes from the database
|
2016-05-11 12:18:13 +01:00 |
|
Erik Johnston
|
1400bb1663
|
Correctly handle NULL password hashes from the database
|
2016-05-11 12:06:02 +01:00 |
|
Mark Haines
|
a284a32d78
|
Merge pull request #774 from matrix-org/markjh/shuffle_base_handler
Shuffle some methods out of base handler
|
2016-05-11 13:00:28 +02:00 |
|
Mark Haines
|
458a435114
|
Fix typo
|
2016-05-11 10:35:33 +01:00 |
|
Mark Haines
|
30057b1e15
|
Move _create_new_client_event and handle_new_client_event out of base handler
|
2016-05-11 09:09:20 +01:00 |
|
David Baker
|
ae1af262f6
|
Pass through _get_state_group_for_events
|
2016-05-10 19:18:03 +02:00 |
|
David Baker
|
90afc07f39
|
StateStore, not EventsStore
|
2016-05-10 19:10:46 +02:00 |
|
David Baker
|
89b5ef7c4b
|
Cached functions must be accessed through the dict
|
2016-05-10 19:05:22 +02:00 |
|
David Baker
|
35b6e6d2a8
|
Pass though _get_state_group_for_events
|
2016-05-10 18:56:40 +02:00 |
|
David Baker
|
3367e65476
|
Pass through get_state_groups
|
2016-05-10 18:53:15 +02:00 |
|
David Baker
|
0c4ccdcb83
|
Also pass through get_profile_displayname
|
2016-05-10 18:51:14 +02:00 |
|
David Baker
|
f28643cea9
|
Uncommit accidentally commited edit to cipher list
|
2016-05-10 18:44:32 +02:00 |
|
David Baker
|
5f46be19a7
|
Pass through get_events to pusher too
|
2016-05-10 18:43:40 +02:00 |
|
David Baker
|
d46b18a00f
|
Pass through _get_event_txn
|
2016-05-10 18:27:06 +02:00 |
|
Matrix
|
3b1930e8ec
|
unbreak schema
|
2016-05-10 16:42:37 +01:00 |
|
Matthew Hodgson
|
fe97b81c09
|
Merge pull request #759 from matrix-org/dbkr/email_notifs
Send email notifications for missed messages
|
2016-05-10 16:30:05 +02:00 |
|
David Baker
|
997db04648
|
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
|
2016-05-10 14:40:19 +02:00 |
|
David Baker
|
c00b484eff
|
More consistent config naming
|
2016-05-10 14:39:16 +02:00 |
|
David Baker
|
94040b0798
|
Add config option to not send email notifs for new users
|
2016-05-10 14:34:53 +02:00 |
|
Erik Johnston
|
e581754f09
|
Merge pull request #763 from matrix-org/erikj/ignore_user
Implement basic ignore user API
|
2016-05-10 13:27:41 +01:00 |
|
David Baker
|
e04b1d6b0a
|
Make pep8 happy
|
2016-05-10 14:23:16 +02:00 |
|
Matthew Hodgson
|
5599608887
|
Switch from CSS to Table layout for HTML mails so they work in Outlook aka Word
Remove templates-vector and theme templates with variables instead
Switch to matrix.to URLs by default for links
|
2016-05-10 00:14:48 +02:00 |
|
Matthew Hodgson
|
6b45ffd2d1
|
Switch from CSS to Table layout for HTML mails so they work in Outlook aka Word
Remove templates-vector and theme templates with variables instead
Switch to matrix.to URLs by default for links
|
2016-05-09 20:16:56 +02:00 |
|
Erik Johnston
|
c9eb6dfc1b
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
|
2016-05-09 13:21:06 +01:00 |
|
Erik Johnston
|
3f84da139c
|
Merge pull request #773 from matrix-org/erikj/get_domian_from_id
Add and use get_domain_from_id
|
2016-05-09 13:21:00 +01:00 |
|
Erik Johnston
|
def64d6ef3
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
|
2016-05-09 13:05:09 +01:00 |
|
Erik Johnston
|
100e2c42f6
|
Merge pull request #764 from matrix-org/erikj/replication_logging
Add some log information at returned replication streams
|
2016-05-09 11:18:00 +01:00 |
|
Erik Johnston
|
8715731559
|
Merge pull request #772 from matrix-org/erikj/get_user_cache
Add cache to get_user_by_id
|
2016-05-09 11:12:11 +01:00 |
|
Erik Johnston
|
34b3af3363
|
Merge pull request #770 from matrix-org/erikj/transaction_reactor
Run transaction queue on reactor
|
2016-05-09 11:12:06 +01:00 |
|
Erik Johnston
|
7354667bd3
|
Merge pull request #768 from matrix-org/erikj/queue_evens_persist
Queue events by room for persistence
|
2016-05-09 11:11:53 +01:00 |
|
Erik Johnston
|
08dfa8eee2
|
Add and use get_domian_from_id
|
2016-05-09 10:36:03 +01:00 |
|
Erik Johnston
|
f6ebaf4a32
|
Run transaction queue on reactor
This ensures that any CPU work that happens doesn't block message
sending.
|
2016-05-09 10:10:06 +01:00 |
|
Erik Johnston
|
4ea762c1a2
|
Add cache to get_user_by_id
|
2016-05-09 10:08:21 +01:00 |
|
Erik Johnston
|
012cb5416c
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/push_actions_delete
|
2016-05-06 15:59:20 +01:00 |
|
Erik Johnston
|
fcb2c3f0db
|
Remove unused import
|
2016-05-06 15:47:40 +01:00 |
|
Erik Johnston
|
fd85b167ec
|
Pull loop one level up
|
2016-05-06 15:38:42 +01:00 |
|
Erik Johnston
|
b6e0be701e
|
Queue events for persistence
|
2016-05-06 14:31:44 +01:00 |
|
Erik Johnston
|
96d9d5d388
|
Merge pull request #767 from matrix-org/erikj/transaction_txn
Reduce database inserts when sending transactions
|
2016-05-06 13:20:43 +01:00 |
|
Erik Johnston
|
d13459636f
|
Pull prev txn from in memory
|
2016-05-06 11:30:55 +01:00 |
|
Erik Johnston
|
1d275dba69
|
Don't needlessly enter transaction
|
2016-05-06 11:25:58 +01:00 |
|
Erik Johnston
|
56b5e83e36
|
Reduce database inserts when sending transactions
|
2016-05-06 11:20:18 +01:00 |
|
Mark Haines
|
1f590f3e9a
|
Merge pull request #765 from matrix-org/markjh/open_id
Add an openidish mechanism for proving that you own a given user_id
|
2016-05-05 19:26:30 +01:00 |
|
Matthew Hodgson
|
53ca739f1f
|
better mail subject lines
|
2016-05-05 15:55:44 +01:00 |
|
Matthew Hodgson
|
81c2176cba
|
fix layout; handle app naming in synapse, not jinja
|
2016-05-05 15:54:29 +01:00 |
|
Mark Haines
|
573ef3f1c9
|
Rename openid/token to openid/request_token
|
2016-05-05 15:15:00 +01:00 |
|
Erik Johnston
|
8940281d1b
|
Don't warn
|
2016-05-05 15:10:03 +01:00 |
|
Mark Haines
|
9c272da05f
|
Add an openidish mechanism for proving to third parties that you own a given user_id
|
2016-05-05 13:42:44 +01:00 |
|
Matthew Hodgson
|
a5974f89d6
|
fix app branding
|
2016-05-05 11:25:56 +01:00 |
|
Erik Johnston
|
5d8a93a10e
|
Add some log information at returned replication streams
|
2016-05-05 10:29:21 +01:00 |
|
Erik Johnston
|
1f0f5ffa1e
|
Add bulk fetch storage API
|
2016-05-05 10:03:15 +01:00 |
|