1660145a08
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/edu_yield
2016-03-18 15:02:43 +00:00
7f79a6405b
Merge pull request #656 from matrix-org/erikj/get_event
...
Dedupe requested event list in _get_events
2016-03-18 14:53:13 +00:00
8595ff7842
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/get_event
2016-03-18 14:47:19 +00:00
58e207cd77
Don't assume existence of event_id in __str__
2016-03-18 14:31:44 +00:00
67ed8065db
Dedupe requested event list in _get_events
2016-03-18 14:31:31 +00:00
916227b4df
Merge pull request #652 from matrix-org/erikj/delete_alias
...
Update aliases event after deletion
2016-03-18 14:02:46 +00:00
3c5f25507b
Yield on EDU handling
2016-03-18 13:55:16 +00:00
56aa4e7a9a
Check canonical alias event exists
2016-03-17 15:24:19 +00:00
384ee6eafb
Merge pull request #650 from matrix-org/dbkr/register_idempotent_with_username
...
Make registration idempotent, part 2
2016-03-17 14:34:08 +00:00
2ec3460967
Merge pull request #651 from matrix-org/markjh/unused_II
...
Remove dead code left over from presence changes
2016-03-17 13:37:53 +00:00
7a38612620
Remove another unused function from presence
2016-03-17 11:54:19 +00:00
2cd9260500
Update aliases event after deletion
...
Attempt to update the appropriate `m.room.aliases` event after deleting
an alias. This may fail due to the deleter not being in the room.
Will also check if the canonical alias of the event is set to the
deleted alias, and if so will attempt to delete it.
2016-03-17 11:42:00 +00:00
673c96ce97
Remove dead code left over from presence changes
2016-03-17 11:03:47 +00:00
4ebb688f4f
Add option to definitions.py to search for functions a function refers to
2016-03-17 10:59:12 +00:00
5670205e2a
remove debug logging
2016-03-16 19:49:42 +00:00
f984decd66
Unused import
2016-03-16 19:40:48 +00:00
a7daa5ae13
Make registration idempotent, part 2: be idempotent if the client specifies a username.
2016-03-16 19:36:57 +00:00
48b2e853a8
Merge pull request #649 from matrix-org/dbkr/idempotent_registration
...
Make registration idempotent
2016-03-16 16:35:45 +00:00
b58d10a875
pep8
2016-03-16 16:22:20 +00:00
3ee7d7dc7f
time_msec()
2016-03-16 16:18:52 +00:00
3176aebf9d
string with symbols is a bit too symboly.
2016-03-16 15:55:49 +00:00
9671e6750c
Replace other time.time().
2016-03-16 15:51:28 +00:00
742b6c6d15
Use hs get_clock instead of time.time()
2016-03-16 15:42:35 +00:00
f5e90422f5
take extra return val from check_auth in account too
2016-03-16 14:33:19 +00:00
ff7d3dc3a0
Fix tests
2016-03-16 14:25:14 +00:00
99797947aa
pep8 & remove debug logging
2016-03-16 12:51:34 +00:00
c12b9d719a
Make registration idempotent: if you specify the same session, make it give you an access token for the user that was registered on previous uses of that session. Tweak the UI auth layer to not delete sessions when their auth has completed and hence expire themn so they don't hang around until server restart. Allow server-side data to be associated with UI auth sessions.
2016-03-16 11:56:24 +00:00
add89a03a6
Merge pull request #647 from matrix-org/markjh/pushers_stream
...
Add replication stream for pushers
2016-03-16 11:26:22 +00:00
467c1599c9
Merge pull request #648 from matrix-org/rav/password_reset
...
Password reset docs and script
2016-03-16 10:47:33 +00:00
660ae8e0f3
Clarify that we do have reset functionality via the IS
2016-03-16 10:40:38 +00:00
ba660ecde2
Add a comment to offer a hint to an explanation for why we have a unique constraint on (app_id, pushkey, user_id)
2016-03-16 10:35:00 +00:00
a877209c8b
Password reset docs and script
...
Replace the bash/perl gen_password script with a python one, and write a note
on how to use it.
2016-03-16 09:45:37 +00:00
ee32d622ce
Fix a couple of errors when deleting pushers
2016-03-15 17:47:36 +00:00
6df1c79c22
Merge branch 'develop' into markjh/pushers_stream
2016-03-15 17:44:39 +00:00
12904932c4
Hook up adding a pusher to the notifier for replication.
2016-03-15 17:42:03 +00:00
b6e8420aee
Add replication stream for pushers
2016-03-15 17:33:10 +00:00
91779b49c4
Merge pull request #646 from matrix-org/erikj/reject_invite_federation
...
Persist rejection of invites over federation
2016-03-15 15:03:00 +00:00
e5f0e58931
Remove needless PreserveLoggingContext
2016-03-15 13:48:40 +00:00
9e982750ee
Persist rejection of invites over federation
2016-03-15 13:24:31 +00:00
6b1e9b8dfe
Merge pull request #645 from matrix-org/erikj/3pid_guest_config
...
Add config to create guest account on 3pid invite
2016-03-14 16:53:53 +00:00
590fbbef03
Add config to create guest account on 3pid invite
...
Currently, when a 3pid invite request is sent to an identity server, it
includes a provisioned guest access token. This allows the link in the,
say, invite email to include the guest access token ensuring that the
same account is used each time the link is clicked.
This flow has a number of flaws, including when using different servers
or servers that have guest access disabled.
For now, we keep this implementation but hide it behind a config option
until a better flow is implemented.
2016-03-14 15:50:40 +00:00
a547e2df85
Return list, not generator.
2016-03-14 15:30:19 +00:00
e462aa97bf
Merge pull request #644 from matrix-org/markjh/parse_jsonIII
...
Fix regression where synapse checked whether push rules were valid
2016-03-14 14:36:17 +00:00
398cd1edfb
Fix regression where synapse checked whether push rules were valid JSON before the compatibility hack that handled clients sending invalid JSON
2016-03-14 14:16:41 +00:00
494d0c8e02
Merge pull request #642 from matrix-org/erikj/logout
...
Implement logout
2016-03-11 20:16:25 +00:00
ffb9dd02fe
Merge pull request #643 from matrix-org/markjh/parse_json_II
...
Use parse_json_object_from_request to parse JSON out of request bodies
2016-03-11 17:27:37 +00:00
15122da0e2
Thats not how transactions work.
2016-03-11 16:45:27 +00:00
e9c1cabac2
Use parse_json_object_from_request to parse JSON out of request bodies
2016-03-11 16:41:03 +00:00
ae6ff09494
Emtpy commit
2016-03-11 16:33:22 +00:00
b13035cc91
Implement logout
2016-03-11 16:27:50 +00:00
Erik Johnston