summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* add a test for get_keys_from_serverRichard van der Hoff2019-04-041-0/+63
* Fix docstring on get_server_keys_jsonRichard van der Hoff2019-04-041-2/+2
* Rewrite KeyringTestCase as a HomeServerTestCase (#4986)Richard van der Hoff2019-04-032-107/+105
* Remove presence lists (#4989)Neil Johnson2019-04-039-456/+23
* Merge pull request #4982 from matrix-org/erikj/msc1915Erik Johnston2019-04-037-17/+216
|\
| * Correctly handle id_server paramErik Johnston2019-04-021-0/+1
| * Remove threepid binding if id server returns 400/404/501Erik Johnston2019-04-021-9/+10
| * Fixup docstringsErik Johnston2019-04-023-7/+9
| * NewsfileErik Johnston2019-04-011-0/+1
| * Add unbind API to /r0 as it is now stabalisedErik Johnston2019-04-011-1/+1
| * Grandfather in existing user threepidsErik Johnston2019-04-012-0/+37
| * Allowing specifying IS to use in unbind API.Erik Johnston2019-04-014-8/+20
| * For unbind poke IS used during binding of 3PIDErik Johnston2019-04-011-9/+35
| * Track IS used to bind 3PIDsErik Johnston2019-04-013-0/+119
* | Run black on the rest of the storage module (#4996)Amber Brown2019-04-0342-2455/+2131
* | Merge pull request #4991 from matrix-org/erikj/stagger_push_startupErik Johnston2019-04-025-8/+74
|\ \
| * | s/misc/feature/Erik Johnston2019-04-021-0/+0
| * | NewsfileErik Johnston2019-04-021-0/+1
| * | Make starting pushers faster during start upErik Johnston2019-04-024-8/+73
* | | Transfer related groups on room upgrade (#4990)Andrew Morgan2019-04-023-0/+3
* | | Add config.signing_key_path. (#4974)Richard van der Hoff2019-04-022-1/+3
|/ /
* | Fix sync bug when accepting invites (#4956)Richard van der Hoff2019-04-027-69/+237
* | Neilj/fix threepid auth check (with tests) (#4474)Neil Johnson2019-04-012-0/+33
* | Merge pull request #4981 from matrix-org/manuroe/demo_bypass_account_rate_lim...manuroe2019-04-012-5/+16
|\ \
| * | start.sh: Fix the --no-rate-limit option for messages and make it bypass rate...manuroe2019-04-012-5/+16
* | | Merge branch 'master' into developNeil Johnson2019-04-0188-89/+107
|\ \ \ | |/ / |/| |
| * | 0.99.3 v0.99.3 github/release-v0.99.3 release-v0.99.3Neil Johnson2019-04-013-3/+13
| * | convert rst link to mdNeil Johnson2019-04-011-1/+1
| * | 0.99.3rc1 v0.99.3rc1Neil Johnson2019-03-2785-85/+93
| * | bump versionNeil Johnson2019-03-271-1/+1
* | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-0128-168/+222
| |/ |/|
* | Merge pull request #4968 from Jurrie/feature/fix_small_stuff_in_Docker_README.mdRichard van der Hoff2019-03-292-2/+4
|\ \
| * | Add changelog.d entryJurrie Overgoor2019-03-291-0/+1
| * | Add -p argument for docker run command exampleJurrie Overgoor2019-03-291-0/+1
| * | Fix typo in TLS filenamesJurrie Overgoor2019-03-291-2/+2
|/ /
* | Merge pull request #4955 from matrix-org/rav/merge_state_into_eventsRichard van der Hoff2019-03-289-49/+141
|\ \
| * | changelogRichard van der Hoff2019-03-271-0/+1
| * | Combine the CurrentStateDeltaStream into the EventStreamRichard van der Hoff2019-03-275-33/+43
| * | Make EventStream rows have a typeRichard van der Hoff2019-03-274-17/+98
* | | Merge pull request #4954 from matrix-org/rav/refactor_parse_rowRichard van der Hoff2019-03-284-5/+22
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/develop' into rav/refactor_parse_rowRichard van der Hoff2019-03-283-380/+336
| |\ \ \ | | |/ / | |/| |
| * | | changelogRichard van der Hoff2019-03-271-0/+1
| * | | Skip building a ROW_TYPE when building updatesRichard van der Hoff2019-03-271-2/+2
| * | | Add parse_row method to replication stream classRichard van der Hoff2019-03-273-3/+19
* | | | remove log line for password (#4965)Neil Johnson2019-03-282-2/+1
* | | | Allow password providers to bind emails (#4947)Andrew Morgan2019-03-283-4/+23
* | | | Merge pull request #4942 from matrix-org/erikj/fix_presenceErik Johnston2019-03-285-33/+412
|\ \ \ \ | |_|/ / |/| | |
| * | | Use an assertErik Johnston2019-03-281-2/+1
| * | | Review commentsErik Johnston2019-03-282-49/+71
| * | | NewsfileErik Johnston2019-03-271-0/+1
| * | | Add unit testsErik Johnston2019-03-271-1/+171
| * | | Use event streams to calculate presenceErik Johnston2019-03-273-32/+219
| | |/ | |/|
* | | Merge pull request #4953 from matrix-org/rav/refactor_replication_streamsRichard van der Hoff2019-03-288-77/+136
|\ \ \ | | |/ | |/|
| * | changelogRichard van der Hoff2019-03-271-0/+2
| * | move FederationStream out to its own fileRichard van der Hoff2019-03-274-23/+43
| * | move EventsStream out to its own fileRichard van der Hoff2019-03-273-23/+42
| * | Move replication.tcp.streams into a packageRichard van der Hoff2019-03-274-35/+53
* | | Run `black` on some storage modules that the stats branch touches (#4959)Amber Brown2019-03-293-380/+336
|/ /
* / Fix/improve some docstrings in the replication code. (#4949)Richard van der Hoff2019-03-273-7/+20
|/
* Support 3PID login in password providers (#4931)Andrew Morgan2019-03-268-26/+137
* Use the state event amount for userdir import batching, not room count (#4944)Amber Brown2019-03-272-8/+21
* Make federation endpoints more tolerant of trailing slashes v2 (#4935)Andrew Morgan2019-03-265-11/+13
* Fix ClientReplicationStreamProtocol.__str__ (#4929)Richard van der Hoff2019-03-253-4/+6
* Fix bug where read-receipts lost their timestamps (#4927)Richard van der Hoff2019-03-258-12/+179
* Use an explicit dbname for postgres connections in the tests. (#4928)Richard van der Hoff2019-03-252-18/+17
* Fix nginx example in ACME doc. (#4923)Richard van der Hoff2019-03-252-1/+2
* Refactor out state delta handling into its own class (#4917)Amber Brown2019-03-255-110/+152
* Merge pull request #4869 from matrix-org/erikj/yaml_loadErik Johnston2019-03-228-11/+12
|\
| * NewsfileErik Johnston2019-03-221-0/+1
| * Use yaml safe_loadErik Johnston2019-03-227-11/+11
* | Allow newsfragments to end with exclamation marks! (#4912)Richard van der Hoff2019-03-212-2/+3
* | Some more porting to HomeserverTestCase and remove old RESTHelper (#4913)Amber Brown2019-03-225-230/+124
* | Remove trailing slashes from outbound federation requests and retry on 400 (#...Andrew Morgan2019-03-215-17/+191
|\ \ | |/ |/|
| * Clean up backoff_on_404 and metehod callsAndrew Morgan2019-03-211-9/+13
| * kwargs doesn't like commas on calling funcs either. TILAndrew Morgan2019-03-201-2/+2
| * lintAndrew Morgan2019-03-202-3/+7
| * New test, fix issuesAndrew Morgan2019-03-202-49/+73
| * Fix comments. v0.99.2 -> v0.99.3Andrew Morgan2019-03-202-6/+6
| * Just return if not doing any trailing slash shennanigansAndrew Morgan2019-03-201-0/+2
| * Federation test fixed!Andrew Morgan2019-03-201-2/+5
| * lintAndrew Morgan2019-03-181-1/+1
| * Better exception handlingAndrew Morgan2019-03-182-20/+18
| * Correct var nameAndrew Morgan2019-03-132-2/+56
| * receiving a 400 caused an exception. handle itAndrew Morgan2019-03-131-5/+12
| * is this what purgatory feels likeAndrew Morgan2019-03-131-3/+3
| * i should have given up x3Andrew Morgan2019-03-131-39/+0
| * i should have given up x2Andrew Morgan2019-03-132-18/+52
| * i should have given upAndrew Morgan2019-03-131-1/+1
| * there comes a time when you should give up. but you dontAndrew Morgan2019-03-131-1/+1
| * as aboveAndrew Morgan2019-03-131-2/+4
| * no kwargs todayAndrew Morgan2019-03-131-7/+12
| * Or perhaps I was the one who was drunkAndrew Morgan2019-03-131-6/+3
| * go home python, you're drunkAndrew Morgan2019-03-131-4/+2
| * Syntax checker is borkAndrew Morgan2019-03-131-6/+5
| * Destructure againAndrew Morgan2019-03-131-7/+8
| * Are you happy nowAndrew Morgan2019-03-131-2/+2
| * Syntax testAndrew Morgan2019-03-131-6/+5
| * Remove testing codeAndrew Morgan2019-03-131-3/+0
| * Add missing docstring detailAndrew Morgan2019-03-131-1/+1
| * Fix syntax issuesAndrew Morgan2019-03-131-7/+10
| * Switch to wrapper function around _send_requestAndrew Morgan2019-03-133-39/+78
| * Retry on 400:M_UNRECOGNIZEDAndrew Morgan2019-03-131-6/+10
| * Fix paranthesis indentAndrew Morgan2019-03-131-1/+2
| * Add workaround noteAndrew Morgan2019-03-131-10/+4
| * Correct argument nameAndrew Morgan2019-03-121-2/+2
| * Cleaner way of implementing trailing slashesAndrew Morgan2019-03-123-70/+66
| * and againAndrew Morgan2019-03-111-1/+1
| * Fix syntax errorAndrew Morgan2019-03-111-1/+1
| * We're calling different functions nowAndrew Morgan2019-03-111-2/+2
| * Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-115-12/+14
| |\
| * \ Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-118-19/+57
| |\ \
| * | | lintAndrew Morgan2019-03-081-1/+3
| * | | Add changelogAndrew Morgan2019-03-081-0/+1
| * | | Retry certain federation requests on 404Andrew Morgan2019-03-082-5/+50
| * | | Remove trailing slashes from outbound federation requestsAndrew Morgan2019-03-081-7/+7
* | | | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_roomsErik Johnston2019-03-214-3/+77
|\ \ \ \
| * | | | Update changelog.d/4908.bugfixRichard van der Hoff2019-03-211-1/+1
| * | | | isortErik Johnston2019-03-211-1/+1
| * | | | NewsfileErik Johnston2019-03-211-0/+1
| * | | | Deny peeking into rooms that have been blockedErik Johnston2019-03-213-3/+76
* | | | | Update Apache Setup To Remove Location Syntax (#4870)Colin W2019-03-212-9/+6
* | | | | Merge pull request #4904 from matrix-org/erikj/fix_shutdownErik Johnston2019-03-218-25/+137
|\ \ \ \ \
| * | | | | Fix typo and add descriptionErik Johnston2019-03-211-1/+5
| |/ / / /
| * | | | Rejig testcase to make it more extensibleErik Johnston2019-03-211-17/+22
| * | | | Remove debugErik Johnston2019-03-211-1/+0
| * | | | Add testsErik Johnston2019-03-211-1/+66
| * | | | Fix upsertErik Johnston2019-03-211-0/+1
| * | | | Revert spurious deleteErik Johnston2019-03-201-0/+4
| * | | | comment block_roomErik Johnston2019-03-201-0/+9
| * | | | Use flagsErik Johnston2019-03-205-15/+17
| * | | | Move requester check into assert_accepted_privacy_policyErik Johnston2019-03-201-5/+8
| * | | | NewsfileErik Johnston2019-03-201-0/+1
| * | | | Gracefully handle failing to kick userErik Johnston2019-03-201-19/+27
| * | | | Log new room IDErik Johnston2019-03-201-1/+6
| * | | | Only require consent for events with an associated requestErik Johnston2019-03-201-1/+5
| * | | | Allow blocking a room multiple timesErik Johnston2019-03-201-2/+4
* | | | | Merge pull request #4896 from matrix-org/erikj/disable_room_directoryErik Johnston2019-03-217-3/+97
|\ \ \ \ \
| * | | | | Add testErik Johnston2019-03-202-3/+58
| * | | | | Disable publishing to room list when its disabledErik Johnston2019-03-201-0/+8
| * | | | | Pull out config optionErik Johnston2019-03-201-3/+3
| * | | | | Return before we logErik Johnston2019-03-201-4/+5
| * | | | | Fix up config commentsErik Johnston2019-03-202-6/+8
| * | | | | NewsfileErik Johnston2019-03-191-0/+1
| * | | | | Add option to disable search room listsErik Johnston2019-03-193-0/+27
* | | | | | Log requests which are simulated by the unit tests. (#4905)Richard van der Hoff2019-03-202-8/+2
* | | | | | Merge pull request #4895 from matrix-org/erikj/disable_user_searchErik Johnston2019-03-205-0/+73
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add testErik Johnston2019-03-201-0/+52
| * | | | | Fix up sample configErik Johnston2019-03-202-4/+8
| * | | | | Update synapse/config/user_directory.pyRichard van der Hoff2019-03-201-1/+1
| * | | | | Update sample configErik Johnston2019-03-191-0/+3
| * | | | | NewsfileErik Johnston2019-03-191-0/+1
| * | | | | Add option to disable searching in the user dirErik Johnston2019-03-192-0/+13
| |/ / / /
* | | | | Batching in the user directory import (#4900)Amber Brown2019-03-212-0/+14
* | | | | Add a config option for torture-testing worker replication. (#4902)Richard van der Hoff2019-03-203-1/+23
* | | | | Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-207-22/+308
|/ / / /
* | | | Merge pull request #4894 from matrix-org/erikj/postgres_tuningErik Johnston2019-03-192-2/+21
|\ \ \ \
| * | | | NewsfileErik Johnston2019-03-191-0/+1
| * | | | Add note on tuning postgresErik Johnston2019-03-191-2/+20
|/ / / /
* | | | Merge pull request #4879 from matrix-org/erikj/test_old_depsErik Johnston2019-03-193-1/+21
|\ \ \ \
| * | | | Add comment back inErik Johnston2019-03-191-0/+1
| * | | | Update newsfileErik Johnston2019-03-191-1/+1
| * | | | Revert changesErik Johnston2019-03-191-12/+2
| * | | | Bring py27-old into line with other test envsErik Johnston2019-03-181-0/+14
| * | | | Add coverage to py27-oldErik Johnston2019-03-181-3/+6
| * | | | NewsfileErik Johnston2019-03-181-0/+1
| * | | | Add py27-old test case to buildkiteErik Johnston2019-03-181-0/+11
* | | | | Merge pull request #4889 from matrix-org/rav/test_real_configRichard van der Hoff2019-03-198-18/+44
|\ \ \ \ \
| * | | | | Fix RegistrationTestCaseRichard van der Hoff2019-03-191-2/+9
| * | | | | changelogRichard van der Hoff2019-03-191-0/+1
| * | | | | Use a regular HomeServerConfig object for unit testsRichard van der Hoff2019-03-193-13/+25
| * | | | | Fix resource limits testsRichard van der Hoff2019-03-191-2/+5
| * | | | | Fix registration testRichard van der Hoff2019-03-191-1/+2
| * | | | | Fix email testRichard van der Hoff2019-03-191-0/+2
| * | | | | Merge remote-tracking branch 'origin/develop' into HEADRichard van der Hoff2019-03-1910-11/+45
| |\ \ \ \ \
* | | | | | | Merge pull request #4888 from matrix-org/rav/fix_disabled_hsRichard van der Hoff2019-03-193-3/+24
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | Enforce hs_disabled_message correctlyRichard van der Hoff2019-03-193-3/+24
* | | | | | fix test_auto_create_auto_join_where_no_consent (#4886)Neil Johnson2019-03-195-5/+39
* | | | | | Fix user directory background update (#4887)Erik Johnston2019-03-192-1/+2
* | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-03-193-5/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Repoint docs for federation (#4881)Michael Kaye2019-03-192-1/+2
| * | | | | fix some typos in federate.mdRichard van der Hoff2019-03-151-4/+2
* | | | | | Comment out most options in the generated config. (#4863)Richard van der Hoff2019-03-1916-171/+230
* | | | | | Migrate the user directory initial population to a background task (#4864)Amber Brown2019-03-198-301/+405
* | | | | | Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-186-5/+86
| |/ / / / |/| | | |
* | | | | Add ratelimiting on login (#4821)Brendan Abolivier2019-03-1511-37/+259
* | | | | Merge pull request #4855 from matrix-org/rav/refactor_transaction_queueRichard van der Hoff2019-03-158-761/+865
|\ \ \ \ \
| * | | | | changelogRichard van der Hoff2019-03-131-0/+1
| * | | | | Rename and move the classesRichard van der Hoff2019-03-137-811/+864
| * | | | | Factor per-destination stuff out of TransactionQueueRichard van der Hoff2019-03-131-132/+182
* | | | | | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_workerRichard van der Hoff2019-03-156-55/+111
|\| | | | |
| * | | | | changelogRichard van der Hoff2019-03-131-0/+1
| * | | | | Move client receipt processing to federation sender worker.Richard van der Hoff2019-03-134-33/+78
| * | | | | declare a ReadReceipt classRichard van der Hoff2019-03-132-24/+34
* | | | | | Merge pull request #4853 from matrix-org/erikj/worker_docker_ciErik Johnston2019-03-155-17/+54
|\ \ \ \ \ \
| * | | | | | Correctly handle all command line optionsErik Johnston2019-03-143-16/+42
| * | | | | | NewsfileErik Johnston2019-03-131-0/+1
| * | | | | | Allow passing --daemonize to workersErik Johnston2019-03-132-1/+11
* | | | | | | Add systemd setup that supports workers (#4662)Luca Corbatto2019-03-156-0/+205
* | | | | | | Add some stuff back to the .gitignore (#4843)Aaron Raimist2019-03-152-3/+8
* | | | | | | Merge pull request #4859 from matrix-org/revert-4793-anoa/trailing_slashesErik Johnston2019-03-144-12/+11
|\ \ \ \ \ \ \
| * | | | | | | Revert "Make federation endpoints more tolerant of trailing slashes for some ...Erik Johnston2019-03-144-12/+11
|/ / / / / / /
* | | | | | | Merge pull request #4846 from matrix-org/hawkowl/userdir-searchErik Johnston2019-03-1411-138/+206
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fixupAmber Brown2019-03-132-2/+2
| * | | | | | fixupAmber Brown2019-03-134-75/+17
| * | | | | | fixupAmber Brown2019-03-121-2/+2
| * | | | | | fixupAmber Brown2019-03-121-1/+1
| * | | | | | fixupAmber Brown2019-03-121-1/+2
| * | | | | | fixupAmber Brown2019-03-124-176/+159
| * | | | | | fixupAmber Brown2019-03-121-1/+1
| * | | | | | use the old methodAmber Brown2019-03-121-3/+2
| * | | | | | fixAmber Brown2019-03-121-1/+1
| * | | | | | pep8Amber Brown2019-03-121-2/+1
| * | | | | | changelogAmber Brown2019-03-121-0/+1
| * | | | | | fixesAmber Brown2019-03-124-52/+74
| * | | | | | setup masterAmber Brown2019-03-111-0/+2
| * | | | | | master startupAmber Brown2019-03-112-0/+9
| * | | | | | Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-searchAmber Brown2019-03-118-19/+57
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | initialAmber Brown2019-03-115-4/+114
| | |_|_|/ / | |/| | | |
* | | | | | Document using a certificate with a full chain (#4849)Andrew Morgan2019-03-134-2/+17
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developNeil Johnson2019-03-125-154/+207
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | fix orphaned sentenceNeil Johnson2019-03-121-1/+0
| * | | | Neilj/improved delegation doc 2 (#4832)Neil Johnson2019-03-124-148/+202
| * | | | Add zwsp in bug report template (#4811)Richard van der Hoff2019-03-061-6/+6
* | | | | Transfer local user's push rules on room upgrade (#4838)Andrew Morgan2019-03-123-0/+62
* | | | | Clarify what registration_shared_secret allows for (#2885) (#4844)Aaron Raimist2019-03-114-6/+7
| |_|_|/ |/| | |
* | | | Make federation endpoints more tolerant of trailing slashes for some endpoint...Andrew Morgan2019-03-114-11/+12
* | | | Merge pull request #4847 from matrix-org/erikj/fix_stacktrace_keyringErik Johnston2019-03-112-2/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | NewsfileErik Johnston2019-03-111-0/+1
| * | | Correctly log expected errors when fetching server keysErik Johnston2019-03-111-2/+2
|/ / /
* | | Merge pull request #4839 from matrix-org/anoa/no_captcha_testsAndrew Morgan2019-03-112-0/+2
|\ \ \
| * | | Add changelogAndrew Morgan2019-03-081-0/+1
| * | | Disable captcha registration by default in testsAndrew Morgan2019-03-081-0/+1
| | |/ | |/|
* | | fix incorrect encoding of filenames with spaces in (#2090)Matthew Hodgson2019-03-112-3/+52
* | | Merge pull request #4837 from matrix-org/erikj/optional_prev_stateErik Johnston2019-03-114-16/+3
|\ \ \ | |/ / |/| |
| * | Add comment to schemaErik Johnston2019-03-081-0/+2
| * | NewsfileErik Johnston2019-03-081-0/+1
| * | Make `prev_state` field optionalErik Johnston2019-03-082-16/+0
|/ /
* | Merge pull request #4814 from matrix-org/erikj/soft_fail_implErik Johnston2019-03-085-1/+113
|\ \
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_...Erik Johnston2019-03-0840-503/+711
| |\ \ | |/ / |/| |
* | | Merge pull request #4829 from matrix-org/erikj/device_list_seen_updatesErik Johnston2019-03-082-3/+8
|\ \ \
| * | | NewsfileErik Johnston2019-03-071-0/+1
| * | | When re-syncing device lists reset the stateErik Johnston2019-03-071-3/+7
* | | | Merge pull request #4828 from matrix-org/erikj/debug_device_listsErik Johnston2019-03-072-2/+39
|\ \ \ \ | |/ / / |/| | |
| * | | NewsfileErik Johnston2019-03-071-0/+1
| * | | Add some debug logging for device list handlingErik Johnston2019-03-071-2/+38
|/ / /
* | | Merge pull request #4824 from matrix-org/rav/docker_docsRichard van der Hoff2019-03-072-4/+38
|\ \ \
| * | | Document the `generate` option for the docker image.Richard van der Hoff2019-03-072-4/+38
* | | | Debian package: fix warning during preconfiguration. (#4823)Richard van der Hoff2019-03-072-1/+11
|\ \ \ \
| * | | | Debian package: fix warning during preconfiguration.Richard van der Hoff2019-03-072-1/+11
| |/ / /
* | | | Update example_log_config.yaml (#4820)Richard van der Hoff2019-03-072-1/+3
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-23 18:11:26 +0000