8c45c8b8b9
Merge pull request #14 from matrix-org/merge_pdu_event_objects
...
Merge pdu and event objects
2014-11-17 10:29:23 +00:00
1d3ef8734c
Merge remote-tracking branch 'origin/develop' into merge_pdu_event_objects
2014-11-17 10:21:51 +00:00
547adda446
Move getLastMessage to modelService.
2014-11-17 10:04:36 +00:00
fbf8003237
s/eventHandlerService.getUsersCountInRoom/modelService.getUserCountInRoom/g
2014-11-17 09:33:22 +00:00
4d922a0f9b
do *not* depend on external websites to host our JS - if nothing else, it makes hacking on synapse when offline (e.g. on planes) a huge PITA :(
2014-11-15 23:21:24 +00:00
8413c38295
doc
2014-11-15 01:52:08 +00:00
adf582dba7
merge in msg.__room_member usage to new message display template
2014-11-15 01:34:33 +00:00
921d95357d
improve notif setting text
2014-11-15 01:30:42 +00:00
1f70929e53
spell useCaptcha right...
2014-11-15 01:30:42 +00:00
a7ddcc9c0f
do not use captcha by default
2014-11-15 01:30:42 +00:00
cb4b6c844a
Merge PDUs and Events into one object
2014-11-14 21:25:02 +00:00
8c2b5ea7c4
Fix PDU and event signatures
2014-11-14 19:11:04 +00:00
de1ec90133
Validate signatures on incoming events
2014-11-14 19:11:04 +00:00
44a24605ad
Add event-stream-service unit tests.
2014-11-14 17:30:17 +00:00
570db98548
Unbreak tab complete...
2014-11-14 17:01:09 +00:00
d22d9b22b1
Add more modelService unit tests.
2014-11-14 16:36:02 +00:00
b93804529d
Move getUserPowerLevel to modelService.
2014-11-14 16:15:32 +00:00
78bf5648e7
Fix bug which caused notifications to appear for old messages.
2014-11-14 15:57:18 +00:00
c3278a8262
Tidy up room.html member list to use member again, now that scope.members is gone.
2014-11-14 15:39:47 +00:00
d4f6d65e1d
Add extra checks to duration filter.
2014-11-14 15:34:19 +00:00
5ebd004a10
Actually look for last_active_ago in the right place..
2014-11-14 15:30:49 +00:00
459863bcff
Remove scope.members from RoomController and use modelService instead. This may make things unstable.
2014-11-14 14:26:05 +00:00
fe3401e037
Be more helpful and tell the user how to generate a config too.
2014-11-14 13:30:06 +00:00
933ce76057
Adding --generate-config will not help if the user has not specified a config file.
2014-11-14 13:24:12 +00:00
d5a42e9d9c
Use modelService for getting current presence state rather than RoomController.members
2014-11-14 12:59:22 +00:00
b8eca1ffbf
Merge pull request #13 from matrix-org/request_logging
...
Request logging
2014-11-14 11:46:07 +00:00
49a1b4262d
Use modelService to access room member power levels rather than RoomController.
2014-11-14 11:29:50 +00:00
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
974206ebe1
Use mUserDisplayName filter in more places. Store power_level[norm] for each RoomMember.
2014-11-14 11:13:03 +00:00
687662c990
Add notification-service unit tests.
2014-11-14 10:33:42 +00:00
d1df3cd4d5
Add mUserDisplayName unit tests.
2014-11-14 09:52:53 +00:00
656bf2c60c
Unskip unit tests; fix filter dependency.
2014-11-14 09:20:36 +00:00
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
3916e23bbd
Remove rootScope.presence and replaced with modelService.getUser/setUser.
2014-11-13 16:43:53 +00:00
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
8d8a133c89
SYN-103: Remove "origin" and "destination" keys from edus
2014-11-13 15:49:03 +00:00
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
58ddff0881
remove stray unmatched css comment
2014-11-13 14:45:29 +00:00
bfe20c11c3
remove now-unused styles
2014-11-13 14:42:31 +00:00
e7c6d2c9d9
SYN-138: Rewrite synctl in python and include it in the python distribution
2014-11-13 14:39:30 +00:00
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
cadcc6cabe
Add commands-service unit tests.
2014-11-13 14:35:58 +00:00
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
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
0a699df5e8
Wipe the selected room ID on the home screen.
2014-11-13 12:33:43 +00:00
5180285456
SYWEB-152: Unbreak /me
2014-11-13 11:58:28 +00:00
8ce69e802d
SYWEB-152: Migrate IRC command logic to commands-service.
2014-11-13 11:55:49 +00:00
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
c2609b239f
suggest ~/.synapse
2014-11-13 11:59:33 +02:00
28408a9f64
Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse into develop
2014-11-13 11:58:54 +02:00
Erik Johnston