Paul "LeoNerd" Evans
|
1c51c8ab7d
|
Merge remote-tracking branch 'origin/develop' into test-sqlite-memory
Conflicts:
synapse/storage/pdu.py
|
2014-09-12 17:20:06 +01:00 |
|
Erik Johnston
|
39e3fc69e5
|
Make the state resolution use actual power levels rather than taking them from a Pdu key.
|
2014-09-12 17:11:09 +01:00 |
|
Erik Johnston
|
b42fe05c51
|
Fix bug where we incorrectly removed a remote host from the list of hosts in a room when any user from that host left that room even if they weren't the last user from that host in that room
|
2014-09-12 17:11:09 +01:00 |
|
Erik Johnston
|
ca1ae7cf9b
|
Fix bug where we didn't return a tuple when expected.
|
2014-09-12 17:11:09 +01:00 |
|
Paul "LeoNerd" Evans
|
aa525e4a63
|
More accurate docs / clearer paramter names in RoomMemberStore
|
2014-09-12 16:43:49 +01:00 |
|
Paul "LeoNerd" Evans
|
a87eac4308
|
Revert recent changes to RoomMemberStore
|
2014-09-12 15:51:51 +01:00 |
|
Paul "LeoNerd" Evans
|
a840ff8f3f
|
Now don't need the other logger.debug() call in _execute
|
2014-09-12 14:38:27 +01:00 |
|
Paul "LeoNerd" Evans
|
1c20249884
|
Logging of all SQL queries via the 'synapse.storage.SQL' logger
|
2014-09-12 14:37:55 +01:00 |
|
Paul "LeoNerd" Evans
|
e53d77b501
|
Add a .runInteraction() method on SQLBaseStore itself to wrap the .db_pool
|
2014-09-12 14:28:07 +01:00 |
|
Paul "LeoNerd" Evans
|
249e8f2277
|
Add a better _store_room_member_txn() method that takes separated fields instead of an event object; also add FIXME comment about a big bug in the logic
|
2014-09-11 18:52:35 +01:00 |
|
Paul "LeoNerd" Evans
|
aaf9ab68c6
|
Rename _store_room_member_txn to _store_room_member_from_event_txn so we can create another, more sensible function of that name
|
2014-09-11 18:44:04 +01:00 |
|
Paul "LeoNerd" Evans
|
55397f6347
|
prepare_database() on db_conn, not plain name, so we can pass in the connection from outside
|
2014-09-10 16:23:58 +01:00 |
|
Paul "LeoNerd" Evans
|
2faffc52ee
|
Make sure not to open our TCP ports until /after/ the DB is nicely prepared ready for use
|
2014-09-10 16:16:24 +01:00 |
|
Paul "LeoNerd" Evans
|
6c1f0055dc
|
No need for a tiny run() function any more, just use reactor.run() directly
|
2014-09-10 16:07:44 +01:00 |
|
Paul "LeoNerd" Evans
|
ce55a8cc4b
|
Move database preparing code out of homserver.py into storage where it belongs
|
2014-09-10 15:42:15 +01:00 |
|
Erik Johnston
|
a75f8686ba
|
Fix bug where we used an unbound local variable if we ended up rolling back the persist_event transaction
|
2014-09-09 16:27:59 +01:00 |
|
Erik Johnston
|
e062f2dfa8
|
Apparently we can't do txn.rollback(), so raise and catch an exception instead.
|
2014-09-08 22:37:19 +01:00 |
|
Kegan Dougal
|
76fe7d4eba
|
Added num_joined_users key to /publicRooms for each room. Show this information in the webclient.
|
2014-09-08 12:15:29 -07:00 |
|
Erik Johnston
|
942d8412c4
|
Handle the case where we don't have a common ancestor
|
2014-09-08 20:13:27 +01:00 |
|
Erik Johnston
|
83ce57302d
|
Fix bug in state handling where we incorrectly identified a missing pdu. Update tests to catch this case.
|
2014-09-08 19:50:59 +01:00 |
|
Erik Johnston
|
c0577ea87a
|
Rollback if we try and insert duplicate events
|
2014-09-08 18:34:18 +01:00 |
|
Erik Johnston
|
768ff1a850
|
Fix race in presence handler where we evicted things from cache while handling a key therein
|
2014-09-08 11:28:50 +02:00 |
|
Erik Johnston
|
7735aad9d6
|
Bump version and changelog
|
2014-09-08 11:28:50 +02:00 |
|
Erik Johnston
|
2205aba3ed
|
Fix bug where we used an event_id as a pdu_id
|
2014-09-06 07:41:51 +01:00 |
|
Kegan Dougal
|
1a298aad9c
|
Added captcha support on both the HS and web client.
Merge branch 'captcha' of github.com:matrix-org/synapse into develop
|
2014-09-05 23:32:51 -07:00 |
|
Kegan Dougal
|
b5749c75d9
|
Reload captchas when they fail. Cleanup on success.
|
2014-09-05 23:08:39 -07:00 |
|
Kegan Dougal
|
3ea6f01b4e
|
80 chars please
|
2014-09-05 22:55:29 -07:00 |
|
Kegan Dougal
|
37e53513b6
|
Add config opion for XFF headers when performing ReCaptcha auth.
|
2014-09-05 22:51:11 -07:00 |
|
Kegan Dougal
|
1829b55bb0
|
Captchas now work on registration. Missing x-forwarded-for config arg support. Missing reloading a new captcha on the web client / displaying a sensible error message.
|
2014-09-05 19:18:23 -07:00 |
|
Erik Johnston
|
6d19fe1481
|
Fix generation of event ids so that they are consistent between local and remote ids
|
2014-09-06 02:48:13 +01:00 |
|
Erik Johnston
|
781ff713ba
|
When getting a state event also include the previous content
|
2014-09-06 02:23:36 +01:00 |
|
Kegan Dougal
|
0b9e1e7b56
|
Added a captcha config to the HS, to enable registration captcha checking and for the recaptcha private key.
|
2014-09-05 17:58:06 -07:00 |
|
Erik Johnston
|
f47f42090d
|
Add support for inviting people when you create a room
|
2014-09-06 01:10:07 +01:00 |
|
Erik Johnston
|
480438eee6
|
Validate power levels event changes. Change error messages to be more helpful. Fix bug where we checked the wrong power levels
|
2014-09-05 21:54:16 +01:00 |
|
Erik Johnston
|
9dd4570b68
|
Generate m.room.aliases event when the HS creates a room alias
|
2014-09-05 21:35:56 +01:00 |
|
Erik Johnston
|
982604fbf2
|
Empty string is not a valid JSON object, so don't return them in HTTP responses.
|
2014-09-05 17:13:26 +01:00 |
|
Erik Johnston
|
250ee2ea7d
|
AUth the contents of power level events
|
2014-09-05 17:13:19 +01:00 |
|
Erik Johnston
|
95037d8d9d
|
Change the default power levels to be 0, 50 and 100
|
2014-09-05 17:13:03 +01:00 |
|
Erik Johnston
|
300816ffa1
|
Bump versions. Update change logs.
|
2014-09-03 19:39:45 +01:00 |
|
Paul "LeoNerd" Evans
|
4c3512a45c
|
Added a TODO note about YAML modeline for editors
|
2014-09-03 19:30:48 +01:00 |
|
Erik Johnston
|
bcaea74352
|
Error code must be an integer
|
2014-09-03 19:19:24 +01:00 |
|
Erik Johnston
|
c9d1ee24ca
|
Import SynapseError
|
2014-09-03 19:15:55 +01:00 |
|
Erik Johnston
|
9b18151104
|
Handle timeouts slightly nicer.
|
2014-09-03 19:13:41 +01:00 |
|
Erik Johnston
|
5b645f9d34
|
Don't do auth for change_membership in federation handler, it doesn't work and federation doesn't do auth in general either. Add a hacky timeout when trying to join a remote room.
|
2014-09-03 19:08:39 +01:00 |
|
Erik Johnston
|
dce6395395
|
When creating a room and a user supplies a room_alias but no name, use the room_alias as the name.
|
2014-09-03 18:52:34 +01:00 |
|
David Baker
|
d72ce4da64
|
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Conflicts:
synapse/http/client.py
|
2014-09-03 18:25:17 +01:00 |
|
David Baker
|
d6ecbbdf0a
|
Add support for registering with a threepid to the HS (get credentials from the client and check them against an ID server).
|
2014-09-03 18:22:27 +01:00 |
|
Paul "LeoNerd" Evans
|
d703e712f7
|
Add support to _simple_insert() to do INSERT OR REPLACE
|
2014-09-03 18:18:41 +01:00 |
|
Erik Johnston
|
1b491e50c9
|
Implement a kick api
|
2014-09-03 17:46:52 +01:00 |
|
Paul "LeoNerd" Evans
|
4081413876
|
Default PID file should be 'homeserver.pid' to match the other 'homeserver.*' naming convention
|
2014-09-03 17:34:07 +01:00 |
|