1
0

Commit Graph

  • b2aeaa2dcc Merge branch 'master' into develop Mark Haines 2014-11-20 10:00:13 +00:00
  • dcb99e4972 SYN-153: Fix formatting of federation error message Mark Haines 2014-11-19 17:23:33 +00:00
  • 25fd4d9f2c typoe Matthew Hodgson 2014-11-19 15:25:23 -08:00
  • bf7940d7ff Add note about rerunning setup.py develop Erik Johnston 2014-11-19 20:07:21 +00:00
  • 051b185811 remove random half-line David Baker 2014-11-19 18:37:00 +00:00
  • 74c3879760 Start creating a module to do generic notifications (just prints them to stdout currently!) David Baker 2014-11-19 18:20:59 +00:00
  • 19977b4659 Merge branch 'release-v0.5.0' of github.com:matrix-org/synapse v0.5.0 Erik Johnston 2014-11-19 18:03:57 +00:00
  • 1a9551db82 Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0 Erik Johnston 2014-11-19 18:03:03 +00:00
  • 5b46ce579b Bump version, changelog and upgrade.rst Erik Johnston 2014-11-19 18:00:57 +00:00
  • 493055731e Fix tests from prev commit Erik Johnston 2014-11-19 18:00:07 +00:00
  • 415ddf59bb Don't add a 'prev' key to m.room.member messages Erik Johnston 2014-11-19 17:59:51 +00:00
  • 03dc63f6c8 Initialise UserPresenceCache instances to always contain a 'presence' key Paul "LeoNerd" Evans 2014-11-19 17:30:35 +00:00
  • 4eada9a908 Fix backfill request Erik Johnston 2014-11-19 17:22:10 +00:00
  • 512993b57f Only users can set state events which have their own user_id Erik Johnston 2014-11-19 17:21:40 +00:00
  • ca91bb2f7f Sometimes there isn't a current logging context Mark Haines 2014-11-19 17:18:55 +00:00
  • 8993affdc0 SYN-153: Raise 404 if room alias is not found Mark Haines 2014-11-19 17:14:14 +00:00
  • ff23e5ba37 remove demo webserver since synapse serves up the webclient itself Mark Haines 2014-11-19 16:45:25 +00:00
  • 0d1221155e remove unused import Mark Haines 2014-11-19 16:40:01 +00:00
  • c5eabe3143 replace user_id with sender Mark Haines 2014-11-19 16:38:40 +00:00
  • 97c7c34f6f Preserve logging context in a few more places, drop the logging context after it has been stashed to reduce potential for confusion Mark Haines 2014-11-19 16:37:43 +00:00
  • 3e54d70ae2 SYN-141: Encode query params as UTF-8. Mark Haines 2014-11-18 19:42:07 +00:00
  • a7f470d1d9 more README fixes Matthew Hodgson 2014-11-18 11:22:41 -08:00
  • 428581dd05 SYN-144: Remove bad keys from pdu json objects, convert age_ts to age for all pdus sent. Mark Haines 2014-11-18 19:18:36 +00:00
  • 572a1ca42a Remember also to UTF-8 decode bytes in room alias names in directory server URLs Paul "LeoNerd" Evans 2014-11-18 18:06:35 +00:00
  • 3bfc3dd45b Remember to URL decode the room_id in room initialSync Paul "LeoNerd" Evans 2014-11-18 17:44:46 +00:00
  • db7e8b5619 SYN-141: Decode the query params as UTF-8 Mark Haines 2014-11-18 17:17:57 +00:00
  • 54c438d8d3 Remove unused variable Mark Haines 2014-11-18 16:46:12 +00:00
  • 1731af3f29 SYN-104: When going backwards the end token should be before the last event Mark Haines 2014-11-18 16:44:52 +00:00
  • 11fd81e398 Merge pull request #17 from matrix-org/room-initial-sync Paul Evans 2014-11-18 16:44:25 +00:00
  • 88dfa7baa6 Ensure to parse a real pagination config object out of room initialSync request and pass it on Paul "LeoNerd" Evans 2014-11-18 16:34:43 +00:00
  • 75e95c45a2 Rename message handler's new snapshot_room to room_initial_sync() as that better suits its purpose Paul "LeoNerd" Evans 2014-11-18 16:02:44 +00:00
  • c6ea29d916 Revert accidental commit of bad file Erik Johnston 2014-11-18 15:57:00 +00:00
  • e9f587ecba Merge remote-tracking branch 'origin/develop' into room-initial-sync Paul "LeoNerd" Evans 2014-11-18 15:48:30 +00:00
  • 3553101eb3 Null check when determining default power levels Mark Haines 2014-11-18 15:43:17 +00:00
  • b01dd76be1 SYN-149: Enable auth for events added during room creation since they should pass auth checks Mark Haines 2014-11-18 15:42:53 +00:00
  • 95614e5220 Fix auth to correctly handle initial creation of rooms Erik Johnston 2014-11-18 15:36:36 +00:00
  • ae9c2ab165 SYN-149: Send join event immediately after the room create event Mark Haines 2014-11-18 15:29:48 +00:00
  • 33d328d967 Include room members' presence in room initialSync Paul "LeoNerd" Evans 2014-11-18 15:28:58 +00:00
  • 759db7d7d5 Added ability to .get_state() from the PresenceHandler by returning a complete m.presence event Paul "LeoNerd" Evans 2014-11-18 15:25:55 +00:00
  • 4c18e08036 Don't expect all _user_cachemap entries to definitely contain a "last_active" key Paul "LeoNerd" Evans 2014-11-18 15:10:11 +00:00
  • 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 Mark Haines 2014-11-18 15:03:01 +00:00
  • 17f977a9de Include 'messages' snapshot in room initialSync Paul "LeoNerd" Evans 2014-11-18 14:07:51 +00:00
  • c571dd4f0e warn about memory Matthew Hodgson 2014-11-17 11:44:53 -08:00
  • 94ed41f236 update the README.rst to reflect the develop branch Matthew Hodgson 2014-11-17 11:42:27 -08:00
  • 26fc878944 Stop before starting when restarting Mark Haines 2014-11-17 19:16:15 +00:00
  • b57e9f58fd yet another installation gotcha Matthew Hodgson 2014-11-17 11:11:35 -08:00
  • d18fc97717 Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse into develop Matthew Hodgson 2014-11-17 11:11:15 -08:00
  • b80d1925ff clarify install instructions further still Matthew Hodgson 2014-11-17 10:52:12 -08:00
  • 31a049eb69 Merge branch 'develop' into room-initial-sync Paul "LeoNerd" Evans 2014-11-17 16:59:24 +00:00
  • cf45e57d9c SYN-148: Add the alias after creating the room Mark Haines 2014-11-17 16:37:33 +00:00
  • 1b91c26409 Mark synapse as not zip-safe since it needs to be able to read schema files from the filesystem Mark Haines 2014-11-17 16:36:24 +00:00
  • 5d273a0c76 Remove syweb directory. pull in syweb as a dependency from github Mark Haines 2014-11-17 12:55:24 +00:00
  • da6df07a9d SYWEB-152: Remove room join logic from RoomController and put it in eventHandlerService.joinRoom. Kegan Dougal 2014-11-17 11:03:58 +00:00
  • 7799e14121 Add clearRooms() to wipe data when you logout. Kegan Dougal 2014-11-17 10:12:44 +00:00
  • 2eaf689f71 These lines aren't doing anything Mark Haines 2014-11-17 10:41:35 +00:00
  • 8c45c8b8b9 Merge pull request #14 from matrix-org/merge_pdu_event_objects Erik Johnston 2014-11-17 10:29:23 +00:00
  • 1d3ef8734c Merge remote-tracking branch 'origin/develop' into merge_pdu_event_objects Mark Haines 2014-11-17 10:21:51 +00:00
  • 547adda446 Move getLastMessage to modelService. Kegan Dougal 2014-11-17 10:04:36 +00:00
  • fbf8003237 s/eventHandlerService.getUsersCountInRoom/modelService.getUserCountInRoom/g Kegan Dougal 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 :( Matthew Hodgson 2014-11-15 23:21:24 +00:00
  • 8413c38295 doc Matthew Hodgson 2014-11-15 01:52:08 +00:00
  • adf582dba7 merge in msg.__room_member usage to new message display template Matthew Hodgson 2014-11-15 01:34:33 +00:00
  • 921d95357d improve notif setting text Matthew Hodgson 2014-11-15 01:30:02 +00:00
  • 1f70929e53 spell useCaptcha right... Matthew Hodgson 2014-11-15 01:29:34 +00:00
  • a7ddcc9c0f do not use captcha by default Matthew Hodgson 2014-11-15 01:29:15 +00:00
  • cb4b6c844a Merge PDUs and Events into one object Mark Haines 2014-11-14 21:25:02 +00:00
  • 8c2b5ea7c4 Fix PDU and event signatures Mark Haines 2014-11-14 19:10:52 +00:00
  • de1ec90133 Validate signatures on incoming events Mark Haines 2014-11-14 16:45:39 +00:00
  • 44a24605ad Add event-stream-service unit tests. Kegan Dougal 2014-11-14 17:30:17 +00:00
  • 570db98548 Unbreak tab complete... Kegan Dougal 2014-11-14 17:01:09 +00:00
  • d22d9b22b1 Add more modelService unit tests. Kegan Dougal 2014-11-14 16:36:02 +00:00
  • b93804529d Move getUserPowerLevel to modelService. Kegan Dougal 2014-11-14 16:15:32 +00:00
  • 78bf5648e7 Fix bug which caused notifications to appear for old messages. Kegan Dougal 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. Kegan Dougal 2014-11-14 15:39:47 +00:00
  • d4f6d65e1d Add extra checks to duration filter. Kegan Dougal 2014-11-14 15:34:19 +00:00
  • 5ebd004a10 Actually look for last_active_ago in the right place.. Kegan Dougal 2014-11-14 15:30:49 +00:00
  • 459863bcff Remove scope.members from RoomController and use modelService instead. This may make things unstable. Kegan Dougal 2014-11-14 14:25:53 +00:00
  • fe3401e037 Be more helpful and tell the user how to generate a config too. David Baker 2014-11-14 13:30:06 +00:00
  • 933ce76057 Adding --generate-config will not help if the user has not specified a config file. David Baker 2014-11-14 13:23:17 +00:00
  • d5a42e9d9c Use modelService for getting current presence state rather than RoomController.members Kegan Dougal 2014-11-14 11:59:33 +00:00
  • b8eca1ffbf Merge pull request #13 from matrix-org/request_logging Erik Johnston 2014-11-14 11:46:07 +00:00
  • 49a1b4262d Use modelService to access room member power levels rather than RoomController. Kegan Dougal 2014-11-14 11:29:50 +00:00
  • e903c941cb Merge branch 'develop' into request_logging Mark Haines 2014-11-14 11:16:50 +00:00
  • 974206ebe1 Use mUserDisplayName filter in more places. Store power_level[norm] for each RoomMember. Kegan Dougal 2014-11-14 11:13:03 +00:00
  • 687662c990 Add notification-service unit tests. Kegan Dougal 2014-11-14 10:33:42 +00:00
  • d1df3cd4d5 Add mUserDisplayName unit tests. Kegan Dougal 2014-11-14 09:52:53 +00:00
  • 656bf2c60c Unskip unit tests; fix filter dependency. Kegan Dougal 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. Kegan Dougal 2014-11-13 17:59:08 +00:00
  • 3916e23bbd Remove rootScope.presence and replaced with modelService.getUser/setUser. Kegan Dougal 2014-11-13 16:43:53 +00:00
  • afd2e214bc SYWEB-152: Move up/down history fully to a directive. Kegan Dougal 2014-11-13 16:09:44 +00:00
  • 8d8a133c89 SYN-103: Remove "origin" and "destination" keys from edus Mark Haines 2014-11-13 15:48:51 +00:00
  • d085807070 Migrate random bits of desktop notification logic out of roomController and into eventHandlerService where everything else is. Kegan Dougal 2014-11-13 15:21:42 +00:00
  • 58ddff0881 remove stray unmatched css comment David Baker 2014-11-13 14:45:29 +00:00
  • bfe20c11c3 remove now-unused styles David Baker 2014-11-13 14:42:08 +00:00
  • e7c6d2c9d9 SYN-138: Rewrite synctl in python and include it in the python distribution Mark Haines 2014-11-13 14:39:11 +00:00
  • cdb8d746ef Merge with Matthew's killing of ng-animate David Baker 2014-11-13 14:37:43 +00:00
  • cadcc6cabe Add commands-service unit tests. Kegan Dougal 2014-11-13 14:35:53 +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 Matthew Hodgson 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). David Baker 2014-11-13 14:34:03 +00:00
  • 0a699df5e8 Wipe the selected room ID on the home screen. Kegan Dougal 2014-11-13 12:33:43 +00:00