Erik Johnston
|
571ac105e6
|
Bump version and changelog
|
2015-08-24 17:10:45 +01:00 |
|
Erik Johnston
|
51c53369a3
|
Do auth checks *before* persisting the event
|
2015-08-24 16:38:20 +01:00 |
|
Erik Johnston
|
61f36d9939
|
Merge pull request #242 from matrix-org/erikj/pushers_ephemeral_events
Don't make pushers handle presence/typing events
|
2015-08-24 16:23:55 +01:00 |
|
Erik Johnston
|
f8f3d72e2b
|
Don't make pushers handle presence/typing events
|
2015-08-24 16:19:43 +01:00 |
|
Erik Johnston
|
457970c724
|
Don't insert events into 'event_*_extremeties' tables if they're outliers
|
2015-08-23 13:44:23 +01:00 |
|
Erik Johnston
|
1bd1a43073
|
Actually check if event_id isn't returned by _get_state_groups
|
2015-08-21 14:30:34 +01:00 |
|
Erik Johnston
|
0f6a25f670
|
Upate changelog
|
2015-08-21 13:07:56 +01:00 |
|
Erik Johnston
|
b9490e8cbb
|
Upate changelog
|
2015-08-21 13:07:37 +01:00 |
|
Erik Johnston
|
5dbd102470
|
Merge branch 'erikj/user_dedup' into release-v0.10.0
|
2015-08-21 12:51:14 +01:00 |
|
Erik Johnston
|
fd5ad0f00e
|
Doc string
|
2015-08-21 11:45:43 +01:00 |
|
Erik Johnston
|
42f12ad92f
|
When logging in fetch user by user_id case insensitively, *unless* there are multiple case insensitive matches, in which case require the exact user_id
|
2015-08-21 11:38:44 +01:00 |
|
Erik Johnston
|
aa3c9c7bd0
|
Don't allow people to register user ids which only differ by case to an existing one
|
2015-08-21 10:57:47 +01:00 |
|
Erik Johnston
|
1f7642efa9
|
Fix bug where we didn't correctly serialize the redacted_because key over federation
|
2015-08-21 09:36:07 +01:00 |
|
Erik Johnston
|
3e9ee62db0
|
Add missing param in store.get_state_groups invocation
|
2015-08-21 09:15:13 +01:00 |
|
Erik Johnston
|
b578c822e3
|
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0
|
2015-08-20 16:10:14 +01:00 |
|
Erik Johnston
|
3befc9ccc3
|
Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop
|
2015-08-20 16:09:27 +01:00 |
|
Mark Haines
|
d5c31e01f2
|
Merge pull request #237 from matrix-org/markjh/readme-rst-formatting
Clean up some of restructured text formatting in the README.rst
|
2015-08-20 16:08:17 +01:00 |
|
Mark Haines
|
cb8201ba12
|
Merge pull request #236 from matrix-org/markjh/upgrade-instructions
Add generic update instructions to UPGRADE.rst
|
2015-08-20 16:08:05 +01:00 |
|
Erik Johnston
|
c141d47a28
|
Merge pull request #235 from matrix-org/erikj/room_avatars
Add m.room.avatar to default power levels.
|
2015-08-20 16:07:49 +01:00 |
|
Erik Johnston
|
61cd03466f
|
Merge pull request #238 from matrix-org/fix_set_password
Fix set password
|
2015-08-20 15:39:05 +01:00 |
|
David Baker
|
f764f92647
|
Remove spurious extra arg to set_password
|
2015-08-20 15:35:54 +01:00 |
|
David Baker
|
ca0d28ef34
|
Another use of check_password that got missed in the yield fix
|
2015-08-20 15:35:14 +01:00 |
|
Mark Haines
|
8a951540f6
|
Further formatting clean ups
|
2015-08-20 15:22:26 +01:00 |
|
Mark Haines
|
482648123f
|
Clean up some of restructured text formatting in the README.rst
|
2015-08-20 15:20:07 +01:00 |
|
Mark Haines
|
fd88ea19c0
|
Tweak the wording a bit
|
2015-08-20 15:12:44 +01:00 |
|
Mark Haines
|
bb9611bd46
|
Add generic update instructions to UPGRADE.rst and add link to them from the README.rst
|
2015-08-20 15:08:18 +01:00 |
|
Erik Johnston
|
9b63def388
|
Add m.room.avatar to default power levels. Change default required power levels of such events to 50
|
2015-08-20 14:35:40 +01:00 |
|
Erik Johnston
|
23b21e5215
|
Update changelog
|
2015-08-20 14:25:57 +01:00 |
|
Erik Johnston
|
9d720223f2
|
Bump version and changelog
|
2015-08-20 14:12:01 +01:00 |
|
Erik Johnston
|
099ce4bc38
|
Merge pull request #231 from matrix-org/erikj/pushers_store_last_token
Push: store the 'last_token' in the db, even if we processed no events
|
2015-08-20 11:27:31 +01:00 |
|
Mark Haines
|
22346a0ee7
|
Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnails
Always return a thumbnail of the requested size.
|
2015-08-20 11:27:15 +01:00 |
|
Erik Johnston
|
cbd053bb8f
|
Merge pull request #233 from matrix-org/erikj/canonical_alias
Add server side support for canonical aliases
|
2015-08-20 11:26:09 +01:00 |
|
David Baker
|
be27d81808
|
Merge pull request #234 from matrix-org/email_login
Support logging in with email addresses (or other threepids)
|
2015-08-20 11:15:42 +01:00 |
|
David Baker
|
4cf302de5b
|
Comma comma comma comma comma chameleon
|
2015-08-20 10:31:18 +01:00 |
|
David Baker
|
c50ad14bae
|
Merge branch 'develop' into email_login
|
2015-08-20 10:16:01 +01:00 |
|
Mark Haines
|
a0b8e5f2fe
|
Merge pull request #211 from matrix-org/email_in_use
Changes for unique emails
|
2015-08-20 10:04:04 +01:00 |
|
Erik Johnston
|
aadb2238c9
|
Check that the canonical room alias actually points to the room
|
2015-08-20 09:55:04 +01:00 |
|
Erik Johnston
|
09d23b6209
|
Merge pull request #232 from matrix-org/erikj/appservice_joined_rooms
Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users
|
2015-08-19 13:50:40 +01:00 |
|
Erik Johnston
|
daa01842f8
|
Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users
|
2015-08-19 13:46:03 +01:00 |
|
Erik Johnston
|
d7272f8d9d
|
Add canonical alias to the default power levels
|
2015-08-19 12:03:09 +01:00 |
|
Erik Johnston
|
78fa346b07
|
Store the 'last_token' in the db, even if we processed no events
|
2015-08-19 10:08:31 +01:00 |
|
Erik Johnston
|
a45ec7c651
|
Block on storing the current last_tokens
|
2015-08-19 10:08:12 +01:00 |
|
Erik Johnston
|
40da1f200d
|
Remove an access token log line
|
2015-08-19 09:41:07 +01:00 |
|
Erik Johnston
|
abc6986a24
|
Fix regression where we incorrectly responded with a 200 to /login
|
2015-08-19 09:31:11 +01:00 |
|
Erik Johnston
|
e624cdec64
|
Merge pull request #228 from matrix-org/erikj/_get_state_for_groups
Ensure we never return a None event from _get_state_for_groups
|
2015-08-18 16:30:17 +01:00 |
|
Erik Johnston
|
c3dd2ecd5e
|
Merge pull request #230 from matrix-org/erikj/appservice_auth_entity
Set request.authenticated_entity for application services
|
2015-08-18 16:30:11 +01:00 |
|
Erik Johnston
|
38a965b816
|
Merge pull request #227 from matrix-org/erikj/receipts_take2
Re-enable receipts API.
|
2015-08-18 16:30:04 +01:00 |
|
Erik Johnston
|
a82938416d
|
Remove newline because vertical whitespace makes mjark sad
|
2015-08-18 16:28:13 +01:00 |
|
Erik Johnston
|
0bfdaf1f4f
|
Rejig the code to make it nicer
|
2015-08-18 16:26:07 +01:00 |
|
Erik Johnston
|
a5cbd20001
|
Merge pull request #225 from matrix-org/erikj/reactor_metrics
Fix pending_calls metric to not lie
|
2015-08-18 16:21:11 +01:00 |