| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #385 from matrix-org/daniel/forgetrooms | Mark Haines | 2015-11-20 | 6 | -5/+118 |
|\ |
|
| * | Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into danie... | Daniel Wagner-Hall | 2015-11-19 | 14 | -74/+112 |
| |\ |
|
| | * | Merge branch 'develop' into daniel/forgetrooms | Paul "LeoNerd" Evans | 2015-11-19 | 14 | -74/+112 |
| | |\ |
|
| * | | | Ignore forgotten rooms in v2 sync | Daniel Wagner-Hall | 2015-11-19 | 1 | -1/+1 |
| |/ / |
|
| * | | Simplify code | Daniel Wagner-Hall | 2015-11-19 | 2 | -8/+6 |
| * | | Apply forgetting properly to historical events | Daniel Wagner-Hall | 2015-11-18 | 2 | -3/+41 |
| * | | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 6 | -4/+81 |
* | | | Fix typo | Erik Johnston | 2015-11-20 | 2 | -3/+3 |
* | | | Don't limit connections to perspective servers | Erik Johnston | 2015-11-20 | 2 | -22/+21 |
* | | | Merge pull request #394 from matrix-org/erikj/search | Erik Johnston | 2015-11-20 | 1 | -1/+54 |
|\ \ \ |
|
| * | | | Add option to include the current room state | Erik Johnston | 2015-11-20 | 1 | -0/+24 |
| * | | | Optionally include historic profile info | Erik Johnston | 2015-11-20 | 1 | -1/+30 |
| | |/
| |/| |
|
* | | | Merge pull request #389 from matrix-org/rav/flatten_sync_response | Richard van der Hoff | 2015-11-20 | 2 | -27/+17 |
|\ \ \ |
|
| * | | | Merge branch 'develop' into rav/flatten_sync_response | Paul "LeoNerd" Evans | 2015-11-19 | 15 | -75/+113 |
| |\| | |
|
| * | | | Put back the 'state.events' subobject | Richard van der Hoff | 2015-11-19 | 1 | -1/+1 |
| * | | | v2 /sync: Rename the keys of the 'rooms' object to match member states | Richard van der Hoff | 2015-11-19 | 1 | -3/+3 |
| * | | | Flatten the /sync response to remove the event_map | Richard van der Hoff | 2015-11-19 | 2 | -24/+14 |
* | | | | Merge pull request #391 from matrix-org/erikj/remove_token_from_flow | Erik Johnston | 2015-11-20 | 1 | -1/+10 |
|\ \ \ \ |
|
| * | | | | Comment | Erik Johnston | 2015-11-20 | 1 | -0/+8 |
| * | | | | Remove m.login.token from advertised flows. | Erik Johnston | 2015-11-19 | 1 | -1/+2 |
* | | | | | Merge pull request #393 from matrix-org/erikj/destination_retry_max | Erik Johnston | 2015-11-20 | 1 | -2/+2 |
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
|
| * | | | | Use min and not max to set an upper bound on retry interval | Erik Johnston | 2015-11-20 | 1 | -2/+2 |
| |/ / / |
|
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-19 | 1 | -1/+1 |
|\| | | |
|
| * | | | Bump changes and version | Erik Johnston | 2015-11-19 | 1 | -1/+1 |
* | | | | Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data | Mark Haines | 2015-11-19 | 11 | -49/+66 |
|\ \ \ \ |
|
| * | | | | Rename the database table | Mark Haines | 2015-11-18 | 1 | -0/+17 |
| * | | | | s/private_user_data/account_data/ | Mark Haines | 2015-11-18 | 10 | -49/+49 |
| | |_|/
| |/| | |
|
* | | | | Take a boolean not a list of lambdas | Daniel Wagner-Hall | 2015-11-19 | 2 | -9/+18 |
| |/ /
|/| | |
|
* | | | Comment | Erik Johnston | 2015-11-19 | 1 | -0/+2 |
* | | | Split out text for missing config options. | Erik Johnston | 2015-11-18 | 1 | -16/+26 |
| |/
|/| |
|
* | | Bump changelog and version | Erik Johnston | 2015-11-17 | 1 | -1/+1 |
|/ |
|
* | Add comment | Erik Johnston | 2015-11-17 | 1 | -0/+2 |
* | Only retry federation requests for a long time for background requests | Erik Johnston | 2015-11-17 | 2 | -7/+20 |
* | Implement required method 'resumeProducing' | Erik Johnston | 2015-11-17 | 1 | -0/+3 |
* | Slightly more aggressive retry timers at HTTP level | Erik Johnston | 2015-11-17 | 1 | -2/+3 |
* | Bump changelog and version | Erik Johnston | 2015-11-17 | 1 | -1/+1 |
* | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-17 | 7 | -42/+219 |
|\ |
|
| * | 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 | 28 | -284/+1003 |
| |\ |
|
| | * | Don't complain if /make_join response lacks 'prev_state' list (SYN-517) | Paul "LeoNerd" Evans | 2015-11-13 | 1 | -0/+6 |
| | * | Allow guests to /room/:room_id/{join,leave} | Daniel Wagner-Hall | 2015-11-13 | 1 | -3/+14 |
| * | | Snakes not camels | Steven Hammerton | 2015-11-11 | 1 | -5/+5 |
| * | | Minor review fixes | Steven Hammerton | 2015-11-11 | 2 | -17/+14 |
| * | | Share more code between macaroon validation | Steven Hammerton | 2015-11-11 | 2 | -57/+17 |
| * | | Updates to fallback CAS login to do new token login | Steven Hammerton | 2015-11-06 | 1 | -26/+12 |
| * | | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-05 | 40 | -295/+1435 |
| |\ \ |
|
| * | | | Allow hs to do CAS login completely and issue the client with a login token t... | Steven Hammerton | 2015-11-05 | 3 | -5/+218 |
| * | | | Add service URL to CAS config | Steven Hammerton | 2015-11-04 | 1 | -0/+3 |
* | | | | Bump version and change log v0.11.0-rc2 | Erik Johnston | 2015-11-13 | 1 | -1/+1 |
| |_|/
|/| | |
|
* | | | Implementation of state rollback in /sync | Richard van der Hoff | 2015-11-13 | 2 | -4/+69 |
* | | | Fix a few race conditions in the state calculation | Richard van der Hoff | 2015-11-13 | 2 | -60/+77 |
* | | | Make handlers.sync return a state dictionary, instead of an event list. | Richard van der Hoff | 2015-11-13 | 2 | -32/+40 |
* | | | Update some comments | Richard van der Hoff | 2015-11-13 | 4 | -14/+98 |
* | | | Merge pull request #369 from matrix-org/daniel/guestnonevents | Daniel Wagner-Hall | 2015-11-12 | 1 | -3/+17 |
|\ \ \ |
|
| * | | | Return non-room events from guest /events calls | Daniel Wagner-Hall | 2015-11-12 | 1 | -3/+17 |
* | | | | Merge pull request #368 from matrix-org/erikj/fix_federation_profile | Erik Johnston | 2015-11-12 | 3 | -6/+13 |
|\ \ \ \ |
|
| * | | | | Fix missing profile data in federation joins | Erik Johnston | 2015-11-12 | 3 | -6/+13 |
| |/ / / |
|
* | | | | Merge pull request #366 from matrix-org/erikj/search_fix_sqlite_faster | Erik Johnston | 2015-11-12 | 1 | -3/+14 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Trailing whitespace | Erik Johnston | 2015-11-12 | 1 | -1/+1 |
| * | | | Expand comment | Erik Johnston | 2015-11-12 | 1 | -0/+6 |
| * | | | Comment | Erik Johnston | 2015-11-12 | 1 | -0/+2 |
| * | | | Fix SQL syntax | Erik Johnston | 2015-11-12 | 1 | -2/+3 |
| * | | | Use a (hopefully) more efficient SQL query for doing recency based room search | Erik Johnston | 2015-11-12 | 1 | -4/+6 |
* | | | | Fix an issue with ignoring power_level changes on divergent graphs | Richard van der Hoff | 2015-11-12 | 1 | -5/+11 |
* | | | | Merge pull request #367 from matrix-org/daniel/readafterleave | Daniel Wagner-Hall | 2015-11-12 | 1 | -10/+11 |
|\ \ \ \ |
|
| * | | | | Tweak guest access permissions | Daniel Wagner-Hall | 2015-11-12 | 1 | -10/+11 |
* | | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync | Daniel Wagner-Hall | 2015-11-12 | 2 | -24/+34 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | Allow guest access to room initialSync | Daniel Wagner-Hall | 2015-11-11 | 2 | -24/+34 |
* | | | | | Fix bug where assumed dict was namedtuple | Erik Johnston | 2015-11-12 | 1 | -1/+1 |
| |/ / /
|/| | | |
|
* | | | | Allow guests to set their display names | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+1 |
* | | | | Consider joined guest users as joined users | Daniel Wagner-Hall | 2015-11-12 | 1 | -12/+21 |
* | | | | Fix race creating directories | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+5 |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-11 | 2 | -5/+11 |
|\ \ \ \ |
|
| * \ \ \ | Merge pull request #361 from matrix-org/daniel/guestcontext | Erik Johnston | 2015-11-11 | 2 | -5/+11 |
| |\ \ \ \ |
|
| | * | | | | Allow guests to access room context API | Daniel Wagner-Hall | 2015-11-11 | 2 | -5/+11 |
| | |/ / / |
|
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-11 | 19 | -134/+594 |
|\| | | | |
|
| * | | | | Merge pull request #359 from matrix-org/markjh/incremental_indexing | Erik Johnston | 2015-11-11 | 6 | -77/+413 |
| |\ \ \ \
| | |/ / /
| |/| | | |
|
| | * | | | Fix param style to work on both sqlite and postgres | Mark Haines | 2015-11-11 | 1 | -2/+6 |
| | * | | | Fix the background update | Mark Haines | 2015-11-11 | 3 | -17/+19 |
| | * | | | Use a background task to update databases to use the full text search | Mark Haines | 2015-11-10 | 2 | -80/+28 |
| | * | | | Run the background updates when starting synapse. | Mark Haines | 2015-11-10 | 4 | -10/+67 |
| | * | | | Add background update task for reindexing event search | Mark Haines | 2015-11-09 | 1 | -2/+96 |
| | * | | | Add storage module for tracking background updates. | Mark Haines | 2015-11-09 | 2 | -0/+231 |
| * | | | | Return world_readable and guest_can_join in /publicRooms | Daniel Wagner-Hall | 2015-11-10 | 3 | -29/+69 |
| * | | | | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 7 | -12/+92 |
| * | | | | Merge pull request #356 from matrix-org/daniel/3pidyetagain | Daniel Wagner-Hall | 2015-11-10 | 2 | -7/+4 |
| |\ \ \ \ |
|
| | * | | | | Get display name from identity server, not client | Daniel Wagner-Hall | 2015-11-09 | 2 | -7/+4 |
| | |/ / / |
|
| * | | | | Don't fiddle with results returned by event sources | Richard van der Hoff | 2015-11-09 | 1 | -4/+12 |
| * | | | | Add a couple of unit tests for room/<x>/messages | Richard van der Hoff | 2015-11-09 | 1 | -1/+1 |
| * | | | | Merge branch 'develop' into markjh/SYN-513 | Mark Haines | 2015-11-09 | 1 | -1/+1 |
| |\ \ \ \ |
|
| | * | | | | fix comedy important missing comma breaking recent-ordered FTS on sqlite | Matthew Hodgson | 2015-11-08 | 1 | -1/+1 |
| | * | | | | add a key existence check to tags_by_room to avoid /events 500'ing when testi... | Matthew Hodgson | 2015-11-06 | 1 | -1/+2 |
| | |/ / / |
|
| * / / / | SYN-513: Include updates for rooms that have had all their tags deleted | Mark Haines | 2015-11-09 | 2 | -2/+2 |
| |/ / / |
|
| * | / | Remove accidentally added ID column | Daniel Wagner-Hall | 2015-11-06 | 1 | -1/+0 |
| | |/
| |/| |
|
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-05 | 13 | -187/+245 |
|\| | |
|
| * | | Merge pull request #350 from matrix-org/erikj/search | Erik Johnston | 2015-11-05 | 3 | -36/+288 |
| |\ \ |
|
| | * | | Be explicit about what we're doing | Erik Johnston | 2015-11-05 | 1 | -1/+1 |
| | * | | Remove redundant test | Erik Johnston | 2015-11-05 | 1 | -1/+0 |
| | * | | Increment by one, not five | Erik Johnston | 2015-11-05 | 1 | -1/+1 |
| * | | | Exchange 3pid invites for m.room.member invites | Daniel Wagner-Hall | 2015-11-05 | 10 | -180/+230 |
| * | | | Merge pull request #340 from matrix-org/erikj/server_retries | Erik Johnston | 2015-11-05 | 2 | -4/+13 |
| |\ \ \ |
|
| | * | | | Retry dead servers a lot less often | Erik Johnston | 2015-11-02 | 2 | -4/+13 |
* | | | | | Bump changelog and version number | Erik Johnston | 2015-11-05 | 1 | -1/+1 |
| |_|/ /
|/| | | |
|
* | | | | COMMENTS | Erik Johnston | 2015-11-05 | 1 | -4/+26 |
* | | | | Error handling | Erik Johnston | 2015-11-05 | 1 | -1/+8 |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-11-05 | 55 | -330/+1126 |
|\| | | |
|
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-05 | 43 | -329/+434 |
| |\ \ \ |
|
| | * | | | Open up /events to anonymous users for room events only | Daniel Wagner-Hall | 2015-11-05 | 16 | -56/+210 |
| | * | | | 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 |
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Daniel Wagner-Hall | 2015-11-04 | 8 | -114/+6 |
| | |\ \ \ |
|
| | | * | | | Merge branch 'develop' into daniel/removesomelies | Mark Haines | 2015-11-04 | 18 | -160/+577 |
| | | |\| | |
|
| | | | * | | Remove the LockManager class because it wasn't being used | Mark Haines | 2015-11-04 | 3 | -81/+0 |
| | | * | | | Remove more unused parameters | Daniel Wagner-Hall | 2015-11-02 | 3 | -4/+1 |
| | | * | | | Remove unused arguments and code | Daniel Wagner-Hall | 2015-11-02 | 3 | -29/+5 |
| | | | |/
| | | |/| |
|
| | * | | | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 27 | -149/+224 |
| | | |/
| | |/| |
|
| * | | | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-05 | 12 | -1/+692 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Use correct service url | Erik Johnston | 2015-10-26 | 1 | -3/+1 |
| | * | | Add login fallback | Erik Johnston | 2015-10-26 | 5 | -0/+280 |
| | * | | Move static folder into synapse | Erik Johnston | 2015-10-26 | 7 | -1/+414 |
* | | | | Implement basic pagination for search results | Erik Johnston | 2015-11-05 | 3 | -50/+86 |
* | | | | Implement order and group by | Erik Johnston | 2015-11-04 | 2 | -17/+205 |
|/ / / |
|
* | | | Merge pull request #341 from matrix-org/markjh/v2_sync_receipts | Mark Haines | 2015-11-03 | 1 | -15/+30 |
|\ \ \ |
|
| * \ \ | Merge branch 'develop' into markjh/v2_sync_receipts | Mark Haines | 2015-11-03 | 13 | -23/+522 |
| |\ \ \ |
|
| * | | | | Include read receipts in v2 sync | Mark Haines | 2015-11-02 | 1 | -15/+30 |
| | |_|/
| |/| | |
|
* | | | | Merge pull request #343 from matrix-org/erikj/fix_retries | Erik Johnston | 2015-11-03 | 2 | -46/+30 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Don't rearrange transaction_queue | Erik Johnston | 2015-11-03 | 1 | -12/+11 |
| * | | | Fix broken cache for getting retry times. This meant we retried remote destin... | Erik Johnston | 2015-11-03 | 2 | -55/+40 |
| |/ / |
|
* | | | Merge pull request #335 from matrix-org/markjh/room_tags | Mark Haines | 2015-11-03 | 13 | -24/+523 |
|\ \ \
| |/ /
|/| | |
|
| * | | That TODO was done | Mark Haines | 2015-11-03 | 1 | -1/+0 |
| * | | Spell "deferred" more correctly | Mark Haines | 2015-11-03 | 1 | -1/+1 |
| * | | Include room tags in v2 /sync | Mark Haines | 2015-11-02 | 3 | -11/+70 |
| * | | Store room tag content and return the content in the m.tag event | Mark Haines | 2015-11-02 | 4 | -22/+41 |
| * | | Merge branch 'develop' into markjh/room_tags | Mark Haines | 2015-11-02 | 9 | -28/+331 |
| |\ \ |
|
| * | | | Support clients supplying older tokens, fix short poll test | Mark Haines | 2015-10-30 | 1 | -1/+1 |
| * | | | Include tags in v1 room initial sync | Mark Haines | 2015-10-30 | 1 | -0/+11 |
| * | | | Include room tags v1 /initialSync | Mark Haines | 2015-10-30 | 1 | -0/+12 |
| * | | | Inform the client of new room tags using v1 /events | Mark Haines | 2015-10-29 | 6 | -14/+91 |
| * | | | Fix pyflakes errors | Mark Haines | 2015-10-28 | 2 | -3/+5 |
| * | | | Add APIs for adding and removing tags from rooms | Mark Haines | 2015-10-28 | 5 | -0/+320 |
* | | | | Add missing column | Daniel Wagner-Hall | 2015-10-30 | 1 | -1/+1 |
| |/ /
|/| | |
|
* | | | Update the other place check_joined_room is called | Mark Haines | 2015-10-30 | 2 | -2/+3 |
* | | | Don't mark newly joined room timelines as limited in an incremental sync | Mark Haines | 2015-10-29 | 1 | -3/+5 |
* | | | Make search API honour limit set in filter | Erik Johnston | 2015-10-29 | 1 | -0/+3 |
* | | | Merge pull request #336 from matrix-org/erikj/search | Erik Johnston | 2015-10-28 | 1 | -1/+52 |
|\ \ \ |
|
| * | | | Optionally return event contexts with search results | Erik Johnston | 2015-10-28 | 1 | -1/+52 |
* | | | | Merge pull request #334 from matrix-org/erikj/context_api | Erik Johnston | 2015-10-28 | 4 | -2/+229 |
|\| | | |
|
| * | | | Docs | Erik Johnston | 2015-10-28 | 2 | -0/+39 |
| * | | | Add room context api | Erik Johnston | 2015-10-28 | 4 | -2/+190 |
* | | | | Merge pull request #332 from matrix-org/rav/full_state_sync | Richard van der Hoff | 2015-10-28 | 2 | -19/+38 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Implement full_state incremental sync | Richard van der Hoff | 2015-10-26 | 2 | -19/+38 |
| |/ / |
|
* / / | Fix a 500 error resulting from empty room_ids | Richard van der Hoff | 2015-10-26 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #328 from matrix-org/erikj/search | Erik Johnston | 2015-10-26 | 1 | -14/+17 |
|\ \ |
|
| * | | Pull out sender when computing search results | Erik Johnston | 2015-10-23 | 1 | -14/+17 |
* | | | Merge pull request #327 from matrix-org/erikj/search | Erik Johnston | 2015-10-23 | 3 | -2/+30 |
|\| | |
|
| * | | Implement rank function for SQLite FTS | Erik Johnston | 2015-10-23 | 3 | -2/+30 |
* | | | 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 branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-10-23 | 7 | -12/+48 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Fix receipts for room initial sync | Erik Johnston | 2015-10-22 | 1 | -7/+1 |
| * | | | Add config option to disable password login | Erik Johnston | 2015-10-22 | 5 | -4/+46 |
| * | | | Bump version | Erik Johnston | 2015-10-15 | 1 | -1/+1 |
* | | | | 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 |
| * | | | Merge pull request #319 from matrix-org/erikj/filter_refactor | Erik Johnston | 2015-10-22 | 2 | -99/+61 |
| |\ \ \ |
|
* | | | | | Actually filter results | Erik Johnston | 2015-10-22 | 1 | -3/+5 |
* | | | | | Rename | Erik Johnston | 2015-10-22 | 1 | -3/+3 |
* | | | | | LESS THAN | Erik Johnston | 2015-10-22 | 1 | -1/+2 |
* | | | | | Use namedtuple as return value | Erik Johnston | 2015-10-22 | 2 | -4/+18 |
* | | | | | Limit max number of SQL vars | Erik Johnston | 2015-10-22 | 1 | -4/+6 |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-22 | 5 | -25/+208 |
|\| | | | |
|
| * | | | | Merge pull request #320 from matrix-org/appservice-retry-cap | Erik Johnston | 2015-10-22 | 1 | -2/+2 |
| |\ \ \ \ |
|
| | * | | | | Cap the time to retry txns to appservices to 8.5 minutes | Kegan Dougal | 2015-10-21 | 1 | -2/+2 |
| * | | | | | Merge branch 'develop' into markjh/v2_sync_typing | Mark Haines | 2015-10-21 | 24 | -212/+896 |
| |\ \ \ \ \ |
|
| | * \ \ \ \ | Merge pull request #316 from matrix-org/markjh/v2_sync_archived | Mark Haines | 2015-10-21 | 3 | -9/+163 |
| | |\ \ \ \ \
| | | |_|_|_|/
| | |/| | | | |
|
| | | * | | | | Include banned rooms in the archived section of v2 sync | Mark Haines | 2015-10-21 | 2 | -8/+11 |
| | | * | | | | Fix pep8 | Mark Haines | 2015-10-19 | 1 | -1/+0 |
| | | * | | | | Add rooms that the user has left under archived in v2 sync. | Mark Haines | 2015-10-19 | 3 | -9/+161 |
| | * | | | | | Merge pull request #318 from matrix-org/syn-502-login-bad-emails | Kegsay | 2015-10-21 | 1 | -0/+2 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Use 403 and message to match handlers/auth | Kegan Dougal | 2015-10-21 | 1 | -3/+1 |
| | | * | | | | | Don't 500 when the email doesn't map to a valid user ID. | Kegan Dougal | 2015-10-20 | 1 | -0/+4 |
| | | | |/ / /
| | | |/| | | |
|
| * | | | | | | Doc string for the SyncHandler.typing_by_room method | Mark Haines | 2015-10-21 | 1 | -0/+12 |
| * | | | | | | Include typing events in initial v2 sync | Mark Haines | 2015-10-20 | 1 | -14/+29 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | PEP8 | Erik Johnston | 2015-10-22 | 1 | -1/+2 |
* | | | | | | Move FTS to delta 25 | Erik Johnston | 2015-10-22 | 2 | -3/+3 |
* | | | | | | Filter room ids before hitting the database | Erik Johnston | 2015-10-21 | 2 | -1/+21 |
* | | | | | | Filter search results | Erik Johnston | 2015-10-21 | 1 | -2/+7 |
| |_|_|/ /
|/| | | | |
|
* | | | | | Docstring | Erik Johnston | 2015-10-20 | 1 | -0/+5 |
* | | | | | Refactor api.filtering to have a Filter API | Erik Johnston | 2015-10-20 | 2 | -100/+57 |
| |/ / /
|/| | | |
|
* | | | | Allow rejecting invites | Daniel Wagner-Hall | 2015-10-20 | 7 | -91/+351 |
| |/ /
|/| | |
|
* | | | Merge pull request #312 from matrix-org/daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-19 | 2 | -8/+15 |
|\ \ \ |
|
| * | | | Stuff signed data in a standalone object | Daniel Wagner-Hall | 2015-10-16 | 2 | -8/+15 |
* | | | | Merge pull request #307 from matrix-org/erikj/search | Erik Johnston | 2015-10-19 | 10 | -2/+365 |
|\ \ \ \ |
|
| * | | | | Explicitly check for Sqlite3Engine | Erik Johnston | 2015-10-16 | 1 | -2/+5 |
| * | | | | Typing | Erik Johnston | 2015-10-16 | 1 | -2/+2 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-16 | 13 | -25/+393 |
| |\ \ \ \ |
|
| * | | | | | Remove unused import | Erik Johnston | 2015-10-16 | 1 | -3/+1 |
| * | | | | | Remove duplicate _filter_events_for_client | Erik Johnston | 2015-10-16 | 1 | -46/+0 |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-16 | 3 | -97/+51 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-16 | 1 | -2/+2 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | Explicitly check for Sqlite3Engine | Erik Johnston | 2015-10-16 | 1 | -2/+5 |
| * | | | | | | | docstring | Erik Johnston | 2015-10-16 | 1 | -0/+10 |
| * | | | | | | | Add docstring | Erik Johnston | 2015-10-16 | 1 | -0/+11 |
| * | | | | | | | Comment on the LIMIT 500 | Erik Johnston | 2015-10-16 | 1 | -0/+2 |
| * | | | | | | | Split up run_upgrade | Erik Johnston | 2015-10-16 | 1 | -5/+11 |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-15 | 6 | -171/+291 |
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| * | | | | | | | Remove unused constatns | Erik Johnston | 2015-10-14 | 1 | -19/+0 |
| * | | | | | | | Make 'keys' optional | Erik Johnston | 2015-10-14 | 1 | -1/+3 |
| * | | | | | | | Fix to work with SQLite | Erik Johnston | 2015-10-14 | 1 | -4/+11 |
| * | | | | | | | More TODO markers | Erik Johnston | 2015-10-14 | 1 | -0/+3 |
| * | | | | | | | Add TODO markers | Erik Johnston | 2015-10-14 | 1 | -1/+4 |
| * | | | | | | | Add paranoia limit | Erik Johnston | 2015-10-13 | 1 | -1/+1 |
| * | | | | | | | Remove constraints in preperation of using filters | Erik Johnston | 2015-10-13 | 2 | -71/+20 |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-13 | 1 | -18/+44 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge branch 'erikj/store_engine' into erikj/search | Erik Johnston | 2015-10-13 | 5 | -4/+4 |
| |\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Add SQLite support | Erik Johnston | 2015-10-13 | 1 | -5/+12 |
| * | | | | | | | | | Merge branch 'erikj/store_engine' into erikj/search | Erik Johnston | 2015-10-13 | 8 | -408/+463 |
| |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Search left rooms too | Erik Johnston | 2015-10-13 | 1 | -5/+2 |
| * | | | | | | | | | | Add sqlite schema | Erik Johnston | 2015-10-13 | 1 | -5/+64 |
| * | | | | | | | | | | Filter events to only thsoe that the user is allowed to see | Erik Johnston | 2015-10-12 | 2 | -13/+17 |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into erikj/search | Erik Johnston | 2015-10-12 | 10 | -64/+254 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Remove unused room_id parameter | Erik Johnston | 2015-10-12 | 5 | -14/+61 |
| * | | | | | | | | | | | PEP8 | Erik Johnston | 2015-10-12 | 1 | -2/+9 |
| * | | | | | | | | | | | Keep FTS indexes up to date. Only search through rooms currently joined | Erik Johnston | 2015-10-12 | 6 | -12/+55 |
| * | | | | | | | | | | | Add basic full text search impl. | Erik Johnston | 2015-10-09 | 8 | -1/+268 |
* | | | | | | | | | | | | Surely we don't need to preserve 'events_default' twice | Paul "LeoNerd" Evans | 2015-10-16 | 1 | -1/+0 |
* | | | | | | | | | | | | Merge pull request #306 from matrix-org/markjh/unused_methods | Mark Haines | 2015-10-16 | 2 | -101/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | synapse.client.v1.login.LoginFallbackRestServlet and synapse.client.v1.login.... | Mark Haines | 2015-10-15 | 1 | -30/+0 |
| * | | | | | | | | | | | synapse.util.emailutils was unused | Mark Haines | 2015-10-15 | 1 | -71/+0 |
| | |_|_|_|_|/ / / / /
| |/| | | | | | | | | |
|
* | | | | | | | | | | | Merge pull request #310 from matrix-org/markjh/bcrypt_rounds | Mark Haines | 2015-10-16 | 2 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | Add config for how many bcrypt rounds to use for password hashes | Mark Haines | 2015-10-16 | 2 | -1/+8 |
| |/ / / / / / / / / |
|
* | | | | | | | | | | Fix FilteringStore.get_user_filter to work with postgres | Mark Haines | 2015-10-16 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #302 from matrix-org/daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-16 | 12 | -24/+392 |
|\ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|/ /
|/| | | | | | | | /
| | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
| * | | | | | | | | Add signing host and keyname to signatures | Daniel Wagner-Hall | 2015-10-16 | 2 | -6/+10 |
| * | | | | | | | | Verify third party ID server certificates | Daniel Wagner-Hall | 2015-10-16 | 4 | -9/+43 |
| * | | | | | | | | Use non-placeholder name for endpoint | Daniel Wagner-Hall | 2015-10-15 | 1 | -1/+1 |
| * | | | | | | | | Look for keys on the right objects | Daniel Wagner-Hall | 2015-10-15 | 3 | -4/+6 |
| * | | | | | | | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-15 | 14 | -581/+748 |
| |\| | | | | | | |
|
| * | | | | | | | | Use more descriptive error code | Daniel Wagner-Hall | 2015-10-13 | 1 | -1/+1 |
| * | | | | | | | | Remove unnecessary class-wrapping | Daniel Wagner-Hall | 2015-10-13 | 8 | -91/+94 |
| * | | | | | | | | Move logic into handler | Daniel Wagner-Hall | 2015-10-13 | 2 | -115/+150 |
| * | | | | | | | | Add logging | Daniel Wagner-Hall | 2015-10-13 | 1 | -2/+2 |
| * | | | | | | | | Re-add accidentally removed code | Daniel Wagner-Hall | 2015-10-13 | 1 | -1/+1 |
| * | | | | | | | | 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 | 7 | -21/+35 |
| * | | | | | | | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-13 | 10 | -64/+288 |
| |\ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-06 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| * | | | | | | | | | Remove merge thinko | Daniel Wagner-Hall | 2015-10-06 | 1 | -4/+0 |
| * | | | | | | | | | Add third party invites to auth_events for joins | Daniel Wagner-Hall | 2015-10-06 | 1 | -0/+5 |