1
0

Commit Graph

  • d14fcfd24a Merge pull request #487 from matrix-org/daniel/forceregistration Daniel Wagner-Hall 2016-01-14 11:06:43 +00:00
  • 27927463a1 Merge pull request #494 from matrix-org/daniel/2 Daniel Wagner-Hall 2016-01-14 11:06:19 +00:00
  • fcb6df45e5 Merge pull request #493 from matrix-org/daniel/1 Daniel Wagner-Hall 2016-01-14 11:06:14 +00:00
  • a7927c13fd Fix enabling & disabling push rules David Baker 2016-01-14 10:53:44 +00:00
  • 339c8f0133 Clamp pagination limits to at most 1000 Erik Johnston 2016-01-14 10:22:02 +00:00
  • bce602eb4e Use logger not logging Erik Johnston 2016-01-14 09:56:26 +00:00
  • 939cbd7057 Merge pull request #495 from matrix-org/erikj/disable_notification Erik Johnston 2016-01-14 09:46:09 +00:00
  • 12623c99b6 Use the unread notification count to send accurate badge counts in push notifications. David Baker 2016-01-13 18:55:57 +00:00
  • 2655d61d70 Don't change signature. Return empty list Erik Johnston 2016-01-13 17:43:39 +00:00
  • fcb05b4c82 Temporarily disable notification branch Erik Johnston 2016-01-13 17:37:09 +00:00
  • 806bae1ee7 Merge pull request #488 from matrix-org/markjh/user_name Mark Haines 2016-01-13 18:11:01 +01:00
  • f6fcff3602 Don't start server if ASes are invalidly configured Daniel Wagner-Hall 2016-01-13 17:09:24 +00:00
  • 244b356a37 Delete unused code Daniel Wagner-Hall 2016-01-13 17:03:58 +00:00
  • 49f33f6438 Add 'event' result to 'context' endpoint Richard van der Hoff 2016-01-13 14:19:22 +00:00
  • 93afb40cd4 Skip, rather than erroring, invalid guest requests Daniel Wagner-Hall 2016-01-05 18:12:37 +00:00
  • 9c1f853d58 Rename 'user_name' to 'user_id' in push to make it consistent with the rest of the code Mark Haines 2016-01-13 13:08:59 +00:00
  • 7d09ab8915 Require AS users to be registered before use Daniel Wagner-Hall 2016-01-13 13:19:47 +00:00
  • d9db819e23 Change default pushrules back to notifying for all messages. David Baker 2016-01-13 13:15:53 +00:00
  • 37716d55ed Merge pull request #482 from matrix-org/markjh/table_name Mark Haines 2016-01-13 13:45:39 +01:00
  • 4399684582 Merge pull request #483 from matrix-org/erikj/bulk_get_push_rules Erik Johnston 2016-01-13 12:35:11 +00:00
  • 44b4fc5f50 Use compiled regex Erik Johnston 2016-01-13 11:47:32 +00:00
  • f4dad9f639 Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/table_name Mark Haines 2016-01-13 11:46:07 +00:00
  • 8740e4e94a bulk_get_push_rules should handle empty lists Erik Johnston 2016-01-13 11:37:17 +00:00
  • c0a279e808 Delete the table objects from TransactionStore Mark Haines 2016-01-13 11:15:20 +00:00
  • 96e400fee5 Remove the RoomsTable object Mark Haines 2016-01-13 11:07:32 +00:00
  • 72ba26679b Merge pull request #480 from matrix-org/erikj/guest_event_tightloop Erik Johnston 2016-01-13 11:00:50 +00:00
  • ea47760bd8 Merge pull request #481 from matrix-org/erikj/SYN-589 Erik Johnston 2016-01-12 16:55:55 +00:00
  • 70dfe4dc96 Don't include old left rooms Erik Johnston 2016-01-12 15:01:56 +00:00
  • a8e9e0b916 Remove the PushersTable and EventPushActionsTable objects Mark Haines 2016-01-12 14:41:26 +00:00
  • 31de2953a3 Remove the PushRuleTable and PushRuleEnableTable objects Mark Haines 2016-01-12 14:22:24 +00:00
  • fd5c28dc52 Dont fire user_joined_room when guest hits /events Erik Johnston 2016-01-12 10:55:11 +00:00
  • 42aa1f3f33 Merge pull request #478 from matrix-org/daniel/userobject Daniel Wagner-Hall 2016-01-11 17:50:22 +00:00
  • 2110e35fd6 Introduce a Requester object Daniel Wagner-Hall 2016-01-11 15:29:57 +00:00
  • b5d33a656f Postgres doesn't like booleans David Baker 2016-01-11 17:13:52 +00:00
  • fe56138142 Remove rogue 'admin' David Baker 2016-01-11 17:09:03 +00:00
  • c110eb92f8 Merge pull request #476 from koobs/patch-1 Matthew Hodgson 2016-01-08 17:55:25 +00:00
  • 8f8b884430 Don't log urlencoded access_tokens Erik Johnston 2016-01-08 17:48:08 +00:00
  • a8cd1eb996 Add FreeBSD install section & instructions Kubilay Kocak 2016-01-09 04:36:22 +11:00
  • 29e595e5d4 Merge pull request #474 from matrix-org/erikj/core_dump Erik Johnston 2016-01-08 16:52:15 +00:00
  • c232780081 Merge pull request #456 from matrix-org/store_event_actions David Baker 2016-01-08 14:47:15 +00:00
  • 7c816de442 Merge pull request #475 from matrix-org/markjh/fix_thumbnail Mark Haines 2016-01-07 20:07:53 +01:00
  • 8677b7d698 Only use cropped thumbnails when asked for a cropped thumbnail. Mark Haines 2016-01-07 18:57:15 +00:00
  • da48657728 Add a comment to a variable in federation code to explain what it's for paul/SYN-560 Paul "LeoNerd" Evans 2016-01-07 17:07:49 +00:00
  • 33bef689c1 Turn on core dumps Erik Johnston 2016-01-07 15:28:40 +00:00
  • fcbe63eaad Use logger not logging Erik Johnston 2016-01-07 15:28:17 +00:00
  • 5727922106 Merge pull request #473 from matrix-org/erikj/ssh_manhole Erik Johnston 2016-01-07 14:36:16 +00:00
  • 5dc5e29b9c s/telnet/ssh/ Erik Johnston 2016-01-07 14:02:57 +00:00
  • 3deffcdb1e Merge pull request #465 from matrix-org/syn-453 Erik Johnston 2016-01-07 14:01:03 +00:00
  • c9ae1d1ee5 Change manhole to use ssh Erik Johnston 2016-01-07 13:57:04 +00:00
  • daadcf36c0 This comma is actually important David Baker 2016-01-07 10:15:35 +00:00
  • 823b679232 more commas David Baker 2016-01-07 10:02:47 +00:00
  • 6c28ac260c copyrights Matthew Hodgson 2016-01-07 04:26:29 +00:00
  • 49c34dfd36 Merge pull request #472 from roblabla/patch-1 Matthew Hodgson 2016-01-06 22:24:28 +00:00
  • 4106477e7f Config Comment mixup in captcha public/private key Robin Lambertz 2016-01-06 23:19:33 +01:00
  • 7ac6ca7311 Merge pull request #468 from matrix-org/daniel/versionsyo Daniel Wagner-Hall 2016-01-06 18:09:04 +00:00
  • 11a974da21 Add /_matrix/versions to report supported versions Daniel Wagner-Hall 2016-01-06 18:08:52 +00:00
  • 09dc9854cd comma style David Baker 2016-01-06 17:44:10 +00:00
  • 442fcc02f7 Merge remote-tracking branch 'origin/develop' into store_event_actions David Baker 2016-01-06 17:28:55 +00:00
  • b6a585348a Adding is_guest here won't work because it just constructs a dict of uid -> password hash David Baker 2016-01-06 17:16:02 +00:00
  • c582f178b7 Merge pull request #469 from matrix-org/markjh/joined_guest_access Mark Haines 2016-01-06 18:10:11 +01:00
  • 4cec90a260 Pass whether the user was a guest to some of the event streams Mark Haines 2016-01-06 16:54:57 +00:00
  • 0e48f7f245 fix tests David Baker 2016-01-06 16:46:41 +00:00
  • 392773ccb2 Guest users must be joined to a room to see it in /sync Mark Haines 2016-01-06 16:44:13 +00:00
  • bf32922e5a Log when starting stats reporting Daniel Wagner-Hall 2016-01-06 14:13:34 +00:00
  • 797691f908 Log on stats scheduling Daniel Wagner-Hall 2016-01-06 14:04:27 +00:00
  • e5ea4fad78 Merge pull request #466 from matrix-org/daniel/logloglog Daniel Wagner-Hall 2016-01-06 13:52:19 +00:00
  • 5880de186b Log when we skip daily messages Daniel Wagner-Hall 2016-01-06 13:52:16 +00:00
  • 992928304f Delete notifications for redacted events David Baker 2016-01-06 11:58:46 +00:00
  • ae1262a241 Add schema change file for is_guest flag David Baker 2016-01-06 11:58:20 +00:00
  • c79f221192 Add is_guest flag to users db to track whether a user is a guest user or not. Use this so we can run _filter_events_for_client when calculating event_push_actions. David Baker 2016-01-06 11:38:09 +00:00
  • 8ce5679813 Update readme to reflect change in signing key name Erik Johnston 2016-01-06 11:19:51 +00:00
  • eb03625626 Merge remote-tracking branch 'origin/develop' into store_event_actions David Baker 2016-01-05 18:39:50 +00:00
  • 87d577e023 Merge pull request #463 from matrix-org/daniel/hashtagnofilter Daniel Wagner-Hall 2016-01-05 18:12:40 +00:00
  • 2ef6de928d Skip, rather than erroring, invalid guest requests Daniel Wagner-Hall 2016-01-05 18:12:37 +00:00
  • 29e131df43 Merge pull request #462 from matrix-org/daniel/guestupgrade Daniel Wagner-Hall 2016-01-05 18:01:29 +00:00
  • cfd07aafff Allow guests to upgrade their accounts Daniel Wagner-Hall 2016-01-05 18:01:18 +00:00
  • a178eb1bc8 Merge pull request #464 from matrix-org/erikj/crop_correct Erik Johnston 2016-01-05 17:41:07 +00:00
  • 8737ead008 Use larger thumbnail rather than smaller. Erik Johnston 2016-01-05 17:30:30 +00:00
  • 90921981be Merge pull request #461 from matrix-org/erikj/sync_leave Erik Johnston 2016-01-05 14:59:05 +00:00
  • acb19068d0 Return /sync when something under the 'leave' key has changed Erik Johnston 2016-01-05 14:49:06 +00:00
  • d74c4e90d4 Merge pull request #460 from matrix-org/erikj/create_room_3pid_invite Erik Johnston 2016-01-05 14:06:23 +00:00
  • 85ca8cb90c comment typo David Baker 2016-01-05 13:32:39 +00:00
  • c3ea36304b Use named args Erik Johnston 2016-01-05 12:57:45 +00:00
  • 1b5642604b Support inviting 3pids in /createRoom Erik Johnston 2016-01-05 11:56:21 +00:00
  • 07c33eff43 Merge branch 'master' of github.com:matrix-org/synapse into develop Erik Johnston 2016-01-05 10:25:13 +00:00
  • 4eb7b950c8 = not == in sql David Baker 2016-01-04 18:11:17 +00:00
  • dc65d0ae9d typoe Matthew Hodgson 2016-01-04 17:23:15 +00:00
  • b18b99eb14 fix another whitespace rst bug Matthew Hodgson 2016-01-04 17:17:27 +00:00
  • 5680be70ae fix whitespace bug Matthew Hodgson 2016-01-04 17:13:52 +00:00
  • c77e7e60fc Only joined rooms have unread_notif_count David Baker 2016-01-04 15:49:06 +00:00
  • d74c6ace24 comma David Baker 2016-01-04 15:32:00 +00:00
  • f1b67730fa Add unread_notif_count in incremental_sync_with_gap David Baker 2016-01-04 14:50:36 +00:00
  • 92a1e74b20 fix tests David Baker 2016-01-04 14:17:35 +00:00
  • c914d67cda Rename event-actions to event_push_actions as per PR request David Baker 2016-01-04 14:05:37 +00:00
  • f35f8d06ea Merge remote-tracking branch 'origin/release-v0.12.0' v0.12.0 Mark Haines 2016-01-04 14:02:50 +00:00
  • d2709a5389 Bump changelog and version for v0.12.0 Mark Haines 2016-01-04 13:57:39 +00:00
  • 928c575c6f Merge remote-tracking branch 'origin/develop' into store_event_actions David Baker 2016-01-04 13:39:51 +00:00
  • 3051c9d002 Address minor PR issues David Baker 2016-01-04 13:39:29 +00:00
  • 34c09f33da Update CHANGES release-v0.12.0 Richard van der Hoff 2016-01-04 12:45:58 +00:00
  • cf3282d103 Merge pull request #459 from matrix-org/rav/fix_r0_login Richard van der Hoff 2016-01-04 12:41:53 +00:00