Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Refactor do_invite_join | Erik Johnston | 2015-09-17 | 2 | -31/+56 | |
* | | | | | | | Merge pull request #291 from matrix-org/receipt-validation | Kegsay | 2015-10-01 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Validate the receipt type before passing it on to the receipt handler | Kegan Dougal | 2015-10-01 | 1 | -0/+4 | |
|/ / / / / / / | ||||||
* | | | | | | | Don't change cwd in synctl | Erik Johnston | 2015-10-01 | 1 | -2/+2 | |
* | | | | | | | Merge pull request #287 from matrix-org/erikj/canonical_alias | Erik Johnston | 2015-09-30 | 1 | -1/+10 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | Remove double indentation | Erik Johnston | 2015-09-30 | 1 | -7/+6 | |
| * | | | | | | Set m.room.canonical_alias on room creation. | Erik Johnston | 2015-09-23 | 1 | -1/+11 | |
* | | | | | | | Merge pull request #288 from matrix-org/markjh/unused_definitions | Mark Haines | 2015-09-28 | 18 | -588/+162 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix scripts-dev/definitions.py argparse options | Mark Haines | 2015-09-23 | 1 | -1/+1 | |
| * | | | | | | | Remove unused _execute_and_decode from scripts/synapse_port_db | Mark Haines | 2015-09-23 | 1 | -2/+0 | |
| * | | | | | | | synapse/storage/state.py: _make_group_id was unused | Mark Haines | 2015-09-23 | 1 | -6/+0 | |
| * | | | | | | | Remove unused functions from synapse/storage/signatures.py | Mark Haines | 2015-09-23 | 1 | -112/+0 | |
| * | | | | | | | synapse/storage/roommember.py:_get_members_query was unused | Mark Haines | 2015-09-23 | 1 | -6/+0 | |
| * | | | | | | | Remove unused functions from synapse/storage/events.py | Mark Haines | 2015-09-23 | 1 | -11/+0 | |
| * | | | | | | | Remove unused functions from synapse/storage/event_federation.py | Mark Haines | 2015-09-23 | 1 | -71/+0 | |
| * | | | | | | | synapse/storage/_base.py:_simple_max_id was unused | Mark Haines | 2015-09-23 | 1 | -18/+0 | |
| * | | | | | | | synapse/storage/_base.py:_simple_delete was unused | Mark Haines | 2015-09-23 | 1 | -10/+0 | |
| * | | | | | | | synapse/storage/_base.py:_simple_selectupdate_one was unused | Mark Haines | 2015-09-23 | 2 | -51/+0 | |
| * | | | | | | | synapse/state.py:_get_state_key_from_event was unused | Mark Haines | 2015-09-23 | 1 | -4/+0 | |
| * | | | | | | | synapse/handlers/room.py:_should_invite_join was unused | Mark Haines | 2015-09-23 | 1 | -26/+0 | |
| * | | | | | | | synapse/handlers/federation.py:_handle_auth_events was unused | Mark Haines | 2015-09-23 | 1 | -49/+0 | |
| * | | | | | | | Use argparse for definition finder | Mark Haines | 2015-09-23 | 1 | -26/+38 | |
| * | | | | | | | synapse/storage/event_federation.py:_get_auth_events is unused | Mark Haines | 2015-09-22 | 1 | -21/+0 | |
| * | | | | | | | synapse/storage/_base.py:_execute_and_decode was unused | Mark Haines | 2015-09-22 | 1 | -3/+0 | |
| * | | | | | | | Move NullSource out of synapse and into tests since it is only used by the tests | Mark Haines | 2015-09-22 | 2 | -17/+17 | |
| * | | | | | | | Note that GzipFile was removed in comment that referenced it | Mark Haines | 2015-09-22 | 1 | -0/+1 | |
| * | | | | | | | synapse/app/homeserver.py:GzipFile was unused | Mark Haines | 2015-09-22 | 1 | -6/+0 | |
| * | | | | | | | synapse/streams/events.py:StreamSource was unused | Mark Haines | 2015-09-22 | 1 | -12/+0 | |
| * | | | | | | | synapse/api/errors.py:RoomError was unused | Mark Haines | 2015-09-22 | 1 | -5/+0 | |
| * | | | | | | | synapse/util/__init__.py:unwrap_deferred was unused | Mark Haines | 2015-09-22 | 1 | -28/+0 | |
| * | | | | | | | synapse/storage/_base.py:Table was unused | Mark Haines | 2015-09-22 | 2 | -130/+2 | |
| * | | | | | | | Add dev script for finding where functions are called from, and finding funct... | Mark Haines | 2015-09-22 | 1 | -0/+130 | |
* | | | | | | | | Merge pull request #290 from matrix-org/daniel/synctl | Daniel Wagner-Hall | 2015-09-28 | 1 | -26/+28 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | Fix restart | Daniel Wagner-Hall | 2015-09-24 | 1 | -2/+2 | |
| * | | | | | | | Allow config file path to be configurable in in synctl | Daniel Wagner-Hall | 2015-09-24 | 1 | -24/+26 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #289 from matrix-org/markjh/fix_sql | Erik Johnston | 2015-09-24 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Fix order of ON constraints in _get_rooms_for_user_where_membership_is_txn | Mark Haines | 2015-09-24 | 1 | -6/+6 | |
| |/ / / / / | ||||||
* | | | | | | Fix demo/start.sh to work with --report-stats | Erik Johnston | 2015-09-23 | 1 | -0/+1 | |
* | | | | | | Merge pull request #282 from matrix-org/erikj/missing_keys | Erik Johnston | 2015-09-23 | 1 | -4/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix bug where we sometimes didn't fetch all the keys requested for a | Erik Johnston | 2015-09-17 | 1 | -4/+3 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #271 from matrix-org/erikj/default_history | Erik Johnston | 2015-09-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Change default history visibility for private rooms | Erik Johnston | 2015-09-09 | 1 | -1/+1 | |
* | | | | | | Merge pull request #286 from matrix-org/markjh/stream_config_repr | Mark Haines | 2015-09-22 | 1 | -3/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Define __repr__ methods for StreamConfig and PaginationConfig | Mark Haines | 2015-09-22 | 1 | -3/+8 | |
* | | | | | | | Merge pull request #285 from matrix-org/daniel/metrics-2 | Daniel Wagner-Hall | 2015-09-22 | 24 | -78/+438 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Add some docstrings | Daniel Wagner-Hall | 2015-09-22 | 2 | -0/+4 | |
| * | | | | | | Catch stats-reporting errors | Daniel Wagner-Hall | 2015-09-22 | 1 | -4/+7 | |
| * | | | | | | Add docstring | Daniel Wagner-Hall | 2015-09-22 | 1 | -0/+6 | |
| * | | | | | | Front-load spaces | Daniel Wagner-Hall | 2015-09-22 | 1 | -7/+7 | |
| * | | | | | | Implement configurable stats reporting | Daniel Wagner-Hall | 2015-09-22 | 24 | -78/+425 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_be... | Mark Haines | 2015-09-21 | 9 | -122/+267 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Clarify that room_initial_sync returns a python dict | Mark Haines | 2015-09-21 | 1 | -1/+1 | |
| * | | | | | | Fix doc string to point at the right class | Mark Haines | 2015-09-21 | 1 | -2/+3 | |
| * | | | | | | Add explicit "elif event.membership == Membership.LEAVE" for clarity | Mark Haines | 2015-09-21 | 1 | -1/+2 | |
| * | | | | | | Clamp the "to" token for /rooms/{roomId}/messages to when the user left | Mark Haines | 2015-09-21 | 1 | -0/+4 | |
| * | | | | | | Clarify which event is returned by check_user_was_in_room | Mark Haines | 2015-09-21 | 1 | -2/+3 | |
| * | | | | | | Allow users to GET individual state events for rooms that they have left | Mark Haines | 2015-09-10 | 2 | -12/+18 | |
| * | | | | | | Allow users that have left a room to get the messages that happend in the roo... | Mark Haines | 2015-09-09 | 2 | -5/+45 | |
| * | | | | | | Remove undocumented and unimplemented 'feedback' parameter from the Client-Se... | Mark Haines | 2015-09-09 | 6 | -42/+5 | |
| * | | | | | | Allow users that have left the room to view the member list from the point th... | Mark Haines | 2015-09-09 | 3 | -43/+15 | |
| * | | | | | | Allow rooms/{roomId}/state for a room that has been left | Mark Haines | 2015-09-09 | 2 | -6/+15 | |
| * | | | | | | Allow room initialSync for users that have left the room, returning a snapsho... | Mark Haines | 2015-09-09 | 3 | -9/+140 | |
| * | | | | | | Include rooms that a user has left in an initialSync. Include the state and m... | Mark Haines | 2015-09-08 | 1 | -6/+21 | |
| * | | | | | | Include the event_id and stream_ordering of membership events when looking up... | Mark Haines | 2015-09-08 | 1 | -2/+4 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #267 from matrix-org/markjh/missing_requirements | Mark Haines | 2015-09-18 | 2 | -11/+29 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Add nacl.bindings to the list of modules checked. Re-arrange import order to ... | Mark Haines | 2015-09-01 | 1 | -3/+3 | |
| * | | | | | Print an example "pip install" line for a missing requirement | Mark Haines | 2015-09-01 | 2 | -8/+26 | |
* | | | | | | Remove run_on_reactor | Erik Johnston | 2015-09-17 | 1 | -3/+0 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-09-16 | 2 | -1/+10 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'hotfixes-v0.10.0-r2' of github.com:matrix-org/synapse v0.10.0-r2 | Erik Johnston | 2015-09-16 | 6 | -11/+39 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Update changelog | Erik Johnston | 2015-09-16 | 1 | -1/+3 | |
| | * | | | | | Merge branch 'erikj/update_extremeties' into hotfixes-v0.10.0-r2 | Erik Johnston | 2015-09-16 | 2 | -0/+11 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | Bump change log | Erik Johnston | 2015-09-10 | 1 | -0/+1 | |
| | * | | | | | | Fix adding threepids to an existing account | David Baker | 2015-09-10 | 1 | -0/+1 | |
| | * | | | | | | Bump version and change log | Erik Johnston | 2015-09-10 | 2 | -1/+7 | |
| | * | | | | | | Various bug fixes to crypto.keyring | Erik Johnston | 2015-09-10 | 1 | -10/+17 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #281 from matrix-org/erikj/update_extremeties | Erik Johnston | 2015-09-15 | 2 | -0/+11 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | "Comments" | Erik Johnston | 2015-09-15 | 1 | -0/+6 | |
| * | | | | | | When updating a stored event from outlier to non-outlier, remember to update ... | Erik Johnston | 2015-09-15 | 2 | -0/+5 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #272 from matrix-org/daniel/insecureclient | Daniel Wagner-Hall | 2015-09-15 | 7 | -12/+55 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use shorter config key name | Daniel Wagner-Hall | 2015-09-15 | 2 | -4/+5 | |
| * | | | | | | Rename context factory | Daniel Wagner-Hall | 2015-09-15 | 2 | -5/+5 | |
| * | | | | | | Merge branch 'master' into daniel/insecureclient | Daniel Wagner-Hall | 2015-09-15 | 2 | -1/+6 | |
| |\| | | | | | ||||||
| * | | | | | | Merge branch 'daniel/insecureclient' into develop | Daniel Wagner-Hall | 2015-09-09 | 7 | -12/+54 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Better document the intent of the insecure SSL setting | Daniel Wagner-Hall | 2015-09-09 | 1 | -2/+6 | |
| | * | | | | | | Fix random formatting | Daniel Wagner-Hall | 2015-09-09 | 2 | -2/+2 | |
| | * | | | | | | Allow configuration to ignore invalid SSL certs | Daniel Wagner-Hall | 2015-09-09 | 7 | -12/+50 | |
* | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-09-15 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | Bump version/changelog v0.10.0-r1 | Erik Johnston | 2015-09-08 | 2 | -1/+6 | |
* | | | | | | | | Merge pull request #280 from matrix-org/paul/sighup | Paul Evans | 2015-09-15 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Hacky attempt at catching SIGHUP and rotating the logfile around | Paul "LeoNerd" Evans | 2015-09-14 | 1 | -0/+14 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #256 from matrix-org/auth | Daniel Wagner-Hall | 2015-09-14 | 7 | -19/+243 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | s/user_id/user/g for consistency | Daniel Wagner-Hall | 2015-09-01 | 6 | -25/+25 | |
| * | | | | | | | | Turn TODO into thing which actually will fail | Daniel Wagner-Hall | 2015-08-26 | 1 | -6/+9 | |
| * | | | | | | | | Merge branch 'mergeeriksmadness' into auth | Daniel Wagner-Hall | 2015-08-26 | 4 | -12/+50 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Attempt to validate macaroons | Daniel Wagner-Hall | 2015-08-26 | 7 | -36/+257 | |
| | | | | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable | Erik Johnston | 2015-09-14 | 15 | -36/+120 | |
| | | | | | | | |\ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #265 from matrix-org/erikj/check_room_exists | Erik Johnston | 2015-09-14 | 2 | -8/+37 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | Drop unused index | Erik Johnston | 2015-09-14 | 1 | -0/+16 | |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #274 from matrix-org/add_threepid_fix | David Baker | 2015-09-10 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix adding threepids to an existing account | David Baker | 2015-09-10 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge pull request #270 from matrix-org/markjh/fix_metrics | Erik Johnston | 2015-09-10 | 1 | -4/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Check that /proc/self/fd exists before listing it | Mark Haines | 2015-09-07 | 1 | -0/+4 | |
| * | | | | | | | | | | | The maxrss reported by getrusage is in kilobytes, not pages | Mark Haines | 2015-09-07 | 1 | -4/+3 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #273 from matrix-org/erikj/key_fetch_fix | Erik Johnston | 2015-09-10 | 1 | -10/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Various bug fixes to crypto.keyring | Erik Johnston | 2015-09-09 | 1 | -10/+17 | |
|/ / / / / / / / / / | ||||||
* / / / / / / / / / | Don't require pdus in check_auth script | Erik Johnston | 2015-09-09 | 1 | -2/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'master' into develop | Mark Haines | 2015-09-07 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Merge pull request #269 from matrix-org/markjh/upgrading_setuptools | Mark Haines | 2015-09-07 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Add instructions for upgrading setuptools for when people encounter a message... | Mark Haines | 2015-09-07 | 1 | -0/+6 | |
| |/ / / / / / / / | ||||||
* | | | | | / / / | Merge branch 'master' into develop | Mark Haines | 2015-09-07 | 7 | -10/+25 | |
|\| | | | | | | | | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | DEPENDENCY_LINKS was turned to a list | Erik Johnston | 2015-09-04 | 1 | -1/+1 | |
| * | | | | | | | Merge branch 'release-v0.10.0' v0.10.0 | Erik Johnston | 2015-09-03 | 110 | -1914/+5472 | |
| |\| | | | | | | ||||||
| | * | | | | | | Change log level to info | Erik Johnston | 2015-09-03 | 1 | -1/+1 | |
| | * | | | | | | Bump version and changelog | Erik Johnston | 2015-09-03 | 2 | -1/+6 | |
| | * | | | | | | Lists use 'append' | Erik Johnston | 2015-09-02 | 1 | -1/+1 | |
| | * | | | | | | Bump version and changelog v0.10.0-rc6 | Erik Johnston | 2015-09-02 | 2 | -1/+7 | |
| | * | | | | | | Update README to include RAM requirements | Erik Johnston | 2015-09-02 | 1 | -0/+1 | |
| | * | | | | | | Make port script handle empty sent_transactions table | Erik Johnston | 2015-09-02 | 1 | -6/+9 | |
* | | | | | | | | update logger to match new ambiguous script name... | Matthew Hodgson | 2015-09-03 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #262 from matrix-org/redactyoself | Daniel Wagner-Hall | 2015-09-02 | 2 | -9/+43 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Check domain of events properly | Daniel Wagner-Hall | 2015-09-01 | 1 | -1/+3 | |
| * | | | | | | | | Merge branch 'develop' into redactyoself | Daniel Wagner-Hall | 2015-08-28 | 17 | -73/+262 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Allow users to redact their own events | Daniel Wagner-Hall | 2015-08-28 | 2 | -10/+42 | |
* | | | | | | | | | | Merge pull request #266 from pztrn/develop | Erik Johnston | 2015-09-02 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Ignore development virtualenv and generated logger configuration as well. | pztrn | 2015-09-01 | 1 | -0/+3 | |
|/ / / / / / / / / | ||||||
| | | | | | | | * | 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 | 2 | -8/+37 | |
| | | | | | | | |\ | | | | | | |_|_|/ | | | | | |/| | | | ||||||
| | | | | * | | | | Fix tests | Erik Johnston | 2015-09-01 | 2 | -9/+30 | |
| | | | | * | | | | Check room exists when authenticating an event, by asserting they reference a... | Erik Johnston | 2015-09-01 | 1 | -0/+8 | |
| |_|_|_|/ / / / |/| | | | | | | | ||||||
| | | | | | | * | Check against sender rather than event_id | Erik Johnston | 2015-09-01 | 2 | -4/+4 | |
| | | | | | | * | Add flag which disables federation of the room | Erik Johnston | 2015-09-01 | 2 | -3/+21 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Merge pull request #264 from matrix-org/markjh/syweb_on_pypi | Mark Haines | 2015-09-01 | 2 | -7/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use the version of "matrix-angular-sdk" hosted on pypi | Mark Haines | 2015-09-01 | 2 | -7/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-09-01 | 7 | -376/+7 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | Merge pull request #261 from matrix-org/erikj/scripts_clean | Erik Johnston | 2015-09-01 | 6 | -380/+6 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Remove spurious .py from docs | Erik Johnston | 2015-09-01 | 1 | -1/+1 | |
| | * | | | | | | Actually add config path | Erik Johnston | 2015-08-28 | 1 | -0/+2 | |
| | * | | | | | | Clean up scripts/ | Erik Johnston | 2015-08-27 | 5 | -380/+4 | |
| * | | | | | | | Lower size of 'stateGroupCache' now that we have data from matrix.org to supp... | Erik Johnston | 2015-09-01 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | don't log the whole DB config (including postgres password...) | Matthew Hodgson | 2015-08-29 | 1 | -2/+2 | |
* | | | | | | | Merge pull request #258 from matrix-org/slowtestsmakemesad | Daniel Wagner-Hall | 2015-08-28 | 3 | -4/+39 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Remove unused import | Daniel Wagner-Hall | 2015-08-26 | 1 | -1/+0 | |
| * | | | | | | Swap out bcrypt for md5 in tests | Daniel Wagner-Hall | 2015-08-26 | 3 | -3/+39 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge branch 'release-v0.10.0' into develop | Mark Haines | 2015-08-28 | 17 | -73/+262 | |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | ||||||
| * | | | | Bump version and changelog v0.10.0-rc5 | Erik Johnston | 2015-08-27 | 2 | -1/+6 | |
| * | | | | Merge pull request #260 from matrix-org/erikj/filename_order | Erik Johnston | 2015-08-27 | 1 | -8/+14 | |
| |\ \ \ \ | ||||||
| | * | | | | Consistency | Erik Johnston | 2015-08-27 | 1 | -3/+3 | |
| | * | | | | Check for an internationalised filename first | Erik Johnston | 2015-08-27 | 1 | -8/+14 | |
| |/ / / / | ||||||
| * | | | | None check the correct variable | Erik Johnston | 2015-08-27 | 1 | -2/+3 | |
| * | | | | Check for None | Erik Johnston | 2015-08-27 | 1 | -1/+1 | |
| * | | | | Bump changelog and version v0.10.0-rc4 | Erik Johnston | 2015-08-27 | 2 | -4/+11 | |
| * | | | | Merge pull request #259 from matrix-org/markjh/unicode_content_disposition | Erik Johnston | 2015-08-27 | 3 | -12/+43 | |
| |\ \ \ \ | ||||||
| | * | | | | Give a sensible error message if the filename is invalid UTF-8 | Mark Haines | 2015-08-26 | 2 | -2/+8 | |
| | * | | | | Handle unicode filenames given when downloading or received over federation | Mark Haines | 2015-08-26 | 1 | -5/+21 | |
| | * | | | | Allow non-ascii filenames for attachments | Mark Haines | 2015-08-26 | 3 | -8/+17 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #252 from matrix-org/erikj/typing_loop | Erik Johnston | 2015-08-26 | 1 | -9/+5 | |
| |\ \ \ \ | ||||||
| | * | | | | Remove needless existence checks | Erik Johnston | 2015-08-26 | 1 | -7/+3 | |
| | * | | | | Don't loop over all rooms ever in typing.get_new_events_for_user | Erik Johnston | 2015-08-26 | 1 | -2/+2 | |
| |/ / / / | ||||||
| * | | | | Bump changelog and version v0.10.0-rc3 | Erik Johnston | 2015-08-25 | 2 | -1/+18 | |
| * | | | | Merge pull request #250 from matrix-org/erikj/generated_directory | Erik Johnston | 2015-08-25 | 1 | -2/+15 | |
| |\ \ \ \ | ||||||
| | * | | | | Update config doc | Erik Johnston | 2015-08-25 | 1 | -1/+2 | |
| | * | | | | s/--generated-directory/--keys-directory/ | Erik Johnston | 2015-08-25 | 1 | -7/+7 | |
| | * | | | | Add config option to specify where generated files should be dumped | Erik Johnston | 2015-08-25 | 1 | -2/+14 | |
| * | | | | | Merge pull request #249 from matrix-org/erikj/allow_config_path_dirs | Erik Johnston | 2015-08-25 | 1 | -6/+34 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Warn if we encounter unexpected files in config directories | Erik Johnston | 2015-08-25 | 1 | -7/+17 | |
| | |/ / / / | ||||||
| | * / / / | Allow specifying directories as config files | Erik Johnston | 2015-08-25 | 1 | -6/+24 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #245 from matrix-org/erikj/configurable_client_location | Erik Johnston | 2015-08-25 | 3 | -14/+30 | |
| |\ \ \ \ | ||||||
| | * | | | | Print the correct pip install line when failing due to lack of matrix-angular... | Erik Johnston | 2015-08-25 | 2 | -8/+9 | |
| | * | | | | Update the log message | Erik Johnston | 2015-08-25 | 1 | -5/+10 | |
| | * | | | | Revert previous commit. Instead, always download matrix-angular-sdk as a requ... | Erik Johnston | 2015-08-25 | 1 | -3/+7 | |
| | * | | | | Remove dependency on matrix-angular-sdk | Erik Johnston | 2015-08-25 | 2 | -6/+9 | |
| | * | | | | Allow specifying a directory to host a web client from | Erik Johnston | 2015-08-25 | 2 | -3/+6 | |
| * | | | | | Merge pull request #246 from matrix-org/erikj/config_helper_function | Erik Johnston | 2015-08-25 | 1 | -0/+30 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Fix typo when using sys.stderr.write | Erik Johnston | 2015-08-25 | 1 | -1/+1 | |
| | * | | | | Add utility to parse config and print out a key | Erik Johnston | 2015-08-25 | 1 | -0/+30 | |
| |/ / / / | ||||||
| * | | | | Bump version and changelog v0.10.0-rc2 | Erik Johnston | 2015-08-24 | 2 | -1/+11 | |
| * | | | | Do auth checks *before* persisting the event | Erik Johnston | 2015-08-24 | 1 | -16/+16 | |
| * | | | | Merge pull request #242 from matrix-org/erikj/pushers_ephemeral_events | Erik Johnston | 2015-08-24 | 3 | -6/+19 | |
| |\ \ \ \ | ||||||
| | * | | | | Don't make pushers handle presence/typing events | Erik Johnston | 2015-08-24 | 3 | -6/+19 | |
| |/ / / / | ||||||
| * | | | | Don't insert events into 'event_*_extremeties' tables if they're outliers | Erik Johnston | 2015-08-23 | 1 | -2/+8 | |
| * | | | | Actually check if event_id isn't returned by _get_state_groups | Erik Johnston | 2015-08-21 | 1 | -2/+9 | |
| * | | | | Upate changelog v0.10.0-rc1 | Erik Johnston | 2015-08-21 | 1 | -1/+1 | |
| * | | | | Upate changelog | Erik Johnston | 2015-08-21 | 1 | -0/+3 | |
| * | | | | Merge branch 'erikj/user_dedup' into release-v0.10.0 | Erik Johnston | 2015-08-21 | 4 | -12/+48 | |
| |\ \ \ \ | ||||||
| | * | | | | Doc string | Erik Johnston | 2015-08-21 | 1 | -0/+6 | |
| | * | | | | When logging in fetch user by user_id case insensitively, *unless* there are ... | Erik Johnston | 2015-08-21 | 3 | -12/+31 | |
| | * | | | | Don't allow people to register user ids which only differ by case to an exist... | Erik Johnston | 2015-08-21 | 2 | -2/+13 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #254 from matrix-org/markjh/tox_setuptools | Mark Haines | 2015-08-26 | 3 | -5/+37 | |
|\ \ \ \ \ | ||||||
| * | | | | | Pass an empty list of arguments to tox if no arguments are given | Mark Haines | 2015-08-26 | 1 | -0/+2 | |
| * | | | | | Install tox locally if it wasn't already installed when running setup.py test | Mark Haines | 2015-08-26 | 1 | -2/+10 | |
| * | | | | | Make 'setup.py test' run tox | Mark Haines | 2015-08-26 | 3 | -5/+27 | |
* | | | | | | Merge pull request #255 from matrix-org/mergeeriksmadness | Daniel Wagner-Hall | 2015-08-26 | 4 | -12/+50 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | ||||||
| * | | | | Merge erikj/user_dedup to develop | Daniel Wagner-Hall | 2015-08-26 | 4 | -12/+50 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #253 from matrix-org/tox | Daniel Wagner-Hall | 2015-08-26 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Allow tests to be filter when using tox | Daniel Wagner-Hall | 2015-08-26 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #251 from matrix-org/removeadmin | Daniel Wagner-Hall | 2015-08-25 | 9 | -24/+5 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'deviceid' into removeadmin | Daniel Wagner-Hall | 2015-08-25 | 2 | -4/+2 | |
| |\ \ \ | ||||||
| * | | | | Stop looking up "admin", which we never read | Daniel Wagner-Hall | 2015-08-25 | 9 | -24/+5 | |
* | | | | | Merge pull request #248 from matrix-org/deviceid | Daniel Wagner-Hall | 2015-08-25 | 30 | -95/+64 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Fix up one more reference | Daniel Wagner-Hall | 2015-08-25 | 2 | -4/+2 | |
| |/ / / | ||||||
| * | | | Re-wrap line | Daniel Wagner-Hall | 2015-08-25 | 1 | -3/+1 | |
| * | | | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 29 | -90/+63 | |
* | | | | Merge pull request #247 from matrix-org/markjh/tox | Mark Haines | 2015-08-25 | 4 | -8/+38 | |
|\ \ \ \ | ||||||
| * | | | | Add .tox to .gitignore | Mark Haines | 2015-08-25 | 1 | -0/+1 | |
| * | | | | Set PYTHONDONTWRITEBYTECODE in the tox environment so that we don't spew .pyc... | Mark Haines | 2015-08-25 | 1 | -0/+2 | |
| * | | | | Prod jenkins | Mark Haines | 2015-08-25 | 0 | -0/+0 | |
| * | | | | Prod jenkins | Mark Haines | 2015-08-25 | 0 | -0/+0 | |
| * | | | | Prod jenkins | Mark Haines | 2015-08-25 | 0 | -0/+0 | |
| * | | | | Only include demo/demo.tls.dh. Don't include any other dh file | Mark Haines | 2015-08-25 | 1 | -3/+5 | |
| * | | | | Add tox.ini file for synapse | Mark Haines | 2015-08-25 | 3 | -5/+30 | |
|/ / / / | ||||||
* | | | | Merge pull request #243 from matrix-org/markjh/remove_syutil | Mark Haines | 2015-08-25 | 22 | -93/+84 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fix typo in module imports and package dependencies | Mark Haines | 2015-08-25 | 2 | -2/+2 | |
| * | | | Fix indent | Mark Haines | 2015-08-24 | 1 | -1/+1 | |
| * | | | Replace syutil references in scripts | Mark Haines | 2015-08-24 | 5 | -22/+15 | |
| * | | | Remove syutil dependency in favour of smaller single-purpose libraries | Mark Haines | 2015-08-24 | 17 | -71/+69 | |
* | | | | Merge pull request #244 from matrix-org/markjh/refresh_tokens | Mark Haines | 2015-08-25 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Remove autoincrement since we incrementing the ID in the storage layer | Mark Haines | 2015-08-24 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-08-21 | 3 | -2/+7 | |
|\| | | ||||||
| * | | Fix bug where we didn't correctly serialize the redacted_because key over fed... | Erik Johnston | 2015-08-21 | 2 | -1/+6 | |
| * | | Add missing param in store.get_state_groups invocation | Erik Johnston | 2015-08-21 | 1 | -1/+1 | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0 | Erik Johnston | 2015-08-20 | 4 | -4/+6 | |
| |\ \ | ||||||
* | | | | Return fully qualified user_id as per spec | David Baker | 2015-08-20 | 1 | -1/+1 | |
* | | | | Merge pull request #240 from matrix-org/refresh | Daniel Wagner-Hall | 2015-08-20 | 19 | -76/+303 | |
|\ \ \ \ | ||||||
| * | | | | Fix bad merge | Daniel Wagner-Hall | 2015-08-20 | 1 | -8/+1 | |
| * | | | | Fix indentation | Daniel Wagner-Hall | 2015-08-20 | 1 | -1/+2 | |
| * | | | | Fix flake8 warnings | Daniel Wagner-Hall | 2015-08-20 | 1 | -4/+6 | |
| * | | | | Merge branch 'auth' into refresh | Daniel Wagner-Hall | 2015-08-20 | 2 | -4/+4 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'develop' into refresh | Daniel Wagner-Hall | 2015-08-20 | 19 | -80/+498 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| * | | | | | /tokenrefresh POST endpoint | Daniel Wagner-Hall | 2015-08-20 | 9 | -8/+232 | |
| * | | | | | s/by_token/by_access_token/g | Daniel Wagner-Hall | 2015-08-20 | 10 | -40/+40 | |
| * | | | | | Move token generation to auth handler | Daniel Wagner-Hall | 2015-08-20 | 3 | -31/+38 | |
| * | | | | | Merge branch 'auth' into refresh | Daniel Wagner-Hall | 2015-08-20 | 7 | -24/+115 | |
| |\ \ \ \ \ | ||||||
* | \ \ \ \ \ | Merge pull request #229 from matrix-org/auth | Daniel Wagner-Hall | 2015-08-20 | 5 | -6/+90 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | Remove incorrect whitespace | Daniel Wagner-Hall | 2015-08-20 | 1 | -3/+3 | |
| * | | | | | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-20 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-20 | 21 | -93/+531 | |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | | ||||||
| * | | | | | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-19 | 9 | -25/+128 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into auth | Daniel Wagner-Hall | 2015-08-19 | 2 | -18/+25 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * | | | | | | | Re-add whitespace around caveat operators | Daniel Wagner-Hall | 2015-08-19 | 2 | -8/+8 | |
| * | | | | | | | Switch to pymacaroons-pynacl | Daniel Wagner-Hall | 2015-08-19 | 1 | -1/+1 | |
| * | | | | | | | Remove padding space around caveat operators | Daniel Wagner-Hall | 2015-08-18 | 2 | -8/+8 | |
| * | | | | | | | Fix units in test | Daniel Wagner-Hall | 2015-08-18 | 1 | -1/+1 | |
| * | | | | | | | Fix some formatting to use tuples | Daniel Wagner-Hall | 2015-08-18 | 2 | -5/+5 | |
| * | | | | | | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-18 | 38 | -455/+1346 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove accidentally added file | Daniel Wagner-Hall | 2015-08-18 | 1 | -0/+0 | |
| * | | | | | | | | Issue macaroons as opaque auth tokens | Daniel Wagner-Hall | 2015-08-18 | 6 | -6/+90 | |
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into develop | Mark Haines | 2015-08-20 | 2 | -18/+25 | |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | hacky support for video for FS CC DD | Matthew Hodgson | 2015-08-06 | 1 | -3/+0 | |
| * | | | | | | | hacky support for video for FS CC DD | Matthew Hodgson | 2015-08-06 | 1 | -15/+25 |