| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix invite pushes | David Baker | 2016-04-08 | 4 | -39/+58 |
* | Make sure max stream ordering only increases | David Baker | 2016-04-08 | 1 | -1/+1 |
* | Unsafe process should call itself if the max has changed | David Baker | 2016-04-08 | 1 | -0/+3 |
* | Comment why unsafe process is unsafe | David Baker | 2016-04-08 | 1 | -0/+5 |
* | Literally a dictionary | David Baker | 2016-04-07 | 1 | -17/+17 |
* | generate id in the main thread | David Baker | 2016-04-07 | 1 | -3/+3 |
* | Only pass in what we need | David Baker | 2016-04-07 | 2 | -11/+13 |
* | Oops, inequality fail | David Baker | 2016-04-07 | 1 | -1/+1 |
* | Wrap process in a flag so we don't process whist already processing. | David Baker | 2016-04-07 | 1 | -0/+9 |
* | indenting | David Baker | 2016-04-07 | 1 | -1/+1 |
* | defer.gatherResults rather than doing all the pokes in series | David Baker | 2016-04-07 | 1 | -2/+16 |
* | Add measure blocks | David Baker | 2016-04-07 | 1 | -5/+10 |
* | Add comments on min_stream_id | David Baker | 2016-04-07 | 2 | -0/+3 |
* | pep8 | David Baker | 2016-04-07 | 1 | -0/+1 |
* | Fix port script for changes merged from develop | David Baker | 2016-04-07 | 1 | -1/+4 |
* | Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_act... | David Baker | 2016-04-07 | 32 | -202/+776 |
|\ |
|
| * | Merge pull request #703 from matrix-org/erikj/member | Erik Johnston | 2016-04-07 | 1 | -0/+5 |
| |\ |
|
| | * | Set profile information when joining rooms remotely | Erik Johnston | 2016-04-07 | 1 | -0/+5 |
| |/ |
|
| * | Merge pull request #699 from matrix-org/rav/show_own_leave_event | Richard van der Hoff | 2016-04-06 | 1 | -11/+40 |
| |\ |
|
| | * | Let users see their own leave events | Richard van der Hoff | 2016-04-06 | 1 | -11/+40 |
| * | | Merge pull request #702 from matrix-org/markjh/slaveII | Mark Haines | 2016-04-06 | 2 | -11/+67 |
| |\ \ |
|
| | * | | Test that room membership is replicated | Mark Haines | 2016-04-06 | 2 | -11/+67 |
| |/ / |
|
| * | | Merge pull request #697 from matrix-org/markjh/slaveI | Mark Haines | 2016-04-06 | 10 | -2/+485 |
| |\ \
| | |/
| |/| |
|
| | * | Add a slaved events store class | Mark Haines | 2016-04-06 | 10 | -2/+485 |
| * | | Merge pull request #698 from matrix-org/erikj/port_script_fix | Erik Johnston | 2016-04-06 | 13 | -86/+69 |
| |\ \
| | |/
| |/| |
|
| | * | Don't require config to create database | Erik Johnston | 2016-04-06 | 13 | -86/+69 |
| * | | Merge pull request #694 from matrix-org/markjh/caches | Mark Haines | 2016-04-06 | 2 | -33/+34 |
| |\ \ |
|
| | * | | Move _get_cache_dict into the SQLBaseStore | Mark Haines | 2016-04-06 | 2 | -33/+34 |
| | |/ |
|
| * | | Merge pull request #695 from matrix-org/markjh/cachesII | Mark Haines | 2016-04-06 | 4 | -26/+29 |
| |\ \
| | |/
| |/| |
|
| | * | Make the cache objects be per instance rather than being global | Mark Haines | 2016-04-06 | 4 | -26/+29 |
| |/ |
|
| * | Merge pull request #692 from matrix-org/markjh/replicate_reshuffle | Mark Haines | 2016-04-05 | 1 | -44/+55 |
| |\ |
|
| | * | Separate generating the replication response... | Mark Haines | 2016-04-05 | 1 | -44/+55 |
| * | | Merge pull request #693 from matrix-org/erikj/backfill_self | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
| |\ \ |
|
| | * | | Don't backfill from self | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
* | | | | Remove code that's now been obsoleted or moved elsewhere | David Baker | 2016-04-07 | 3 | -454/+9 |
* | | | | Send badge count pushes. | David Baker | 2016-04-07 | 4 | -24/+71 |
* | | | | pep8 | David Baker | 2016-04-06 | 4 | -4/+8 |
* | | | | Make pushers use the event_push_actions table instead of listening on an even... | David Baker | 2016-04-06 | 13 | -130/+503 |
|/ / / |
|
* | | | Merge pull request #691 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 4 | -16/+58 |
|\ \ \ |
|
| * | | | Fix stuck invites | Erik Johnston | 2016-04-05 | 4 | -16/+58 |
* | | | | Merge pull request #690 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 5 | -32/+155 |
|\| | |
| |_|/
|/| | |
|
| * | | Docs and indents | Erik Johnston | 2016-04-04 | 3 | -14/+31 |
| * | | Add upgrade path, rename table | Erik Johnston | 2016-04-04 | 2 | -6/+20 |
| * | | Store invites in a separate table. | Erik Johnston | 2016-04-04 | 5 | -32/+124 |
* | | | Merge pull request #689 from matrix-org/erikj/member | Erik Johnston | 2016-04-04 | 6 | -154/+192 |
|\| | |
|
| * | | Use computed prev event ids | Erik Johnston | 2016-04-01 | 4 | -13/+41 |
| * | | Remove state hack from _create_new_client_event | Erik Johnston | 2016-04-01 | 1 | -43/+0 |
| * | | Do checks for memberships before creating events | Erik Johnston | 2016-04-01 | 3 | -98/+151 |
* | | | Merge pull request #686 from matrix-org/markjh/doc_strings | Mark Haines | 2016-04-01 | 14 | -169/+242 |
|\ \ \
| |/ /
|/| | |
|
| * | | Use google style doc strings. | Mark Haines | 2016-04-01 | 14 | -169/+242 |
* | | | Merge pull request #684 from matrix-org/markjh/backfill_id_gen | Mark Haines | 2016-04-01 | 11 | -61/+71 |
|\ \ \ |
|
| * | | | Assert that the step != 0 | Mark Haines | 2016-04-01 | 1 | -0/+1 |
| * | | | use google style doc strings | Mark Haines | 2016-04-01 | 1 | -11/+12 |
| * | | | Rename direction to step, apply checks consistently | Mark Haines | 2016-04-01 | 2 | -16/+16 |
| * | | | Use a stream id generator for backfilled ids | Mark Haines | 2016-04-01 | 11 | -61/+69 |
| |/ / |
|
* | | | Merge pull request #685 from matrix-org/erikj/sync_leave | Erik Johnston | 2016-04-01 | 4 | -72/+85 |
|\ \ \ |
|
| * | | | Comment | Erik Johnston | 2016-04-01 | 1 | -1/+1 |
| * | | | Add concurrently_execute function | Erik Johnston | 2016-04-01 | 4 | -75/+82 |
| * | | | Filter rooms list before chunking | Erik Johnston | 2016-04-01 | 1 | -6/+12 |
|/ / / |
|
* | | | Merge pull request #682 from matrix-org/markjh/fix_invalidate | Mark Haines | 2016-04-01 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Fix the invalidation of the names and aliases cache | Mark Haines | 2016-04-01 | 1 | -1/+1 |
| |/ / |
|
* | | | Merge pull request #681 from matrix-org/markjh/remove_outlier | Mark Haines | 2016-03-31 | 3 | -11/+7 |
|\ \ \
| |/ /
|/| | |
|
| * | | Remove outlier parameter from compute_event_context | Mark Haines | 2016-03-31 | 3 | -11/+7 |
|/ / |
|
* | | Merge pull request #680 from matrix-org/markjh/remove_is_new_state | Mark Haines | 2016-03-31 | 3 | -56/+57 |
|\ \ |
|
| * | | Move the check for backfilled outside the for loop | Mark Haines | 2016-03-31 | 1 | -5/+5 |
| * | | Remove the is_new_state argument to persist event. | Mark Haines | 2016-03-31 | 3 | -56/+57 |
* | | | Merge pull request #679 from matrix-org/erikj/member | Erik Johnston | 2016-03-31 | 3 | -603/+651 |
|\ \ \
| |/ /
|/| | |
|
| * | | Split out RoomMemberHandler | Erik Johnston | 2016-03-31 | 3 | -603/+651 |
| |/ |
|
* | | Merge pull request #676 from matrix-org/markjh/replicate_stateIII | Mark Haines | 2016-03-31 | 3 | -5/+128 |
|\ \
| |/
|/| |
|
| * | Use a namedtuple rather than tuple unpacking | Mark Haines | 2016-03-31 | 2 | -12/+15 |
| * | Add replication streams for ex outliers and current state resets | Mark Haines | 2016-03-30 | 3 | -2/+113 |
| * | Add a entry to current_state_resets table when the current state is reset | Mark Haines | 2016-03-30 | 1 | -0/+9 |
* | | Line length | Erik Johnston | 2016-03-31 | 1 | -1/+3 |
* | | Merge pull request #678 from matrix-org/dbkr/push_obey_enable | David Baker | 2016-03-31 | 1 | -2/+3 |
|\ \ |
|
| * | | Don't ignore the obey overlay if the rule has an enabled attribute of False | David Baker | 2016-03-31 | 1 | -2/+3 |
|/ / |
|
* | | spell out more packages | Matthew Hodgson | 2016-03-30 | 1 | -8/+21 |
* | | typo | Matthew Hodgson | 2016-03-30 | 1 | -1/+1 |
* | | Merge pull request #675 from matrix-org/markjh/replicate_stateII | Mark Haines | 2016-03-30 | 4 | -12/+93 |
|\ \ |
|
| * | | return the state_group for backfill | Mark Haines | 2016-03-30 | 1 | -1/+2 |
| |/ |
|
| * | Add a replication stream for state groups | Mark Haines | 2016-03-30 | 4 | -11/+91 |
|/ |
|
* | Merge pull request #674 from matrix-org/markjh/replicate_state | Mark Haines | 2016-03-30 | 4 | -50/+60 |
|\ |
|
| * | Use a stream id generator to assign state group ids | Mark Haines | 2016-03-30 | 4 | -50/+60 |
* | | Merge pull request #673 from matrix-org/erikj/forget | Erik Johnston | 2016-03-30 | 2 | -6/+54 |
|\ \ |
|
| * | | Only forget room if you were in the room | Erik Johnston | 2016-03-30 | 1 | -1/+2 |
| * | | Remove spurious comment | Erik Johnston | 2016-03-30 | 1 | -1/+0 |
| * | | Require user to have left room to forget room | Erik Johnston | 2016-03-30 | 2 | -6/+54 |
| |/ |
|
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-03-30 | 3 | -3/+71 |
|\ \
| |/
|/| |
|
| * | Merge branch 'release-v0.14.0' of github.com:matrix-org/synapse v0.14.0 | Erik Johnston | 2016-03-30 | 180 | -5320/+6403 |
| |\ |
|
| | * | Bump version and changelog | Erik Johnston | 2016-03-30 | 2 | -1/+6 |
| | * | Bump version and changelog v0.14.0-rc2 github/release-v0.14.0 release-v0.14.0 | Erik Johnston | 2016-03-23 | 2 | -1/+22 |
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.14.0 | Erik Johnston | 2016-03-23 | 45 | -474/+923 |
| | |\ |
|
| | * | | English v0.14.0-rc1 | Erik Johnston | 2016-03-15 | 1 | -1/+1 |
| | * | | Bump version and changelog | Erik Johnston | 2016-03-15 | 2 | -1/+40 |
| * | | | Merge pull request #672 from nikriek/new-author | Erik Johnston | 2016-03-29 | 1 | -2/+5 |
| |\ \ \ |
|
| | * | | | Add new author | Niklas Riekenbrauck | 2016-03-29 | 1 | -2/+5 |
| |/ / / |
|
* | | | | Merge pull request #671 from nikriek/jwt-support | Erik Johnston | 2016-03-29 | 4 | -1/+93 |
|\ \ \ \ |
|
| * | | | | Add JWT support | Niklas Riekenbrauck | 2016-03-29 | 4 | -1/+93 |
|/ / / / |
|
* | | | | Merge pull request #668 from matrix-org/markjh/deduplicate | Mark Haines | 2016-03-24 | 4 | -2/+75 |
|\ \ \ \ |
|
| * | | | | Fix typo | Mark Haines | 2016-03-24 | 1 | -1/+1 |
| * | | | | Add a response cache for getting the public room list | Mark Haines | 2016-03-24 | 1 | -1/+11 |
| * | | | | Deduplicate identical /sync requests | Mark Haines | 2016-03-24 | 3 | -1/+64 |
|/ / / / |
|
* | | | | Merge pull request #667 from matrix-org/dbkr/never_notify_member_events | David Baker | 2016-03-24 | 1 | -20/+21 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Never notify for member events. This fixes https://github.com/vector-im/vecto... | David Baker | 2016-03-24 | 1 | -20/+21 |
|/ / / |
|
* | | | Merge pull request #666 from matrix-org/erikj/intern | Erik Johnston | 2016-03-23 | 8 | -31/+100 |
|\ \ \ |
|
| * | | | Simplify intern_dict | Erik Johnston | 2016-03-23 | 1 | -17/+10 |
| * | | | Don't bother interning keys that are already interned | Erik Johnston | 2016-03-23 | 1 | -3/+1 |
| * | | | Intern all the things | Erik Johnston | 2016-03-23 | 8 | -45/+97 |
| * | | | Intern sender, event_id and room_id in events | Erik Johnston | 2016-03-23 | 1 | -0/+5 |
| * | | | Intern type and state_key on events | Erik Johnston | 2016-03-23 | 1 | -0/+7 |
| * | | | String intern | Erik Johnston | 2016-03-23 | 2 | -3/+17 |
|/ / / |
|
* | | | Merge pull request #664 from matrix-org/erikj/public_room_list | Erik Johnston | 2016-03-23 | 2 | -18/+51 |
|\ \ \ |
|
| * | | | Comment about weird SQL | Erik Johnston | 2016-03-23 | 1 | -1/+3 |
| * | | | SQLite and postgres doesn't share a true literal | Erik Johnston | 2016-03-23 | 1 | -1/+1 |
| * | | | Ensure all old public rooms have aliases | Erik Johnston | 2016-03-23 | 2 | -4/+26 |
| * | | | Ensure published rooms have public join rules | Erik Johnston | 2016-03-23 | 1 | -0/+7 |
| * | | | Comment | Erik Johnston | 2016-03-23 | 1 | -0/+3 |
| * | | | Don't require alias in public room list. | Erik Johnston | 2016-03-23 | 1 | -14/+13 |
* | | | | Merge pull request #663 from matrix-org/erikj/invite_for_user | Erik Johnston | 2016-03-23 | 2 | -7/+5 |
|\ \ \ \ |
|
| * | | | | Make get_invites return RoomsForUser | Erik Johnston | 2016-03-23 | 2 | -7/+5 |
| |/ / / |
|
* | | | | Merge pull request #665 from matrix-org/erikj/dont_cache_events | Erik Johnston | 2016-03-23 | 3 | -23/+30 |
|\ \ \ \ |
|
| * | | | | Don't cache events in get_recent_events_for_room | Erik Johnston | 2016-03-23 | 1 | -14/+19 |
| * | | | | Don't cache events in get_current_state_for_key | Erik Johnston | 2016-03-23 | 2 | -9/+11 |
| |/ / / |
|
* | | | | Merge pull request #662 from matrix-org/erikj/state_cache | Erik Johnston | 2016-03-23 | 3 | -69/+94 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Reduce cache size | Erik Johnston | 2016-03-23 | 1 | -1/+1 |
| * | | | Key StateHandler._state_cache off of state groups | Erik Johnston | 2016-03-22 | 1 | -40/+21 |
| * | | | Make LruCache use a dedicated _Node class | Erik Johnston | 2016-03-22 | 1 | -32/+41 |
| * | | | Make StateHandler._state_cache only store event_ids. | Erik Johnston | 2016-03-22 | 2 | -7/+42 |
|/ / / |
|
* | | | Measure StateHandler._resolve_events | Erik Johnston | 2016-03-22 | 1 | -38/+40 |
* | | | Bump get_unread_event_push_actions_by_room_for_user cache | Erik Johnston | 2016-03-22 | 1 | -1/+1 |
* | | | Bump get_aliases_for_room cache | Erik Johnston | 2016-03-22 | 1 | -1/+1 |
* | | | Merge pull request #661 from matrix-org/markjh/member_count | Mark Haines | 2016-03-22 | 1 | -1/+3 |
|\ \ \ |
|
| * | | | Use get_users_in_room to count the number of room members rather than using r... | Mark Haines | 2016-03-22 | 1 | -1/+3 |
* | | | | Merge pull request #660 from matrix-org/erikj/state_cache | Erik Johnston | 2016-03-22 | 1 | -60/+48 |
|\ \ \ \ |
|
| * | | | | Don't cache events in _state_group_cache | Erik Johnston | 2016-03-22 | 1 | -60/+48 |
* | | | | | Merge pull request #659 from matrix-org/erikj/state_cache_factor | Erik Johnston | 2016-03-22 | 1 | -1/+7 |
|\ \ \ \ \ |
|
| * | | | | | Make stateGroupCache honour CACHE_SIZE_FACTOR | Erik Johnston | 2016-03-22 | 1 | -1/+7 |
| |/ / / / |
|
* | | | | | Merge pull request #657 from matrix-org/erikj/roomlist | Erik Johnston | 2016-03-22 | 4 | -4/+122 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Doc string | Erik Johnston | 2016-03-22 | 1 | -0/+6 |
| * | | | | an invalide is something else... | Matthew Hodgson | 2016-03-22 | 1 | -1/+1 |
| * | | | | Add published room list edit API | Erik Johnston | 2016-03-21 | 4 | -4/+116 |
| |/ / / |
|
* | | | | Merge pull request #658 from matrix-org/markjh/cleanup | Mark Haines | 2016-03-22 | 3 | -44/+19 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Remove unused backfilled parameter from persist_event | Mark Haines | 2016-03-21 | 3 | -42/+19 |
| * | | | remove unused current_state variable from on_receive_pdu | Mark Haines | 2016-03-21 | 1 | -2/+0 |
|/ / / |
|
* | | | Merge pull request #655 from matrix-org/erikj/edu_yield | Erik Johnston | 2016-03-18 | 1 | -3/+9 |
|\ \ \ |
|
| * | | | Catch exceptions from EDU handling | Erik Johnston | 2016-03-18 | 1 | -1/+6 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/edu_yield | Erik Johnston | 2016-03-18 | 4 | -22/+64 |
| |\ \ \
| |/ / /
|/| | | |
|
* | | | | Merge pull request #656 from matrix-org/erikj/get_event | Erik Johnston | 2016-03-18 | 2 | -15/+15 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/get_event | Erik Johnston | 2016-03-18 | 2 | -7/+49 |
| |\ \ \ \
| |/ / / /
|/| | | | |
|
* | | | | | Merge pull request #652 from matrix-org/erikj/delete_alias | Erik Johnston | 2016-03-18 | 2 | -7/+49 |
|\ \ \ \ \ |
|
| * | | | | | Check canonical alias event exists | Erik Johnston | 2016-03-17 | 1 | -1/+2 |
| * | | | | | Update aliases event after deletion | Erik Johnston | 2016-03-17 | 2 | -7/+48 |
| | * | | | | Don't assume existence of event_id in __str__ | Erik Johnston | 2016-03-18 | 1 | -1/+3 |
| | * | | | | Dedupe requested event list in _get_events | Erik Johnston | 2016-03-18 | 1 | -14/+12 |
| |/ / / /
|/| | | | |
|
| | * | | | Yield on EDU handling | Erik Johnston | 2016-03-18 | 1 | -3/+4 |
| |/ / /
|/| | | |
|
* | | | | Merge pull request #650 from matrix-org/dbkr/register_idempotent_with_username | David Baker | 2016-03-17 | 3 | -6/+38 |
|\ \ \ \ |
|
| * | | | | remove debug logging | David Baker | 2016-03-16 | 1 | -3/+0 |
| * | | | | Unused import | David Baker | 2016-03-16 | 1 | -1/+0 |
| * | | | | Make registration idempotent, part 2: be idempotent if the client specifies a... | David Baker | 2016-03-16 | 3 | -6/+42 |
| |/ / / |
|
* | | | | Merge pull request #651 from matrix-org/markjh/unused_II | Mark Haines | 2016-03-17 | 4 | -112/+0 |
|\ \ \ \ |
|
| * | | | | Remove another unused function from presence | Mark Haines | 2016-03-17 | 1 | -4/+0 |
| * | | | | Remove dead code left over from presence changes | Mark Haines | 2016-03-17 | 4 | -108/+0 |
|/ / / / |
|
* / / / | Add option to definitions.py to search for functions a function refers to | Mark Haines | 2016-03-17 | 1 | -1/+22 |
|/ / / |
|
* | | | Merge pull request #649 from matrix-org/dbkr/idempotent_registration | David Baker | 2016-03-16 | 4 | -17/+80 |
|\ \ \ |
|
| * | | | pep8 | David Baker | 2016-03-16 | 1 | -1/+2 |
| * | | | time_msec() | David Baker | 2016-03-16 | 1 | -1/+1 |
| * | | | string with symbols is a bit too symboly. | David Baker | 2016-03-16 | 1 | -1/+1 |
| * | | | Replace other time.time(). | David Baker | 2016-03-16 | 1 | -2/+1 |
| * | | | Use hs get_clock instead of time.time() | David Baker | 2016-03-16 | 1 | -2/+2 |
| * | | | take extra return val from check_auth in account too | David Baker | 2016-03-16 | 1 | -1/+1 |
| * | | | Fix tests | David Baker | 2016-03-16 | 1 | -4/+5 |
| * | | | pep8 & remove debug logging | David Baker | 2016-03-16 | 2 | -5/+6 |
| * | | | Make registration idempotent: if you specify the same session, make it give y... | David Baker | 2016-03-16 | 2 | -13/+74 |
|/ / / |
|
* | | | Merge pull request #647 from matrix-org/markjh/pushers_stream | Mark Haines | 2016-03-16 | 8 | -18/+120 |
|\ \ \ |
|
| * | | | Add a comment to offer a hint to an explanation for why we have a unique cons... | Mark Haines | 2016-03-16 | 1 | -0/+1 |
| * | | | Fix a couple of errors when deleting pushers | Mark Haines | 2016-03-15 | 1 | -2/+2 |
| * | | | Merge branch 'develop' into markjh/pushers_stream | Mark Haines | 2016-03-15 | 4 | -29/+53 |
| |\ \ \ |
|
| * | | | | Hook up adding a pusher to the notifier for replication. | Mark Haines | 2016-03-15 | 2 | -0/+12 |
| * | | | | Add replication stream for pushers | Mark Haines | 2016-03-15 | 6 | -18/+107 |
* | | | | | Merge pull request #648 from matrix-org/rav/password_reset | Richard van der Hoff | 2016-03-16 | 3 | -2/+59 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | Clarify that we do have reset functionality via the IS | Richard van der Hoff | 2016-03-16 | 1 | -21/+20 |
| * | | | | Password reset docs and script | Richard van der Hoff | 2016-03-16 | 3 | -1/+59 |
|/ / / / |
|
* | | | | Merge pull request #646 from matrix-org/erikj/reject_invite_federation | Erik Johnston | 2016-03-15 | 1 | -1/+16 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Remove needless PreserveLoggingContext | Erik Johnston | 2016-03-15 | 1 | -5/+4 |
| * | | | Persist rejection of invites over federation | Erik Johnston | 2016-03-15 | 1 | -1/+17 |
|/ / / |
|
* | | | Merge pull request #645 from matrix-org/erikj/3pid_guest_config | Erik Johnston | 2016-03-14 | 2 | -25/+36 |
|\ \ \ |
|
| * | | | Add config to create guest account on 3pid invite | Erik Johnston | 2016-03-14 | 2 | -25/+36 |
|/ / / |
|
* / / | Return list, not generator. | Erik Johnston | 2016-03-14 | 1 | -3/+1 |
|/ / |
|
* | | Merge pull request #644 from matrix-org/markjh/parse_jsonIII | Mark Haines | 2016-03-14 | 2 | -6/+19 |
|\ \ |
|
| * | | Fix regression where synapse checked whether push rules were valid JSON befor... | Mark Haines | 2016-03-14 | 2 | -6/+19 |
|/ / |
|
* | | Merge pull request #642 from matrix-org/erikj/logout | Erik Johnston | 2016-03-11 | 3 | -15/+113 |
|\ \ |
|
| * | | Thats not how transactions work. | Erik Johnston | 2016-03-11 | 1 | -13/+16 |
| * | | Emtpy commit | Erik Johnston | 2016-03-11 | 0 | -0/+0 |
| * | | Implement logout | Erik Johnston | 2016-03-11 | 3 | -14/+109 |
* | | | Merge pull request #643 from matrix-org/markjh/parse_json_II | Mark Haines | 2016-03-11 | 11 | -90/+49 |
|\ \ \
| |/ /
|/| | |
|
| * | | Use parse_json_object_from_request to parse JSON out of request bodies | Mark Haines | 2016-03-11 | 11 | -90/+49 |
|/ / |
|
* | | Fix SQL statement | Erik Johnston | 2016-03-11 | 1 | -1/+1 |
* | | Merge pull request #641 from matrix-org/dbkr/fix_change_password | Erik Johnston | 2016-03-11 | 4 | -30/+32 |
|\ \ |
|
| * | | more pep8 | David Baker | 2016-03-11 | 1 | -1/+1 |
| * | | Make select more sensible when dseleting access tokens, rename pusher deletio... | David Baker | 2016-03-11 | 3 | -7/+5 |
| * | | Delete old, unused methods and rename new one to just be `user_delete_access_... | David Baker | 2016-03-11 | 2 | -16/+3 |
| * | | Dear PyCharm, please indent sensibly for me. Thx. | David Baker | 2016-03-11 | 2 | -3/+3 |
| * | | Fix cache invalidation so deleting access tokens (which we did when changing ... | David Baker | 2016-03-11 | 4 | -17/+34 |
* | | | Merge pull request #640 from matrix-org/erikj/keyclient_host | Erik Johnston | 2016-03-11 | 1 | -0/+3 |
|\ \ \ |
|
| * | | | Make key client send a Host header | Erik Johnston | 2016-03-11 | 1 | -0/+3 |
* | | | | Merge pull request #635 from matrix-org/erikj/sync_order | Erik Johnston | 2016-03-11 | 1 | -3/+6 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Add comment | Erik Johnston | 2016-03-09 | 1 | -0/+3 |
| * | | | Return the correct token form | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
| * | | | Use topological orders for initial sync timeline | Erik Johnston | 2016-03-09 | 1 | -2/+2 |
* | | | | Merge pull request #638 from matrix-org/daniel/appserviceid | Daniel Wagner-Hall | 2016-03-10 | 2 | -7/+38 |
|\ \ \ \ |
|
| * | | | | Store appservice ID on register | Daniel Wagner-Hall | 2016-03-10 | 2 | -7/+38 |
|/ / / / |
|
* | | | | Merge pull request #639 from matrix-org/erikj/as_user_update_batch | Erik Johnston | 2016-03-10 | 1 | -9/+14 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Update users table in a batched manner | Erik Johnston | 2016-03-10 | 1 | -9/+14 |
|/ / / |
|
* | | | Merge pull request #637 from blide/develop | Erik Johnston | 2016-03-10 | 2 | -11/+20 |
|\ \ \
| |/ /
|/| | |
|
| * | | Flake8 fix | blide | 2016-03-10 | 1 | -6/+6 |
| * | | Register endpoint returns refresh_token | blide | 2016-03-10 | 2 | -17/+26 |
|/ / |
|
* | | Merge pull request #634 from matrix-org/erikj/pin_saml2_version | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
|\ \ |
|
| * | | Pin pysaml2 version to 3.x | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
* | | | Merge pull request #628 from matrix-org/markjh/parse_json | Mark Haines | 2016-03-09 | 11 | -121/+97 |
|\ \ \
| |/ /
|/| | |
|
| * | | Add a parse_json_object function | Mark Haines | 2016-03-09 | 11 | -121/+97 |
|/ / |
|
* | | Ensure integer is an integer | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
* | | Reinstate coverage checks for integ tests | Richard van der Hoff | 2016-03-09 | 2 | -2/+4 |
* | | Specify synapse-directory for integ tests | Richard van der Hoff | 2016-03-09 | 2 | -2/+6 |
* | | Only build py27 tox env for integ tests | Richard van der Hoff | 2016-03-08 | 2 | -2/+2 |
* | | Use sytest build scripts, rather than reinventing the wheel | Richard van der Hoff | 2016-03-08 | 2 | -52/+7 |
* | | Merge pull request #632 from matrix-org/markjh/py3v2 | Mark Haines | 2016-03-08 | 17 | -22/+22 |
|\ \ |
|
| * | | Fix relative imports so they work in both py3 and py27 | Mark Haines | 2016-03-08 | 17 | -22/+22 |
* | | | Merge pull request #633 from matrix-org/daniel/ick | Daniel Wagner-Hall | 2016-03-08 | 1 | -1/+5 |
|\ \ \ |
|
| * \ \ | Merge branch 'develop' into daniel/ick | Daniel Wagner-Hall | 2016-03-08 | 49 | -336/+1061 |
| |\ \ \
| |/ / /
|/| | | |
|
* | | | | Merge pull request #630 from matrix-org/dbkr/post_urlencoded_encode_params | David Baker | 2016-03-08 | 1 | -2/+15 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | pep8 | David Baker | 2016-03-08 | 1 | -2/+5 |
| * | | | Encode unicode objects given to post_urlencode* otherwise urllib.urlencode ch... | David Baker | 2016-03-08 | 1 | -2/+12 |
* | | | | Merge pull request #631 from matrix-org/markjh/py3v1 | Mark Haines | 2016-03-08 | 8 | -10/+10 |
|\ \ \ \ |
|
| * | | | | Use syntax that works on both py2.7 and py3 | Mark Haines | 2016-03-07 | 8 | -10/+10 |
| |/ / / |
|
* | | | | Merge pull request #627 from matrix-org/dbkr/guest_reuse_send_user_id | David Baker | 2016-03-08 | 5 | -22/+27 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Fix tests | David Baker | 2016-03-07 | 3 | -20/+20 |
| * | | | Send the user ID matching the guest access token, since there is no Matrix AP... | David Baker | 2016-03-07 | 2 | -2/+7 |
|/ / / |
|
* | | | Merge pull request #626 from matrix-org/erikj/visibility | Erik Johnston | 2016-03-07 | 1 | -0/+26 |
|\ \ \ |
|
| * | | | Send history visibility on boundary changes | Erik Johnston | 2016-03-04 | 1 | -0/+26 |
* | | | | Merge pull request #618 from matrix-org/markjh/pushrule_stream | Mark Haines | 2016-03-04 | 15 | -193/+483 |
|\ \ \ \ |
|
| * | | | | Prefill from the correct stream | Mark Haines | 2016-03-04 | 1 | -1/+1 |
| * | | | | prefill the push rules stream change cache | Mark Haines | 2016-03-04 | 1 | -2/+9 |
| * | | | | s/stream_ordering/event_stream_ordering/ in push | Mark Haines | 2016-03-04 | 3 | -27/+31 |
| * | | | | /FNARG/d | Mark Haines | 2016-03-04 | 1 | -1/+0 |
| * | | | | poke jenkins | Mark Haines | 2016-03-04 | 0 | -0/+0 |
| * | | | | Fix unit tests | Mark Haines | 2016-03-04 | 1 | -2/+2 |
| * | | | | Merge branch 'develop' into markjh/pushrule_stream | Mark Haines | 2016-03-04 | 41 | -148/+641 |
| |\| | | |
|
| * | | | | Hook up the push rules stream to account_data in /sync | Mark Haines | 2016-03-04 | 4 | -69/+85 |
| * | | | | Move the code for formatting push rules into a separate function | Mark Haines | 2016-03-03 | 2 | -86/+116 |
| * | | | | Hook up the push rules to the notifier | Mark Haines | 2016-03-03 | 5 | -18/+43 |
| * | | | | Hook push rules up to the replication API | Mark Haines | 2016-03-02 | 3 | -4/+36 |