summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #297 from matrix-org/markjh/presence_racesMark Haines2015-10-121-3/+8
|\
| * Fix some races in the synapse presence handler caused by not yielding on defe...Mark Haines2015-10-091-3/+8
* | Formatting changesSteven Hammerton2015-10-101-1/+2
* | Provide ability to login using CASSteven Hammerton2015-10-101-0/+31
* | Add a flag to initial sync to indicate we want rooms that the user has leftMark Haines2015-10-081-5/+8
|/
* Explicitly add Create event as auth eventErik Johnston2015-10-021-2/+3
* Add 'trusted_private_chat' to room creation presetsErik Johnston2015-10-021-0/+5
* Merge pull request #275 from matrix-org/erikj/invite_stateErik Johnston2015-10-022-4/+30
|\
| * Also bundle in senderErik Johnston2015-10-021-0/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_stateErik Johnston2015-09-253-88/+160
| |\
| * | Bundle in some room state in the unsigned bit of the invite when sending to i...Erik Johnston2015-09-102-4/+29
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-10-024-240/+302
|\ \ \
| * \ \ Merge pull request #283 from matrix-org/erikj/atomic_join_federationErik Johnston2015-10-021-76/+131
| |\ \ \
| | * | | CommentErik Johnston2015-09-301-0/+8
| | * | | Rename varErik Johnston2015-09-301-3/+3
| | * | | Fix getting an event for a room the server forgot it was inErik Johnston2015-09-171-47/+59
| | * | | Also persist stateErik Johnston2015-09-171-1/+1
| | * | | Capture errErik Johnston2015-09-171-2/+2
| | * | | Also handle stateErik Johnston2015-09-171-3/+3
| | * | | Don't bail out of joining if we encounter a rejected eventErik Johnston2015-09-171-13/+20
| | * | | Refactor do_invite_joinErik Johnston2015-09-171-28/+56
| * | | | Merge pull request #287 from matrix-org/erikj/canonical_aliasErik Johnston2015-09-301-1/+10
| |\ \ \ \
| | * | | | Remove double indentationErik Johnston2015-09-301-7/+6
| | * | | | Set m.room.canonical_alias on room creation.Erik Johnston2015-09-231-1/+11
| | | |_|/ | | |/| |
| * | | | Merge pull request #288 from matrix-org/markjh/unused_definitionsMark Haines2015-09-282-75/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | synapse/handlers/room.py:_should_invite_join was unusedMark Haines2015-09-231-26/+0
| | * | | synapse/handlers/federation.py:_handle_auth_events was unusedMark Haines2015-09-231-49/+0
| * | | | Merge pull request #271 from matrix-org/erikj/default_historyErik Johnston2015-09-231-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Change default history visibility for private roomsErik Johnston2015-09-091-1/+1
| | | |/ | | |/|
| * | | Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_be...Mark Haines2015-09-212-85/+158
| |\ \ \ | | |_|/ | |/| |
| | * | Clarify that room_initial_sync returns a python dictMark Haines2015-09-211-1/+1
| | * | Fix doc string to point at the right classMark Haines2015-09-211-2/+3
| | * | Add explicit "elif event.membership == Membership.LEAVE" for clarityMark Haines2015-09-211-1/+2
| | * | Clamp the "to" token for /rooms/{roomId}/messages to when the user leftMark Haines2015-09-211-0/+4
| | * | Allow users to GET individual state events for rooms that they have leftMark Haines2015-09-101-7/+13
| | * | Allow users that have left a room to get the messages that happend in the roo...Mark Haines2015-09-091-4/+27
| | * | Remove undocumented and unimplemented 'feedback' parameter from the Client-Se...Mark Haines2015-09-092-19/+3
| | * | Allow users that have left the room to view the member list from the point th...Mark Haines2015-09-091-36/+0
| | * | Allow rooms/{roomId}/state for a room that has been leftMark Haines2015-09-091-5/+13
| | * | Allow room initialSync for users that have left the room, returning a snapsho...Mark Haines2015-09-091-9/+76
| | * | Include rooms that a user has left in an initialSync. Include the state and m...Mark Haines2015-09-081-6/+21
| | |/
| * / Allow configuration to ignore invalid SSL certsDaniel Wagner-Hall2015-09-091-2/+1
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-09-141-1/+16
|\|
| * Merge pull request #262 from matrix-org/redactyoselfDaniel Wagner-Hall2015-09-021-1/+16
| |\
| | * Merge branch 'develop' into redactyoselfDaniel Wagner-Hall2015-08-283-27/+29
| | |\
| | * | Allow users to redact their own eventsDaniel Wagner-Hall2015-08-281-2/+17
* | | | Add flag which disables federation of the roomErik Johnston2015-09-011-2/+6
|/ / /
* | | Merge pull request #258 from matrix-org/slowtestsmakemesadDaniel Wagner-Hall2015-08-282-4/+26
|\ \ \ | |_|/ |/| |
| * | Remove unused importDaniel Wagner-Hall2015-08-261-1/+0
| * | Swap out bcrypt for md5 in testsDaniel Wagner-Hall2015-08-262-3/+26
| |/
* | Merge branch 'release-v0.10.0' into developMark Haines2015-08-283-27/+29
|\ \ | |/ |/|
| * Remove needless existence checksErik Johnston2015-08-261-7/+3
| * Don't loop over all rooms ever in typing.get_new_events_for_userErik Johnston2015-08-261-2/+2
| * Do auth checks *before* persisting the eventErik Johnston2015-08-241-16/+16
| * Don't make pushers handle presence/typing eventsErik Johnston2015-08-241-2/+8
| * Doc stringErik Johnston2015-08-211-0/+6
| * When logging in fetch user by user_id case insensitively, *unless* there are ...Erik Johnston2015-08-211-8/+23
| * Don't allow people to register user ids which only differ by case to an exist...Erik Johnston2015-08-211-2/+2
* | Merge erikj/user_dedup to developDaniel Wagner-Hall2015-08-262-10/+33
* | Fix up one more referenceDaniel Wagner-Hall2015-08-251-1/+0
* | Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-252-6/+4
* | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-08-211-1/+1
|\|
| * Add missing param in store.get_state_groups invocationErik Johnston2015-08-211-1/+1
* | Fix bad mergeDaniel Wagner-Hall2015-08-201-8/+1
* | Fix indentationDaniel Wagner-Hall2015-08-201-1/+2
* | Fix flake8 warningsDaniel Wagner-Hall2015-08-201-4/+6
* | Merge branch 'auth' into refreshDaniel Wagner-Hall2015-08-201-3/+3
|\ \
| * | Remove incorrect whitespaceDaniel Wagner-Hall2015-08-201-3/+3
| * | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-206-15/+78
| |\|
* | | Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-204-3/+46
|\ \ \ | | |/ | |/|
| * | Merge pull request #235 from matrix-org/erikj/room_avatarsErik Johnston2015-08-201-2/+3
| |\ \
| | * | Add m.room.avatar to default power levels. Change default required power leve...Erik Johnston2015-08-201-2/+3
| * | | Another use of check_password that got missed in the yield fixDavid Baker2015-08-201-1/+1
| |/ /
| * | Merge pull request #233 from matrix-org/erikj/canonical_aliasErik Johnston2015-08-202-1/+18
| |\ \
| | * | Check that the canonical room alias actually points to the roomErik Johnston2015-08-201-1/+17
| | * | Add canonical alias to the default power levelsErik Johnston2015-08-191-0/+1
| * | | Merge pull request #211 from matrix-org/email_in_useMark Haines2015-08-201-0/+25
| |\ \ \
| | * | | Add endpoint that proxies ID server request token and errors if the given ema...David Baker2015-08-041-0/+25
* | | | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-201-5/+30
* | | | | Move token generation to auth handlerDaniel Wagner-Hall2015-08-202-24/+31
* | | | | Merge branch 'auth' into refreshDaniel Wagner-Hall2015-08-201-6/+13
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-192-4/+3
| |\ \ \ | | | |/ | | |/|
| * | | Re-add whitespace around caveat operatorsDaniel Wagner-Hall2015-08-191-4/+4
| * | | Remove padding space around caveat operatorsDaniel Wagner-Hall2015-08-181-4/+4
| * | | Fix some formatting to use tuplesDaniel Wagner-Hall2015-08-181-4/+4
| * | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-184-49/+136
| |\ \ \
| * | | | Issue macaroons as opaque auth tokensDaniel Wagner-Hall2015-08-181-6/+13
* | | | | Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_usersErik Johnston2015-08-193-12/+32
| |_|/ / |/| | |
* | | | Remove an access token log lineErik Johnston2015-08-191-1/+1
* | | | Fix regression where we incorrectly responded with a 200 to /loginErik Johnston2015-08-191-1/+2
* | | | Merge pull request #227 from matrix-org/erikj/receipts_take2Erik Johnston2015-08-181-2/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_t...Erik Johnston2015-08-174-122/+86
| |\ \ \
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_t...Erik Johnston2015-08-131-7/+3
| |\ \ \ \
| * | | | | Re-enable receiptsErik Johnston2015-08-131-2/+0
* | | | | | TypoErik Johnston2015-08-181-1/+1
* | | | | | None checkErik Johnston2015-08-181-0/+2
* | | | | | More helpful variable namesErik Johnston2015-08-181-7/+7
* | | | | | Doc stringsErik Johnston2015-08-181-0/+28
* | | | | | Remove debug try/catchErik Johnston2015-08-181-47/+43
* | | | | | Implement a batched presence_handler.get_state and use itErik Johnston2015-08-172-12/+69
| |_|/ / / |/| | | |
* | | | | Merge pull request #221 from matrix-org/authDaniel Wagner-Hall2015-08-144-122/+86
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Merge password checking implementationsDaniel Wagner-Hall2015-08-121-20/+15
| * | | Simplify LoginHander and AuthHandlerDaniel Wagner-Hall2015-08-124-108/+77
| | |/ | |/|
* | | Remove pointless mapErik Johnston2015-08-131-7/+3
| |/ |/|
* | Fix _filter_events_for_clientErik Johnston2015-08-122-6/+2
* | Simplify staggered deferred listsErik Johnston2015-08-121-2/+2
* | Use list comprehension instead of filterErik Johnston2015-08-122-20/+6
* | Remove debug loggersErik Johnston2015-08-112-6/+0
* | Fix application of ACLsErik Johnston2015-08-113-14/+30
* | Don't be too enthusiatic with defer.gatherResultsErik Johnston2015-08-071-4/+8
* | Use dictionary cache to do group -> state fetchingErik Johnston2015-08-051-1/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/acl_perfErik Johnston2015-08-041-1/+1
|\|
| * Add vector.im as trusted ID serverDavid Baker2015-08-031-1/+1
* | Speed up event filtering (for ACL) logicErik Johnston2015-08-043-3/+15
|/
* Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-281-1/+2
* Disable receipts for nowMatrix2015-07-221-0/+2
* Don't do any database hits in receipt handling if from_key == to_keyMatrix2015-07-181-0/+3
* Merge pull request #199 from matrix-org/erikj/receiptsErik Johnston2015-07-165-5/+224
|\
| * DocsErik Johnston2015-07-141-3/+8
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-135-1/+197
| |\
| * | CommentsErik Johnston2015-07-131-4/+12
| * | Remove spurious commentErik Johnston2015-07-091-2/+0
| * | Integer timestampsErik Johnston2015-07-091-1/+1
| * | Change format of receipts to allow inclusion of dataErik Johnston2015-07-091-8/+16
| * | Add a cache to fetching of receipt streamsErik Johnston2015-07-081-24/+7
| * | Split receipt events up into one per roomErik Johnston2015-07-081-30/+21
| * | Hook up receipts to v1 initialSyncErik Johnston2015-07-082-4/+57
| * | Wire together receipts and the notifer/federationErik Johnston2015-07-071-21/+60
| * | Fix various typosErik Johnston2015-07-072-2/+6
| * | Consolidate duplicate code in notifierErik Johnston2015-07-023-4/+4
| * | Add basic ReceiptHandlerErik Johnston2015-07-011-0/+130
* | | Merge pull request #203 from matrix-org/erikj/room_creation_presetsErik Johnston2015-07-161-19/+77
|\ \ \
| * | | Implement specifying custom initial state for /createRoomErik Johnston2015-07-161-40/+60
| * | | s/everyone_ops/original_invitees_have_ops/Erik Johnston2015-07-141-3/+3
| * | | Capitalize contantsErik Johnston2015-07-141-4/+4
| * | | Implement presets at room creationErik Johnston2015-07-131-22/+60
| | |/ | |/|
* | | Add back in support for remembering parameters submitted to a user-interactiv...David Baker2015-07-151-2/+4
* | | Merge pull request #193 from matrix-org/erikj/bulk_persist_eventErik Johnston2015-07-141-106/+121
|\ \ \ | |/ / |/| |
| * | Add bulk insert events APIErik Johnston2015-06-251-106/+121
| |/
* | Merge pull request #196 from matrix-org/erikj/room_historyErik Johnston2015-07-104-1/+168
|\ \
| * | Add commentErik Johnston2015-07-091-0/+4
| * | Add m.room.history_visibility to newly created rooms' m.room.power_levelsErik Johnston2015-07-061-0/+1
| * | Rename key and values for m.room.history_visibility. Support 'invited' valueErik Johnston2015-07-063-23/+60
| * | Filter and redact events that the other server doesn't have permission to see...Erik Johnston2015-07-031-0/+44
| * | Respect m.room.history_visibility in v2_alpha sync APIErik Johnston2015-07-031-0/+33
| * | Make v1 initial syncs respect room history ACLErik Johnston2015-07-021-17/+34
| * | Add basic impl for room history ACL on GET /messages client APIErik Johnston2015-07-021-1/+32
| |/
* | code beautifyMuthu Subramanian2015-07-081-1/+0
* | Integrate SAML2 basic authentication - uses pysaml2Muthu Subramanian2015-07-081-0/+30
|/
* Merge pull request #189 from matrix-org/erikj/room_init_syncErik Johnston2015-06-192-35/+45
|\
| * Use another deferred listErik Johnston2015-06-161-18/+27
| * Use DeferredListErik Johnston2015-06-161-9/+9
| * Don't do unecessary db ops in presence.get_stateErik Johnston2015-06-162-14/+15
* | Fix bug where synapse was sending AS user queries incorrectly.Kegan Dougal2015-06-171-1/+1
|/
* Merge pull request #176 from matrix-org/erikj/backfill_authErik Johnston2015-06-031-1/+46
|\
| * Add a timeoutErik Johnston2015-06-021-0/+1
| * Handle the fact we might be missing auth eventsErik Johnston2015-06-021-15/+19
| * Add some loggingErik Johnston2015-06-021-0/+5
| * Correctly look up auth_eventsErik Johnston2015-06-021-9/+12
| * Don't process events we've already processed. Remember to process state eventsErik Johnston2015-06-021-0/+22
| * Correctly pass in auth_eventsErik Johnston2015-06-011-1/+11
* | Merge pull request #180 from matrix-org/erikj/prev_state_contextErik Johnston2015-06-031-1/+3
|\ \
| * | Don't needlessly compute prev_stateErik Johnston2015-06-031-1/+3
| |/
* / Don't needlessly compute contextErik Johnston2015-06-031-2/+4
|/
* Merge branch 'develop' into markjh/SYT-8-recaptchaMark Haines2015-05-291-0/+1
|\
| * SYN-395: Fix CAPTCHA, don't double decode jsonErik Johnston2015-05-281-2/+3
* | Add config for setting the recaptcha verify api endpoint, so we can test it i...Mark Haines2015-05-291-3/+3
|/
* Merge pull request #163 from matrix-org/markjh/presence_list_cacheMark Haines2015-05-221-9/+15
|\
| * Add a cache for getting the presence list for a userMark Haines2015-05-221-9/+15
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_f...Erik Johnston2015-05-223-69/+105
|\|
| * Merge pull request #156 from matrix-org/erikj/join_perfMark Haines2015-05-221-22/+56
| |\
| * \ Merge pull request #157 from matrix-org/markjh/presence_performanceMark Haines2015-05-221-61/+102
| |\ \
| | * | Remove spurious TODO commentMark Haines2015-05-221-1/+0
| | * | Removed unused 'is_visible' methodMark Haines2015-05-201-27/+0
| | * | Clean up the presence_list checking logic a bitMark Haines2015-05-201-12/+9
| | * | Speed up the get_pagination_rows as wellMark Haines2015-05-181-3/+17
| | * | Cache the most recent serial for each roomMark Haines2015-05-181-6/+22
| | * | Move updating the serial and state of the presence cache into a single functionMark Haines2015-05-181-17/+43
| | * | Merge branch 'notifier_performance' into markjh/presence_performanceMark Haines2015-05-185-14/+28
| | |\ \
| | * | | Add more doc string, reduce C+P boilerplate for getting room listMark Haines2015-05-181-6/+22
| * | | | Remove unused importMark Haines2015-05-221-1/+1
| * | | | Make the appservice use 'users_in_room' rather than get_room_members since it...Mark Haines2015-05-221-4/+1
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-05-221-3/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add caches for things requested by the pushersMark Haines2015-05-211-3/+1
* | | | | Actually fetch state for new backwards extremeties when backfilling.Erik Johnston2015-05-201-61/+103
| |_|_|/ |/| | |
* | | | Don't apply new room join hack if depth > 5Erik Johnston2015-05-191-3/+6
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perfErik Johnston2015-05-195-14/+28
|\| | |
| * | | Merge branch 'develop' into notifier_performanceMark Haines2015-05-184-49/+233
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'notifier_unify' into notifier_performanceMark Haines2015-05-142-20/+8
| |\ \ \
| * | | | Fix v2 sync, update the last_notified_ms only if there was an active listenerMark Haines2015-05-141-1/+1
| * | | | Don't bother checking for updates if the stream token hasn't advanced for a userMark Haines2015-05-134-13/+27
* | | | | Do work in parellel when joining a roomErik Johnston2015-05-181-19/+50
| |_|/ / |/| | |
* | | | More whitespaceMark Haines2015-05-151-0/+1
* | | | Add some missed argument types, cleanup the whitespace a bitMark Haines2015-05-141-6/+17
* | | | More doc-stringsMark Haines2015-05-141-39/+202
* | | | Remove unused arguments and doc PresenceHandler.push_update_to_clientsMark Haines2015-05-141-12/+8
* | | | Treat setting your display name to the empty string as removing it (SYN-186).David Baker2015-05-141-0/+3
* | | | Disallow whitespace in aliases here tooDavid Baker2015-05-141-0/+5
* | | | Throw error when creating room if alias contains whitespace #SYN-335David Baker2015-05-141-0/+5
| |/ / |/| |
* | | Don't talk to yourself when backfillingErik Johnston2015-05-121-0/+2
* | | Revert "Improvement to performance of presence event stream handling"Mark Haines2015-05-121-20/+6
|/ /
* | Merge pull request #147 from matrix-org/presence-performanceMark Haines2015-05-121-6/+20
|\ \
| * | Use the presence cachemap ordering to early-abort the iteration loopPaul "LeoNerd" Evans2015-05-071-2/+7
| * | Store presence cachemap in an ordered dict, so that the newer serials will be...Paul "LeoNerd" Evans2015-05-071-4/+13
* | | Merge pull request #144 from matrix-org/erikj/logging_contextMark Haines2015-05-128-59/+66
|\ \ \
| * | | Unwrap defer.gatherResults failuresErik Johnston2015-05-124-6/+9
| * | | Fix up leak. Add warnings.Erik Johnston2015-05-084-21/+33
| * | | PEP8Erik Johnston2015-05-081-1/+0
| * | | Change the way we do logging contexts so that they survive divergencesErik Johnston2015-05-083-32/+25
| |/ /
* | | s/backfil/backfill/Erik Johnston2015-05-121-4/+4
* | | Typos everywhereErik Johnston2015-05-121-1/+1
* | | And another typo.Erik Johnston2015-05-121-3/+3
* | | Err, gatherResults doesn't take a dict...Erik Johnston2015-05-121-4/+7
* | | Handle the case where the other side is unreachable when backfillingErik Johnston2015-05-121-14/+42
* | | Make get_current_token accept a direction parameter, which tells whether the ...Erik Johnston2015-05-122-3/+5
* | | Initial hack at wiring together pagination and backfillErik Johnston2015-05-112-3/+115
|/ /
* | revert accidental bcrypt gensalt round reduction from loadtestingMark Haines2015-05-071-1/+1
* | pynacl-0.3.0 was released so we can finally start using it directly from pypiMark Haines2015-05-071-1/+1
|/
* That wasn't a deferredErik Johnston2015-05-012-4/+2
* Remove inlineCallbacks from non-generatorErik Johnston2015-05-011-2/+0
* Remove some run_on_reactorsErik Johnston2015-05-011-2/+0
* More missed get_user_by_id API changesDavid Baker2015-05-011-1/+1
* One too many lensErik Johnston2015-05-011-1/+1
* Change public room list to use defer.gatherResultsErik Johnston2015-05-011-5/+13
* This api now no longer returns an arrayDavid Baker2015-05-011-1/+1
* Make simple query rather than long one and then throw away half the resultsErik Johnston2015-04-301-2/+1
* Fix off by one in presence token handlingErik Johnston2015-04-291-1/+1
* Accept camelcase + underscores in binding tooDavid Baker2015-04-291-2/+17
* Fix includesDavid Baker2015-04-291-1/+2
* Accept both camelcase and underscore threepid creds for transitionDavid Baker2015-04-291-4/+19
* Ensure we never miss any presence updatesErik Johnston2015-04-281-1/+7
* Fix typoErik Johnston2015-04-281-1/+1
* Ensure the serial returned by presence is always an integerErik Johnston2015-04-281-3/+3
* Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-286-117/+434
|\
| * Merge pull request #126 from matrix-org/csauthMark Haines2015-04-285-116/+432
| |\
| | * Add commentage.David Baker2015-04-271-0/+4
| | * Change to https for ID server communicationDavid Baker2015-04-241-3/+2
| | * Use underscores instead of camelcase for id server stuffDavid Baker2015-04-242-12/+12
| | * pep8David Baker2015-04-241-2/+2
| | * Merge branch 'develop' into csauthDavid Baker2015-04-242-11/+48
| | |\
| | * | Remove ultimately unused feature of saving params from the first call in the ...David Baker2015-04-231-2/+10
| | * | Password reset, finally.David Baker2015-04-171-1/+7
| | * | pep8David Baker2015-04-173-8/+5
| | * | make add3pid servlet workDavid Baker2015-04-171-0/+7
| | * | Merge branch 'develop' into csauthDavid Baker2015-04-175-48/+93
| | |\ \
| | * | | Need to yield the username check, otherwise very very weird things happen.David Baker2015-04-171-1/+1
| | * | | Oops, left debugging in.David Baker2015-04-161-6/+0
| | * | | Return user ID in use error straight awayDavid Baker2015-04-163-64/+65
| | * | | Dummy login so we can do the first POST request to get login flows without it...David Baker2015-04-152-3/+9
| | * | | Regstration with email in v2David Baker2015-04-154-22/+116
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-10-31 03:33:53 +0000