summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * 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
| |\ | | | | | | Federation retries
| | * turn back on per-request transaction retries, so that every time we try to ↵Matthew Hodgson2014-12-101-4/+3
| | | | | | | | | | | | hit a dead server we actually end up hammering 5 times :|
| | * 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 ↵Matthew Hodgson2014-12-102-8/+12
| | | | | | | | | | | | sends to warn rather than exception
| | * 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 ↵Matthew Hodgson2014-12-094-3/+23
| | | | | | | | | | | | retries
| | * Merge branch 'develop' into federation_retriesMatthew Hodgson2014-12-082-1/+3
| | |\ | | |/ | |/|
| | * 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 ↵Matthew Hodgson2014-12-079-18/+156
| | | | | | | | | | | | sending transactions. does *not* yet retry transactions, but drops them on the floor if waiting for a server to recover.
* | | 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
|\| |
| * | Ignore pycharm dirErik Johnston2014-12-081-0/+2
| | |
| * | point the entry_point for synapse-homeserver at the right methodMark Haines2014-12-051-1/+1
| |/
| * Pull in latest matrix-angular_sdkErik Johnston2014-12-051-2/+2
| |
| * Pull in latest matrix-angular_sdkErik Johnston2014-12-051-2/+2
| |
* | 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
|\|
| * @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 ↵Paul "LeoNerd" Evans2014-12-031-4/+4
| | | | | | | | no interested observers (yet *hint*) (SYN-115)
| * 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
| |/
* | 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
|\|
| * Fix bug where did not always resolve all the deferreds in ↵Erik Johnston2014-12-031-2/+6
| | | | | | | | _attempt_new_transaction
| * 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 ↵Paul "LeoNerd" Evans2014-12-021-1/+3
| | | | | | | | confusing HAVING COUNT() test of room membership intersection (with thanks to Tom Molesworth)
| * 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
| | | | | | | | have no idea /why/ the dups are happening in the first place
| * 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
| | |\ \ \
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | fix NA::Matrix dep
| * | | | | 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 package
| | * | Added the needed libssl-dev packageTjardick van der Kraan2014-12-021-1/+2
| |/ /
* | | 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
| |/ |/|
* | 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
| | | | | | | | fix NA::Matrix dep
* | 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
|\|
| * Bump version v0.5.3aErik Johnston2014-11-272-2/+2
| |
| * Bump pinned version of pynacl pulled from githubErik Johnston2014-11-271-1/+1
| |
| * Merge branch 'release-v0.5.3' of github.com:matrix-org/synapse v0.5.3Erik Johnston2014-11-279-66/+190
| |\
* | \ Merge branch 'release-v0.5.3' of github.com:matrix-org/synapse into developErik Johnston2014-11-273-2/+10
|\ \ \ | | |/ | |/|
| * | Bump version and changelogErik Johnston2014-11-273-2/+10
|/ /
* | Don't return outliers when we get recent events for rooms.Erik Johnston2014-11-271-1/+1
| |
* | Fix bugs when joining a remote room that has dodgy event graphs. This should ↵Erik Johnston2014-11-273-31/+68
| | | | | | | | also fix the number of times a HS will trigger a GET /event/
* | on_receive_pdu takes more argsErik Johnston2014-11-271-3/+3
| |
* | Change the way we get missing auth and state eventsErik Johnston2014-11-272-44/+106
| |
* | Re-sign events when we return them via federation as a temporary hack to ↵Erik Johnston2014-11-271-0/+11
| | | | | | | | work around the problem where we reconstruct events differently than when they were signed
* | Attempt to fix bug where we 500d an event stream due to trying to cancel a ↵Erik Johnston2014-11-261-3/+9
|/ | | | timer twice
* Add a workaround for bug where some initial join events don't reference ↵Erik Johnston2014-11-261-1/+7
| | | | creation events in their auth_events
* Catch exceptions when trying to add an entry to rooms tablesErik Johnston2014-11-261-6/+11
|
* SpellingErik Johnston2014-11-261-1/+1
|
* Bump version and changelog v0.5.2Erik Johnston2014-11-263-2/+7
|
* Merge branch 'develop' of github.com:matrix-org/synapseErik Johnston2014-11-261-1/+4
|\
| * Don't delete the entire current_state_events tableErik Johnston2014-11-261-1/+4
| |
| * Merge branch 'release-v0.5.1' of github.com:matrix-org/synapse into developErik Johnston2014-11-264-4/+12
| |\
* | \ Merge branch 'release-v0.5.1' of github.com:matrix-org/synapse v0.5.1Erik Johnston2014-11-2657-731/+1036
|\ \ \ | | |/ | |/|
| * | Bump version numbers and change logErik Johnston2014-11-264-4/+12
| |/
| * Use correct default port in scripts/check_signature.pyErik Johnston2014-11-261-1/+1
| |
| * Add update delta for schema changeErik Johnston2014-11-262-1/+35
| |
| * Update schema to support multiple signaturesErik Johnston2014-11-261-1/+1
| |
| * Fix tests.Erik Johnston2014-11-261-1/+1
| |
| * Correctly handle the case where we get an event for an unknown room, which ↵Erik Johnston2014-11-265-47/+99
| | | | | | | | turns out we are actually in
| * upgrade script depends on sqlite3 cliMatthew Hodgson2014-11-261-1/+1
| |
| * Fix bugs in invite/join dances.Erik Johnston2014-11-258-142/+215
| | | | | | | | | | We now do more implement more of the auth on the events so that we don't reject valid events.
| * Don't double url-decode state event types.Kegan Dougal2014-11-251-1/+1
| |
| * Drop log level for incorrect logging contexts to WARN if the context is ↵Mark Haines2014-11-251-5/+8
| | | | | | | | wrong and DEBUG if the context is missing
| * pip uninstall sywebMatthew Hodgson2014-11-241-0/+9
| |
| * Mark the auth events as possible outlierErik Johnston2014-11-241-0/+1
| |
| * Add missing None checkErik Johnston2014-11-241-1/+1
| |
| * Ask for any auth events that we don't haveErik Johnston2014-11-241-0/+15
| |
| * We don't always want to Auth get_persisted_pduErik Johnston2014-11-242-11/+20
| |
| * SYN-163: Add an order by rowid to selects.Erik Johnston2014-11-242-9/+18
| | | | | | | | | | | | | | This should fix the bug where the edges of the graph get returned in a different order than they were inserted in, and so no get_event no longer returned the exact same JSON as was inserted. This meant that signature checks failed.
| * typosMatthew Hodgson2014-11-241-2/+2
| |
| * rst bugsMatthew Hodgson2014-11-241-5/+5
| |
| * Return 404 M_NOT_FOUND when trying to look up a room alias that doesn't existMark Haines2014-11-211-12/+24
| |
| * SYN-58: Allow passing explicit limit=0 to initialSync to request no messages ↵Paul "LeoNerd" Evans2014-11-202-7/+7
| | | | | | | | at all; missing still implies default 10
| * Fix pep8 and pyflakes warningsMark Haines2014-11-206-12/+21
| |
| * Merge pull request #20 from matrix-org/http_client_refactorMark Haines2014-11-208-355/+373
| |\ | | | | | | Http client refactor
| | * Merge branch 'develop' into http_client_refactorDavid Baker2014-11-2035-140/+193
| | |\ | | |/ | |/|
| * | Fix pep8 codestyle warningsMark Haines2014-11-2021-47/+71
| | |
| * | Use module loggers rather than the root logger. Exceptions caused by bad ↵Mark Haines2014-11-208-10/+17
| | | | | | | | | | | | clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str'
| * | Add a few missing yields, Move deferred lists inside PreserveLoggingContext ↵Mark Haines2014-11-2015-85/+107
| | | | | | | | | | | | because they don't interact well with the logging contexts
| | * Separate out the matrix http client completely because just about all of its ↵David Baker2014-11-208-337/+361
| | | | | | | | | | | | code it now separate from the simple case we need for standard HTTP(S)
| | * Oops, I removed this param.David Baker2014-11-201-2/+0
| | |
| | * Refactor the HTTP clients a little.David Baker2014-11-204-86/+82
| | |
| | * CaptchaServerHttpClient should extend the base, not matrix http client.David Baker2014-11-201-1/+1
| |/
| * Merge branch 'master' into developMark Haines2014-11-201-4/+4
| |\ | |/ |/|
* | Use tagged version of matrix-angular-sdkMark Haines2014-11-201-4/+4
| |
| * Merge branch 'master' into developMark Haines2014-11-206-3/+84
| |\ | |/ |/|
* | typoeMatthew Hodgson2014-11-191-1/+1
| |
* | Add note about rerunning setup.py developErik Johnston2014-11-191-0/+6
| |
* | Merge branch 'release-v0.5.0' of github.com:matrix-org/synapse v0.5.0Erik Johnston2014-11-19202-65738/+4981
|\ \
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0Erik Johnston2014-11-193-5/+0
| |\ \
| * | | Bump version, changelog and upgrade.rstErik Johnston2014-11-196-3/+78
| | | |
* | | | Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse v0.4.2Erik Johnston2014-10-3166-284/+10511
|\ \ \ \
| | | | * SYN-153: Fix formatting of federation error messageMark Haines2014-11-201-1/+1
| | | |/
| | | * Fix tests from prev commitErik Johnston2014-11-191-1/+0
| | | |
| | | * Don't add a 'prev' key to m.room.member messagesErik Johnston2014-11-192-4/+0
| | |/
| | * Initialise UserPresenceCache instances to always contain a 'presence' keyPaul "LeoNerd" Evans2014-11-192-6/+10
| | |
| | * Fix backfill requestErik Johnston2014-11-191-1/+1
| | |
| | * Only users can set state events which have their own user_idErik Johnston2014-11-191-0/+20
| | |
| | * Sometimes there isn't a current logging contextMark Haines2014-11-191-1/+1
| | |
| | * SYN-153: Raise 404 if room alias is not foundMark Haines2014-11-191-4/+8
| | |
| | * remove demo webserver since synapse serves up the webclient itselfMark Haines2014-11-191-3/+0
| | |
| | * remove unused importMark Haines2014-11-191-1/+1
| | |
| | * replace user_id with senderMark Haines2014-11-194-2/+11
| | |
| | * Preserve logging context in a few more places, drop the logging context ↵Mark Haines2014-11-194-22/+37
| | | | | | | | | | | | after it has been stashed to reduce potential for confusion
| | * SYN-141: Encode query params as UTF-8.Mark Haines2014-11-181-1/+7
| | |
| | * more README fixesMatthew Hodgson2014-11-181-1/+3
| | |
| | * SYN-144: Remove bad keys from pdu json objects, convert age_ts to ageMark Haines2014-11-182-15/+29
| | | | | | | | | | | | for all pdus sent.
| | * Remember also to UTF-8 decode bytes in room alias names in directory server URLsPaul "LeoNerd" Evans2014-11-181-3/+9
| | |
| | * Remember to URL decode the room_id in room initialSyncPaul "LeoNerd" Evans2014-11-181-1/+1
| | |
| | * SYN-141: Decode the query params as UTF-8Mark Haines2014-11-181-1/+2
| | |
| | * Remove unused variableMark Haines2014-11-181-1/+1
| | |
| | * SYN-104: When going backwards the end token should be before the last eventMark Haines2014-11-181-0/+3
| | |
| | * Merge pull request #17 from matrix-org/room-initial-syncPaul Evans2014-11-184-26/+175
| | |\ | | | | | | | | Room initial sync
| | | * Ensure to parse a real pagination config object out of room initialSync ↵Paul "LeoNerd" Evans2014-11-181-2/+4
| | | | | | | | | | | | | | | | request and pass it on
| | | * Rename message handler's new snapshot_room to room_initial_sync() as that ↵Paul "LeoNerd" Evans2014-11-182-2/+2
| | | | | | | | | | | | | | | | better suits its purpose
| | | * Merge remote-tracking branch 'origin/develop' into room-initial-syncPaul "LeoNerd" Evans2014-11-188-167/+209
| | | |\
| | | * | Include room members' presence in room initialSyncPaul "LeoNerd" Evans2014-11-182-1/+36
| | | | |
| | | * | Added ability to .get_state() from the PresenceHandler by returning a ↵Paul "LeoNerd" Evans2014-11-181-2/+15
| | | | | | | | | | | | | | | | | | | | complete m.presence event
| | | * | Don't expect all _user_cachemap entries to definitely contain a ↵Paul "LeoNerd" Evans2014-11-181-3/+3
| | | | | | | | | | | | | | | | | | | | "last_active" key
| | | * | Include 'messages' snapshot in room initialSyncPaul "LeoNerd" Evans2014-11-182-1/+24
| | | | |
| | | * | Merge branch 'develop' into room-initial-syncPaul "LeoNerd" Evans2014-11-17197-66999/+4442
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/message.py
| | | * | | Include room membership in room initialSyncPaul "LeoNerd" Evans2014-11-102-1/+8
| | | | | |
| | | * | | Put room state in room initialSync output - I guess this is right; I really ↵Paul "LeoNerd" Evans2014-11-102-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | can't find any other tests similar...
| | | * | | Have room initialSync return the room's room_idPaul "LeoNerd" Evans2014-11-103-21/+19
| | | | | |
| | | * | | Initial (empty) test that room initialSync at least returns 200 OKPaul "LeoNerd" Evans2014-11-101-0/+53
| | | | | |
| | * | | | Revert accidental commit of bad fileErik Johnston2014-11-181-37/+24
| | | |_|/ | | |/| |
| | * | | Null check when determining default power levelsMark Haines2014-11-181-1/+2
| | | | |
| | * | | SYN-149: Enable auth for events added during room creation since they should ↵Mark Haines2014-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | pass auth checks
| | * | | Fix auth to correctly handle initial creation of roomsErik Johnston2014-11-182-27/+58
| | | | |
| | * | | SYN-149: Send join event immediately after the room create eventMark Haines2014-11-183-26/+31
| | | | |
| | * | | Split out sending the room alias events from creating the alias so that we ↵Mark Haines2014-11-184-27/+31
| | | | | | | | | | | | | | | | | | | | can do them in the right point when creating a room
| | * | | warn about memoryMatthew Hodgson2014-11-171-0/+7
| | | | |
| | * | | update the README.rst to reflect the develop branchMatthew Hodgson2014-11-171-73/+40
| | | | |
| | * | | Stop before starting when restartingMark Haines2014-11-171-1/+1
| | | | |
| | * | | yet another installation gotchaMatthew Hodgson2014-11-171-7/+13
| | | | |
| | * | | Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse into developMatthew Hodgson2014-11-172-9/+10
| | |\ \ \ | | | | |/ | | | |/|
| | | * | SYN-148: Add the alias after creating the roomMark Haines2014-11-171-9/+9
| | | | |
| | | * | Mark synapse as not zip-safe since it needs to be able to read schema files ↵Mark Haines2014-11-171-0/+1
| | | | | | | | | | | | | | | | | | | | from the filesystem
| | * | | clarify install instructions further stillMatthew Hodgson2014-11-171-17/+38
| | |/ /
| | * | Remove syweb directory. pull in syweb as a dependency from githubMark Haines2014-11-1792-50658/+4
| | | |
| | * | SYWEB-152: Remove room join logic from RoomController and put it in ↵Kegan Dougal2014-11-172-145/+101
| | | | | | | | | | | | | | | | eventHandlerService.joinRoom.
| | * | Add clearRooms() to wipe data when you logout.Kegan Dougal2014-11-173-16/+29
| | | |
| | * | These lines aren't doing anythingMark Haines2014-11-171-5/+0
| | | |
| | * | Merge pull request #14 from matrix-org/merge_pdu_event_objectsErik Johnston2014-11-1710-212/+91
| | |\ \ | | | | | | | | | | Merge pdu and event objects
| | | * \ Merge remote-tracking branch 'origin/develop' into merge_pdu_event_objectsMark Haines2014-11-1718-251/+483
| | | |\ \ | | | |/ / | | |/| |
| | * | | Move getLastMessage to modelService.Kegan Dougal2014-11-175-31/+31
| | | | |
| | * | | s/eventHandlerService.getUsersCountInRoom/modelService.getUserCountInRoom/gKegan Dougal2014-11-175-65/+61
| | | | |
| | * | | do *not* depend on external websites to host our JS - if nothing else, it ↵Matthew Hodgson2014-11-152-6/+201
| | | | | | | | | | | | | | | | | | | | makes hacking on synapse when offline (e.g. on planes) a huge PITA :(
| | * | | docMatthew Hodgson2014-11-151-3/+3
| | | | |
| | * | | merge in msg.__room_member usage to new message display templateMatthew Hodgson2014-11-157-135/+182
| | | | |
| | * | | improve notif setting textMatthew Hodgson2014-11-151-1/+1
| | | | |
| | * | | spell useCaptcha right...Matthew Hodgson2014-11-151-1/+1
| | | | |
| | * | | do not use captcha by defaultMatthew Hodgson2014-11-151-11/+5
| | | | |
| | | * | Merge PDUs and Events into one objectMark Haines2014-11-1410-212/+91
| | |/ /
| | * | Fix PDU and event signaturesMark Haines2014-11-144-6/+16
| | | |
| | * | Validate signatures on incoming eventsMark Haines2014-11-143-7/+52
| | | |
| | * | Add event-stream-service unit tests.Kegan Dougal2014-11-142-0/+84
| | | |
| | * | Unbreak tab complete...Kegan Dougal2014-11-141-5/+6
| | | |
| | * | Add more modelService unit tests.Kegan Dougal2014-11-141-0/+132
| | | |
| | * | Move getUserPowerLevel to modelService.Kegan Dougal2014-11-145-71/+58
| | | |
| | * | Fix bug which caused notifications to appear for old messages.Kegan Dougal2014-11-142-9/+9
| | | |
| | * | Tidy up room.html member list to use member again, now that scope.members is ↵Kegan Dougal2014-11-141-6/+6
| | | | | | | | | | | | | | | | gone.
| | * | Add extra checks to duration filter.Kegan Dougal2014-11-142-0/+8
| | | |
| | * | Actually look for last_active_ago in the right place..Kegan Dougal2014-11-143-70/+140
| | | |
| | * | Remove scope.members from RoomController and use modelService instead. This ↵Kegan Dougal2014-11-145-225/+237
| | | | | | | | | | | | | | | | may make things unstable.
| | * | Be more helpful and tell the user how to generate a config too.David Baker2014-11-141-1/+4
| | | |
| | * | Adding --generate-config will not help if the user has not specified a ↵David Baker2014-11-141-1/+1
| | | | | | | | | | | | | | | | config file.
| | * | Use modelService for getting current presence state rather than ↵Kegan Dougal2014-11-142-2/+23
| | | | | | | | | | | | | | | | RoomController.members
| | * | Merge pull request #13 from matrix-org/request_loggingErik Johnston2014-11-1410-51/+247
| | |\ \ | | | | | | | | | | Request logging
| | | * \ Merge branch 'develop' into request_loggingMark Haines2014-11-14208-19392/+8818
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py
| | | * | | Remove unused 'context' variables to appease pyflakesMark Haines2014-10-301-2/+2
| | | | | |
| | | * | | Merge branch 'develop' into request_loggingMark Haines2014-10-3046-199/+391
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/config/logger.py
| | | * | | | Pep8 and a few doc stringsMark Haines2014-10-302-17/+40
| | | | | | |
| | | * | | | Add a request-id to each log lineMark Haines2014-10-3011-31/+205
| | | | | | |
| | * | | | | Use modelService to access room member power levels rather than RoomController.Kegan Dougal2014-11-143-48/+4
| | | | | | |
| | * | | | | Use mUserDisplayName filter in more places. Store power_level[norm] for each ↵Kegan Dougal2014-11-142-17/+26
| | | |_|/ / | | |/| | | | | | | | | | | | | | | RoomMember.
| | * | | | Add notification-service unit tests.Kegan Dougal2014-11-141-0/+78
| | | | | |
| | * | | | Add mUserDisplayName unit tests.Kegan Dougal2014-11-141-0/+141
| | | | | |
| | * | | | Unskip unit tests; fix filter dependency.Kegan Dougal2014-11-141-12/+18
| | | | | |
| | * | | | Remove getUserDisplayName and move that logic the filter mUserDisplayName. ↵Kegan Dougal2014-11-133-90/+76
| | | | | | | | | | | | | | | | | | | | | | | | Update references. Skip tests for now as there are some unresolved DI issues for filters.
| | * | | | Remove rootScope.presence and replaced with modelService.getUser/setUser.Kegan Dougal2014-11-133-13/+23
| | | | | |
| | * | | | SYWEB-152: Move up/down history fully to a directive.Kegan Dougal2014-11-133-94/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, there was some of it in a lovely generic directive, but the core of it was hard coded id attributes in RoomController. It's now all generic in a directive: the room history you get when you up/down arrow is determined by the value of the attribute e.g. command-history="!foo:bar" would present the history for !foo:bar. In practice, this is {{room_id}} in the html.
| | * | | | SYN-103: Remove "origin" and "destination" keys from edusMark Haines2014-11-134-14/+4
| | | | | |
| | * | | | Migrate random bits of desktop notification logic out of roomController and ↵Kegan Dougal2014-11-132-32/+33
| | | | | | | | | | | | | | | | | | | | | | | | into eventHandlerService where everything else is.