1
0

Commit Graph

  • b578c822e3 Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0 Erik Johnston 2015-08-20 16:10:14 +01:00
  • 3befc9ccc3 Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop Erik Johnston 2015-08-20 16:09:27 +01:00
  • d5c31e01f2 Merge pull request #237 from matrix-org/markjh/readme-rst-formatting Mark Haines 2015-08-20 16:08:17 +01:00
  • cb8201ba12 Merge pull request #236 from matrix-org/markjh/upgrade-instructions Mark Haines 2015-08-20 16:08:05 +01:00
  • c141d47a28 Merge pull request #235 from matrix-org/erikj/room_avatars Erik Johnston 2015-08-20 16:07:49 +01:00
  • 13a6517d89 s/by_token/by_access_token/g Daniel Wagner-Hall 2015-08-20 16:01:29 +01:00
  • 61cd03466f Merge pull request #238 from matrix-org/fix_set_password Erik Johnston 2015-08-20 15:39:05 +01:00
  • f764f92647 Remove spurious extra arg to set_password David Baker 2015-08-20 15:35:54 +01:00
  • ca0d28ef34 Another use of check_password that got missed in the yield fix David Baker 2015-08-20 15:35:14 +01:00
  • 8a951540f6 Further formatting clean ups Mark Haines 2015-08-20 15:22:26 +01:00
  • 482648123f Clean up some of restructured text formatting in the README.rst Mark Haines 2015-08-20 15:20:07 +01:00
  • fd88ea19c0 Tweak the wording a bit Mark Haines 2015-08-20 15:12:44 +01:00
  • bb9611bd46 Add generic update instructions to UPGRADE.rst and add link to them from the README.rst Mark Haines 2015-08-20 15:08:18 +01:00
  • 9b63def388 Add m.room.avatar to default power levels. Change default required power levels of such events to 50 Erik Johnston 2015-08-20 14:35:40 +01:00
  • 23b21e5215 Update changelog Erik Johnston 2015-08-20 14:25:57 +01:00
  • 9d720223f2 Bump version and changelog Erik Johnston 2015-08-20 14:12:01 +01:00
  • 617501dd2a Move token generation to auth handler Daniel Wagner-Hall 2015-08-20 11:35:56 +01:00
  • 099ce4bc38 Merge pull request #231 from matrix-org/erikj/pushers_store_last_token Erik Johnston 2015-08-20 11:27:31 +01:00
  • 22346a0ee7 Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnails Mark Haines 2015-08-20 11:27:15 +01:00
  • cbd053bb8f Merge pull request #233 from matrix-org/erikj/canonical_alias Erik Johnston 2015-08-20 11:26:09 +01:00
  • be27d81808 Merge pull request #234 from matrix-org/email_login David Baker 2015-08-20 11:15:42 +01:00
  • ade5342752 Merge branch 'auth' into refresh Daniel Wagner-Hall 2015-08-20 11:03:47 +01:00
  • 4cf302de5b Comma comma comma comma comma chameleon David Baker 2015-08-20 10:31:18 +01:00
  • c50ad14bae Merge branch 'develop' into email_login David Baker 2015-08-20 10:16:01 +01:00
  • a0b8e5f2fe Merge pull request #211 from matrix-org/email_in_use Mark Haines 2015-08-20 10:04:04 +01:00
  • aadb2238c9 Check that the canonical room alias actually points to the room Erik Johnston 2015-08-20 09:55:04 +01:00
  • f9e7493ac2 Merge branch 'develop' into auth Daniel Wagner-Hall 2015-08-19 15:20:09 +01:00
  • ecc59ae66e Merge branch 'master' into auth Daniel Wagner-Hall 2015-08-19 15:19:37 +01:00
  • 70e265e695 Re-add whitespace around caveat operators Daniel Wagner-Hall 2015-08-19 14:30:31 +01:00
  • 09d23b6209 Merge pull request #232 from matrix-org/erikj/appservice_joined_rooms Erik Johnston 2015-08-19 13:50:40 +01:00
  • daa01842f8 Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users Erik Johnston 2015-08-19 13:46:03 +01:00
  • 7f08ebb772 Switch to pymacaroons-pynacl Daniel Wagner-Hall 2015-08-19 13:21:36 +01:00
  • d7272f8d9d Add canonical alias to the default power levels Erik Johnston 2015-08-19 12:03:09 +01:00
  • 118bb5c036 Cheekily use RUSAGE_THREAD erikj/context_cpu_timing Erik Johnston 2015-08-19 09:26:14 +01:00
  • 43349a7b43 Time CPU time spent in each log context Erik Johnston 2015-08-18 10:04:08 +01:00
  • 78fa346b07 Store the 'last_token' in the db, even if we processed no events Erik Johnston 2015-08-19 10:08:31 +01:00
  • a45ec7c651 Block on storing the current last_tokens Erik Johnston 2015-08-19 10:08:12 +01:00
  • 40da1f200d Remove an access token log line Erik Johnston 2015-08-19 09:41:07 +01:00
  • abc6986a24 Fix regression where we incorrectly responded with a 200 to /login Erik Johnston 2015-08-19 09:30:52 +01:00
  • ce832c38d4 Remove padding space around caveat operators Daniel Wagner-Hall 2015-08-18 17:39:26 +01:00
  • 42e858daeb Fix units in test Daniel Wagner-Hall 2015-08-18 17:38:37 +01:00
  • e624cdec64 Merge pull request #228 from matrix-org/erikj/_get_state_for_groups Erik Johnston 2015-08-18 16:30:17 +01:00
  • c3dd2ecd5e Merge pull request #230 from matrix-org/erikj/appservice_auth_entity Erik Johnston 2015-08-18 16:30:11 +01:00
  • 38a965b816 Merge pull request #227 from matrix-org/erikj/receipts_take2 Erik Johnston 2015-08-18 16:30:04 +01:00
  • a82938416d Remove newline because vertical whitespace makes mjark sad Erik Johnston 2015-08-18 16:28:13 +01:00
  • 0bfdaf1f4f Rejig the code to make it nicer Erik Johnston 2015-08-18 16:26:07 +01:00
  • a5cbd20001 Merge pull request #225 from matrix-org/erikj/reactor_metrics Erik Johnston 2015-08-18 16:21:11 +01:00
  • 128ed32e6b Bump size of get_presence_state cache Erik Johnston 2015-08-18 15:51:23 +01:00
  • 3e6fdfda00 Fix some formatting to use tuples Daniel Wagner-Hall 2015-08-18 15:18:50 +01:00
  • ee59af9ac0 Set request.authenticated_entity for application services Erik Johnston 2015-08-18 15:16:28 +01:00
  • 1469141023 Merge branch 'develop' into auth Daniel Wagner-Hall 2015-08-18 14:43:44 +01:00
  • cacdb529ab Remove accidentally added file Daniel Wagner-Hall 2015-08-18 14:27:23 +01:00
  • 2d3462714e Issue macaroons as opaque auth tokens Daniel Wagner-Hall 2015-08-18 14:22:02 +01:00
  • f704c10f29 Rename unhelpful variable name Erik Johnston 2015-08-18 11:54:03 +01:00
  • 6e7d36a72c Also check for presence of 'threadCallQueue' in reactor Erik Johnston 2015-08-18 11:51:08 +01:00
  • d3da63f766 Use more helpful variable names Erik Johnston 2015-08-18 11:47:00 +01:00
  • 8199475ce0 Ensure we never return a None event from _get_state_for_groups Erik Johnston 2015-08-18 11:44:10 +01:00
  • 0d4abf7777 Typo Erik Johnston 2015-08-18 11:19:08 +01:00
  • e55291ce5e None check Erik Johnston 2015-08-18 11:17:37 +01:00
  • 8e254862f4 Don't assume @cachedList function returns keys for everything Erik Johnston 2015-08-18 11:11:33 +01:00
  • 85d0bc3bdc Reduce cache size from obscenely large to quite large Erik Johnston 2015-08-18 11:00:38 +01:00
  • cfc503681f Comments Erik Johnston 2015-08-18 10:49:23 +01:00
  • dc2a105fca Merge pull request #226 from matrix-org/erikj/room_presence Erik Johnston 2015-08-18 10:43:50 +01:00
  • 83eb627b5a More helpful variable names Erik Johnston 2015-08-18 10:33:11 +01:00
  • 776ee6d92b Doc strings Erik Johnston 2015-08-18 10:30:07 +01:00
  • f72ed6c6a3 Remove debug try/catch Erik Johnston 2015-08-18 10:29:49 +01:00
  • 8899df13bf Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation Mark Haines 2015-08-18 09:12:54 +01:00
  • 8f4165628b Add index receipts_linearized_room_stream Erik Johnston 2015-08-17 14:43:54 +01:00
  • d3d582bc1c Remove unused import Erik Johnston 2015-08-17 13:38:09 +01:00
  • 4d8e1e1f9e Remove added unused methods Erik Johnston 2015-08-17 13:36:07 +01:00
  • afef6f5d16 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2 Erik Johnston 2015-08-17 13:23:44 +01:00
  • 2d97e65558 Remember to invalidate caches Erik Johnston 2015-08-17 10:46:55 +01:00
  • 1a9510bb84 Implement a batched presence_handler.get_state and use it Erik Johnston 2015-08-17 10:40:23 +01:00
  • 47abebfd6d Add batched version of store.get_presence_state Erik Johnston 2015-08-17 09:50:50 +01:00
  • f9d4da7f45 Fix bug where we were leaking None into state event lists Erik Johnston 2015-08-17 09:39:12 +01:00
  • 30883d8409 Merge pull request #221 from matrix-org/auth Daniel Wagner-Hall 2015-08-14 17:02:22 +01:00
  • 891dfd90bd Fix pending_calls metric to not lie Erik Johnston 2015-08-14 15:42:52 +01:00
  • 68b255c5a1 Batch _get_linearized_receipts_for_rooms Erik Johnston 2015-08-14 15:06:22 +01:00
  • 95b0f5449d Fix flake8 warning Mark Haines 2015-08-13 17:34:22 +01:00
  • 129ee4e149 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2 Erik Johnston 2015-08-13 17:28:43 +01:00
  • c5966b2a97 Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-federation Mark Haines 2015-08-13 17:27:53 +01:00
  • 0cceb2ac92 Add a few strategic new lines to break up the on_query_client_keys and on_claim_client_keys methods in federation_server.py Mark Haines 2015-08-13 17:27:46 +01:00
  • d6bcc68ea7 Merge pull request #219 from matrix-org/erikj/dictionary_cache Erik Johnston 2015-08-13 17:27:08 +01:00
  • b16cd18a86 Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thumbnails Mark Haines 2015-08-13 17:23:39 +01:00
  • 9f7f228ec2 Remove pointless map Erik Johnston 2015-08-13 17:20:59 +01:00
  • 3d77e56c12 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache Erik Johnston 2015-08-13 17:18:52 +01:00
  • d884047d34 Merge pull request #224 from matrix-org/erikj/reactor_metrics Erik Johnston 2015-08-13 17:17:07 +01:00
  • 2bb2c02571 Remove some vertical space Erik Johnston 2015-08-13 17:11:30 +01:00
  • 3d1cdda762 Merge branch 'develop' into erikj/reactor_metrics Mark Haines 2015-08-13 17:03:58 +01:00
  • 57877b01d7 Replace list comprehension Erik Johnston 2015-08-13 17:00:17 +01:00
  • 5db5677969 Add metrics to the receipts cache Erik Johnston 2015-08-13 16:58:23 +01:00
  • 7e77a82c5f Re-enable receipts Erik Johnston 2015-08-13 16:58:10 +01:00
  • 7eb4d626ba Add max-line-length to the flake8 section of setup.cfg Mark Haines 2015-08-13 13:12:33 +01:00
  • 06750140f6 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache Erik Johnston 2015-08-13 11:55:20 +01:00
  • adbd720fab PEP8 Erik Johnston 2015-08-13 11:47:38 +01:00
  • 8b7ce2945b Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache Erik Johnston 2015-08-13 11:42:22 +01:00
  • a6c27de1aa Don't time getDelayedCalls Erik Johnston 2015-08-13 11:41:57 +01:00
  • c044aca1fd Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache Erik Johnston 2015-08-13 11:39:38 +01:00
  • ba5d34a832 Add some metrics about the reactor Erik Johnston 2015-08-13 11:38:59 +01:00
  • 6a191d62ed Merge pull request #173 from matrix-org/markjh/twisted-15 Mark Haines 2015-08-12 17:28:47 +01:00