1
0

Commit Graph

  • 306415391d Only add the user_id if the sender is present Mark Haines 2015-12-01 11:14:48 +00:00
  • d0f28b46cd Merge pull request #399 from matrix-org/erikj/search Erik Johnston 2015-12-01 11:13:07 +00:00
  • da7dd58641 Tidy up a bit Erik Johnston 2015-12-01 11:06:40 +00:00
  • bde8d78b8a Copy rather than move the fields to shuffle between a v1 and a v2 event. Mark Haines 2015-11-30 17:46:35 +00:00
  • 4dcaa42b6d Allow paginating search ordered by recents Erik Johnston 2015-11-30 17:45:31 +00:00
  • 76936f43ae Return words to highlight in search results Erik Johnston 2015-11-27 16:40:42 +00:00
  • f280726037 Run sytest against postgresql if appropriate databases exist for it to run against Mark Haines 2015-11-26 16:50:44 +00:00
  • 6cd595e438 Merge pull request #397 from matrix-org/erikj/redaction_inequality Erik Johnston 2015-11-26 13:23:09 +00:00
  • 17dd5071ef Allow user to redact with an equal power Erik Johnston 2015-11-26 11:17:57 +00:00
  • df7cf6c0eb Fix SQL for postgres again Daniel Wagner-Hall 2015-11-23 18:54:41 +00:00
  • 3e573a5c6b Fix SQL for postgres Daniel Wagner-Hall 2015-11-23 18:48:53 +00:00
  • 7dfa455508 Remove size specifier for database column Daniel Wagner-Hall 2015-11-23 18:35:25 +00:00
  • 924d85a75e Merge pull request #375 from matrix-org/daniel/guestroominitialsync Daniel Wagner-Hall 2015-11-23 16:10:49 +00:00
  • 91695150cc Merge pull request #396 from MadsRC/develop Matthew Hodgson 2015-11-21 10:51:32 +00:00
  • 3dd09a8795 Added myself to AUTHORS.rst Mads R. Christensen 2015-11-20 22:39:10 +01:00
  • d7739c4e37 Added prerequisite instructions for CentOS 7 Mads R. Christensen 2015-11-20 22:37:23 +01:00
  • c6a15f5026 Merge pull request #385 from matrix-org/daniel/forgetrooms Mark Haines 2015-11-20 18:07:26 +00:00
  • 2ca01ed747 Merge branch 'release-v0.11.1' of github.com:matrix-org/synapse v0.11.1 Erik Johnston 2015-11-20 17:38:58 +00:00
  • 1b64cb019e Merge branch 'erikj/perspective_limiter' into release-v0.11.1 Erik Johnston 2015-11-20 17:24:23 +00:00
  • 8c3af5bc62 Merge pull request #395 from matrix-org/erikj/perspective_limiter Erik Johnston 2015-11-20 17:23:26 +00:00
  • 0eabfa55f6 Fix typo Erik Johnston 2015-11-20 17:17:58 +00:00
  • 6408541075 Don't limit connections to perspective servers Erik Johnston 2015-11-20 17:15:44 +00:00
  • 13130c2c9f Mention report_stats in upgrade.rst Erik Johnston 2015-11-20 16:48:43 +00:00
  • 7680ae16c9 Fix english Erik Johnston 2015-11-20 16:40:55 +00:00
  • 2c1bc4392f Bump changes and version Erik Johnston 2015-11-20 16:35:01 +00:00
  • 93f7bb8dd5 Merge pull request #394 from matrix-org/erikj/search Erik Johnston 2015-11-20 16:31:24 +00:00
  • 1d9c1d4166 Merge pull request #389 from matrix-org/rav/flatten_sync_response Richard van der Hoff 2015-11-20 15:18:55 +00:00
  • 3f151da314 Merge pull request #391 from matrix-org/erikj/remove_token_from_flow Erik Johnston 2015-11-20 14:16:59 +00:00
  • 6b95a79724 Add option to include the current room state Erik Johnston 2015-11-20 14:16:42 +00:00
  • e3dae653e8 Comment Erik Johnston 2015-11-20 14:05:22 +00:00
  • 9de1f328ad Merge pull request #393 from matrix-org/erikj/destination_retry_max Erik Johnston 2015-11-20 13:41:20 +00:00
  • 506874cca9 Optionally include historic profile info Erik Johnston 2015-11-20 11:39:44 +00:00
  • 2f2bbb4d06 Use min and not max to set an upper bound on retry interval Erik Johnston 2015-11-20 09:34:58 +00:00
  • 95c3306798 Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into daniel/forgetrooms Daniel Wagner-Hall 2015-11-19 15:00:14 -05:00
  • df6824a008 Ignore forgotten rooms in v2 sync Daniel Wagner-Hall 2015-11-19 14:54:47 -05:00
  • dd11bf8a79 Merge branch 'develop' into rav/flatten_sync_response Paul "LeoNerd" Evans 2015-11-19 17:21:03 +00:00
  • 1cfda3d2d8 Merge branch 'develop' into daniel/forgetrooms Paul "LeoNerd" Evans 2015-11-19 16:53:13 +00:00
  • 8b5349c7bc Merge branch 'master' of github.com:matrix-org/synapse into develop Erik Johnston 2015-11-19 16:17:54 +00:00
  • 37de8a7f4a Remove m.login.token from advertised flows. Erik Johnston 2015-11-19 16:16:49 +00:00
  • 7a802ec0ff Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data Mark Haines 2015-11-19 15:21:35 +00:00
  • d2ecde2cbb Merge pull request #382 from matrix-org/daniel/macarooncleanup Daniel Wagner-Hall 2015-11-19 15:16:32 +00:00
  • 248cfd5eb3 Take a boolean not a list of lambdas Daniel Wagner-Hall 2015-11-19 15:16:25 +00:00
  • 9da4c5340d Simplify code Daniel Wagner-Hall 2015-11-19 10:07:21 -05:00
  • f9d9bd6aa0 Merge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse v0.11.0-r2 Erik Johnston 2015-11-19 13:11:49 +00:00
  • 5fcef78c6a Bump changes and version Erik Johnston 2015-11-19 13:09:48 +00:00
  • c104fd3494 Merge branch 'erikj/fix_port_script' into hotfixes-v0.11.0-r2 Erik Johnston 2015-11-19 13:08:44 +00:00
  • 57a76c9aee Merge pull request #388 from matrix-org/erikj/messages Erik Johnston 2015-11-19 13:08:09 +00:00
  • 06f74068f4 Comment Erik Johnston 2015-11-19 13:05:51 +00:00
  • e5d91b8e57 Merge pull request #387 from matrix-org/erikj/fix_port_script Erik Johnston 2015-11-19 13:04:28 +00:00
  • f6e092f6cc Put back the 'state.events' subobject Richard van der Hoff 2015-11-19 12:23:42 +00:00
  • 24ae0eee8e v2 /sync: Rename the keys of the 'rooms' object to match member states Richard van der Hoff 2015-11-18 11:38:36 +00:00
  • 3c3fc6b268 Flatten the /sync response to remove the event_map Richard van der Hoff 2015-11-12 10:33:19 +00:00
  • b361440738 Spelling Erik Johnston 2015-11-19 09:11:42 +00:00
  • f0ee1d515b Merge pull request #381 from matrix-org/daniel/jenkins-sytest-cached Daniel Wagner-Hall 2015-11-18 23:22:34 +00:00
  • 628ba81a77 Share sytest clone across runs Daniel Wagner-Hall 2015-11-18 23:22:27 +00:00
  • bed7889703 Apply forgetting properly to historical events Daniel Wagner-Hall 2015-11-18 18:08:22 -05:00
  • 03204f54ac Merge branch 'master' of github.com:matrix-org/synapse into develop Erik Johnston 2015-11-18 18:38:06 +00:00
  • 037ce4c68f Split out text for missing config options. Erik Johnston 2015-11-18 18:37:03 +00:00
  • 2fcd9819ac Erik pointed out we should advise on the lack of included client Oddvar Lovaas 2015-11-18 16:51:26 +00:00
  • 162e2c1ce5 Fix database port script to work with new event_search table Erik Johnston 2015-11-18 15:54:50 +00:00
  • 1fe973fa5a Merge branch 'master' of github.com:matrix-org/synapse into develop Erik Johnston 2015-11-18 15:53:39 +00:00
  • d153f482dd Rename the database table Mark Haines 2015-11-18 15:33:02 +00:00
  • 1c960fbb80 s/private_user_data/account_data/ Mark Haines 2015-11-18 15:31:04 +00:00
  • 915e56e1af Merge branch 'hotfixes-v0.11.0-r1' v0.11.0-r1 Erik Johnston 2015-11-18 14:15:25 +00:00
  • fbb76a4d5d Change date Erik Johnston 2015-11-18 14:15:03 +00:00
  • 8bae98b314 adding link to apt repo Oddvar Lovaas 2015-11-18 11:44:35 +00:00
  • fe51b3628e Better change log Erik Johnston 2015-11-18 11:31:05 +00:00
  • ba26eb3d5d Allow users to forget rooms Daniel Wagner-Hall 2015-11-17 17:17:30 -05:00
  • cf844e2ad6 Bump changelog and version Erik Johnston 2015-11-17 18:48:32 +00:00
  • b697a842a5 Merge pull request #384 from matrix-org/erikj/shorter_retries Erik Johnston 2015-11-17 18:46:04 +00:00
  • bd3de8f39a Update tests Erik Johnston 2015-11-17 18:38:48 +00:00
  • cbf3cd6151 Add comment Erik Johnston 2015-11-17 18:29:29 +00:00
  • a9770e5d24 Merge branch 'hotfixes-v0.10.0-r1' of github.com:matrix-org/synapse into develop Erik Johnston 2015-11-17 18:27:17 +00:00
  • cf4ef5f3c7 Only retry federation requests for a long time for background requests Erik Johnston 2015-11-17 18:26:50 +00:00
  • afdfd12bdf Implement required method 'resumeProducing' Erik Johnston 2015-11-17 16:57:06 +00:00
  • d3861b4442 Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse v0.11.0 Erik Johnston 2015-11-17 15:45:43 +00:00
  • 391f2aa56c Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop Erik Johnston 2015-11-17 15:10:49 +00:00
  • bceec65913 Slightly more aggressive retry timers at HTTP level Erik Johnston 2015-11-17 15:10:05 +00:00
  • 9eff52d1a6 Bump changelog and version Erik Johnston 2015-11-17 14:38:36 +00:00
  • 0186aef814 Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 Erik Johnston 2015-11-17 14:37:13 +00:00
  • e503848990 Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserver Erik Johnston 2015-11-17 14:36:15 +00:00
  • 90b3a98df7 Merge pull request #380 from matrix-org/daniel/jenkins-sytest Daniel Wagner-Hall 2015-11-17 09:17:03 -05:00
  • d34990141e Merge pull request #379 from matrix-org/daniel/jenkins Daniel Wagner-Hall 2015-11-17 09:14:20 -05:00
  • f20d064e05 Always check guest = true in macaroons Steven Hammerton 2015-11-17 10:58:05 +00:00
  • f5e25c5f35 Merge branch 'develop' into sh-cas-auth-via-homeserver Steven Hammerton 2015-11-17 10:55:41 +00:00
  • f4db76692f Run sytests on jenkins Daniel Wagner-Hall 2015-11-16 15:40:55 -05:00
  • 09bb5cf02f Output results files on jenkins Daniel Wagner-Hall 2015-11-16 14:30:18 -05:00
  • 3b90df21d5 Merge pull request #376 from matrix-org/daniel/jenkins Daniel Wagner-Hall 2015-11-16 12:50:26 -05:00
  • 1654d3b329 Merge pull request #377 from matrix-org/paul/tiny-fixes Paul Evans 2015-11-13 17:43:30 +00:00
  • aca6e5bf46 Don't complain if /make_join response lacks 'prev_state' list (SYN-517) Paul "LeoNerd" Evans 2015-11-13 17:27:25 +00:00
  • 4fbe6ca401 Merge branch 'develop' into paul/tiny-fixes Paul "LeoNerd" Evans 2015-11-13 17:26:59 +00:00
  • 233af7c74b Pull out jenkins script into a checked in script Daniel Wagner-Hall 2015-11-13 16:22:51 +00:00
  • 641420c5e0 Clean up room initialSync for guest users Daniel Wagner-Hall 2015-11-13 15:44:57 +00:00
  • 6fed9fd697 Merge pull request #374 from matrix-org/daniel/guestleave Daniel Wagner-Hall 2015-11-13 11:57:57 +00:00
  • 9c3f4f8dfd Allow guests to /room/:room_id/{join,leave} Daniel Wagner-Hall 2015-11-13 11:56:58 +00:00
  • 0644f0eb7d Bump version and change log v0.11.0-rc2 Erik Johnston 2015-11-13 11:43:29 +00:00
  • da3dd4867d Merge branch 'develop' into release-v0.11.0 Erik Johnston 2015-11-13 11:40:17 +00:00
  • e4d622aaaf Implementation of state rollback in /sync Richard van der Hoff 2015-11-10 18:29:25 +00:00
  • fddedd51d9 Fix a few race conditions in the state calculation Richard van der Hoff 2015-11-10 18:27:23 +00:00
  • 5ab4b0afe8 Make handlers.sync return a state dictionary, instead of an event list. Richard van der Hoff 2015-11-12 16:34:42 +00:00