Erik Johnston
f2de2d644a
Move the impl of backfill to use events.
2014-10-31 09:59:02 +00:00
Erik Johnston
d9a9e9eb30
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
2014-10-31 09:49:43 +00:00
Erik Johnston
4a1597f295
Fix bug in redaction auth.
...
This caused a 500 when sending a redaction due to a typo in a method
invocation.
2014-10-31 09:48:59 +00:00
Kegan Dougal
86d3180666
SYWEB-12: You'll be needing this.
2014-10-30 17:33:14 +00:00
Kegan Dougal
864de6a7a4
SYWEB-12: Minor layout tweaks.
2014-10-30 17:23:11 +00:00
Kegan Dougal
ea6bec96d3
SYWEB-12: UX tweaks.
2014-10-30 17:16:16 +00:00
Kegan Dougal
f618f99ece
SYWEB-12: Add ability to add new state events.
2014-10-30 17:01:17 +00:00
Erik Johnston
12ce441e67
Convert event ids to be of the form :example.com
2014-10-30 17:00:11 +00:00
Kegan Dougal
0985bfb775
SYWEB-12: Allow edited state events to be submitted.
2014-10-30 16:31:47 +00:00
Kegan Dougal
9de9661baa
SYWEB-12: More formatting and tweaking of state event JSON.
...
Use a proper elastic directive to make the <textarea> resize dynamically.
Use an 'asjson' directive to turn an ngModel of a JSON object into a
formatted JSON string so it can be displayed on the textarea. Also, deep
copy the state events being displayed, else it actually alters the underlying
data structures when playing around with the JSON in the textarea!
2014-10-30 16:21:27 +00:00
Kegan Dougal
6f3f631fd1
SYWEB-12: More formatting.
2014-10-30 13:24:40 +00:00
Erik Johnston
da511334d2
Make federation return the old current state, so that we can use it to do auth
2014-10-30 11:53:35 +00:00
Kegan Dougal
40342af459
SYWEB-12: Format room info dialog better.
2014-10-30 11:53:28 +00:00
Kegan Dougal
8e8bbb00f5
SYWEB-12: Store unknown state events so they are displayed in the Room Info dialog.
2014-10-30 11:22:47 +00:00
Erik Johnston
ef9c4476a0
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
2014-10-30 11:18:28 +00:00
Kegan Dougal
d5aa965522
SYWEB-12: Add a 'Room Info' button which displays all state content.
...
Content displayed in a modal dialog. Currently only read-only.
2014-10-30 11:15:44 +00:00
Mark Haines
7a756e5d9d
Remove unused 'context' variables to appease pyflakes
2014-10-30 11:15:39 +00:00
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
Erik Johnston
aa80900a8e
Fix SQL so that accepts we may want to persist events twice.
2014-10-30 10:11:06 +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
Erik Johnston
53216a500d
Add a run_on_reactor function
2014-10-29 17:02:22 +00:00
Erik Johnston
e7858b6d7e
Start filling out and using new events tables
2014-10-29 16:59:24 +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
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
7c7d9d6326
Merge branch 'develop' into event_signing
2014-10-27 16:56:08 +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
