Mark Haines
7c06399512
Merge branch 'develop' into request_logging
...
Conflicts:
synapse/config/logger.py
2014-10-30 11:13:58 +00:00
Mark Haines
7d709542ca
Fix pep8 warnings
2014-10-30 11:10:17 +00:00
Mark Haines
fa955cc2a4
Pep8 and a few doc strings
2014-10-30 10:13:46 +00:00
Kegan Dougal
b4b492824e
SYWEB-112: Use the right user ID when determining invites for display on the recents list.
2014-10-30 10:05:43 +00:00
Mark Haines
b29517bd01
Add a request-id to each log line
2014-10-30 01:21:33 +00:00
Kegan Dougal
0f192579ac
SYWEB-48: Better regex for binging on usernames.
...
This uses /\blocalpart\b|\bdisplayname\b/i which is overall a lot
better than before. This specifically gets @localpart references
which the bug was originally for.
2014-10-29 17:44:57 +00:00
Paul "LeoNerd" Evans
beae9acfcc
Use floating-point rather than integer division to handle timeouts so that non-zero but sub-second waits don't collapse to zero
2014-10-29 17:03:02 +00:00
Kegan Dougal
0d278f5da8
SYWEB-127: Open event info modal dialog when the bubble is clicked.
...
This allows images to be clicked by clicking on the edge with the bubble.
This is important since Redactions are only visible on the event info
screen.
2014-10-29 16:35:33 +00:00
Paul "LeoNerd" Evans
b1ee6fd7ed
Fix an off-by-one bug in presence event stream pagination; this might be responsible for any number of bug reports
2014-10-29 16:16:01 +00:00
Paul "LeoNerd" Evans
d6bcffa929
Construct a source-specific 'SourcePaginationConfig' to pass into get_pagination_rows; meaning each source doesn't have to care about its own name any more
2014-10-29 16:16:01 +00:00
Paul "LeoNerd" Evans
c5a25f610a
Remove redundant (and incorrect) presence pagination fetching code
2014-10-29 16:16:01 +00:00
Matthew Hodgson
194e1e9151
oops - fix css on desktop
2014-10-29 17:02:16 +01:00
Kegan Dougal
c2f2e26ec5
SYWEB-98: Handle incoming m.room.redaction events.
...
UI for redactions is now complete.
2014-10-29 15:48:41 +00:00
Kegan Dougal
6d4617960d
SYWEB-98: Add redactEvent matrix API call.
2014-10-29 15:31:50 +00:00
Kegan Dougal
70137409ed
SYWEB-98: Add a 'Redact' button to the event info modal dialog.
...
I think this is better than overriding the right-click contextual menu.
Currently clicking this button does nothing.
2014-10-29 15:02:30 +00:00
Kegan Dougal
ed241ba032
Implement SYWEB-58: Clicking a notification now takes you to that room.
2014-10-29 11:29:26 +00:00
Kegan Dougal
2a44558fbd
Fix SYWEB-128 : Auto-scroll broken if not exactly at bottom of list.
...
Added a small 10px buffer so if the list isn't quite at the bottom it
still actually scrolls.
2014-10-29 11:05:05 +00:00
Matthew Hodgson
51b81b472d
fix mobile CSS layout
2014-10-28 10:03:59 +01:00
Kegan Dougal
4f6acf114c
Fix SYWEB-110 : Prevent room ID leaking by looking for an m.room.name
2014-10-27 17:05:13 +00:00
Mark Haines
4841b6d4ba
Remove duplicate join_event from create_room
2014-10-27 16:55:51 +00:00
Kegan Dougal
fc121f9785
Fix SYWEB-114 : Error message when trying to invite a user already in the room.
2014-10-27 16:48:43 +00:00
Kegan Dougal
332b2869ef
Don't clobber existing css
2014-10-27 16:42:19 +00:00
Kegan Dougal
f4e64ac253
SYWEB-121: Have some bootstrap files.
2014-10-27 16:31:10 +00:00
Kegan Dougal
da87990bd6
Implement SYWEB-121 : Display JSON when clicking messages.
...
JSON is displayed as a modal dialog via AngularJS' bootstrap module,
"ui.bootstrap".
2014-10-27 16:30:07 +00:00
giomfo
cf1feee21d
HandleRoomMember: handle correctly prev_content
2014-10-27 14:17:16 +01:00
Kegan Dougal
6603e39e6a
Fix SYWEB-109 : No error if HS rejects the username in registration.
...
Display all error messages from the server when registering, rather
than just the types of errors the client recognises.
2014-10-27 11:58:23 +00:00
Kegan Dougal
f3bb3943c9
Remove test_pyflakes.
2014-10-27 11:13:04 +00:00
Mark Haines
7bd604e3be
Test pyflakes jenikns integration
2014-10-27 10:56:38 +00:00
Mark Haines
d56e389a95
Fix pyflakes warnings
2014-10-27 10:33:17 +00:00
Mark Haines
15be181642
Add log message if we can't enable ECC. Require pyopenssl>=0.14 since 0.13 doesn't seem to have ECC
2014-10-24 19:27:12 +01:00
Mark Haines
db2e350e29
Wrap preparing the database in a transaction. Otherwise it will take many seconds to complete because sqlite will create a transaction per statement
2014-10-24 19:04:26 +01:00
Matthew Hodgson
1342bcedaf
switch from the deprecated msg.content.prev to msg.prev_content.membership, and fix the bug where kicks of unjoined users aren't displayed sensibly in the history
2014-10-24 16:14:47 +01:00
Mark Haines
be6d41ffe5
Merge branch 'master' into develop
2014-10-24 10:57:38 +01:00
Kegan Dougal
53f69bf089
Added pylint config file: ignore missing-docstring messages.
2014-10-24 10:22:09 +01:00
David Baker
51edfeb3d0
Coturn's timestamps are in seconds, not milliseconds
2014-10-21 18:57:13 +01:00
manuroe
9e57ed2b1f
Added a param (--no-rate-limit) to demo/start.sh to disable the HS rate limit
2014-10-20 18:35:39 +01:00
Erik Johnston
4ae0844ee3
Merge branch 'master' of github.com:matrix-org/synapse into develop
2014-10-20 17:53:18 +01:00
Mark Haines
06a5a40e90
use a tagged version of syutil rather than master
2014-10-20 15:11:01 +01:00
Mark Haines
f0382357ca
Use https link to download syutil as not everyone has ssh access to github.
2014-10-20 14:43:37 +01:00
Mark Haines
4be99c2989
Add get_json method to 3pid http client. Better logging for errors in 3pid requests
2014-10-20 14:10:08 +01:00
Mark Haines
9c0826592c
Fix auto generating signing_keys
2014-10-18 16:56:44 +01:00
Matthew Hodgson
8f0997d17d
improve changelog slightly
2014-10-18 11:46:11 +01:00
Matthew Hodgson
58b1a891ce
fix timestamps some more
...
Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse
2014-10-17 23:54:21 +01:00
Matthew Hodgson
e9abbe89f3
more timestamp fixes
2014-10-17 23:53:24 +01:00
Erik Johnston
b3e6cd59a1
Bump the other version
2014-10-18 00:29:55 +02:00
Erik Johnston
f22d023c4b
Bump version
2014-10-18 00:29:15 +02:00
Erik Johnston
4c8111ef98
Bunp to change log.
2014-10-18 00:28:36 +02:00
Erik Johnston
f05dce54a7
Merge pull request #9 from matrix-org/develop
...
Fix issue with timestamps in webclient
2014-10-18 00:25:57 +02:00
Matthew Hodgson
514e0fd4b6
fix webclient to know about right timestamps
2014-10-17 23:11:55 +01:00
Erik Johnston
cb939ed450
I can't type apparently
2014-10-17 21:29:28 +01:00