| Commit message (Expand) | Author | Age | Files | Lines |
* | Add 'contains_url' to filter | Erik Johnston | 2016-07-14 | 1 | -3/+20 |
* | Implement https://github.com/matrix-org/matrix-doc/pull/346/files | David Baker | 2016-07-08 | 1 | -0/+1 |
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-07-08 | 1 | -5/+10 |
|\ |
|
| * | Fix bug where we did not correctly explode when multiple user_ids were set in... | Erik Johnston | 2016-07-07 | 1 | -5/+10 |
* | | requestToken update | David Baker | 2016-06-30 | 1 | -1/+2 |
|/ |
|
* | Working unsubscribe links going straight to the HS | David Baker | 2016-06-02 | 1 | -0/+7 |
* | Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 1 | -0/+18 |
|\ |
|
| * | special case m.room.third_party_invite event auth to match invites, otherwise... | Matthew Hodgson | 2016-06-01 | 1 | -0/+18 |
* | | WIP on unsubscribing email notifs without logging in | David Baker | 2016-06-01 | 1 | -9/+16 |
|/ |
|
* | Spell "domain" correctly | Mark Haines | 2016-05-16 | 1 | -8/+8 |
* | Create user with expiry | Negi Fazeli | 2016-05-13 | 1 | -1/+2 |
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 1 | -8/+8 |
|\ |
|
| * | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 1 | -8/+8 |
* | | Implement basic ignore user | Erik Johnston | 2016-05-04 | 1 | -3/+5 |
|/ |
|
* | Measure Auth.check | Erik Johnston | 2016-04-13 | 1 | -47/+50 |
* | Don't auto log failed auth checks | Erik Johnston | 2016-04-13 | 1 | -53/+45 |
* | Add published room list edit API | Erik Johnston | 2016-03-21 | 1 | -4/+50 |
* | Send the user ID matching the guest access token, since there is no Matrix AP... | David Baker | 2016-03-07 | 1 | -2/+2 |
* | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 1 | -21/+36 |
* | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 1 | -1/+0 |
|\ |
|
| * | Check presence state is a valid one | Erik Johnston | 2016-02-18 | 1 | -1/+0 |
* | | api/filtering: don't assume that event content will always be a dict | Patrik Oldsberg | 2016-02-17 | 1 | -1/+4 |
|/ |
|
* | Revert "Merge two of the room join codepaths" | Daniel Wagner-Hall | 2016-02-12 | 1 | -5/+0 |
* | Merge two of the room join codepaths | Daniel Wagner-Hall | 2016-02-12 | 1 | -0/+5 |
* | Fix up logcontexts | Erik Johnston | 2016-02-08 | 1 | -1/+3 |
* | Host /media/r0 as well as /media/v1 | Daniel Wagner-Hall | 2016-02-05 | 1 | -1/+2 |
* | Log more diagnostics for unrecognised access tokens | Daniel Wagner-Hall | 2016-02-02 | 1 | -0/+2 |
* | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 1 | -1/+1 |
* | Fix test | Erik Johnston | 2016-01-28 | 1 | -0/+5 |
* | Fix tests | Erik Johnston | 2016-01-25 | 1 | -1/+1 |
* | Move logic from rest/ to handlers/ | Erik Johnston | 2016-01-25 | 1 | -12/+10 |
* | Sanitize filters | Erik Johnston | 2016-01-22 | 1 | -21/+27 |
* | Don't error on AS non-ghost user use | Daniel Wagner-Hall | 2016-01-18 | 1 | -0/+2 |
* | Pull out app service user lookup | Daniel Wagner-Hall | 2016-01-18 | 1 | -31/+28 |
* | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 1 | -0/+1 |
* | M_INVALID_USERNAME to be consistent with the parameter name | David Baker | 2016-01-15 | 1 | -1/+1 |
* | Add specific error code for invalid user names. | David Baker | 2016-01-14 | 1 | -0/+1 |
* | Require AS users to be registered before use | Daniel Wagner-Hall | 2016-01-13 | 1 | -0/+5 |
* | Introduce a Requester object | Daniel Wagner-Hall | 2016-01-11 | 1 | -3/+5 |
* | copyrights | Matthew Hodgson | 2016-01-07 | 6 | -6/+6 |
* | Guest users must be joined to a room to see it in /sync | Mark Haines | 2016-01-06 | 2 | -28/+0 |
* | Allow guests to upgrade their accounts | Daniel Wagner-Hall | 2016-01-05 | 1 | -3/+3 |
* | Include the list of bad room ids in the error | Mark Haines | 2015-12-22 | 1 | -0/+16 |
* | Merge remote-tracking branch 'origin/develop' into markjh/guest_access | Mark Haines | 2015-12-22 | 1 | -0/+5 |
|\ |
|
| * | Add top level filters for filtering by room id | Mark Haines | 2015-12-22 | 1 | -33/+35 |
* | | Allow guest access if the user provides a list of rooms in the filter | Mark Haines | 2015-12-22 | 1 | -0/+12 |
* | | Add top level filtering by room id | Mark Haines | 2015-12-21 | 1 | -33/+30 |
|/ |
|
* | Strip address and such out of 3pid invites | Daniel Wagner-Hall | 2015-12-17 | 1 | -1/+1 |
* | Only include the archived rooms if a include_leave flag in set in the filter | Mark Haines | 2015-12-04 | 1 | -0/+4 |
* | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 1 | -1/+8 |
* | Allow user to redact with an equal power | Erik Johnston | 2015-11-26 | 1 | -1/+1 |
* | Merge branch 'develop' into daniel/forgetrooms | Paul "LeoNerd" Evans | 2015-11-19 | 2 | -13/+22 |
|\ |
|
| * | Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data | Mark Haines | 2015-11-19 | 1 | -5/+5 |
| |\ |
|
| | * | s/private_user_data/account_data/ | Mark Haines | 2015-11-18 | 1 | -5/+5 |
| * | | Take a boolean not a list of lambdas | Daniel Wagner-Hall | 2015-11-19 | 1 | -8/+17 |
| |/ |
|
* / | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 1 | -0/+7 |
|/ |
|
* | Always check guest = true in macaroons | Steven Hammerton | 2015-11-17 | 1 | -1/+2 |
* | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-17 | 1 | -0/+1 |
|\ |
|
| * | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 1 | -0/+1 |
* | | Share more code between macaroon validation | Steven Hammerton | 2015-11-11 | 1 | -9/+10 |
|/ |
|
* | Exchange 3pid invites for m.room.member invites | Daniel Wagner-Hall | 2015-11-05 | 1 | -35/+38 |
* | Merge pull request #347 from matrix-org/markjh/check_filter | Mark Haines | 2015-11-05 | 1 | -18/+2 |
|\ |
|
| * | Remove fields that are both unspecified and unused from the filter checks, ch... | Mark Haines | 2015-11-04 | 1 | -18/+2 |
* | | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 2 | -41/+55 |
|/ |
|
* | Include room tags in v2 /sync | Mark Haines | 2015-11-02 | 1 | -0/+7 |
* | Merge pull request #323 from matrix-org/daniel/sizelimits | Daniel Wagner-Hall | 2015-10-23 | 2 | -1/+30 |
|\ |
|
| * | Reject events which are too large | Daniel Wagner-Hall | 2015-10-22 | 2 | -1/+30 |
* | | Merge pull request #325 from matrix-org/markjh/filter_dicts | Mark Haines | 2015-10-22 | 1 | -3/+22 |
|\ \ |
|
| * | | Don't assume that the event has a room_id or sender | Mark Haines | 2015-10-22 | 1 | -2/+2 |
| * | | Support filtering events represented as dicts. | Mark Haines | 2015-10-22 | 1 | -3/+22 |
* | | | Filter room ids before hitting the database | Erik Johnston | 2015-10-21 | 1 | -0/+20 |
|/ / |
|
* | | Docstring | Erik Johnston | 2015-10-20 | 1 | -0/+5 |
* | | Refactor api.filtering to have a Filter API | Erik Johnston | 2015-10-20 | 1 | -98/+55 |
|/ |
|
* | Allow rejecting invites | Daniel Wagner-Hall | 2015-10-20 | 1 | -1/+5 |
* | Stuff signed data in a standalone object | Daniel Wagner-Hall | 2015-10-16 | 1 | -7/+14 |
* | Add signing host and keyname to signatures | Daniel Wagner-Hall | 2015-10-16 | 1 | -5/+9 |
* | Verify third party ID server certificates | Daniel Wagner-Hall | 2015-10-16 | 1 | -0/+11 |
* | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-15 | 1 | -18/+44 |
|\ |
|
| * | Update the v2 filters to support filtering presence and remove support for pu... | Mark Haines | 2015-10-13 | 1 | -18/+44 |
* | | Remove unnecessary class-wrapping | Daniel Wagner-Hall | 2015-10-13 | 1 | -3/+3 |
* | | Add some docstring | Daniel Wagner-Hall | 2015-10-13 | 1 | -0/+15 |
* | | Move event contents into third_party_layout field | Daniel Wagner-Hall | 2015-10-13 | 1 | -9/+12 |
* | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-06 | 1 | -1/+0 |
|\| |
|
| * | Remove log line that was generated whenever an error was created. We are now ... | Mark Haines | 2015-10-06 | 1 | -1/+0 |
* | | Add third party invites to auth_events for joins | Daniel Wagner-Hall | 2015-10-06 | 1 | -0/+5 |
* | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-05 | 2 | -1/+25 |
|\| |
|
| * | Add 'trusted_private_chat' to room creation presets | Erik Johnston | 2015-10-02 | 1 | -0/+1 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable | Erik Johnston | 2015-10-02 | 3 | -19/+140 |
| |\ |
|
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable | Erik Johnston | 2015-09-14 | 1 | -8/+27 |
| |\ \ |
|
| * | | | Also check the domains for membership state_keys | Erik Johnston | 2015-09-01 | 1 | -0/+9 |
| * | | | Merge branch 'erikj/check_room_exists' into erikj/unfederatable | Erik Johnston | 2015-09-01 | 1 | -0/+8 |
| |\ \ \ |
|
| * | | | | Check against sender rather than event_id | Erik Johnston | 2015-09-01 | 1 | -3/+3 |
| * | | | | Add flag which disables federation of the room | Erik Johnston | 2015-09-01 | 1 | -1/+15 |
* | | | | | Implement third party identifier invites | Daniel Wagner-Hall | 2015-10-01 | 2 | -1/+33 |
| |_|_|/
|/| | | |
|
* | | | | synapse/api/errors.py:RoomError was unused | Mark Haines | 2015-09-22 | 1 | -5/+0 |
* | | | | Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_be... | Mark Haines | 2015-09-21 | 2 | -11/+51 |
|\ \ \ \ |
|
| * | | | | Clarify which event is returned by check_user_was_in_room | Mark Haines | 2015-09-21 | 1 | -2/+3 |
| * | | | | Remove undocumented and unimplemented 'feedback' parameter from the Client-Se... | Mark Haines | 2015-09-09 | 1 | -11/+0 |
| * | | | | Allow rooms/{roomId}/state for a room that has been left | Mark Haines | 2015-09-09 | 1 | -1/+2 |
| * | | | | Allow room initialSync for users that have left the room, returning a snapsho... | Mark Haines | 2015-09-09 | 1 | -0/+49 |
* | | | | | Merge pull request #256 from matrix-org/auth | Daniel Wagner-Hall | 2015-09-14 | 1 | -3/+89 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | s/user_id/user/g for consistency | Daniel Wagner-Hall | 2015-09-01 | 1 | -10/+10 |
| * | | | | Attempt to validate macaroons | Daniel Wagner-Hall | 2015-08-26 | 1 | -9/+95 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #265 from matrix-org/erikj/check_room_exists | Erik Johnston | 2015-09-14 | 1 | -0/+8 |
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/| |
|
| * | | Fix tests | Erik Johnston | 2015-09-01 | 1 | -1/+1 |
| * | | Check room exists when authenticating an event, by asserting they reference a... | Erik Johnston | 2015-09-01 | 1 | -0/+8 |
| |/ |
|
* | | Check domain of events properly | Daniel Wagner-Hall | 2015-09-01 | 1 | -1/+3 |
* | | Allow users to redact their own events | Daniel Wagner-Hall | 2015-08-28 | 1 | -8/+25 |
|/ |
|
* | Stop looking up "admin", which we never read | Daniel Wagner-Hall | 2015-08-25 | 1 | -3/+1 |
* | Re-wrap line | Daniel Wagner-Hall | 2015-08-25 | 1 | -3/+1 |
* | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 1 | -10/+7 |
* | Merge branch 'develop' into refresh | Daniel Wagner-Hall | 2015-08-20 | 2 | -0/+3 |
|\ |
|
| * | Add m.room.avatar to default power levels. Change default required power leve... | Erik Johnston | 2015-08-20 | 1 | -0/+1 |
| * | Merge pull request #233 from matrix-org/erikj/canonical_alias | Erik Johnston | 2015-08-20 | 1 | -0/+1 |
| |\ |
|
| | * | Add canonical alias to the default power levels | Erik Johnston | 2015-08-19 | 1 | -0/+1 |
| * | | Merge pull request #211 from matrix-org/email_in_use | Mark Haines | 2015-08-20 | 1 | -0/+1 |
| |\ \
| | |/
| |/| |
|
| | * | Add endpoint that proxies ID server request token and errors if the given ema... | David Baker | 2015-08-04 | 1 | -0/+1 |
* | | | s/by_token/by_access_token/g | Daniel Wagner-Hall | 2015-08-20 | 1 | -3/+3 |
|/ / |
|
* | | Set request.authenticated_entity for application services | Erik Johnston | 2015-08-18 | 1 | -0/+3 |
* | | Add missing space because linter | Daniel Wagner-Hall | 2015-08-11 | 1 | -1/+1 |
* | | Minor docs cleanup | Daniel Wagner-Hall | 2015-08-11 | 1 | -2/+7 |
* | | Remove redundant if-guard | Daniel Wagner-Hall | 2015-08-11 | 1 | -13/+12 |
|/ |
|
* | Merge pull request #203 from matrix-org/erikj/room_creation_presets | Erik Johnston | 2015-07-16 | 1 | -0/+5 |
|\ |
|
| * | Capitalize contants | Erik Johnston | 2015-07-14 | 1 | -2/+2 |
| * | Implement presets at room creation | Erik Johnston | 2015-07-13 | 1 | -0/+5 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/power_leve... | Erik Johnston | 2015-07-13 | 2 | -1/+4 |
|\| |
|
| * | Add m.room.history_visibility to newly created rooms' m.room.power_levels | Erik Johnston | 2015-07-06 | 1 | -0/+1 |
| * | Add m.room.history_visibility to list of auth events | Erik Johnston | 2015-07-03 | 1 | -1/+1 |
| * | Add basic impl for room history ACL on GET /messages client API | Erik Johnston | 2015-07-02 | 1 | -0/+2 |
* | | Sanitize power level checks | Erik Johnston | 2015-07-10 | 1 | -15/+21 |
* | | You shouldn't be able to ban/kick users with higher power levels | Erik Johnston | 2015-07-10 | 1 | -2/+5 |
|/ |
|
* | Log more when we have processed the request | Erik Johnston | 2015-06-15 | 1 | -0/+2 |
* | Typo | Erik Johnston | 2015-05-01 | 1 | -1/+1 |
* | Remove some run_on_reactors | Erik Johnston | 2015-05-01 | 1 | -3/+0 |
* | Don't log all auth events every time we call auth.check | Erik Johnston | 2015-05-01 | 1 | -1/+4 |
* | Don't wait for storage of access_token | Erik Johnston | 2015-05-01 | 1 | -1/+1 |
* | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-29 | 3 | -19/+40 |
|\ |
|
| * | Merge pull request #126 from matrix-org/csauth | Mark Haines | 2015-04-28 | 3 | -19/+32 |
| |\ |
|
| | * | Merge branch 'develop' into csauth | David Baker | 2015-04-24 | 2 | -60/+32 |
| | |\ |
|
| | * | | Dedicated error code for failed 3pid auth verification | David Baker | 2015-04-23 | 1 | -0/+1 |
| | * | | Add an error code to 'missing token' response. | David Baker | 2015-04-23 | 2 | -1/+3 |
| | * | | Merge branch 'develop' into csauth | David Baker | 2015-04-17 | 1 | -14/+11 |
| | |\ \ |
|
| | * | | | Dummy login so we can do the first POST request to get login flows without it... | David Baker | 2015-04-15 | 1 | -0/+1 |
| | * | | | Add app service auth back in to v2 register | David Baker | 2015-04-02 | 1 | -3/+1 |
| | * | | | Add shared secret auth into register v2 and switch the script over. | David Baker | 2015-04-02 | 1 | -1/+3 |
| | * | | | New registration for C/S API v2. Only ReCAPTCHA working currently. | David Baker | 2015-03-30 | 1 | -0/+2 |
| | * | | | unused import | David Baker | 2015-03-24 | 1 | -1/+1 |
| | * | | | 1) Pushers are now associated with an access token | David Baker | 2015-03-24 | 1 | -18/+25 |
| * | | | | Merge branch 'develop' into invite_power_level | Paul "LeoNerd" Evans | 2015-04-27 | 2 | -38/+14 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| * | | | | Also remember to check 'invite' level for changes | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -0/+1 |
| * | | | | Initial implementation of an 'invite' power_level | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -0/+7 |
* | | | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-24 | 2 | -60/+32 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | No commas here, otherwise our error string constants become tuples. | David Baker | 2015-04-24 | 1 | -2/+2 |
| * | | | | Neater fetching of user's auth level in a room - squash to int() at access ti... | Paul "LeoNerd" Evans | 2015-04-22 | 1 | -35/+12 |
| * | | | | Appease pep8 | Paul "LeoNerd" Evans | 2015-04-22 | 1 | -1/+0 |
| |/ / / |
|
| * | | | Much neater fetching of defined powerlevels from m.room.power_levels state event | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -31/+21 |
| * | | | Remove debugging print statement accidentally committed | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -1/+0 |
| * | | | Sanitise a user's powerlevel to an int() before numerical comparison, because... | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -0/+7 |
| | |/
| |/| |
|
* | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-20 | 1 | -13/+10 |
|\| | |
|
| * | | Neater implementation of membership change auth checks, ensuring we can't for... | Paul "LeoNerd" Evans | 2015-04-15 | 1 | -18/+10 |
| * | | Ensure that non-room-members cannot ban others, even if they do have enough p... | Paul "LeoNerd" Evans | 2015-04-15 | 1 | -0/+5 |
* | | | Add a version 2 of the key server api | Mark Haines | 2015-04-14 | 1 | -0/+1 |
|/ / |
|
* / | Fix a bug which causes a send event level of 0 to not be honoured. | Kegan Dougal | 2015-04-07 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #109 from matrix-org/default_registration | Erik Johnston | 2015-03-18 | 1 | -0/+1 |
|\ |
|
| * | Implement registering with shared secret. | Erik Johnston | 2015-03-13 | 1 | -0/+1 |
* | | @cached() annotate get_user_by_token() - achieves a minor DB performance impr... | Paul "LeoNerd" Evans | 2015-03-17 | 1 | -1/+1 |
* | | Remove concept of context.auth_events, instead use context.current_state | Erik Johnston | 2015-03-16 | 1 | -6/+0 |
* | | Make context.auth_events grap auth events from current state. Otherwise auth ... | Erik Johnston | 2015-03-16 | 1 | -1/+7 |
* | | Respect ban membership | Erik Johnston | 2015-03-16 | 1 | -5/+17 |
|/ |
|
* | Add RegisterFallbackResource to /_matrix/static/client/register | Kegan Dougal | 2015-02-23 | 1 | -0/+1 |
* | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 1 | -7/+14 |
|\ |
|
| * | During room intial sync, only calculate current state once. | Erik Johnston | 2015-02-09 | 1 | -7/+14 |
* | | Modify auth.get_user_by_req for authing appservices directly. | Kegan Dougal | 2015-02-09 | 1 | -18/+16 |
* | | Grant ASes the ability to create alias in their own namespace. | Kegan Dougal | 2015-02-06 | 2 | -1/+14 |
* | | Add m.login.application_service registration procedure. | Kegan Dougal | 2015-02-05 | 1 | -0/+1 |
* | | Fix unit tests. | Kegan Dougal | 2015-02-05 | 1 | -0/+6 |
* | | Add CS extension for masquerading as users within the namespaces specified by... | Kegan Dougal | 2015-02-05 | 1 | -0/+23 |
* | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 2 | -9/+13 |
|\| |
|
| * | Merge branch 'signature_failures' of github.com:matrix-org/synapse into feder... | Erik Johnston | 2015-02-04 | 1 | -6/+6 |
| |\ |
|
| | * | Change context.auth_events to what the auth_events would be bases on context.... | Erik Johnston | 2015-02-04 | 1 | -6/+6 |
| * | | Apply sanity to the transport client interface. Convert 'make_join' and 'send... | Erik Johnston | 2015-02-04 | 1 | -1/+7 |
| |/ |
|
| * | Keep around the old (buggy) version of the prune_event function so that we ca... | Erik Johnston | 2015-02-03 | 1 | -2/+0 |
* | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-02 | 4 | -20/+297 |
|\| |
|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 1 | -0/+229 |
| |\ |
|
| | * | Use 'in' to test if the key exists, remove unused _filters_for_user | Mark Haines | 2015-01-30 | 1 | -6/+2 |
| | * | Unused import | Mark Haines | 2015-01-30 | 1 | -2/+0 |
| | * | Create a separate filter object to do the actual filtering, so that we can | Mark Haines | 2015-01-29 | 1 | -112/+108 |
| | * | Merge branch 'develop' into client_v2_filter | Mark Haines | 2015-01-29 | 1 | -0/+1 |
| | |\ |
|
| | * | | Fix code-style | Mark Haines | 2015-01-29 | 1 | -13/+6 |
| | * | | Merge changes from develop | Mark Haines | 2015-01-29 | 2 | -3/+38 |
| | |\ \ |
|
| | * | | | Add basic filtering public API unit tests. Use defers in the right places. | Kegan Dougal | 2015-01-29 | 1 | -4/+7 |
| | * | | | Implement filter algorithm. Add basic event type unit tests to assert it works. | Kegan Dougal | 2015-01-29 | 1 | -0/+49 |
| | * | | | Add filtering public API; outline filtering algorithm. | Kegan Dougal | 2015-01-29 | 1 | -8/+52 |
| | * | | | Add filtering.filter_events function, with stub passes_filter function. | Kegan Dougal | 2015-01-29 | 1 | -0/+15 |
| | * | | | Add filter JSON sanity checks. | Kegan Dougal | 2015-01-28 | 1 | -4/+105 |
| | * | | | Move storage of user filters into real datastore layer; now have to mock it o... | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -23/+4 |
| | * | | | Have the Filtering API return Deferreds, so we can do the Datastore implement... | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -2/+14 |
| | * | | | Initial trivial implementation of an actual 'Filtering' object; move storage ... | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -0/+41 |
| * | | | | Fix bug where we superfluously asked for current state. Change API of /query_... | Erik Johnston | 2015-01-30 | 1 | -0/+2 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 3 | -3/+40 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | * | | | Code style fixes. | Mark Haines | 2015-01-29 | 1 | -0/+1 |
| | | |/
| | |/| |
|
| | * | | Merge pull request #36 from matrix-org/device_id_from_access_token | Mark Haines | 2015-01-28 | 1 | -3/+8 |
| | |\ \ |
|
| | | * | | Rename ClientID to ClientInfo since it is a pair of IDs rather than a single ... | Mark Haines | 2015-01-28 | 1 | -2/+2 |
| | | * | | Add a : to the doc string after the type of the return value | Mark Haines | 2015-01-28 | 1 | -1/+1 |
| | | * | | Extract the id token of the token when authing users, include the token and d... | Mark Haines | 2015-01-28 | 1 | -3/+5 |
| | | * | | Return the device_id from get_auth_by_req | Mark Haines | 2015-01-28 | 1 | -2/+5 |
| | | |/ |
|
| | * | | Merge branch 'develop' into pushers | David Baker | 2015-01-28 | 2 | -4/+6 |
| | |\| |
|
| | * | | Add slightly pedantic trailing slash error. | David Baker | 2015-01-23 | 1 | -1/+6 |
| | * | | right super() param | David Baker | 2015-01-23 | 1 | -1/+1 |
| | * | | As yet fairly untested GET API for push rules | David Baker | 2015-01-22 | 1 | -1/+13 |
| | * | | Oops: second part of commit dc938606 | David Baker | 2015-01-22 | 1 | -0/+12 |
| | * | | Merge branch 'develop' into pushers | David Baker | 2015-01-13 | 6 | -6/+6 |
| | |\ \ |
|
| | * \ \ | Merge branch 'develop' into pushers | David Baker | 2014-12-18 | 9 | -632/+73 |
| | |\ \ \ |
|
| | * \ \ \ | Merge branch 'develop' into pushers | David Baker | 2014-12-02 | 2 | -73/+78 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Merge branch 'develop' into pushers | David Baker | 2014-11-20 | 4 | -4/+9 |
| | |\ \ \ \ \ |
|
| | * | | | | | | Start creating a module to do generic notifications (just prints them to stdo... | David Baker | 2014-11-19 | 1 | -0/+1 |
| * | | | | | | | Start implementing auth conflict res | Erik Johnston | 2015-01-28 | 2 | -17/+27 |
* | | | | | | | | Add stub application services REST API. | Kegan Dougal | 2015-01-27 | 1 | -0/+1 |
| |_|_|_|_|_|/
|/| | | | | | |
|
* | | | | | | | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 1 | -0/+1 |
|/ / / / / / |
|
* | | | | / | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 1 | -4/+5 |
| |_|_|_|/
|/| | | | |
|
* | | | | | SYN-154: Tweak how the m.room.create check is done. | Kegan Dougal | 2015-01-07 | 1 | -10/+1 |
* | | | | | SYN-154: Better error messages when joining an unknown room by ID. | Kegan Dougal | 2015-01-07 | 1 | -1/+10 |
* | | | | | Update copyright notices | Mark Haines | 2015-01-06 | 6 | -6/+6 |
| |_|_|/
|/| | | |
|
* | | | | Kill off synapse.api.events.* | Erik Johnston | 2014-12-16 | 6 | -580/+1 |
* | | | | Make auth module use EventTypes constants | Erik Johnston | 2014-12-12 | 1 | -27/+23 |
* | | | | Validate message, topic and name event contents | Erik Johnston | 2014-12-12 | 1 | -0/+5 |
* | | | | Fix stream test. Make sure we add join to auth_events for invitiations | Erik Johnston | 2014-12-12 | 1 | -0/+6 |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-11 | 2 | -0/+2 |
|\ \ \ \ |
|
| * | | | | Limit the size of images that are thumbnailed serverside. Limit the size of f... | Mark Haines | 2014-12-11 | 1 | -0/+1 |
| * | | | | Merge branch 'develop' into media_repository | Mark Haines | 2014-12-10 | 2 | -72/+77 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| * | | | | Get uploads working with new media repo | Mark Haines | 2014-12-02 | 1 | -0/+1 |
* | | | | | PEP8 | Erik Johnston | 2014-12-09 | 1 | -1/+1 |
* | | | | | Remove unused import | Erik Johnston | 2014-12-08 | 1 | -1/+0 |
* | | | | | Various typos and bug fixes. | Erik Johnston | 2014-12-08 | 1 | -7/+9 |
* | | | | | Start making more things use EventContext rather than event.* | Erik Johnston | 2014-12-05 | 1 | -13/+20 |
* | | | | | Begin converting things to use the new Event structure | Erik Johnston | 2014-12-04 | 1 | -9/+2 |
* | | | | | WIP for new way of managing events. | Erik Johnston | 2014-12-03 | 2 | -6/+16 |
* | | | | | Change DomainSpecificString so that it doesn't use a HomeServer object | Erik Johnston | 2014-12-02 | 1 | -1/+1 |
| |/ / /
|/| | | |
|
* | | | | Fix bugs when joining a remote room that has dodgy event graphs. This should ... | Erik Johnston | 2014-11-27 | 1 | -2/+8 |
* | | | | Fix bugs in invite/join dances. | Erik Johnston | 2014-11-25 | 2 | -70/+69 |
|/ / / |
|
* | / | Add missing None check | Erik Johnston | 2014-11-24 | 1 | -1/+1 |
| |/
|/| |
|
* | | Fix pep8 codestyle warnings | Mark Haines | 2014-11-20 | 2 | -2/+2 |
* | | Use module loggers rather than the root logger. Exceptions caused by bad clie... | Mark Haines | 2014-11-20 | 2 | -2/+7 |
|/ |
|
* | Only users can set state events which have their own user_id | Erik Johnston | 2014-11-19 | 1 | -0/+20 |
* | replace user_id with sender | Mark Haines | 2014-11-19 | 1 | -1/+3 |
* | SYN-144: Remove bad keys from pdu json objects, convert age_ts to age | Mark Haines | 2014-11-18 | 1 | -1/+12 |
* | Null check when determining default power levels | Mark Haines | 2014-11-18 | 1 | -1/+2 |
* | Fix auth to correctly handle initial creation of rooms | Erik Johnston | 2014-11-18 | 1 | -3/+21 |
* | Merge PDUs and Events into one object | Mark Haines | 2014-11-14 | 2 | -0/+8 |
* | Fix bugs with invites/joins across federatiom. | Erik Johnston | 2014-11-12 | 1 | -3/+16 |