summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha (follow)
Commit message (Expand)AuthorAgeFilesLines
* Enable 3PID add/bind/unbind endpoints on r0 routesBrendan Abolivier2020-06-151-3/+3
* Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-051-15/+1
* Fix encryption algorithm typos in tests/comments (#7637)Andrew Morgan2020-06-041-4/+4
* Add ability to wait for replication streams (#7542)Erik Johnston2020-05-221-1/+1
* Use a non-empty RelayState for user interactive auth with SAML. (#7552)Patrick Cloke2020-05-221-1/+4
* Hash passwords earlier in the password reset process (#7538)Patrick Cloke2020-05-202-5/+20
* Merge tag 'v1.13.0rc3' into developPatrick Cloke2020-05-181-9/+13
|\
| * Hash passwords earlier in the registration process (#7523)Patrick Cloke2020-05-181-9/+13
* | Support UI Authentication for OpenID Connect accounts (#7457)Patrick Cloke2020-05-151-4/+15
|/
* Do not validate that the client dict is stable during UI Auth. (#7483)Patrick Cloke2020-05-131-1/+0
* Rework UI Auth session validation for registration (#7455)Patrick Cloke2020-05-081-0/+1
* Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-302-4/+4
* Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t...Brendan Abolivier2020-04-232-2/+27
* Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-221-0/+8
|\
| * Support GET account_data requests on a worker (#7311)Richard van der Hoff2020-04-211-0/+8
* | Use a template for the SSO success page to allow for customization. (#7279)Patrick Cloke2020-04-171-1/+24
* | Support CAS in UI Auth flows. (#7186)Patrick Cloke2020-04-031-5/+23
* | Support SAML in the user interactive authentication workflow. (#7102)Patrick Cloke2020-04-015-30/+50
* | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-271-0/+16
* | Ensure is_verified on /_matrix/client/r0/room_keys/keys is a boolean (#7150)Andrew Morgan2020-03-271-1/+1
* | Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-262-0/+60
* | Validate that the session is not modified during UI-Auth (#7068)Patrick Cloke2020-03-264-8/+14
* | Clean-up some auth/login REST code (#7115)Patrick Cloke2020-03-201-33/+20
|/
* Add an option to the set password API to choose whether to logout other devic...Patrick Cloke2020-03-181-1/+4
* Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-171-16/+0
* updates after reviewdklimpel2020-03-091-6/+12
* add disable_3pid_changesdklimpel2020-03-081-0/+10
* Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-211-1/+1
* Add `allow_departed_users` param to `check_in_room_or_world_readable`Richard van der Hoff2020-02-191-6/+6
* Add `rooms.room_version` column (#6729)Erik Johnston2020-01-271-1/+2
* Validate client_secret parameter (#6767)Andrew Morgan2020-01-242-5/+21
* Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-221-1/+1
* Fixup synapse.rest to pass mypy (#6732)Erik Johnston2020-01-202-2/+4
* Remove duplicate session check in web fallback servlet (#6702)Andrew Morgan2020-01-151-4/+0
* Port rest.client.v2Erik Johnston2019-12-0523-505/+361
* Add User-Interactive Auth to /account/3pid/add (#6119)Andrew Morgan2019-11-291-0/+5
* add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-271-4/+4
* Update black to 19.10b0 (#6304)Amber Brown2019-11-012-4/+4
* Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-313-13/+13
* Port receipt and read markers to async/waitErik Johnston2019-10-292-15/+9
* Address codestyle concernsMichael Kaye2019-10-241-1/+6
* Delay printf until logging is required.Michael Kaye2019-10-241-3/+3
* Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-185-222/+419
|\
| * Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-185-222/+419
| |\
| | * Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-111-1/+1
| | |\
| | | * make version optional in body of e2e backup version updateHubert Chathi2019-10-091-1/+1
| | * | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-102-22/+31
| | |/
| | * Kill off half-implemented password-reset via sms (#6101)Richard van der Hoff2019-09-261-64/+1
| | * Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-251-3/+29
| | * Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-251-62/+62
| | * Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2019-09-231-2/+45
| | * Implement MSC2290 (#6043)Andrew Morgan2019-09-232-72/+95
| | * Disable /register/available if registration is disabled (#6082)Andrew Morgan2019-09-231-0/+5
| | * Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-202-51/+225
| | * Remove trailing slash ability from password reset's submit_token endpoint (#6...Andrew Morgan2019-09-201-1/+1
| | * Drop support for bind param on POST /account/3pid (MSC2290) (#6067)Andrew Morgan2019-09-201-4/+0
| | * Use unstable prefix for 3PID unbind API (#6062)J. Ryan Stinnett2019-09-191-1/+1
| | * Remove POST method from password reset submit_token endpoint (#6056)Andrew Morgan2019-09-191-17/+0
| | * Add changelogAndrew Morgan2019-09-101-1/+1
| | * Use account_threepid_delegate for 3pid validationAndrew Morgan2019-09-101-1/+2
| * | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-073-165/+339
| |\|
* | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-073-165/+339
|\ \ \ | | |/ | |/|
| * | Apply suggestions from code reviewAndrew Morgan2019-09-062-2/+2
| * | Fix destructuring assumption bugAndrew Morgan2019-09-062-2/+2
| * | Allow Synapse to send registration emails + choose Synapse or an external ser...Andrew Morgan2019-09-063-159/+299
| * | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-051-6/+7
| * | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-051-0/+33
* | | update with newer coding styleHubert Chathi2019-09-041-2/+2
* | | make black happyHubert Chathi2019-09-041-0/+1
* | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-041-1/+1
* | | implement device signature uploading/fetchingHubert Chathi2019-09-041-0/+50
| |/ |/|
* | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0420-98/+98
|\|
| * Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-041-2/+0
| * Remove double return statements (#5962)Andrew Morgan2019-09-031-2/+0
| * Opentrace device lists (#5853)Jorik Schellekens2019-09-032-2/+6
| * Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3019-92/+92
* | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-284-64/+35
|\|
| * Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_regis...Richard van der Hoff2019-08-221-53/+4
| |\
| | * Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-221-53/+4
| * | Revert "Add "require_consent" parameter for registration"Brendan Abolivier2019-08-221-4/+1
| * | Add "require_consent" parameter for registrationHalf-Shot2019-08-221-1/+4
| * | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-221-1/+12
| |/
| * Fix up password reset template config names (#5863)Andrew Morgan2019-08-151-2/+2
| * LintBrendan Abolivier2019-08-011-4/+2
| * Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-6/+17
* | apply PR review suggestionsHubert Chathi2019-08-211-1/+1
* | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-0123-153/+145
|\|
| * Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-241-0/+2
| |\
| | * Fix servlet metric names (#5734)Jorik Schellekens2019-07-241-0/+2
| * | Replace returnValue with return (#5736)Amber Brown2019-07-2323-153/+143
| |/
* / allow uploading keys for cross-signingHubert Chathi2019-07-251-3/+43
|/
* Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2019-07-181-32/+43
* Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-2/+12
* Include the original event in /relations (#5626)Andrew Morgan2019-07-091-3/+5
* Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-081-6/+5
* Run Black. (#5482)Amber Brown2019-06-2024-509/+419
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-111-4/+5
|\
| * Change password reset links to /_matrix.Erik Johnston2019-06-111-4/+5
* | Don't warn user about password reset disabling through config code (#5387)Andrew Morgan2019-06-111-4/+15
* | Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai...Brendan Abolivier2019-06-101-1/+1
|\ \ | |/ |/|
| * Don't check whether the user's account is expired on /send_mail requestsBrendan Abolivier2019-06-051-1/+1
* | Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-061-5/+238
* | Unify v1 and v2 REST client APIs (#5226)Amber Brown2019-06-0325-102/+104
* | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_eventsErik Johnston2019-05-241-0/+3
|\ \
| * | Don't bundle events in /sync or /eventsErik Johnston2019-05-211-0/+3
* | | Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-2/+3
|/ /
* | Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-201-0/+338
|\ \
| * | Move parsing of tokens out of storage layerErik Johnston2019-05-161-0/+19
| * | Check that event is visible in new APIsErik Johnston2019-05-161-2/+15
| * | Add aggregations APIErik Johnston2019-05-161-1/+140
| * | Actually implement idempotencyErik Johnston2019-05-151-1/+8
| * | Add simple pagination APIErik Johnston2019-05-151-0/+50
| * | Add simple send_relation API and track in DBErik Johnston2019-05-151-0/+110
* | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_onlyDavid Baker2019-05-161-5/+17
|\ \ \ | |_|/ |/| |
| * | Re-order flows so that email auth is done lastDavid Baker2019-05-101-4/+12
| * | CommentDavid Baker2019-05-101-0/+4
| * | Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
* | | Merge pull request #5187 from matrix-org/dbkr/only_check_threepid_not_in_use_...David Baker2019-05-161-18/+22
|\ \ \
| * | | Only check 3pids not in use when registeringDavid Baker2019-05-141-18/+22
| |/ /
* | | Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-10/+13
* | | Drop support for v2_alpha API prefix (#5190)Richard van der Hoff2019-05-155-20/+15
| |/ |/|
* | NewsfileErik Johnston2019-05-141-6/+6
* | Allow client event serialization to be asyncErik Johnston2019-05-142-29/+28
|/
* Revert 085ae346ace418e0fc043ac5f568f85ebf80038eDavid Baker2019-05-101-1/+1
* Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
* Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-174-9/+26
|\
| * Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-171-0/+62
| |\
| * \ Merge pull request #5071 from matrix-org/babolivier/3pid-checkBrendan Abolivier2019-04-171-0/+18
| |\ \
| | * | Make sure we're not registering the same 3pid twiceBrendan Abolivier2019-04-171-0/+18
| * | | Merge pull request #4982 from matrix-org/erikj/msc1915Erik Johnston2019-04-031-2/+3
| |\ \ \
| | * | | Add unbind API to /r0 as it is now stabalisedErik Johnston2019-04-011-1/+1
| | * | | Allowing specifying IS to use in unbind API.Erik Johnston2019-04-011-1/+2
| | |/ /
| * / / Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-012-7/+5
| |/ /
* | / Add management endpoints for account validityBrendan Abolivier2019-04-171-1/+30
| |/ |/|
* | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-171-0/+62
|/
* Add option to disable searching in the user dirErik Johnston2019-03-191-0/+6
* Add ratelimiting on login (#4821)Brendan Abolivier2019-03-151-2/+2
* Make registration ratelimiter separate from the main events oneBrendan Abolivier2019-03-061-1/+1
* Revert "Split ratelimiters in two (one for events, one for registration)"Brendan Abolivier2019-03-061-1/+1
* Split ratelimiters in two (one for events, one for registration)Brendan Abolivier2019-03-051-1/+1
* Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-051-4/+29
* switch from google.com to recaptcha.net for reCAPTCHA (#4731)Matthew Hodgson2019-02-251-1/+1
* Fix registration on workers (#4682)Erik Johnston2019-02-202-135/+12
* Move register_device into handlerErik Johnston2019-02-181-47/+2
* Update docsErik Johnston2019-02-181-1/+1
* Split out registration to workerErik Johnston2019-02-181-27/+46
* Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updatingErik Johnston2019-02-111-0/+34
|\
| * make sure version is in body and wrap in linearizer queueHubert Chathi2019-02-081-1/+2
| * add new endpoint to update backup versionsHubert Chathi2019-02-061-0/+33
* | Allow "unavailable" presence status for /sync (#4592)Valentin Anger2019-02-081-1/+1
|/
* isortNeil Johnson2019-01-301-2/+1
* formatting and use constants where availableNeil Johnson2019-01-301-19/+17
* Populate default room version from ConstantsNeil Johnson2019-01-301-1/+2
* reflect that rooms v3 is a stable room versionNeil Johnson2019-01-301-0/+1
* rework format of change password capabilityNeil Johnson2019-01-291-1/+3
* support change_password in capabilities end-pointNeil Johnson2019-01-291-2/+12
* enforce auth for capabilities endpointNeil Johnson2019-01-291-10/+17
* backout v3Neil Johnson2019-01-251-1/+0
* Support room version capabilities in CS API (MSC1804)Neil Johnson2019-01-251-0/+49
* move guard out of is_threepid_reserved and into register.pyNeil Johnson2019-01-221-4/+5
* Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-221-1/+3
* Config option to disable requesting MSISDN on registrationNeil Johnson2019-01-211-11/+5
* Add GET account data routes (#4303)Travis Ralston2019-01-071-1/+33
* Neilj/fix autojoin (#4223)Neil Johnson2018-11-281-0/+1
* Fix fallback auth on Python 3 (#4197)Amber Brown2018-11-191-22/+16
* Remove duplicate slashes in generated consent URLsTravis Ralston2018-11-151-2/+2
* Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-061-1/+1
* handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-051-3/+18
* Include a version query string arg for the consent routeTravis Ralston2018-10-311-2/+4
* Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-311-0/+89
|\
| * Address review commentsRichard van der Hoff2018-10-261-5/+16
| * Basic initial support for room upgradesRichard van der Hoff2018-10-251-0/+78
* | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-241-1/+1
|\|
| * Fix a number of flake8 errorsRichard van der Hoff2018-10-241-1/+1
* | pep8Travis Ralston2018-10-152-13/+2
* | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-151-0/+372
|\|
| * missed oneDavid Baker2018-10-121-0/+1
| * Don't mangle exceptionsDavid Baker2018-10-121-4/+2
| * Split /room_keys/version into 2 servletsDavid Baker2018-10-121-9/+21
| * PR feedback pt. 1David Baker2018-10-121-1/+1
| * isortDavid Baker2018-10-091-1/+1
| * Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-094-23/+72
| |\
| * | WIP e2e key backupsDavid Baker2018-09-131-4/+10
| * | try to make flake8 and isort happyHubert Chathi2018-09-061-1/+4
| * | Merge branch 'develop' into e2e_backupsHubert Chathi2018-08-242-4/+19
| |\ \
| * | | missing importMatthew Hodgson2018-08-121-1/+1
| * | | use parse_stringMatthew Hodgson2018-08-121-3/+3
| * | | support DELETE /version with no argsMatthew Hodgson2018-08-121-2/+3
| * | | implement remaining tests and make them workMatthew Hodgson2018-08-121-0/+6
| * | | improve docstringMatthew Hodgson2018-08-121-1/+5
| * | | add a tonne of docstring; make upload_room_keys properly assert versionMatthew Hodgson2018-08-121-1/+10
| * | | more docstring for the e2e_room_keys restMatthew Hodgson2018-08-121-0/+51
| * | | blindly incorporate PR review - needs testing & fixingMatthew Hodgson2018-08-121-0/+2
| * | | make /room_keys/version workMatthew Hodgson2018-08-121-1/+8
| * | | implement /room_keys/version too (untested)Matthew Hodgson2018-08-121-0/+47
| * | | document the APIMatthew Hodgson2018-08-121-0/+133
| * | | make it work and fix pep8Matthew Hodgson2018-08-121-13/+20
| * | | interim WIP checkin; doesn't build yetMatthew Hodgson2018-08-121-4/+33
| * | | total WIP skeleton for /room_keys APIMatthew Hodgson2018-08-121-0/+56
* | | | Rely on the lack of ?u to represent public accessTravis Ralston2018-10-121-2/+2
* | | | Use a flag rather than a new route for the public policyTravis Ralston2018-10-031-2/+2
* | | | Auto-consent to the privacy policy if the user registered with termsTravis Ralston2018-10-031-0/+6
* | | | Make the terms flow requriedTravis Ralston2018-10-031-4/+4
* | | | Flesh out the fallback auth for termsTravis Ralston2018-10-031-7/+67
* | | | Incorporate Dave's work for GDPR login flowsTravis Ralston2018-10-032-0/+35
| |_|/ |/| |
* | | Port rest/ to Python 3 (#3823)Amber Brown2018-09-122-3/+3
* | | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filterRichard van der Hoff2018-09-051-13/+38
|\ \ \
| * | | Implement 'event_format' filter param in /syncRichard van der Hoff2018-09-041-13/+38
* | | | improve human readable error messageNeil Johnson2018-09-041-1/+2
* | | | improve human readable error messagesNeil Johnson2018-09-042-7/+20
|/ / /
* | | move threepid checker to config, add missing yieldsNeil Johnson2018-08-311-2/+3
* | | ensure post registration auth checks do not fail erroneouslyNeil Johnson2018-08-311-0/+4
* | | fix bug where preserved threepid user comes to sign up and server is mau blockedNeil Johnson2018-08-311-0/+5
| |/ |/|
* | initial cut at a room summary API (#3574)Matthew Hodgson2018-08-161-0/+1
* | Don't fail requests to unbind 3pids for non supporting ID serversErik Johnston2018-08-081-4/+18
|/
* Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-021-6/+6
* Refactor REST API tests to use explicit reactors (#3351)Amber Brown2018-07-171-1/+1
* check isort by travisKrombel2018-07-161-1/+1
* Merge pull request #3534 from krombel/use_parse_and_asserts_from_servletAmber Brown2018-07-144-59/+40
|\
| * rename assert_params_in_request to assert_params_in_dictKrombel2018-07-134-16/+16
| * Use parse_{int,str} and assert from http.servletKrombel2018-07-133-51/+32
* | Make auth & transactions more testable (#3499)Amber Brown2018-07-143-6/+4
|/
* Merge branch 'develop' into rav/enforce_report_apiRichard van der Hoff2018-07-1217-85/+98
|\
| * run isortAmber Brown2018-07-0917-68/+74
| * Attempt to be more performant on PyPy (#3462)Amber Brown2018-06-281-1/+1
| * Revert "Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibili...Erik Johnston2018-06-251-2/+11
| * Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility"Richard van der Hoff2018-06-221-11/+2
| * Merge pull request #3431 from matrix-org/rav/erasure_visibilityErik Johnston2018-06-221-2/+11
| |\
| | * mark accounts as erased when requestedRichard van der Hoff2018-06-121-2/+11
| * | Remove run_on_reactor (#3395)Amber Brown2018-06-142-10/+0
| |/
| * pep8David Baker2018-05-241-1/+1
| * Unbind 3pids when they're deleted tooDavid Baker2018-05-241-3/+10
* | Enforce the specified API for report_eventRichard van der Hoff2018-05-311-2/+23
|/
* Stub out ServerNoticesSender on the workersRichard van der Hoff2018-05-221-0/+4
* Set Server header in SynapseRequestRichard van der Hoff2018-05-101-2/+0
* notifications: Convert next_token to string according to the specKonstantinos Sideris2018-05-051-1/+1
* Construct HMAC as bytes on py3Adrian Tschira2018-04-291-4/+6
* Merge pull request #2996 from krombel/allow_auto_join_roomsRichard van der Hoff2018-04-101-32/+0
|\
| * Merge branch 'develop' of into allow_auto_join_roomsKrombel2018-03-281-1/+1
| |\
| * | move handling of auto_join_rooms to RegisterHandlerKrombel2018-03-141-32/+0
* | | Use "/settings/" (plural)Luke Barnard2018-04-051-1/+1
* | | Use join_policy API instead of joinableLuke Barnard2018-04-031-6/+6
* | | This should probably be a PUTDavid Baker2018-03-281-1/+1
* | | Add joinability for groupsDavid Baker2018-03-281-0/+28
| |/ |/|
* | Replace some ujson with simplejson to make it workErik Johnston2018-03-161-1/+1
|/
* Move RoomMemberHandler out of HandlersErik Johnston2018-03-011-1/+1
* fix thinko on 3pid whitelistingMatthew Hodgson2018-01-241-2/+2
* fix typo (thanks sytest)Matthew Hodgson2018-01-191-1/+1
* oops, check all login typesMatthew Hodgson2018-01-191-14/+11
* trailing commasMatthew Hodgson2018-01-192-7/+7
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-28 12:37:15 +0000