Mark Haines
e903c941cb
Merge branch 'develop' into request_logging
...
Conflicts:
setup.py
synapse/storage/_base.py
synapse/util/async.py
2014-11-14 11:16:50 +00:00
Kegan Dougal
974206ebe1
Use mUserDisplayName filter in more places. Store power_level[norm] for each RoomMember.
2014-11-14 11:13:03 +00:00
Kegan Dougal
687662c990
Add notification-service unit tests.
2014-11-14 10:33:42 +00:00
Kegan Dougal
d1df3cd4d5
Add mUserDisplayName unit tests.
2014-11-14 09:52:53 +00:00
Kegan Dougal
656bf2c60c
Unskip unit tests; fix filter dependency.
2014-11-14 09:20:36 +00:00
Kegan Dougal
633137d501
Remove getUserDisplayName and move that logic the filter mUserDisplayName. Update references. Skip tests for now as there are some unresolved DI issues for filters.
2014-11-13 17:59:08 +00:00
Kegan Dougal
3916e23bbd
Remove rootScope.presence and replaced with modelService.getUser/setUser.
2014-11-13 16:43:53 +00:00
Kegan Dougal
afd2e214bc
SYWEB-152: Move up/down history fully to a directive.
...
Previously, there was some of it in a lovely generic directive, but the
core of it was hard coded id attributes in RoomController. It's now all
generic in a directive: the room history you get when you up/down arrow
is determined by the value of the attribute e.g. command-history="!foo:bar"
would present the history for !foo:bar. In practice, this is {{room_id}}
in the html.
2014-11-13 16:12:17 +00:00
Mark Haines
8d8a133c89
SYN-103: Remove "origin" and "destination" keys from edus
2014-11-13 15:49:03 +00:00
Kegan Dougal
d085807070
Migrate random bits of desktop notification logic out of roomController and into eventHandlerService where everything else is.
2014-11-13 15:21:50 +00:00
David Baker
58ddff0881
remove stray unmatched css comment
2014-11-13 14:45:29 +00:00
David Baker
bfe20c11c3
remove now-unused styles
2014-11-13 14:42:31 +00:00
Mark Haines
e7c6d2c9d9
SYN-138: Rewrite synctl in python and include it in the python distribution
2014-11-13 14:39:30 +00:00
David Baker
cdb8d746ef
Merge with Matthew's killing of ng-animate
...
Conflicts:
syweb/webclient/app-controller.js
syweb/webclient/index.html
2014-11-13 14:37:43 +00:00
Kegan Dougal
cadcc6cabe
Add commands-service unit tests.
2014-11-13 14:35:58 +00:00
Matthew Hodgson
11da8d0dff
remove nganimate dependency as it seems to feature disproportionately highly in the FF profiler, and removing it seems to have stopped my FF stalling for seconds on end
2014-11-13 16:34:51 +02:00
David Baker
f842bca471
Kill ng-animate with fire because it's terrible (was causing the page to be very sluggish). Do the call icons in pure CSS3 and use one less image to boot (in some browsers the phone icon will be the wrong browser but they can deal).
2014-11-13 14:34:03 +00:00
Kegan Dougal
0a699df5e8
Wipe the selected room ID on the home screen.
2014-11-13 12:33:43 +00:00
Kegan Dougal
5180285456
SYWEB-152: Unbreak /me
2014-11-13 11:58:28 +00:00
Kegan Dougal
8ce69e802d
SYWEB-152: Migrate IRC command logic to commands-service.
2014-11-13 11:55:49 +00:00
David Baker
0046df4b51
This gives just enough space for the vertical scrollbar to be shown without adding a horizontal scrollbar.
2014-11-13 10:19:09 +00:00
Matthew Hodgson
c2609b239f
suggest ~/.synapse
2014-11-13 11:59:33 +02:00
Matthew Hodgson
28408a9f64
Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse into develop
2014-11-13 11:58:54 +02:00
David Baker
9950ce2334
Detect OpenWebRTC and add workarounds, but comment out the turn server removal for now so we have a live demo of it not working.
2014-11-12 17:34:00 +00:00
David Baker
2b64c573c3
Oops, change videoElement / selector in audio call too.
2014-11-12 17:31:03 +00:00
Kegan Dougal
f4a3b194da
Fix ability to invite users. Remove unused variables.
2014-11-12 17:06:12 +00:00
Erik Johnston
f04b3d5042
Store all signatures on events rather than just dropping them
2014-11-12 17:02:34 +00:00
Kegan Dougal
59cf6f5ec9
Add more recents service unit tests.
2014-11-12 16:32:17 +00:00
Kegan Dougal
3d3f692fd8
Add test coverage to the webclient. Update .gitignore
2014-11-12 16:22:22 +00:00
Erik Johnston
b2596c660b
Add a few more comments to the federation handler
2014-11-12 16:20:30 +00:00
Erik Johnston
e715741abc
Update some of the docs in event_federation
2014-11-12 16:20:30 +00:00
Kegan Dougal
813125e122
Make earlier versions of jasmine happy by doing explicit object comparisons
2014-11-12 16:01:01 +00:00
Kegan Dougal
92ea45070c
Add recentsService unit tests.
2014-11-12 15:58:30 +00:00
David Baker
9412110c82
comment typo
2014-11-12 15:36:05 +00:00
Kegan Dougal
960b28c90a
SYWEB-57: Highlight rooms which have had their bingers go off in blue.
...
Priority is the same as xchat so selected > blue > red.
2014-11-12 15:31:06 +00:00
Matthew Hodgson
ca386a4b25
various fixes based on truphone feedback
2014-11-12 17:26:50 +02:00
Kegan Dougal
99c445a6d6
Migrate unread messages logic to recentsService.
2014-11-12 15:11:34 +00:00
Kegan Dougal
96cd467cfa
Add recents-service to store shared state between recents-controllers.
...
Remove the selectedRoomId from rootScope and instead store it in
recents-service. Add a broadcast to notify listeners (recents-controller)
to updates of this.
2014-11-12 14:57:36 +00:00
Erik Johnston
e24d5cb97d
Document StateStore and use transactions
2014-11-12 14:33:48 +00:00
Erik Johnston
58c0ef90c9
Add indices to state group tables
2014-11-12 14:33:48 +00:00
Kegan Dougal
e632fcd933
SYWEB-57: Highlight rooms where the history has changed.
...
This highlights rooms when something has happened and you haven't viewed
it yet. It highlights entries in a slightly red background colour.
2014-11-12 14:31:30 +00:00
Kegan Dougal
78ff63a9c7
Remove getRoomAliasAndDisplayName: room name logic is in mRoomName filter, and this method was only used for /publicRooms requests.
2014-11-12 11:49:27 +00:00
Kegan Dougal
e7ccd26c70
SYWEB-140: Redact button layout.
2014-11-12 11:40:28 +00:00
Erik Johnston
3db0efa69f
Fix pyflake warnings and add a FIXME comment to deal with auth_chains received when joining
2014-11-12 11:27:02 +00:00
Erik Johnston
6fea478d2e
Fix bugs with invites/joins across federatiom.
...
Both in terms of auth and not trying to fetch missing PDUs for invites,
joins etc.
2014-11-12 11:24:11 +00:00
Kegan Dougal
2c400363e8
SYWEB-146: Fix room ID leaking on recents page when the name of the room is just an alias.
2014-11-12 11:24:05 +00:00
Kegan Dougal
9d0efedaee
Move room alias/id mapping logic from matrixService to modelService.
2014-11-12 11:14:19 +00:00
Matthew Hodgson
33e9e0fb2d
move model/ into matrix-doc/drafts
2014-11-12 01:16:38 +02:00
Matthew Hodgson
ef1eb4c888
this got merged into matrix-doc/specification/00_basis.rst by someone
2014-11-12 01:14:06 +02:00
Matthew Hodgson
0ac2dc388e
move OLD_specification into matrix-doc/drafts
2014-11-12 01:04:32 +02:00