Erik Johnston
|
d72f897f07
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts:
synapse/storage/stream.py
|
2014-08-15 11:50:14 +01:00 |
|
Erik Johnston
|
c5f2da5875
|
Add a check to make sure that during state conflict res we only request a PDU we don't have.
|
2014-08-15 11:47:01 +01:00 |
|
Erik Johnston
|
1a26905cc9
|
Fix pontenial bug in state resolution handler that compared dicts rather than their id's
|
2014-08-15 11:41:20 +01:00 |
|
Paul "LeoNerd" Evans
|
33d62c2c66
|
Remember to reflect membership LEAVE events to the leaving member so they know it happened
|
2014-08-15 11:40:58 +01:00 |
|
Erik Johnston
|
5002efa31b
|
Reimplement the get public rooms api to work with new DB schema
|
2014-08-15 10:26:35 +01:00 |
|
Kegan Dougal
|
286e90e58f
|
Updated README about -w in all the places.
|
2014-08-15 09:29:39 +01:00 |
|
Matthew Hodgson
|
0b179db36d
|
s/Synapse/Matrix/
|
2014-08-14 18:58:40 +01:00 |
|
Matthew Hodgson
|
7a025d6368
|
It's called Matrix :)
|
2014-08-14 18:58:01 +01:00 |
|
Erik Johnston
|
2c46bb6208
|
Fix up typos and correct sql queries
|
2014-08-14 18:40:50 +01:00 |
|
Erik Johnston
|
7e681ad778
|
Update StreamStore
|
2014-08-14 18:01:39 +01:00 |
|
Matthew Hodgson
|
3ddfc949dc
|
manual syutil
|
2014-08-14 17:55:50 +01:00 |
|
Kegan Dougal
|
24dfdb4a7d
|
Update README to mention -w and remove SimpleHTTPServer
|
2014-08-14 17:51:19 +01:00 |
|
Paul "LeoNerd" Evans
|
94eb2560f4
|
Add documentation about Federation Queries and EDUs
|
2014-08-14 17:50:55 +01:00 |
|
Matthew Hodgson
|
856f29c03c
|
fix linewrap
|
2014-08-14 17:44:21 +01:00 |
|
Kegan Dougal
|
5de086b736
|
More helpful display when the event stream fails, wiping it when the connection is regained.
|
2014-08-14 17:40:38 +01:00 |
|
Emmanuel ROHEE
|
e6c62d5d7f
|
We can now upload avatar image somewhere
|
2014-08-14 18:40:20 +02:00 |
|
Emmanuel ROHEE
|
deae7f4f5d
|
Create a temporary upload service server side (by hacking demos/webserver.py) and client side with an angularjs service component.
|
2014-08-14 18:39:23 +02:00 |
|
Emmanuel ROHEE
|
f5973d8ddb
|
Create a temporary upload service server side (by hacking demos/webserver.py) and client side with an angularjs service component.
|
2014-08-14 18:38:56 +02:00 |
|
Erik Johnston
|
661c711765
|
Start fixing places that use the data store.
|
2014-08-14 17:34:37 +01:00 |
|
Kegan Dougal
|
30da8c81c7
|
webclient: You can now paginate in rooms. Defaults to 10 messages, with a button to get more (needs to be hooked into infini-scrolling).
|
2014-08-14 17:23:47 +01:00 |
|
Erik Johnston
|
78b501eba6
|
Fix typo
|
2014-08-14 17:09:28 +01:00 |
|
Erik Johnston
|
2529f2bc01
|
Rename _execute_query
|
2014-08-14 16:58:51 +01:00 |
|
Kegan Dougal
|
fef3183461
|
Pass back the user_id in the response to /login in case it has changed. Store and use that on the webclient rather than the input field.
|
2014-08-14 16:40:15 +01:00 |
|
Kegan Dougal
|
ca3747fb2f
|
hs: Make /login accept full user IDs or just local parts. webclient: Only enable Register button when both password fields match.
|
2014-08-14 16:29:51 +01:00 |
|
Paul "LeoNerd" Evans
|
53147e5ae4
|
Reflect user's messages up to themselves before pushing it to federatoin; also release roomlock before touching federation so we don't halt progress on the world
|
2014-08-14 16:22:08 +01:00 |
|
Paul "LeoNerd" Evans
|
93a8be7bef
|
We really don't need debug logging of all the SQL statements we execute; we're quite happy these all work now
|
2014-08-14 16:15:57 +01:00 |
|
Kegan Dougal
|
6f925f61ff
|
Auto-correct the username when logging in if there isn't an @
|
2014-08-14 16:08:22 +01:00 |
|
Paul "LeoNerd" Evans
|
657ab9ba9d
|
Put some DEBUG logging in lockutils.py so we can debug roomlocks
|
2014-08-14 16:06:05 +01:00 |
|
Kegan Dougal
|
fb93e14e53
|
Be more helpful when failing to register/login, stating why (communication error, user in user, wrong credentials, etc). Make the HS send M_USER_IN_USE.
|
2014-08-14 16:03:04 +01:00 |
|
Erik Johnston
|
937c175029
|
Fix up RoomMemberStore to work with the new schema.
|
2014-08-14 16:02:10 +01:00 |
|
Kegan Dougal
|
40c998336d
|
Finish up room controller too. May have missed one or two, but testing didn't pick anything up.
|
2014-08-14 15:47:38 +01:00 |
|
Kegan Dougal
|
24bd133d9d
|
Added extra nesting .data and rename callback to be response not data
|
2014-08-14 15:43:16 +01:00 |
|
Kegan Dougal
|
db3e1d73c6
|
Move the unknown token broadcast to the interceptor. Return the $http promise and not a wrapped one via $q. Everything now needs a level deeper nesting. Fixed registration and login.
|
2014-08-14 15:36:40 +01:00 |
|
Kegan Dougal
|
76005c44f7
|
Added an access token interceptor to check unknown tokens.
|
2014-08-14 15:21:39 +01:00 |
|
Erik Johnston
|
6d6a1c3454
|
Actually encode dicts as json in the DB
|
2014-08-14 14:30:25 +01:00 |
|
Kegan Dougal
|
5a5f37ca17
|
Send forbidden codes when doing login attempts.
|
2014-08-14 14:29:06 +01:00 |
|
Paul "LeoNerd" Evans
|
0fa05ea331
|
Round Presence mtime and mtime_age to nearest msec; avoids floats for msec values over the wire
|
2014-08-14 14:16:01 +01:00 |
|
Erik Johnston
|
cbd5d55222
|
Change relative db paths to absolute paths in case we daemonize.
|
2014-08-14 14:08:57 +01:00 |
|
Erik Johnston
|
e4061383b8
|
Change relative db paths to absolute paths in case we daemonize.
|
2014-08-14 14:07:22 +01:00 |
|
Paul "LeoNerd" Evans
|
e37de2aef3
|
chmod +x homeserver.py
|
2014-08-14 14:05:05 +01:00 |
|
Emmanuel ROHEE
|
7143f358f1
|
Detect when the user access token is no more valid and log the user out in this case
|
2014-08-14 15:00:21 +02:00 |
|
Kegan Dougal
|
613e468b89
|
Guess the home server URL on the login screen by inspecting the URL of the web client.
|
2014-08-14 13:57:55 +01:00 |
|
Kegan Dougal
|
61933f8e52
|
Added M_UNKNOWN_TOKEN error code and send it when there is an unrecognised access_token
|
2014-08-14 13:47:39 +01:00 |
|
Emmanuel ROHEE
|
d5033849a5
|
BF: Use ng-src
|
2014-08-14 13:51:35 +02:00 |
|
Kegan Dougal
|
2a793a6c42
|
Default error code BAD_PAGINATION for EventStreamErrors
|
2014-08-14 11:57:25 +01:00 |
|
Kegan Dougal
|
d253a35539
|
Added web client prefix
|
2014-08-14 11:54:37 +01:00 |
|
Kegan Dougal
|
c75add6ec8
|
Added a urls module for keeping client and federation prefixes.
|
2014-08-14 11:52:56 +01:00 |
|
Kegan Dougal
|
9fd445eb92
|
If the web client is enabled, automatically redirect root '/' to the web client path.
|
2014-08-14 11:37:13 +01:00 |
|
Kegan Dougal
|
e543d6a91d
|
Fixed dynamic resource mapping to clobber dummy Resources with the actual desired Resource in the event of a collision (as is the case for '/matrix/client' and '/matrix/client/api/v1')
|
2014-08-14 11:18:18 +01:00 |
|
Emmanuel ROHEE
|
60b0fca103
|
Use ng-src
|
2014-08-14 11:51:31 +02:00 |