| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #677 from matrix-org/erikj/dns_cache | Erik Johnston | 2016-04-08 | 1 | -17/+24 |
|\ |
|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cache | Erik Johnston | 2016-04-07 | 51 | -1236/+2026 |
| |\ |
|
| * | | Allow clock to be passed in to func | Erik Johnston | 2016-03-31 | 1 | -3/+3 |
| * | | Read from DNS cache if within TTL | Erik Johnston | 2016-03-31 | 1 | -16/+23 |
* | | | Merge pull request #707 from matrix-org/markjh/remove_changed_presencelike_data | Erik Johnston | 2016-04-08 | 1 | -15/+0 |
|\ \ \ |
|
| * | | | changed_presencelike_data isn't observed anywhere in synapse so can be removed | Mark Haines | 2016-04-08 | 1 | -15/+0 |
* | | | | Remove some unused functions (#711) | Mark Haines | 2016-04-08 | 11 | -219/+0 |
* | | | | Move all the wrapper functions for distributor.fire | Mark Haines | 2016-04-08 | 5 | -39/+24 |
|/ / / |
|
* | | | Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_data | Mark Haines | 2016-04-08 | 2 | -37/+1 |
|\ \ \ |
|
| * | | | Call profile handler get_displayname directly rather than using collect_prese... | Mark Haines | 2016-04-07 | 2 | -37/+1 |
* | | | | Merge pull request #701 from DoubleMalt/ldap-auth | Erik Johnston | 2016-04-07 | 3 | -10/+131 |
|\ \ \ \ |
|
| * | | | | fix check for failed authentication | Christoph Witzany | 2016-04-06 | 1 | -2/+4 |
| * | | | | remove line | Christoph Witzany | 2016-04-06 | 1 | -1/+0 |
| * | | | | make tests for ldap more specific to not be fooled by Mocks | Christoph Witzany | 2016-04-06 | 1 | -3/+3 |
| * | | | | output ldap version for info and to pacify pep8 | Christoph Witzany | 2016-04-06 | 1 | -0/+2 |
| * | | | | conditionally import ldap | Christoph Witzany | 2016-04-06 | 2 | -3/+5 |
| * | | | | fix pep8 | Christoph Witzany | 2016-04-06 | 1 | -2/+1 |
| * | | | | fix exception handling | Christoph Witzany | 2016-04-06 | 1 | -2/+2 |
| * | | | | code style | Christoph Witzany | 2016-04-06 | 1 | -6/+13 |
| * | | | | cleanup | Christoph Witzany | 2016-04-06 | 1 | -5/+0 |
| * | | | | add tls property and twist my head around twisted | Christoph Witzany | 2016-04-06 | 1 | -15/+29 |
| * | | | | add tls property | Christoph Witzany | 2016-04-06 | 1 | -6/+10 |
| * | | | | move LDAP authentication to AuthenticationHandler | Christoph Witzany | 2016-04-06 | 2 | -61/+48 |
| * | | | | Introduce LDAP authentication | Christoph Witzany | 2016-04-06 | 4 | -1/+111 |
* | | | | | Add tests for redactions | Mark Haines | 2016-04-07 | 2 | -3/+3 |
| |/ / /
|/| | | |
|
* | | | | Merge pull request #704 from matrix-org/markh/slaveIII | Mark Haines | 2016-04-07 | 1 | -0/+5 |
|\ \ \ \ |
|
| * | | | | Add sensible __eq__ operators inside the tests. | Mark Haines | 2016-04-07 | 1 | -9/+0 |
| * | | | | Add tests for get_latest_event_ids_in_room and get_current_state | Mark Haines | 2016-04-07 | 2 | -0/+14 |
| | |_|/
| |/| | |
|
* | | | | Merge pull request #700 from matrix-org/erikj/deduplicate_joins | Erik Johnston | 2016-04-07 | 3 | -2/+81 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Rename things | Erik Johnston | 2016-04-07 | 1 | -5/+5 |
| * | | | Log contexts and squash things together | Erik Johnston | 2016-04-07 | 1 | -17/+15 |
| * | | | Add comment | Erik Johnston | 2016-04-07 | 1 | -0/+8 |
| * | | | Deduplicate joins | Erik Johnston | 2016-04-07 | 3 | -1/+74 |
* | | | | 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 |
* | | | Test that room membership is replicated | Mark Haines | 2016-04-06 | 1 | -3/+4 |
* | | | Merge pull request #697 from matrix-org/markjh/slaveI | Mark Haines | 2016-04-06 | 6 | -2/+286 |
|\ \ \
| |/ /
|/| | |
|
| * | | Add a slaved events store class | Mark Haines | 2016-04-06 | 6 | -2/+286 |
* | | | Merge pull request #698 from matrix-org/erikj/port_script_fix | Erik Johnston | 2016-04-06 | 10 | -74/+60 |
|\ \ \
| |/ /
|/| | |
|
| * | | Don't require config to create database | Erik Johnston | 2016-04-06 | 10 | -74/+60 |
* | | | 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 |
| |/ / |
|
* / / | 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 |
* | | | | 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 | 5 | -152/+190 |
|\| | | |
|
| * | | | 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 | 2 | -96/+149 |
* | | | | Merge pull request #686 from matrix-org/markjh/doc_strings | Mark Haines | 2016-04-01 | 13 | -169/+239 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Use google style doc strings. | Mark Haines | 2016-04-01 | 13 | -169/+239 |
* | | | | 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 |
| |/ / / |
|
* | | | | 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 |
| |/ / / |
|
* / / / | 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 |
* | | | Don't ignore the obey overlay if the rule has an enabled attribute of False | David Baker | 2016-03-31 | 1 | -2/+3 |
| |/
|/| |
|
* | | typo | Matthew Hodgson | 2016-03-30 | 1 | -1/+1 |
* | | 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 | 3 | -8/+64 |
* | 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 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | Bump version and changelog | Erik Johnston | 2016-03-30 | 1 | -1/+1 |
| * | Bump version and changelog v0.14.0-rc2 github/release-v0.14.0 release-v0.14.0 | Erik Johnston | 2016-03-23 | 1 | -1/+1 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.14.0 | Erik Johnston | 2016-03-23 | 38 | -457/+836 |
| |\ |
|
| * | | Bump version and changelog | Erik Johnston | 2016-03-15 | 1 | -1/+1 |
* | | | Add JWT support | Niklas Riekenbrauck | 2016-03-29 | 4 | -1/+93 |
* | | | 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 |
* | | | Never notify for member events. This fixes https://github.com/vector-im/vecto... | David Baker | 2016-03-24 | 1 | -20/+21 |
| |/
|/| |
|
* | | 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 |
| |/ / |
|
* | | | 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 |
| |/ / |
|
* | | | 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 |
|/ / |
|
* | | 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 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 |
| |/ / |
|
* | | | 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 | 3 | -98/+0 |
|/ / |
|
* | | 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 |
* | | 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 |
* | | 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 |
|\ \ |
|
| * | | 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 |
| |/ |
|
| * | 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 |
* | | 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 | 5 | -18/+106 |
|/ |
|
* | 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 |
| * | Implement logout | Erik Johnston | 2016-03-11 | 3 | -14/+109 |
* | | Use parse_json_object_from_request to parse JSON out of request bodies | Mark Haines | 2016-03-11 | 10 | -88/+45 |
|/ |
|
* | 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 |
* | | | Store appservice ID on register | Daniel Wagner-Hall | 2016-03-10 | 2 | -7/+38 |
* | | | Update users table in a batched manner | Erik Johnston | 2016-03-10 | 1 | -9/+14 |
| |/
|/| |
|
* | | Register endpoint returns refresh_token | blide | 2016-03-10 | 1 | -5/+8 |
|/ |
|
* | 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 |
* | | 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 |
* | 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 branch 'develop' into daniel/ick | Daniel Wagner-Hall | 2016-03-08 | 37 | -299/+802 |
|\ \ |
|
| * \ | 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 |
| | |/ |
|
| * / | 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 | 13 | -189/+477 |
| |\ \ |
|
| | * | | 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 |
| | * | | Merge branch 'develop' into markjh/pushrule_stream | Mark Haines | 2016-03-04 | 27 | -119/+356 |
| | |\| |
|
| | * | | 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 | 2 | -2/+32 |
| | * | | Add a stream for push rule updates | Mark Haines | 2016-03-01 | 5 | -74/+251 |
| * | | | Merge pull request #625 from matrix-org/erikj/kick_ban_sync | Erik Johnston | 2016-03-04 | 1 | -3/+9 |
| |\ \ \ |
|
| | * | | | Always include kicks and bans in full /sync | Erik Johnston | 2016-03-04 | 1 | -3/+9 |
| | | |/
| | |/| |
|
| * | | | Spelling | Erik Johnston | 2016-03-04 | 1 | -1/+1 |
| * | | | Add profile information to invites | Erik Johnston | 2016-03-04 | 3 | -3/+17 |
| |/ / |
|
| * | | Merge pull request #598 from Rugvip/invite-state | Erik Johnston | 2016-03-04 | 3 | -7/+44 |
| |\ \ |
|
| | * | | config,handlers/_base: added homeserver config for what state is included in ... | Patrik Oldsberg | 2016-03-04 | 3 | -7/+44 |
| * | | | Merge pull request #596 from Rugvip/create | Erik Johnston | 2016-03-04 | 1 | -0/+6 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | handlers/_base: don't allow room create event to be changed | Patrik Oldsberg | 2016-02-23 | 1 | -0/+6 |
| * | | | Merge pull request #610 from Rugvip/unique-user | Erik Johnston | 2016-03-04 | 1 | -0/+1 |
| |\ \ \ |
|
| | * | | | handlers/register: make sure another user id is generated when a collision oc... | Patrik Oldsberg | 2016-02-29 | 1 | -0/+1 |
| * | | | | Merge pull request #623 from matrix-org/rav/fix_createroom_race | Richard van der Hoff | 2016-03-04 | 1 | -1/+1 |
| |\ \ \ \ |
|
| | * | | | | Make sure we add all invited members before returning from createRoom | Richard van der Hoff | 2016-03-04 | 1 | -1/+1 |
| * | | | | | Merge pull request #614 from matrix-org/erikj/alias_delete | Erik Johnston | 2016-03-04 | 4 | -10/+51 |
| |\ \ \ \ \ |
|
| | * | | | | | Allow alias creators to delete aliases | Erik Johnston | 2016-03-01 | 4 | -10/+51 |
| * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/SYN-642 | Richard van der Hoff | 2016-03-03 | 17 | -90/+193 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge pull request #621 from matrix-org/daniel/ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 9 | -63/+95 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 9 | -63/+95 |
| | * | | | | | | Merge pull request #619 from matrix-org/dbkr/dont_use_checkpw | Erik Johnston | 2016-03-03 | 1 | -1/+1 |
| | |\ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | | * | | | | | Stop using checkpw as it seems to have vanished from bcrypt. Use `bcrypt.hash... | David Baker | 2016-03-02 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'develop' into rav/SYN-642 | Richard van der Hoff | 2016-03-03 | 23 | -84/+667 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| * | | | | | | | Fix typo | Richard van der Hoff | 2016-03-03 | 1 | -1/+1 |
| * | | | | | | | Move arg default to the start of the function | Richard van der Hoff | 2016-03-02 | 1 | -2/+3 |
| * | | | | | | | fix pyflakes quibble | Richard van der Hoff | 2016-03-02 | 1 | -1/+2 |
| * | | | | | | | Address review comments | Richard van der Hoff | 2016-03-02 | 2 | -8/+17 |
| * | | | | | | | Fix pyflakes warning | Richard van der Hoff | 2016-03-01 | 1 | -1/+1 |
| * | | | | | | | Handle rejections of invites from local users locally | Richard van der Hoff | 2016-03-01 | 2 | -8/+31 |
| | |_|_|/ / /
| |/| | | | | |
|
* | | | | | | | Idempotent-ise schema update script | Daniel Wagner-Hall | 2016-03-08 | 1 | -1/+5 |
| |_|/ / / /
|/| | | | | |
|
* | | | | | | Merge pull request #571 from matrix-org/daniel/asids | Daniel Wagner-Hall | 2016-03-03 | 7 | -26/+97 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Mark AS users with their AS's ID | Daniel Wagner-Hall | 2016-02-11 | 7 | -27/+98 |
* | | | | | | Merge pull request #616 from matrix-org/matthew/800x600 | Matthew Hodgson | 2016-03-02 | 1 | -0/+3 |
|\ \ \ \ \ \ |
|
| * | | | | | | add 800x600 thumbnails to make vector look prettier (and anyone else who like... | Matthew Hodgson | 2016-03-02 | 1 | -0/+3 |
* | | | | | | | Merge pull request #612 from matrix-org/erikj/cache_size | Erik Johnston | 2016-03-02 | 4 | -3/+15 |
|\ \ \ \ \ \ \
| |_|_|_|_|_|/
|/| | | | | | |
|
| * | | | | | | Limit stream change cache size too | Erik Johnston | 2016-03-01 | 1 | -1/+5 |