Commit Graph

1900 Commits (5f49914dee80c7572c549bb17a0099cdad7cdb32)

Author SHA1 Message Date
Mark Haines a5b88c489e Split out sending the room alias events from creating the alias so that we can do them in the right point when creating a room 2014-11-18 15:03:13 +00:00
Paul "LeoNerd" Evans 17f977a9de Include 'messages' snapshot in room initialSync 2014-11-18 14:07:51 +00:00
Matthew Hodgson c571dd4f0e warn about memory 2014-11-17 11:44:53 -08:00
Matthew Hodgson 94ed41f236 update the README.rst to reflect the develop branch 2014-11-17 11:42:27 -08:00
Mark Haines 26fc878944 Stop before starting when restarting 2014-11-17 19:16:15 +00:00
Matthew Hodgson b57e9f58fd yet another installation gotcha 2014-11-17 11:11:35 -08:00
Matthew Hodgson d18fc97717 Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse into develop 2014-11-17 11:11:15 -08:00
Matthew Hodgson b80d1925ff clarify install instructions further still 2014-11-17 10:52:12 -08:00
Paul "LeoNerd" Evans 31a049eb69 Merge branch 'develop' into room-initial-sync
Conflicts:
	synapse/handlers/message.py
2014-11-17 16:59:24 +00:00
Mark Haines cf45e57d9c SYN-148: Add the alias after creating the room 2014-11-17 16:37:33 +00:00
Mark Haines 1b91c26409 Mark synapse as not zip-safe since it needs to be able to read schema files from the filesystem 2014-11-17 16:36:24 +00:00
Mark Haines 5d273a0c76 Remove syweb directory. pull in syweb as a dependency from github 2014-11-17 12:55:24 +00:00
Kegan Dougal da6df07a9d SYWEB-152: Remove room join logic from RoomController and put it in eventHandlerService.joinRoom. 2014-11-17 11:04:10 +00:00
Kegan Dougal 7799e14121 Add clearRooms() to wipe data when you logout. 2014-11-17 11:04:10 +00:00
Mark Haines 2eaf689f71 These lines aren't doing anything 2014-11-17 10:41:35 +00:00
Erik Johnston 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
Mark Haines 1d3ef8734c Merge remote-tracking branch 'origin/develop' into merge_pdu_event_objects 2014-11-17 10:21:51 +00:00
Kegan Dougal 547adda446 Move getLastMessage to modelService. 2014-11-17 10:04:36 +00:00
Kegan Dougal fbf8003237 s/eventHandlerService.getUsersCountInRoom/modelService.getUserCountInRoom/g 2014-11-17 09:33:22 +00:00
Matthew Hodgson 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
Matthew Hodgson 8413c38295 doc 2014-11-15 01:52:08 +00:00
Matthew Hodgson adf582dba7 merge in msg.__room_member usage to new message display template 2014-11-15 01:34:33 +00:00
Matthew Hodgson 921d95357d improve notif setting text 2014-11-15 01:30:42 +00:00
Matthew Hodgson 1f70929e53 spell useCaptcha right... 2014-11-15 01:30:42 +00:00
Matthew Hodgson a7ddcc9c0f do not use captcha by default 2014-11-15 01:30:42 +00:00
Mark Haines cb4b6c844a Merge PDUs and Events into one object 2014-11-14 21:25:02 +00:00
Mark Haines 8c2b5ea7c4 Fix PDU and event signatures 2014-11-14 19:11:04 +00:00
Mark Haines de1ec90133 Validate signatures on incoming events 2014-11-14 19:11:04 +00:00
Kegan Dougal 44a24605ad Add event-stream-service unit tests. 2014-11-14 17:30:17 +00:00
Kegan Dougal 570db98548 Unbreak tab complete... 2014-11-14 17:01:09 +00:00
Kegan Dougal d22d9b22b1 Add more modelService unit tests. 2014-11-14 16:36:02 +00:00
Kegan Dougal b93804529d Move getUserPowerLevel to modelService. 2014-11-14 16:15:32 +00:00
Kegan Dougal 78bf5648e7 Fix bug which caused notifications to appear for old messages. 2014-11-14 15:57:18 +00:00
Kegan Dougal 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
Kegan Dougal d4f6d65e1d Add extra checks to duration filter. 2014-11-14 15:34:19 +00:00
Kegan Dougal 5ebd004a10 Actually look for last_active_ago in the right place.. 2014-11-14 15:30:49 +00:00
Kegan Dougal 459863bcff Remove scope.members from RoomController and use modelService instead. This may make things unstable. 2014-11-14 14:26:05 +00:00
David Baker fe3401e037 Be more helpful and tell the user how to generate a config too. 2014-11-14 13:30:06 +00:00
David Baker 933ce76057 Adding --generate-config will not help if the user has not specified a config file. 2014-11-14 13:24:12 +00:00
Kegan Dougal d5a42e9d9c Use modelService for getting current presence state rather than RoomController.members 2014-11-14 12:59:22 +00:00
Erik Johnston b8eca1ffbf Merge pull request #13 from matrix-org/request_logging
Request logging
2014-11-14 11:46:07 +00:00
Kegan Dougal 49a1b4262d Use modelService to access room member power levels rather than RoomController. 2014-11-14 11:29:50 +00:00
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