Erik Johnston
|
22dd0b37c4
|
Fix typo in merge conflict
|
2014-08-19 15:02:47 +01:00 |
|
Paul "LeoNerd" Evans
|
89cabba3e0
|
Don't delete OFFLINE users from the presence cache, so we can report on their offline mtime
|
2014-08-19 14:51:15 +01:00 |
|
Erik Johnston
|
347242a5c4
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts:
tests/rest/test_presence.py
tests/rest/test_rooms.py
tests/utils.py
|
2014-08-19 14:48:19 +01:00 |
|
Kegan Dougal
|
7e83a58c4d
|
Proofing
|
2014-08-19 14:38:34 +01:00 |
|
Erik Johnston
|
840771190f
|
Fix bug where we sometimes set min_token to None.
|
2014-08-19 14:32:47 +01:00 |
|
Erik Johnston
|
234128586b
|
Print out stacktrace when we failed to persist event.
|
2014-08-19 14:30:28 +01:00 |
|
Paul "LeoNerd" Evans
|
d7cfb91a7a
|
Rewrite of PresenceHandler test to ensure it covers the interaction with Federation as well
|
2014-08-19 14:26:06 +01:00 |
|
Paul "LeoNerd" Evans
|
992782b9f5
|
Ensure that federation's .send_edu() returns a Deferred
|
2014-08-19 14:26:06 +01:00 |
|
Paul "LeoNerd" Evans
|
fcdc40a5dd
|
Add a DeferredMockCallable; like mock's MockCallable but allows awaiting
on method calls to be made later
|
2014-08-19 14:25:43 +01:00 |
|
Kegan Dougal
|
e636e8799e
|
More formatting, more clarity.
|
2014-08-19 14:25:03 +01:00 |
|
Erik Johnston
|
75b6d982a0
|
Add a 'backfill room' button
|
2014-08-19 14:20:03 +01:00 |
|
Erik Johnston
|
598a1d8ff9
|
Change the way pagination works to support out of order events.
|
2014-08-19 14:19:48 +01:00 |
|
Kegan Dougal
|
77f1cc7d6d
|
rst formatting, section heading intro blurbs.
|
2014-08-19 14:03:16 +01:00 |
|
Kegan Dougal
|
8464009a66
|
Added top level TODO and a bit more info on storing the 'end' token.
|
2014-08-19 13:43:45 +01:00 |
|
Kegan Dougal
|
185a68b473
|
Added a first cut for a 'how to' on the client-server API.
|
2014-08-19 12:31:17 +01:00 |
|
Kegan Dougal
|
caef65d819
|
More unquotes. Also, don't return the room_id on membership state changes, they already know it.
|
2014-08-19 12:30:28 +01:00 |
|
Kegan Dougal
|
ece7a6d995
|
Unquote sender IDs.
|
2014-08-19 11:50:57 +01:00 |
|
Paul "LeoNerd" Evans
|
88f7482b92
|
Perform the 'REST'-level tests of Presence against the real Presence handler as well, mocking out the datastore beneath it
|
2014-08-19 11:16:23 +01:00 |
|
Paul "LeoNerd" Evans
|
83f031207e
|
Implement and test presence dropping of remote users
|
2014-08-19 11:16:23 +01:00 |
|
Paul "LeoNerd" Evans
|
6fafa878f6
|
Deny __iter__ on UserID/RoomID/RoomName instances as it's a subtle bug that will bite you
|
2014-08-19 11:16:23 +01:00 |
|
Paul "LeoNerd" Evans
|
bb793019a5
|
Rename MockHttpServer to MockHttpResource as it stands for one server resource rather than an entire server
|
2014-08-19 11:16:23 +01:00 |
|
Kegan Dougal
|
f48792eec4
|
Reduce the amount of incredibly spammy stack traces. Expected errors (e.g. SynapseErrors) shouldn't have their full trace logged every time. Don't send responses to disconnected requests.
|
2014-08-19 10:56:43 +01:00 |
|
Emmanuel ROHEE
|
509ce6c137
|
Change mouse cursor to pointer on elements user can click on
|
2014-08-19 11:37:07 +02:00 |
|
Emmanuel ROHEE
|
ff21d4d93b
|
Merge remote-tracking branch 'origin/master' into user_page
|
2014-08-19 09:44:50 +02:00 |
|
Emmanuel ROHEE
|
d7a4f2ed7f
|
Fill user page with avatar, display name and matrix id
|
2014-08-19 09:37:10 +02:00 |
|
Emmanuel ROHEE
|
38f5c1c378
|
Made small avatar image center
|
2014-08-19 09:24:35 +02:00 |
|
Emmanuel ROHEE
|
f144f8cc56
|
Use $location.url to open the user profile page. The user page URL is then the one expected: http://127.0.0.1:8000/#/user/@Manu:localhost:8080 insteaf of
http://127.0.0.1:8000/#/user/@Manu:localhost:8080#public:localhost:8080
|
2014-08-19 09:06:21 +02:00 |
|
Emmanuel ROHEE
|
c3f1548bb4
|
Added link to user profile pages
|
2014-08-19 08:58:53 +02:00 |
|
Matthew Hodgson
|
cdc5ffe2a2
|
show private room_ids rather than nulls in notifs if there is no room_alias
|
2014-08-18 20:56:27 +01:00 |
|
Kegan Dougal
|
e37b040bc3
|
Small amounts of cleanup and bonus round comments.
|
2014-08-18 17:22:31 +01:00 |
|
Kegan Dougal
|
58548ab557
|
Implemented GETs for the ContentRepoResource. It all actually appears to be working.
|
2014-08-18 17:18:54 +01:00 |
|
Kegan Dougal
|
590ab24c85
|
hs: Make the uploads directory if it doesn't exist. Namespace uploads by the base64 encoded user id of the uploader. Make a reasonable attempt to retry clashing upload paths. Try to guess a sensible file extension depending on the content type.
|
2014-08-18 17:18:54 +01:00 |
|
Kegan Dougal
|
35da1bf4a3
|
Auth content uploads. Added a mapping function from request > filename. Added exception handling for content uploads. webclient: Only prefix the client API path on doRequest, not doBaseRequest (this would've broken the identity server auth too). Added matrixService.uploadContent. May not require mFileUpload anymore.
|
2014-08-18 17:18:54 +01:00 |
|
Kegan Dougal
|
a18b1a649c
|
Added /matrix/content path, HS resource_for_content_repo attribute and FileUploadResource. Added stub methods.
|
2014-08-18 17:18:54 +01:00 |
|
Emmanuel ROHEE
|
ecfdf23250
|
Created boilerplate for user profile page
|
2014-08-18 18:05:42 +02:00 |
|
Emmanuel ROHEE
|
301e55d11d
|
In members list, on avatar mouseover, show a tooltip with the user matrix id
|
2014-08-18 17:49:50 +02:00 |
|
Emmanuel ROHEE
|
f8693c6b48
|
Join room: open the room URL with the room alias in it
|
2014-08-18 17:41:23 +02:00 |
|
Emmanuel ROHEE
|
43772d0b15
|
Support urlencoded room aliases in room URL
|
2014-08-18 17:40:05 +02:00 |
|
Erik Johnston
|
1422a22970
|
Fix typos in SQL and where we still had rowid's (which no longer exist)
|
2014-08-18 16:25:18 +01:00 |
|
Erik Johnston
|
4eb8f84aa8
|
Make snapshot_all_rooms return results in the correct form, including start and end tokens.
|
2014-08-18 16:20:21 +01:00 |
|
Emmanuel ROHEE
|
cebceb7b9d
|
If possible, use href with room alias in rooms list
|
2014-08-18 17:14:57 +02:00 |
|
Emmanuel ROHEE
|
e5257b21b3
|
Support room alias in rooms URL (ex: http://127.0.0.1:8000/#/room/#public:localhost:8080)
|
2014-08-18 17:11:08 +02:00 |
|
Erik Johnston
|
709a92cee8
|
SQL doesn't allow AUTOINCREMENT on non PRIMARY KEY columns.
|
2014-08-18 16:00:46 +01:00 |
|
Erik Johnston
|
b4a1f2ccb5
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
|
2014-08-18 15:53:40 +01:00 |
|
Erik Johnston
|
fc26275bb3
|
Add two different columns for ordering the events table, one which can be used for pagination and one which can be as tokens for notifying clients. Also add a 'processed' field which is currently always set to True
|
2014-08-18 15:50:41 +01:00 |
|
Kegan Dougal
|
b37ced8f63
|
Update the default longpoll timeout time.
|
2014-08-18 14:30:07 +01:00 |
|
Kegan Dougal
|
c12f55aa3b
|
Increase /events timeout to 30 secs. We don't need it so low anymore to get around request suppression when changing rooms, since there is just a single event stream now.
|
2014-08-18 14:25:25 +01:00 |
|
Paul "LeoNerd" Evans
|
faf25e3a83
|
Allow room presence visibility between users who share a room
|
2014-08-18 13:41:43 +01:00 |
|
Paul "LeoNerd" Evans
|
7d324612ec
|
Precent lack of presence visiblity from causing room /members/list to fail
|
2014-08-18 13:17:35 +01:00 |
|
Erik Johnston
|
1c2caacd67
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
|
2014-08-18 11:14:57 +01:00 |