Matthew Hodgson
|
0d3d7de6fc
|
sync in changes from matrixfederationclient
|
2016-03-31 12:42:27 +01:00 |
|
Mark Haines
|
62e395f0e3
|
Merge pull request #676 from matrix-org/markjh/replicate_stateIII
Add replication streams for ex outliers and current state resets
|
2016-03-31 11:20:57 +01:00 |
|
Erik Johnston
|
5260db7663
|
Line length
|
2016-03-31 10:49:27 +01:00 |
|
Mark Haines
|
2ec5426035
|
Use a namedtuple rather than tuple unpacking
|
2016-03-31 10:33:02 +01:00 |
|
David Baker
|
c9500a9c1d
|
Merge pull request #678 from matrix-org/dbkr/push_obey_enable
Don't ignore the obey overlay if the rule has an enabled attribute of False
|
2016-03-31 10:26:22 +01:00 |
|
Erik Johnston
|
f9d3665c88
|
Allow clock to be passed in to func
|
2016-03-31 10:23:48 +01:00 |
|
David Baker
|
c27c51484a
|
Don't ignore the obey overlay if the rule has an enabled attribute of False
Fixes https://github.com/vector-im/vector-web/issues/1244
|
2016-03-31 10:12:31 +01:00 |
|
Erik Johnston
|
f699b8f997
|
Read from DNS cache if within TTL
|
2016-03-31 10:04:28 +01:00 |
|
Matthew Hodgson
|
a8a5dd3b44
|
handle requests with missing content-length headers (e.g. YouTube)
|
2016-03-31 01:55:21 +01:00 |
|
Matthew Hodgson
|
a68c1b15aa
|
spell out more packages
|
2016-03-30 17:29:42 +01:00 |
|
Matthew Hodgson
|
9113316b0e
|
typo
|
2016-03-30 17:29:42 +01:00 |
|
Matthew Hodgson
|
7178ab7da0
|
spell out more packages
|
2016-03-30 17:29:22 +01:00 |
|
Mark Haines
|
1fbb094c6f
|
Add replication streams for ex outliers and current state resets
|
2016-03-30 17:19:56 +01:00 |
|
Mark Haines
|
98c460cecd
|
Merge pull request #675 from matrix-org/markjh/replicate_stateII
Add a replication stream for state groups
|
2016-03-30 16:40:17 +01:00 |
|
Mark Haines
|
8b8052909f
|
return the state_group for backfill
|
2016-03-30 16:20:07 +01:00 |
|
Mark Haines
|
61407986b4
|
Add a entry to current_state_resets table when the current state is reset
|
2016-03-30 16:18:46 +01:00 |
|
Mark Haines
|
31a9eceda5
|
Add a replication stream for state groups
|
2016-03-30 16:01:58 +01:00 |
|
Mark Haines
|
fc66df1e60
|
Merge pull request #674 from matrix-org/markjh/replicate_state
Use a stream id generator to assign state group ids
|
2016-03-30 15:58:49 +01:00 |
|
Erik Johnston
|
178c9fb200
|
Merge pull request #673 from matrix-org/erikj/forget
Require user to have left room to forget room
|
2016-03-30 15:55:24 +01:00 |
|
Erik Johnston
|
73b6bf4629
|
Only forget room if you were in the room
|
2016-03-30 15:09:18 +01:00 |
|
Erik Johnston
|
08a8514b7a
|
Remove spurious comment
|
2016-03-30 15:05:33 +01:00 |
|
Erik Johnston
|
d24662b88a
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2016-03-30 14:41:31 +01:00 |
|
Mark Haines
|
1e25f62ee6
|
Use a stream id generator to assign state group ids
|
2016-03-30 12:55:02 +01:00 |
|
Erik Johnston
|
5fbdf2bcec
|
Merge branch 'release-v0.14.0' of github.com:matrix-org/synapse
|
2016-03-30 12:36:40 +01:00 |
|
Erik Johnston
|
e7aaa7c61e
|
Bump version and changelog
|
2016-03-30 12:35:25 +01:00 |
|
Erik Johnston
|
fddb6fddc1
|
Require user to have left room to forget room
This dramatically simplifies the forget API code - in particular it no
longer generates a leave event.
|
2016-03-30 11:03:00 +01:00 |
|
Erik Johnston
|
a932acaa6b
|
Merge pull request #672 from nikriek/new-author
Add new author
|
2016-03-29 23:19:52 +01:00 |
|
Niklas Riekenbrauck
|
82312d4fff
|
Add new author
|
2016-03-29 23:42:15 +02:00 |
|
Erik Johnston
|
f5bf45a2e5
|
Merge pull request #671 from nikriek/jwt-support
Support login using Javascript Web Tokens (JWT)
|
2016-03-29 16:31:42 +01:00 |
|
Niklas Riekenbrauck
|
3f9948a069
|
Add JWT support
|
2016-03-29 14:36:36 +02:00 |
|
Matthew Hodgson
|
ae5831d303
|
fix bugs
|
2016-03-29 03:32:55 +01:00 |
|
Matthew Hodgson
|
721b2bfa85
|
implement redirects
|
2016-03-29 03:32:52 +01:00 |
|
Matthew Hodgson
|
19038582d3
|
debug
|
2016-03-29 03:14:16 +01:00 |
|
Matthew Hodgson
|
64b4aead15
|
make it work
|
2016-03-29 03:13:25 +01:00 |
|
Matthew Hodgson
|
dd4287ca5d
|
make it build
|
2016-03-29 02:07:57 +01:00 |
|
Matthew Hodgson
|
e0c2490a14
|
Merge branch 'develop' into matthew/preview_urls
|
2016-03-29 01:20:25 +01:00 |
|
Matthew Hodgson
|
ec0cf996c9
|
typo
|
2016-03-29 01:20:14 +01:00 |
|
Matthew Hodgson
|
d9d48aad2d
|
Merge branch 'develop' into matthew/preview_urls
|
2016-03-27 22:54:42 +01:00 |
|
Matthew Hodgson
|
adafa24b0a
|
typo
|
2016-03-25 23:38:19 +00:00 |
|
Mark Haines
|
3e8bb99a2b
|
Merge pull request #668 from matrix-org/markjh/deduplicate
Deduplicate identical /sync requests
|
2016-03-24 18:07:30 +00:00 |
|
Mark Haines
|
77cba688ed
|
Fix typo
|
2016-03-24 18:02:37 +00:00 |
|
Mark Haines
|
54a546091a
|
Add a response cache for getting the public room list
|
2016-03-24 18:02:10 +00:00 |
|
Mark Haines
|
191c7bef6b
|
Deduplicate identical /sync requests
|
2016-03-24 17:47:31 +00:00 |
|
David Baker
|
31e6f8636f
|
Merge pull request #667 from matrix-org/dbkr/never_notify_member_events
Never notify for member events.
|
2016-03-24 13:48:02 +00:00 |
|
David Baker
|
3b554bda26
|
Never notify for member events. This fixes https://github.com/vector-im/vector-web/issues/828
|
2016-03-24 13:19:39 +00:00 |
|
Erik Johnston
|
15844040c2
|
Bump version and changelog
|
2016-03-23 16:57:41 +00:00 |
|
Erik Johnston
|
7a3815b372
|
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.14.0
|
2016-03-23 16:55:29 +00:00 |
|
Erik Johnston
|
647b041d1a
|
Merge pull request #666 from matrix-org/erikj/intern
Intern lots of strings
|
2016-03-23 16:54:59 +00:00 |
|
Erik Johnston
|
8122ad7bab
|
Simplify intern_dict
|
2016-03-23 16:41:54 +00:00 |
|
Erik Johnston
|
2f0180b09e
|
Don't bother interning keys that are already interned
|
2016-03-23 16:29:46 +00:00 |
|