Commit Graph

1488 Commits

Author SHA1 Message Date
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
Erik Johnston
a10c2ec88d Don't reference PDU when persisting event 2014-10-28 17:15:32 +00:00
Erik Johnston
2d1dfb3b34 Begin implementing all the PDU storage stuff in Events land 2014-10-28 16:42:35 +00:00
Erik Johnston
da1dda3e1d Add transaction level logging and timing information. Add a _simple_delete method 2014-10-28 11:18:04 +00:00
Erik Johnston
967ce43b59 Clean up LoggingTransaction 2014-10-28 10:53:11 +00:00
Erik Johnston
8e358ef35a Add timer to LoggingTransaction 2014-10-28 10:34: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
Erik Johnston
c372929ab6 Remove duplicate import 2014-10-27 16:31:39 +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
Erik Johnston
ad9226eeec Merge branch 'event_signing' of github.com:matrix-org/synapse into federation_authorization
Conflicts:
	synapse/storage/__init__.py
2014-10-27 11:58:32 +00: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
Mark Haines
5e2236f9ff fix pyflakes warnings 2014-10-27 11:19:15 +00:00
Mark Haines
acb2d171e8 Merge branch 'develop' into event_signing 2014-10-27 11:14:11 +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
Erik Johnston
bb4a20174c Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Conflicts:
	synapse/federation/transport.py
	synapse/handlers/message.py
2014-10-27 10:20:44 +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