summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #410 from matrix-org/markjh/edu_frequencyMark Haines2015-12-022-5/+15
|\
| * Use the context returned by _handle_new_eventMark Haines2015-12-021-4/+1
| * Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-021-1/+1
| |\
| * | Add commentsMark Haines2015-12-022-0/+6
| * | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-0211-69/+109
| |\ \
| * | | Only fire user_joined_room if the membership has changedMark Haines2015-12-011-3/+8
| * | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-0145-243/+845
| |\ \ \
| * | | | Only fire user_joined_room on the distributor if the user has actually joined...Mark Haines2015-12-011-4/+6
* | | | | Merge pull request #413 from matrix-org/markjh/reuse_http_clientMark Haines2015-12-023-18/+10
|\ \ \ \ \
| * | | | | Reuse a single http client, rather than creating new onesMark Haines2015-12-023-18/+10
| | |_|_|/ | |/| | |
* | | | | Merge pull request #411 from matrix-org/default_dont_notifyDavid Baker2015-12-021-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Change the m.room.message rule to be disabled by default so we only notify fo...David Baker2015-12-021-0/+1
| | |/ / | |/| |
* | | | Fix typo in collect_presencelike_dataMark Haines2015-12-021-1/+1
| |_|/ |/| |
* | | Merge pull request #409 from MadsRC/developErik Johnston2015-12-022-0/+5
|\ \ \
| * | | Added a single line to explain what the server_name is used forMads R. Christensen2015-12-021-0/+1
| * | | Added a few lines to better explain how to run Synapse on a FQDN that is not ...Mads R. Christensen2015-12-021-0/+4
* | | | Merge pull request #408 from matrix-org/markjh/distributor_facadeMark Haines2015-12-027-53/+78
|\ \ \ \
| * \ \ \ Merge branch 'develop' into markjh/distributor_facadeMark Haines2015-12-011-1/+1
| |\ \ \ \
| * | | | | Wrap calls to distributor.fire in appropriately named functions so that stati...Mark Haines2015-12-017-53/+78
| | |_|/ / | |/| | |
* | | | | Merge pull request #406 from matrix-org/erikj/searchErik Johnston2015-12-021-3/+12
|\ \ \ \ \
| * | | | | Search: Don't disregard grouping info in pagination tokensErik Johnston2015-12-011-3/+12
* | | | | | various fixes - thanks to Mark White for pointing out you need to run synapse...Matthew Hodgson2015-12-011-12/+13
| |_|/ / / |/| | | |
* | | | | Fix definitions scriptMark Haines2015-12-011-1/+1
| |/ / / |/| | |
* | | | Merge pull request #392 from matrix-org/markjh/client_configMark Haines2015-12-0111-25/+476
|\ \ \ \
| * | | | Add API for setting account_data globaly or on a per room basisMark Haines2015-12-0111-25/+476
* | | | | Merge pull request #407 from MadsRC/developMatthew Hodgson2015-12-011-3/+4
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Added --report-status=yes|no as Synapse won't generate the config without itMads R. Christensen2015-12-011-2/+3
| * | | Added libffi-devel in CentOS 7 installation requirements and fixed indentatio...Mads R. Christensen2015-12-011-2/+2
* | | | Merge pull request #400 from matrix-org/daniel/versioningDaniel Wagner-Hall2015-12-0127-117/+133
|\ \ \ \ | |_|/ / |/| | |
| * | | Host /unstable and /r0 versions of r0 APIsDaniel Wagner-Hall2015-12-0127-117/+133
|/ / /
* | | Merge pull request #404 from matrix-org/markjh/trivial_renameMark Haines2015-12-013-5/+5
|\ \ \
| * | | rename the method in the tests as wellMark Haines2015-12-011-3/+3
| * | | Rename presence_handler.send_invite to presence_handler.send_presence_invite ...Mark Haines2015-12-012-2/+2
| | |/ | |/|
* | | Merge pull request #402 from matrix-org/markjh/event_formattingMark Haines2015-12-011-9/+7
|\ \ \
| * | | Only add the user_id if the sender is presentMark Haines2015-12-011-1/+3
| * | | Copy rather than move the fields to shuffle between a v1 and a v2 event.Mark Haines2015-11-301-9/+5
* | | | Merge pull request #403 from matrix-org/erikj/search-tsErik Johnston2015-12-014-84/+220
|\ \ \ \ | |_|/ / |/| | |
| * | | Tidy up a bitErik Johnston2015-12-011-8/+9
| * | | Allow paginating search ordered by recentsErik Johnston2015-11-304-84/+219
* | | | Add options to definitions.py to fetch referrers and to output dotMark Haines2015-12-011-6/+39
* | | | Merge pull request #398 from matrix-org/markjh/jenkins_postgresMark Haines2015-12-011-1/+26
|\ \ \ \
| * | | | Write the tap results for each database to different files when running sytestMark Haines2015-12-011-2/+2
| * | | | Set the port when running sytest under postgresqlMark Haines2015-12-011-1/+1
| * | | | Use a PORT_BASE environment variable to configure the ports that sytest usesMark Haines2015-12-011-12/+4
| * | | | Run sytest against postgresql if appropriate databases exist for it to run ag...Mark Haines2015-11-261-0/+33
| | |/ / | |/| |
* | | | Merge pull request #399 from matrix-org/erikj/searchErik Johnston2015-12-012-22/+120
|\ \ \ \ | |/ / / |/| / / | |/ /
| * / Return words to highlight in search resultsErik Johnston2015-11-272-22/+120
|/ /
* | Merge pull request #397 from matrix-org/erikj/redaction_inequalityErik Johnston2015-11-261-1/+1
|\ \
| * | Allow user to redact with an equal powerErik Johnston2015-11-261-1/+1
|/ /
* | Fix SQL for postgres againDaniel Wagner-Hall2015-11-231-1/+1
* | Fix SQL for postgresDaniel Wagner-Hall2015-11-231-1/+1
* | Remove size specifier for database columnDaniel Wagner-Hall2015-11-231-1/+3
* | Merge pull request #375 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-231-10/+15
|\ \
| * | Clean up room initialSync for guest usersDaniel Wagner-Hall2015-11-131-10/+15
* | | Merge pull request #396 from MadsRC/developMatthew Hodgson2015-11-212-0/+11
|\ \ \ | | |/ | |/|
| * | Added myself to AUTHORS.rstMads R. Christensen2015-11-201-0/+3
| * | Added prerequisite instructions for CentOS 7Mads R. Christensen2015-11-201-0/+8
|/ /
* | Merge pull request #385 from matrix-org/daniel/forgetroomsMark Haines2015-11-206-5/+118
|\ \
| * \ Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into danie...Daniel Wagner-Hall2015-11-1918-87/+180
| |\ \
| | * \ Merge branch 'develop' into daniel/forgetroomsPaul "LeoNerd" Evans2015-11-1918-87/+180
| | |\ \
| * | | | Ignore forgotten rooms in v2 syncDaniel Wagner-Hall2015-11-191-1/+1
| |/ / /
| * | | Simplify codeDaniel Wagner-Hall2015-11-192-8/+6
| * | | Apply forgetting properly to historical eventsDaniel Wagner-Hall2015-11-182-3/+41
| * | | Allow users to forget roomsDaniel Wagner-Hall2015-11-176-4/+81
* | | | Merge pull request #395 from matrix-org/erikj/perspective_limiterErik Johnston2015-11-202-22/+21
|\ \ \ \
| * | | | Fix typoErik Johnston2015-11-202-3/+3
| * | | | Don't limit connections to perspective serversErik Johnston2015-11-202-22/+21
|/ / / /
* | | | Merge pull request #394 from matrix-org/erikj/searchErik Johnston2015-11-201-1/+54
|\ \ \ \
| * | | | Add option to include the current room stateErik Johnston2015-11-201-0/+24
| * | | | Optionally include historic profile infoErik Johnston2015-11-201-1/+30
| | |/ / | |/| |
* | | | Merge pull request #389 from matrix-org/rav/flatten_sync_responseRichard van der Hoff2015-11-202-27/+17
|\ \ \ \
| * | | | Merge branch 'develop' into rav/flatten_sync_responsePaul "LeoNerd" Evans2015-11-1917-86/+162
| |\| | |
| * | | | Put back the 'state.events' subobjectRichard van der Hoff2015-11-191-1/+1
| * | | | v2 /sync: Rename the keys of the 'rooms' object to match member statesRichard van der Hoff2015-11-191-3/+3
| * | | | Flatten the /sync response to remove the event_mapRichard van der Hoff2015-11-192-24/+14
* | | | | Merge pull request #391 from matrix-org/erikj/remove_token_from_flowErik Johnston2015-11-201-1/+10
|\ \ \ \ \
| * | | | | CommentErik Johnston2015-11-201-0/+8
| * | | | | Remove m.login.token from advertised flows.Erik Johnston2015-11-191-1/+2
* | | | | | Merge pull request #393 from matrix-org/erikj/destination_retry_maxErik Johnston2015-11-201-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Use min and not max to set an upper bound on retry intervalErik Johnston2015-11-201-2/+2
| |/ / / /
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-11-192-1/+6
|\| | | |
| * | | | Merge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse v0.11.0-r2Erik Johnston2015-11-194-28/+78
| |\ \ \ \
| | * | | | Bump changes and versionErik Johnston2015-11-192-1/+6
| | * | | | Merge branch 'erikj/fix_port_script' into hotfixes-v0.11.0-r2Erik Johnston2015-11-191-11/+44
| | |\ \ \ \
* | | \ \ \ \ Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_dataMark Haines2015-11-1911-49/+66
|\ \ \ \ \ \ \
| * | | | | | | Rename the database tableMark Haines2015-11-181-0/+17
| * | | | | | | s/private_user_data/account_data/Mark Haines2015-11-1810-49/+49
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #382 from matrix-org/daniel/macarooncleanupDaniel Wagner-Hall2015-11-192-9/+18
|\ \ \ \ \ \ \
| * | | | | | | Take a boolean not a list of lambdasDaniel Wagner-Hall2015-11-192-9/+18
|/ / / / / / /
* | | | | | | Merge pull request #388 from matrix-org/erikj/messagesErik Johnston2015-11-191-16/+28
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | CommentErik Johnston2015-11-191-0/+2
| * | | | | | Split out text for missing config options.Erik Johnston2015-11-181-16/+26
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #387 from matrix-org/erikj/fix_port_scriptErik Johnston2015-11-191-11/+44
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | |
| * | | | SpellingErik Johnston2015-11-191-1/+1
| * | | | Fix database port script to work with new event_search tableErik Johnston2015-11-181-11/+44
* | | | | Merge pull request #381 from matrix-org/daniel/jenkins-sytest-cachedDaniel Wagner-Hall2015-11-181-2/+8
|\ \ \ \ \
| * | | | | Share sytest clone across runsDaniel Wagner-Hall2015-11-181-2/+8
|/ / / / /
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-11-181-0/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Erik pointed out we should advise on the lack of included clientOddvar Lovaas2015-11-181-0/+3
| |/ / /
* | / / Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-11-183-1/+9
|\| | | | |/ / |/| |
| * | Merge branch 'hotfixes-v0.11.0-r1' v0.11.0-r1Erik Johnston2015-11-187-8/+49
| |\ \
| | * | Change dateErik Johnston2015-11-181-1/+1
| | * | Better change logErik Johnston2015-11-181-2/+2
| | * | Bump changelog and versionErik Johnston2015-11-172-1/+7
| * | | adding link to apt repoOddvar Lovaas2015-11-181-0/+2
* | | | Merge pull request #384 from matrix-org/erikj/shorter_retriesErik Johnston2015-11-175-7/+39
|\ \ \ \ | | |/ / | |/| |
| * | | Update testsErik Johnston2015-11-173-0/+17
| * | | Add commentErik Johnston2015-11-171-0/+2
| * | | Only retry federation requests for a long time for background requestsErik Johnston2015-11-172-7/+20
* | | | Merge branch 'hotfixes-v0.10.0-r1' of github.com:matrix-org/synapse into developErik Johnston2015-11-171-0/+3
|\| | |
| * | | Implement required method 'resumeProducing'Erik Johnston2015-11-171-0/+3
| |/ /
| * | Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse v0.11.0Erik Johnston2015-11-17172-2810/+8255
| |\ \
* | \ \ Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into developErik Johnston2015-11-173-3/+17
|\ \ \ \ | | |/ / | |/| |
| * | | Slightly more aggressive retry timers at HTTP levelErik Johnston2015-11-171-2/+3
| * | | Bump changelog and versionErik Johnston2015-11-172-1/+6
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-1710-45/+265
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserverErik Johnston2015-11-175-39/+199
|\ \ \ \
| * | | | Always check guest = true in macaroonsSteven Hammerton2015-11-171-1/+2
| * | | | Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-1739-292/+1268
| |\ \ \ \
| * | | | | Snakes not camelsSteven Hammerton2015-11-111-5/+5
| * | | | | Minor review fixesSteven Hammerton2015-11-112-17/+14
| * | | | | Share more code between macaroon validationSteven Hammerton2015-11-112-57/+17
| * | | | | Updates to fallback CAS login to do new token loginSteven Hammerton2015-11-061-26/+12
| * | | | | Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-0545-324/+1117
| |\ \ \ \ \
| * | | | | | Allow hs to do CAS login completely and issue the client with a login token t...Steven Hammerton2015-11-053-5/+218
| * | | | | | Add service URL to CAS configSteven Hammerton2015-11-041-0/+3
* | | | | | | Merge pull request #380 from matrix-org/daniel/jenkins-sytestDaniel Wagner-Hall2015-11-171-1/+22
|\ \ \ \ \ \ \
| * | | | | | | Run sytests on jenkinsDaniel Wagner-Hall2015-11-161-1/+22
* | | | | | | | Merge pull request #379 from matrix-org/daniel/jenkinsDaniel Wagner-Hall2015-11-172-4/+18
|\| | | | | | | | |_|_|/ / / / |/| | | | | |
| * | | | | | Output results files on jenkinsDaniel Wagner-Hall2015-11-162-4/+18
|/ / / / / /
* | | | | | Merge pull request #376 from matrix-org/daniel/jenkinsDaniel Wagner-Hall2015-11-163-1/+9
|\ \ \ \ \ \
| * | | | | | Pull out jenkins script into a checked in scriptDaniel Wagner-Hall2015-11-133-1/+9
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #377 from matrix-org/paul/tiny-fixesPaul Evans2015-11-131-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Don't complain if /make_join response lacks 'prev_state' list (SYN-517)Paul "LeoNerd" Evans2015-11-131-0/+6
| * | | | | Merge branch 'develop' into paul/tiny-fixesPaul "LeoNerd" Evans2015-11-13100-1036/+3170
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #374 from matrix-org/daniel/guestleaveDaniel Wagner-Hall2015-11-131-3/+14
|\ \ \ \ \ \
| * | | | | | Allow guests to /room/:room_id/{join,leave}Daniel Wagner-Hall2015-11-131-3/+14
|/ / / / / /
| * | | | | Merge branch 'develop' into paul/tiny-fixesPaul "LeoNerd" Evans2015-11-0346-288/+1802
| |\ \ \ \ \
| | | | | * | Bump version and change log v0.11.0-rc2Erik Johnston2015-11-132-1/+9
| | | | | * | Merge branch 'develop' into release-v0.11.0Erik Johnston2015-11-1318-142/+474
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | |
* | | | | | | Implementation of state rollback in /syncRichard van der Hoff2015-11-132-4/+69
* | | | | | | Fix a few race conditions in the state calculationRichard van der Hoff2015-11-132-60/+77
* | | | | | | Make handlers.sync return a state dictionary, instead of an event list.Richard van der Hoff2015-11-132-32/+40
* | | | | | | Update some commentsRichard van der Hoff2015-11-134-14/+98
* | | | | | | Merge pull request #369 from matrix-org/daniel/guestnoneventsDaniel Wagner-Hall2015-11-122-3/+20
|\ \ \ \ \ \ \
| * | | | | | | Return non-room events from guest /events callsDaniel Wagner-Hall2015-11-122-3/+20
* | | | | | | | Merge pull request #368 from matrix-org/erikj/fix_federation_profileErik Johnston2015-11-123-6/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix missing profile data in federation joinsErik Johnston2015-11-123-6/+13
| |/ / / / / / /
* | | | | | | | Merge pull request #366 from matrix-org/erikj/search_fix_sqlite_fasterErik Johnston2015-11-121-3/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Trailing whitespaceErik Johnston2015-11-121-1/+1
| * | | | | | | Expand commentErik Johnston2015-11-121-0/+6
| * | | | | | | CommentErik Johnston2015-11-121-0/+2
| * | | | | | | Fix SQL syntaxErik Johnston2015-11-121-2/+3
| * | | | | | | Use a (hopefully) more efficient SQL query for doing recency based room searchErik Johnston2015-11-121-4/+6
* | | | | | | | Fix an issue with ignoring power_level changes on divergent graphsRichard van der Hoff2015-11-122-5/+104
* | | | | | | | Merge pull request #367 from matrix-org/daniel/readafterleaveDaniel Wagner-Hall2015-11-121-10/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Tweak guest access permissionsDaniel Wagner-Hall2015-11-121-10/+11
* | | | | | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-122-24/+34
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Allow guest access to room initialSyncDaniel Wagner-Hall2015-11-112-24/+34
* | | | | | | | | Fix bug where assumed dict was namedtupleErik Johnston2015-11-121-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #364 from matrix-org/daniel/guestdisplaynamesDaniel Wagner-Hall2015-11-121-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow guests to set their display namesDaniel Wagner-Hall2015-11-121-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #363 from matrix-org/daniel/guestscanjoinDaniel Wagner-Hall2015-11-121-12/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Consider joined guest users as joined usersDaniel Wagner-Hall2015-11-121-12/+21
|/ / / / / / / /
* | | | | | | | Merge pull request #362 from matrix-org/daniel/raceyraceyfunfunDaniel Wagner-Hall2015-11-121-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix race creating directoriesDaniel Wagner-Hall2015-11-121-1/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into developErik Johnston2015-11-112-1/+17
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Update date v0.11.0-rc1Erik Johnston2015-11-111-1/+1
| * | | | | | | Update CHANGESErik Johnston2015-11-111-1/+1
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-112-5/+11
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #361 from matrix-org/daniel/guestcontextErik Johnston2015-11-112-5/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow guests to access room context APIDaniel Wagner-Hall2015-11-112-5/+11
| | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-1124-141/+738
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #359 from matrix-org/markjh/incremental_indexingErik Johnston2015-11-118-77/+492
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix param style to work on both sqlite and postgresMark Haines2015-11-111-2/+6
| * | | | | | | Fix the background updateMark Haines2015-11-113-17/+19
| * | | | | | | Use a background task to update databases to use the full text searchMark Haines2015-11-102-80/+28
| * | | | | | | Test for background updatesMark Haines2015-11-102-0/+79
| * | | | | | | Run the background updates when starting synapse.Mark Haines2015-11-104-10/+67
| * | | | | | | Add background update task for reindexing event searchMark Haines2015-11-091-2/+96
| * | | | | | | Add storage module for tracking background updates.Mark Haines2015-11-092-0/+231
* | | | | | | | Merge pull request #358 from matrix-org/daniel/publicwritableDaniel Wagner-Hall2015-11-114-29/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | Return world_readable and guest_can_join in /publicRoomsDaniel Wagner-Hall2015-11-104-29/+71
|/ / / / / / / /
* | | | | | | | Merge pull request #355 from matrix-org/daniel/anonymouswritingDaniel Wagner-Hall2015-11-107-12/+92
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow guest users to join and message roomsDaniel Wagner-Hall2015-11-107-12/+92
|/ / / / / / / /
* | | | | | | | Merge pull request #356 from matrix-org/daniel/3pidyetagainDaniel Wagner-Hall2015-11-102-7/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Get display name from identity server, not clientDaniel Wagner-Hall2015-11-092-7/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #357 from matrix-org/rav/SYN-516Mark Haines2015-11-091-4/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't fiddle with results returned by event sourcesRichard van der Hoff2015-11-091-4/+12
|/ / / / / / / /
* | | | | | | | Add a couple of unit tests for room/<x>/messagesRichard van der Hoff2015-11-092-1/+57
* | | | | | | | Merge pull request #354 from matrix-org/markjh/SYN-513Mark Haines2015-11-092-3/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' into markjh/SYN-513Mark Haines2015-11-091-1/+1
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | fix comedy important missing comma breaking recent-ordered FTS on sqliteMatthew Hodgson2015-11-081-1/+1
* | | | | | | | | add a key existence check to tags_by_room to avoid /events 500'ing when testi...Matthew Hodgson2015-11-061-1/+2
| |/ / / / / / / |/| | | | | | |
| * | | | | | | SYN-513: Include updates for rooms that have had all their tags deletedMark Haines2015-11-092-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #353 from matrix-org/daniel/oopsDaniel Wagner-Hall2015-11-061-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove accidentally added ID columnDaniel Wagner-Hall2015-11-061-1/+0
|/ / / / / / /
* | | | | / / remove references to matrix.org/betaMatthew Hodgson2015-11-061-7/+7
| |_|_|_|/ / |/| | | | |
| * | | | | Remove anonymous access, since its not ready yetErik Johnston2015-11-051-2/+1
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-0514-190/+249
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #350 from matrix-org/erikj/searchErik Johnston2015-11-053-36/+288
|\ \ \ \ \ \
| * | | | | | Be explicit about what we're doingErik Johnston2015-11-051-1/+1
| * | | | | | Remove redundant testErik Johnston2015-11-051-1/+0
| * | | | | | Increment by one, not fiveErik Johnston2015-11-051-1/+1
* | | | | | | Exchange 3pid invites for m.room.member invitesDaniel Wagner-Hall2015-11-0510-180/+230
* | | | | | | Merge pull request #351 from matrix-org/daniel/fixtoxDaniel Wagner-Hall2015-11-051-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix tox config after fa1cf5ef34Daniel Wagner-Hall2015-11-051-3/+4
|/ / / / / / /
* | | | | | | Merge pull request #340 from matrix-org/erikj/server_retriesErik Johnston2015-11-052-4/+13
|\ \ \ \ \ \ \
| * | | | | | | Retry dead servers a lot less oftenErik Johnston2015-11-022-4/+13
| | |_|_|/ / / | |/| | | | |
| | | * | | | Add PRErik Johnston2015-11-051-1/+1
| | | * | | | Bump changelog and version numberErik Johnston2015-11-052-1/+18
| | |/ / / /
| | * | | | COMMENTSErik Johnston2015-11-051-4/+26
| | * | | | Error handlingErik Johnston2015-11-051-1/+8
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-11-0567-491/+853
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2015-11-0555-490/+572
|\ \ \ \ \ \
| * | | | | | Open up /events to anonymous users for room events onlyDaniel Wagner-Hall2015-11-0520-82/+299
| * | | | | | Merge pull request #347 from matrix-org/markjh/check_filterMark Haines2015-11-051-18/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Remove fields that are both unspecified and unused from the filter checks, ch...Mark Haines2015-11-041-18/+2
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into developDaniel Wagner-Hall2015-11-0412-231/+7
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #339 from matrix-org/daniel/removesomeliesDaniel Wagner-Hall2015-11-048-42/+7
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'develop' into daniel/removesomeliesMark Haines2015-11-0420-270/+579
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge pull request #346 from matrix-org/markjh/remove_lock_managerMark Haines2015-11-044-189/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Remove the LockManager class because it wasn't being usedMark Haines2015-11-044-189/+0
| | |/ / / / / /
| | | * | | | | Remove more unused parametersDaniel Wagner-Hall2015-11-026-13/+2
| | | * | | | | Remove unused arguments and codeDaniel Wagner-Hall2015-11-023-29/+5
| | | |/ / / /
| * | / / / / Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-0433-167/+272
| |/ / / / /
* | | | | | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into developErik Johnston2015-11-0512-1/+281
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into release-...Erik Johnston2015-10-260-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #330 from matrix-org/erikj/login_fallbackErik Johnston2015-10-265-0/+280
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge pull request #329 from matrix-org/erikj/staticErik Johnston2015-10-267-1/+3
| | |\ \ \ \ \ \
| * | | | | | | | Use correct service urlErik Johnston2015-10-261-3/+1
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Add login fallbackErik Johnston2015-10-265-0/+280
| | |/ / / / / | |/| | | | |
| * | | | | | Move static folder into synapseErik Johnston2015-10-267-1/+3
| |/ / / / /
| | | * | | Implement basic pagination for search resultsErik Johnston2015-11-053-50/+86
| | | * | | Implement order and group byErik Johnston2015-11-042-17/+205
| |_|/ / / |/| | | |
* | | | | Merge pull request #341 from matrix-org/markjh/v2_sync_receiptsMark Haines2015-11-031-15/+30
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' into markjh/v2_sync_receiptsMark Haines2015-11-0314-25/+524
| |\ \ \ \ \
| * | | | | | Include read receipts in v2 syncMark Haines2015-11-021-15/+30
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #343 from matrix-org/erikj/fix_retriesErik Johnston2015-11-032-46/+30
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Don't rearrange transaction_queueErik Johnston2015-11-031-12/+11
| * | | | | Fix broken cache for getting retry times. This meant we retried remote destin...Erik Johnston2015-11-032-55/+40
| |/ / / /
* | | | | Merge pull request #335 from matrix-org/markjh/room_tagsMark Haines2015-11-0314-26/+525
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | That TODO was doneMark Haines2015-11-031-1/+0
| * | | | Spell "deferred" more correctlyMark Haines2015-11-031-1/+1
| * | | | Include room tags in v2 /syncMark Haines2015-11-023-11/+70
| * | | | Store room tag content and return the content in the m.tag eventMark Haines2015-11-024-22/+41
| * | | | Merge branch 'develop' into markjh/room_tagsMark Haines2015-11-0211-30/+339
| |\ \ \ \
| * | | | | Support clients supplying older tokens, fix short poll testMark Haines2015-10-302-3/+3
| * | | | | Include tags in v1 room initial syncMark Haines2015-10-301-0/+11
| * | | | | Include room tags v1 /initialSyncMark Haines2015-10-301-0/+12
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 00:13:16 +0000