summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Update copyright noticesMark Haines2015-01-06132-128/+212
* Set a content-length for JSON responsesMark Haines2015-01-061-0/+1
* SYN-208/SYN-228: Add runtime checks on startup to enforce that JPEG/PNG suppo...Kegan Dougal2015-01-061-0/+29
* SYN-229: Include Content-Length when downloading filesMark Haines2015-01-063-7/+23
* spell out that VoIP needs TURNMatthew Hodgson2014-12-241-0/+3
* clarify these instructions a media-repo specificMatthew Hodgson2014-12-241-1/+3
* spell out that upgrading is just installing over the topMatthew Hodgson2014-12-241-0/+5
* Include version in User-Agent and Server headersMark Haines2014-12-224-6/+35
* Merge branch 'hotfixes-v0.6.0' v0.6.0aMark Haines2014-12-198-13/+42
|\
| * Mock ratelimiter to make tests pass.Kegan Dougal2014-12-192-4/+16
| * more changelogsMatthew Hodgson2014-12-191-0/+6
| * Rate limit display names and avatar urls per request rather than per event.Kegan Dougal2014-12-191-2/+4
| * Set a state_key for the topic and room name, otherwise they won't be treated ...Mark Haines2014-12-191-0/+2
| * Look for name, topic in the event content rather than the event itself when p...Mark Haines2014-12-191-4/+4
| * bump_presence_active_time when sending a message eventMark Haines2014-12-191-0/+6
| * Don't ratelimit room create eventsMark Haines2014-12-192-3/+4
|/
* Merge branch 'release-v0.6.0' v0.6.0Mark Haines2014-12-19101-2219/+4746
|\
| * Bump web sdk version to 0.6.0Mark Haines2014-12-191-2/+2
| * Set display name when joining via aliasMark Haines2014-12-191-0/+5
| * Remove unneeded federation keys from eventsMark Haines2014-12-191-0/+3
| * SYN-203: Handle requests for thunbnails for images that are smallMark Haines2014-12-191-5/+14
| * s/user_id/sender/Mark Haines2014-12-191-1/+1
| * Merge branch 'develop' into release-v0.6.0Mark Haines2014-12-191-0/+31
| |\
| | * Update README.rstKegsay2014-12-181-0/+9
| | * Update README.rstKegsay2014-12-181-0/+22
| * | Supply auth_chain along with current state in '/state/', fetch auth events fr...Mark Haines2014-12-184-31/+55
| * | Replace distributor deferred list, with a simple for loop until I understand ...Mark Haines2014-12-182-14/+25
| * | Don't yield on sending the event accross federation.Mark Haines2014-12-181-2/+2
| * | Use _get_events_txn instead of _parse_events_txnErik Johnston2014-12-161-7/+1
| * | Fix where we pulled in event.state_events from hotfixes branchErik Johnston2014-12-161-1/+1
| * | Merge branch 'hotfixes-v0.5.4a' of github.com:matrix-org/synapse into release...Erik Johnston2014-12-162-10/+14
| |\ \
| | * | Add FIXMEErik Johnston2014-12-161-0/+1
| | * | Fix bug where we did not send the full auth chain to people that joined over ...Erik Johnston2014-12-162-10/+13
| |/ / |/| |
* | | Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse v0.5.4aErik Johnston2014-12-134-4/+10
|\ \ \
| | * | Make error messages slightly more helpfulErik Johnston2014-12-161-5/+5
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.6.0Erik Johnston2014-12-1615-322/+99
| | |\|
| | | * Merge branch 'release-v0.6.0' into developMark Haines2014-12-1610-53/+194
| | | |\
| | | * | SYN-142: Use a default log file 'homeserver.log' so people get logging by def...Kegan Dougal2014-12-161-1/+1
| | | * | Remove send_message since nothing was calling it. Remove Snapshot because onl...Mark Haines2014-12-162-118/+0
| | | * | Construct the EventContext in the state handler rather than constructing one ...Mark Haines2014-12-166-59/+50
| | | * | clean up coding style a bitMark Haines2014-12-168-26/+26
| | | * | Remove annotate_event_with_state as nothing was using it. Update state tests ...Mark Haines2014-12-162-135/+39
| | * | | Use is_outlier() so that we don't get AttributeErrorErik Johnston2014-12-163-7/+5
| | * | | Don't assume an event existsErik Johnston2014-12-161-2/+4
| | * | | Mention that we should pull in new deps before running upgrade scriptErik Johnston2014-12-161-0/+4
| | | |/ | | |/|
| | * | Change upgrade script to not check hashes or signaturesErik Johnston2014-12-161-46/+53
| | * | Enable rate limiting for all eventsErik Johnston2014-12-161-0/+5
| | * | Fix typo where we thought a list was a dictErik Johnston2014-12-161-3/+4
| | * | Fix upgrade script to run all the missing deltas.Erik Johnston2014-12-162-1/+77
| | * | Do run all deltas up to missing delta 10Erik Johnston2014-12-161-4/+4
| | * | Bump UPGRADES and CHANGESErik Johnston2014-12-163-0/+27
| | * | Make failure to run appropraite upgrade scripts more helpful.Erik Johnston2014-12-162-3/+22
| | * | Fix bugs in upgrade script.Erik Johnston2014-12-161-1/+5
| | * | Rename upgrade scriptErik Johnston2014-12-161-0/+0
| | * | Include database bump in upgrade scriptErik Johnston2014-12-161-0/+2
| | * | Bump database versionErik Johnston2014-12-161-1/+1
| | * | Bump versionErik Johnston2014-12-162-2/+2
| | |/
| | * Merge pull request #25 from matrix-org/events_refactorMark Haines2014-12-1660-1812/+2114
| | |\
| | | * Fix pyflakesErik Johnston2014-12-161-2/+0
| | | * Remove FrozenEncoderErik Johnston2014-12-161-8/+0
| | | * Better english in docstrings are helpful.Erik Johnston2014-12-161-2/+2
| | | * Update upgrade scriptErik Johnston2014-12-162-3/+12
| | | * Persist internal_metadataErik Johnston2014-12-164-5/+13
| | | * Add basic docstring to annotate_context_with_stateErik Johnston2014-12-161-0/+11
| | | * Kill off synapse.api.events.*Erik Johnston2014-12-1626-925/+74
| | | * Add fixme to raising of AuthError in federation landErik Johnston2014-12-161-0/+1
| | | * Fix pyflakesErik Johnston2014-12-151-2/+0
| | | * Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-152-8/+26
| | | |\
| | | * | Use frozenutilsErik Johnston2014-12-152-34/+5
| | | * | User.is_mine is no longer a thing. Use hs.is_mine instead.Erik Johnston2014-12-151-1/+1
| | | * | Rename MessageHandler.handle_event. Add a few comments.Erik Johnston2014-12-157-14/+32
| | | * | Remove unused functionsErik Johnston2014-12-151-42/+0
| | | * | Finish up upgrade scriptErik Johnston2014-12-152-31/+95
| | | * | Get current member state from current_state snapshot. Fix leave test.Erik Johnston2014-12-152-4/+15
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-1513-56/+449
| | | |\ \
| | | * | | Add beginnings of upgrade scriptErik Johnston2014-12-151-0/+223
| | | * | | Fix bug where we ignored event_edge_hashes tableErik Johnston2014-12-155-7/+10
| | | * | | Remove unused importsErik Johnston2014-12-123-3/+0
| | | * | | Make auth module use EventTypes constantsErik Johnston2014-12-121-27/+23
| | | * | | Fix tests and remove debug loggingErik Johnston2014-12-122-6/+7
| | | * | | Consistently url decode and decode as utf 8 the URL partsErik Johnston2014-12-125-43/+35
| | | * | | Store json as UTF-8 and not bytesErik Johnston2014-12-121-1/+1
| | | * | | PyflakesErik Johnston2014-12-121-1/+0
| | | * | | Fix membership handler testErik Johnston2014-12-121-82/+97
| | | * | | Fix test.Erik Johnston2014-12-121-1/+1
| | | * | | Validate message, topic and name event contentsErik Johnston2014-12-123-1/+27
| | | * | | Fix stream test. Make sure we add join to auth_events for invitiationsErik Johnston2014-12-122-4/+6
| | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-1127-20/+1422
| | | |\ \ \
| | | * | | | Fix replication testsErik Johnston2014-12-111-12/+6
| | | * | | | Fix federation testErik Johnston2014-12-112-19/+25
| | | * | | | Fix room creation testErik Johnston2014-12-111-34/+34
| | | * | | | Fix public room joining by making sure replaces_state never points to itself.Erik Johnston2014-12-113-10/+13
| | | * | | | Fix prev_contentErik Johnston2014-12-113-3/+16
| | | * | | | Fix redaction testsErik Johnston2014-12-111-6/+8
| | | * | | | Fix redactions. Fix 'age' keyErik Johnston2014-12-116-30/+83
| | | * | | | Fix some testsErik Johnston2014-12-105-130/+120
| | | * | | | .from_string() no longer takes a HSErik Johnston2014-12-101-2/+2
| | | * | | | Remove dead codeErik Johnston2014-12-102-27/+0
| | | * | | | Add some basic event validationErik Johnston2014-12-102-10/+27
| | | * | | | Add new event graphing toolErik Johnston2014-12-101-0/+138
| | | * | | | Fix bug where we clobbered old state group valuesErik Johnston2014-12-103-2/+13
| | | * | | | Actually fix bug when uploading state with empty state_keyErik Johnston2014-12-102-2/+3
| | | * | | | Fix bug when uploading state with empty state_keyErik Johnston2014-12-106-88/+29
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-1015-27/+311
| | | |\ \ \ \
| | | * | | | | Fix AttributeErrorErik Johnston2014-12-102-1/+4
| | | * | | | | Make depth increase.Erik Johnston2014-12-101-1/+1
| | | * | | | | Add __str__ to FrozenEventErik Johnston2014-12-101-0/+5
| | | * | | | | Try and figure out how and why signatures are being changed.Erik Johnston2014-12-109-34/+86
| | | * | | | | This is to test jenkinsErik Johnston2014-12-091-1/+0
| | | * | | | | This is to test jenkinsErik Johnston2014-12-091-1/+1
| | | * | | | | This is to test jenkinsErik Johnston2014-12-091-0/+1
| | | * | | | | This is to test jenkinsErik Johnston2014-12-091-0/+0
| | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-091-3/+3
| | | |\ \ \ \ \
| | | * | | | | | PEP8Erik Johnston2014-12-092-2/+2
| | | * | | | | | Fix joining from an inviteErik Johnston2014-12-094-17/+20
| | | * | | | | | Change the way we implement get_events to be less suckyErik Johnston2014-12-092-36/+22
| | | * | | | | | Delete test fileErik Johnston2014-12-091-1/+0
| | | * | | | | | This is to test jenkinsErik Johnston2014-12-091-1/+1
| | | * | | | | | This is to test jenkinsErik Johnston2014-12-091-1/+1
| | | * | | | | | This is to test jenkinsErik Johnston2014-12-091-1/+1
| | | * | | | | | This is to test jenkinsErik Johnston2014-12-091-1/+1
| | | * | | | | | This is to test jenkinsErik Johnston2014-12-091-1/+1
| | | * | | | | | This is to test jenkinsErik Johnston2014-12-091-0/+1
| | | * | | | | | Add PEP8 newlinesErik Johnston2014-12-091-1/+1
| | | * | | | | | Add PEP8 newlinesErik Johnston2014-12-093-3/+3
| | | * | | | | | Remove unused snapshotErik Johnston2014-12-091-2/+0
| | | * | | | | | Remove unused importErik Johnston2014-12-091-2/+1
| | | * | | | | | More bug fixesErik Johnston2014-12-085-30/+35
| | | * | | | | | More bug fixesErik Johnston2014-12-085-13/+20
| | | * | | | | | Remove unused importErik Johnston2014-12-082-2/+0
| | | * | | | | | More bug fixesErik Johnston2014-12-082-3/+7
| | | * | | | | | Fix registrationErik Johnston2014-12-082-3/+7
| | | * | | | | | Ignore pycharm dirErik Johnston2014-12-081-0/+2
| | | * | | | | | Add forgotten fileErik Johnston2014-12-081-0/+56
| | | * | | | | | Various typos and bug fixes.Erik Johnston2014-12-088-80/+80
| | | * | | | | | Start making more things use EventContext rather than event.*Erik Johnston2014-12-0510-134/+212
| | | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-044-7/+17
| | | |\ \ \ \ \ \
| | | * | | | | | | Convert rest and handlers to use new event structureErik Johnston2014-12-0414-199/+188
| | | * | | | | | | Begin converting things to use the new Event structureErik Johnston2014-12-048-39/+96
| | | * | | | | | | WIP for new way of managing events.Erik Johnston2014-12-039-102/+374
| | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-0321-11/+5537
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Begin fleshing out a new Event objectErik Johnston2014-12-023-0/+195
| | | * | | | | | | | Change DomainSpecificString so that it doesn't use a HomeServer objectErik Johnston2014-12-0212-66/+63
| | | * | | | | | | | Store full JSON of events in dbErik Johnston2014-12-013-56/+50
| | * | | | | | | | | Add a script for talking matrix federation adding X-Matrix AuthorizationMark Haines2014-12-151-0/+143
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Update media_repository.pyKegsay2014-12-151-1/+1
| | * | | | | | | | Remember to hook up the typing event stream to the notifier as wellPaul "LeoNerd" Evans2014-12-151-7/+25
| | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Still send typing notifications to myself if I'm the only one in the room (it...Paul "LeoNerd" Evans2014-12-151-2/+1
| | * | | | | | | Update docs in media_repositoryMark Haines2014-12-151-2/+2
| | * | | | | | | return an mxc uri rather than a content_token.Mark Haines2014-12-151-1/+3
| | * | | | | | | Merge branch 'develop' into typing_notificationsPaul "LeoNerd" Evans2014-12-154-4/+10
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into developErik Johnston2014-12-134-4/+10
| | | |\ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Bump version and change logErik Johnston2014-12-133-2/+8
| * | | | | | | | | Fix bug while generating the error message when a file path specified in the ...Erik Johnston2014-12-131-2/+2
|/ / / / / / / / /
| * | | | | | | | Send list of typing user IDs as 'user_ids' list within 'content', so that m.t...Paul "LeoNerd" Evans2014-12-123-7/+21
| * | | | | | | | Merge branch 'develop' into typing_notificationsPaul "LeoNerd" Evans2014-12-1124-17/+1320
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into developPaul "LeoNerd" Evans2014-12-1124-17/+1320
| | |\| | | | | | |
| | | * | | | | | | Fix typo in media repository doc stringMark Haines2014-12-111-1/+1
| | | * | | | | | | Fix media repository doc string to include server_nameMark Haines2014-12-111-3/+3
| | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge pull request #23 from matrix-org/media_repositoryErik Johnston2014-12-1124-17/+1320
| | | |\ \ \ \ \ \
| | | | * | | | | | Allow only one download for a given image at a time, so that we don't end up ...Mark Haines2014-12-113-20/+29
| | | | * | | | | | Limit the size of images that are thumbnailed serverside. Limit the size of f...Mark Haines2014-12-114-6/+43
| | | | * | | | | | doc the thumbnail methodsMark Haines2014-12-111-2/+11
| | | | * | | | | | Make sure we pass a tuple to string '%' formattingMark Haines2014-12-111-2/+2
| | | | * | | | | | Merge branch 'develop' into media_repositoryMark Haines2014-12-1016-27/+313
| | | | |\ \ \ \ \ \
| | | | * | | | | | | update media repository implementation docsMark Haines2014-12-101-4/+9
| | | | * | | | | | | Merge branch 'develop' into media_repositoryMark Haines2014-12-1042-224/+6628
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | import Image as PIL.Image.Mark Haines2014-12-101-1/+1
| | | | * | | | | | | | Get the code actually workingMark Haines2014-12-106-52/+61
| | | | * | | | | | | | Thumbnail uploaded and cached imagesMark Haines2014-12-107-175/+587
| | | | * | | | | | | | Add a method field to thumbnail storageMark Haines2014-12-052-7/+12
| | | | * | | | | | | | Add pillow to dependenciesMark Haines2014-12-051-0/+1
| | | | * | | | | | | | Add a class for generating thumbnails using PILMark Haines2014-12-051-0/+78
| | | | * | | | | | | | Implement download support for media_repositoryMark Haines2014-12-045-12/+278
| | | | * | | | | | | | Fix pyflakes and pep8 warningsMark Haines2014-12-023-3/+4
| | | | * | | | | | | | Get uploads working with new media repoMark Haines2014-12-0214-29/+56
| | | | * | | | | | | | Write the upload portion of version 1 of the media repositoryMark Haines2014-12-028-7/+451
| * | | | | | | | | | | Merge remote-tracking branch 'origin' into typing_notificationsPaul "LeoNerd" Evans2014-12-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse v0.5.4Erik Johnston2014-12-0325-8/+6089
|\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | When users leave rooms mark them as no longer typing in themPaul "LeoNerd" Evans2014-12-111-0/+8
| | * | | | | | | | | | | Add a 'user_left_room' distributor signal analogous to 'user_joined_room'Paul "LeoNerd" Evans2014-12-112-3/+48
| | * | | | | | | | | | | Actually auth-check to ensure people can only send typing notifications for r...Paul "LeoNerd" Evans2014-12-112-0/+14
| | * | | | | | | | | | | Add a sprinkling of logger.debug() into typing notification handlerPaul "LeoNerd" Evans2014-12-111-0/+8
| | * | | | | | | | | | | Move typing-notification REST tests into their own .py filePaul "LeoNerd" Evans2014-12-112-83/+113
| | * | | | | | | | | | | Actually unit-test the event stream around REST typing testsPaul "LeoNerd" Evans2014-12-111-0/+14
| | * | | | | | | | | | | Initial hack at unit tests of room typing REST APIPaul "LeoNerd" Evans2014-12-112-3/+75
| | * | | | | | | | | | | Initial tiny hack at REST API for setting room typing notification statusPaul "LeoNerd" Evans2014-12-111-0/+32
| | |/ / / / / / / / / /
| | * | | | | | | | | | Avoid cyclic dependency in handler setupPaul "LeoNerd" Evans2014-12-101-4/+10
| | * | | | | | | | | | Hook up the event stream to typing notificationsPaul "LeoNerd" Evans2014-12-102-2/+82
| | * | | | | | | | | | Store serial numbers per room for typing event stream purposesPaul "LeoNerd" Evans2014-12-102-43/+44
| | * | | | | | | | | | First hack at implementing timeouts in typing notification handlerPaul "LeoNerd" Evans2014-12-102-6/+52
| | |/ / / / / / / / /
| | * | | | | | | | | Implement .cancel_call_later() in MockClockPaul "LeoNerd" Evans2014-12-102-2/+23
| | * | | | | | | | | Implement .call_later() in MockClockPaul "LeoNerd" Evans2014-12-102-0/+48
| | * | | | | | | | | Trivial test of MockClock()Paul "LeoNerd" Evans2014-12-101-0/+30
| | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | oopsMatthew Hodgson2014-12-101-3/+3
| | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | update codestyle based on debate on #matrix-devMatthew Hodgson2014-12-101-3/+34
| | * | | | | | | Merge pull request #22 from matrix-org/federation_retriesErik Johnston2014-12-1014-24/+277
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | turn back on per-request transaction retries, so that every time we try to hi...Matthew Hodgson2014-12-101-4/+3
| | | * | | | | | Add newline back inErik Johnston2014-12-101-0/+1
| | | * | | | | | Remove whitespaceErik Johnston2014-12-101-1/+1
| | | * | | | | | Code style.Erik Johnston2014-12-103-46/+85
| | | * | | | | | plateau retries after 1hMatthew Hodgson2014-12-101-3/+6
| | | * | | | | | add errbacks to enqueue_pdu deferreds; change logging for failed federation s...Matthew Hodgson2014-12-102-8/+12
| | | * | | | | | squidge to 79 columns as per pep8Matthew Hodgson2014-12-103-19/+36
| | | * | | | | | fix UTs by telling all the mock stores about the new methods for tracking ret...Matthew Hodgson2014-12-094-3/+23
| | | * | | | | | Merge branch 'develop' into federation_retriesMatthew Hodgson2014-12-082-1/+3
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Ignore pycharm dirErik Johnston2014-12-081-0/+2
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | point the entry_point for synapse-homeserver at the right methodMark Haines2014-12-051-1/+1
| | | * | | | | fix a million stupid bugs and make it actually workMatthew Hodgson2014-12-083-20/+33
| | | * | | | | add a write-through cache on the retry scheduleMatthew Hodgson2014-12-081-4/+15
| | | * | | | | actually reset retry schedule if we can successfuly talk to itMatthew Hodgson2014-12-082-0/+9
| | | * | | | | fix stupid syntax thinkosMatthew Hodgson2014-12-072-13/+12
| | | * | | | | track replication destination health, and perform exponential back-off when s...Matthew Hodgson2014-12-079-18/+156
| | |/ / / / /
| | * | | | | Pull in latest matrix-angular_sdkErik Johnston2014-12-051-2/+2
| | * | | | | Pull in latest matrix-angular_sdkErik Johnston2014-12-051-2/+2
| | | |_|_|/ | | |/| | |
| | * | | | @log_function on PresenceStream's get_new_events_for_user()Paul "LeoNerd" Evans2014-12-031-1/+3
| | * | | | Store any incoming presence push in the local cache anyway, even if there's n...Paul "LeoNerd" Evans2014-12-031-4/+4
| | * | | | Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse into developErik Johnston2014-12-033-2/+10
| | |\ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| * / | | Bump changes and versionErik Johnston2014-12-033-2/+10
| |/ / /
| * | | Fix bug where did not always resolve all the deferreds in _attempt_new_transa...Erik Johnston2014-12-031-2/+6
| * | | Don't log synapse.storage at DEBUG level when under -v; require -v -v for thatPaul "LeoNerd" Evans2014-12-021-0/+6
| * | | Workaround for non-uniqueness of room member events in the database confusing...Paul "LeoNerd" Evans2014-12-021-1/+3
| * | | Extra verbosity on logging of received presence infoPaul "LeoNerd" Evans2014-12-021-0/+5
| * | | Squash room_ids list to a set() to remove duplicates - with TODO marker as I ...Paul "LeoNerd" Evans2014-12-021-1/+5
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into developPaul "LeoNerd" Evans2014-12-020-0/+0
| |\ \ \
| | * \ \ Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-12-023-2/+9
| | |\ \ \ | |_|/ / / |/| | | |
| | * | | Merge branch 'master' into developMark Haines2014-12-021-2/+5
| | |\ \ \
| | * | | | Remove editor junkPaul "LeoNerd" Evans2014-12-021-0/+0
| | * | | | Add non-working jitsi meet bridgeDavid Baker2014-12-0210-0/+5488
| | * | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-12-021-1/+2
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | re-add OSX troubleshooting instructions (not sure how they got lost)Matthew Hodgson2014-11-301-0/+3
| | * | | | fix IO::Async abuse - thanks leoMatthew Hodgson2014-11-281-9/+11
| | * | | | ignore rogue matrix call events; support verto.media RPC as a horrible hack; ...Matthew Hodgson2014-11-283-21/+33
| | * | | | clean up a vertobot a bitMatthew Hodgson2014-11-282-5/+0
| | * | | | a simple matrix->verto bot, distantly related to the irc bridgeMatthew Hodgson2014-11-285-0/+546
| | * | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-11-273-3/+3
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'release-v0.5.3' of github.com:matrix-org/synapse into developErik Johnston2014-11-273-2/+10
| | |\ \ \ \ \
| * | | | | | | Allow GET /room/:room_id/messages without 'limit' parameter to default to 10Paul "LeoNerd" Evans2014-12-022-2/+8
| * | | | | | | Remove editor junkPaul "LeoNerd" Evans2014-12-021-0/+0
| * | | | | | | Add non-working jitsi meet bridgeDavid Baker2014-12-0210-0/+5488
| * | | | | | | re-add OSX troubleshooting instructions (not sure how they got lost)Matthew Hodgson2014-12-021-0/+3
| * | | | | | | fix IO::Async abuse - thanks leoMatthew Hodgson2014-12-021-9/+11
| * | | | | | | ignore rogue matrix call events; support verto.media RPC as a horrible hack; ...Matthew Hodgson2014-12-023-21/+33
| * | | | | | | clean up a vertobot a bitMatthew Hodgson2014-12-022-5/+0
| * | | | | | | a simple matrix->verto bot, distantly related to the irc bridgeMatthew Hodgson2014-12-025-0/+546
|/ / / / / / /
* | | | | / / Bump version v0.5.3cErik Johnston2014-12-023-2/+9
| |_|_|_|/ / |/| | | | |
* | | | | | SYN-187: Set a more sensible default for the content_addr v0.5.3bMark Haines2014-12-021-2/+5
| |_|_|/ / |/| | | |
* | | | | Merge pull request #21 from tjardick/masterErik Johnston2014-12-021-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Added the needed libssl-dev packageTjardick van der Kraan2014-12-021-1/+2
|/ / / /
* | | | Bump version v0.5.3aErik Johnston2014-11-272-2/+2