summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Reduce log levels in tcp replicationErik Johnston2017-07-111-2/+2
* Include registration and as stores in frontend proxyErik Johnston2017-07-071-0/+4
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-07-071-1/+1
|\
| * Bump version and changelogErik Johnston2017-07-061-1/+1
* | Add a frontend proxyErik Johnston2017-07-072-0/+269
* | Perf: Don't filter events for pushErik Johnston2017-07-073-36/+21
* | Merge pull request #2342 from matrix-org/erikj/pusher_pool_instantiateErik Johnston2017-07-063-10/+11
|\|
| * Fix bug where pusherpool didn't start and broke some roomsErik Johnston2017-07-063-10/+11
* | Merge pull request #2309 from matrix-org/erikj/user_ip_replErik Johnston2017-07-064-11/+16
|\ \
| * | Serialize user ip command as jsonErik Johnston2017-06-271-5/+9
| * | Fix upErik Johnston2017-06-273-6/+7
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-07-061-1/+1
|\ \ \ | | |/ | |/|
| * | Bump version and changelog github/release-v0.22.0 release-v0.22.0Erik Johnston2017-07-061-1/+1
| * | Bump version and changelog v0.22.0-rc2Erik Johnston2017-07-041-1/+1
* | | Merge pull request #2334 from matrix-org/erikj/refactor_transport_serverErik Johnston2017-07-051-8/+16
|\ \ \
| * | | Separate federation servlet into different listsErik Johnston2017-07-051-8/+16
| |/ /
* | | Merge pull request #2332 from matrix-org/rav/fix_pushesRichard van der Hoff2017-07-051-1/+3
|\ \ \ | |/ / |/| |
| * | Fix caching error in the push evaluatorRichard van der Hoff2017-07-051-1/+3
* | | Merge pull request #2330 from matrix-org/erikj/cache_size_factorErik Johnston2017-07-046-22/+7
|\ \ \
| * | | Increase default cache factor size.Erik Johnston2017-07-041-1/+1
| * | | Define CACHE_SIZE_FACTOR onceErik Johnston2017-07-045-21/+6
* | | | Improve the error handling for bad invites received over federationMark Haines2017-06-301-2/+17
|/ / /
* | | Make into listErik Johnston2017-06-291-1/+1
* | | Prefill forward extrems and event to state groupsErik Johnston2017-06-292-2/+13
* | | Cache macaroon parse and validationErik Johnston2017-06-291-13/+60
* | | Use an ExpiringCache for storing registration sessionsErik Johnston2017-06-292-11/+13
* | | Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse into developErik Johnston2017-06-271-1/+1
|\ \ \
| * | | Update version and changelog v0.22.0-rc1Erik Johnston2017-06-261-1/+1
* | | | Merge pull request #2308 from matrix-org/erikj/user_ip_replErik Johnston2017-06-279-8/+111
|\ \ \ \ | | |_|/ | |/| |
| * | | Make workers report to master for user ip updatesErik Johnston2017-06-279-8/+111
* | | | Merge pull request #2307 from matrix-org/erikj/user_ip_batchErik Johnston2017-06-274-44/+100
|\| | |
| * | | Fix up client ips to read from pending dataErik Johnston2017-06-273-23/+61
| * | | Batch upsert user ipsErik Johnston2017-06-272-21/+39
| |/ /
* | | Merge pull request #2290 from matrix-org/erikj/ensure_round_tripErik Johnston2017-06-261-0/+9
|\ \ \ | |/ / |/| |
| * | Remove unused variablesErik Johnston2017-06-261-1/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ensure_rou...Erik Johnston2017-06-2625-58/+527
| |\ \
| * | | Reject local events that don't round trip the DBErik Johnston2017-06-191-0/+9
* | | | Fix up indices for users_who_share_roomsErik Johnston2017-06-261-1/+2
| |/ / |/| |
* | | Merge pull request #2301 from xwiki-labs/push-redact-contentErik Johnston2017-06-243-2/+48
|\ \ \
| * | | Change the config file generator to more descriptive explanation of push.reda...Caleb James DeLisle2017-06-241-3/+11
| * | | Fix TravisCI tests for PR #2301 - Fat finger mistakeCaleb James DeLisle2017-06-231-0/+37
| * | | Fix TravisCI tests for PR #2301Caleb James DeLisle2017-06-233-42/+2
| * | | Add configuration parameter to allow redaction of content from push messages ...Caleb James DeLisle2017-06-233-2/+43
* | | | Store URL cache preview downloads seperatelyErik Johnston2017-06-237-20/+94
|/ / /
* | | Make some more params configurableErik Johnston2017-06-221-5/+8
* | | Typo. ARGH.Erik Johnston2017-06-221-1/+1
* | | Fix thinko in unhandled user spamErik Johnston2017-06-221-2/+2
* | | Merge branch 'master' into developMatthew Hodgson2017-06-221-1/+1
|\ \ \
| * | | Bump version and changelogErik Johnston2017-06-151-1/+1
* | | | Add descErik Johnston2017-06-221-0/+1
* | | | Merge pull request #2296 from matrix-org/erikj/dont_appserver_sharErik Johnston2017-06-214-18/+37
|\ \ \ \
| * | | | Initialise exclusive_user_regexErik Johnston2017-06-212-15/+22
| * | | | Fix for workersErik Johnston2017-06-212-1/+4
| * | | | Don't work out users who share room with appservice usersErik Johnston2017-06-211-2/+11
* | | | | Merge branch 'develop' into avoid_duplicate_filtersKrombel2017-06-2167-475/+3482
|\| | | |
| * | | | Handle thumbnail urlsErik Johnston2017-06-191-12/+14
| * | | | Add API to quarantine mediaErik Johnston2017-06-197-5/+119
| * | | | Handle all cases of sending membership eventsErik Johnston2017-06-191-0/+5
| * | | | Remove unused importErik Johnston2017-06-191-1/+1
| * | | | Change to create new room and join other usersErik Johnston2017-06-192-10/+70
| * | | | Forget roomErik Johnston2017-06-191-0/+2
| * | | | Add shutdown room APIErik Johnston2017-06-196-1/+134
| | |/ / | |/| |
| * | | Merge pull request #2286 from matrix-org/erikj/split_out_user_dirErik Johnston2017-06-166-7/+328
| |\ \ \
| | * | | Initial worker implErik Johnston2017-06-166-7/+328
| * | | | Merge pull request #2280 from matrix-org/erikj/share_room_user_dirErik Johnston2017-06-165-60/+508
| |\| | |
| | * | | Include users who share room with requester in user directoryErik Johnston2017-06-153-26/+47
| | * | | Implement updating users who share rooms on the flyErik Johnston2017-06-152-24/+235
| | * | | Implement initial population of users who share rooms tableErik Johnston2017-06-152-9/+193
| | * | | Add DB schema for tracking users who share roomsErik Johnston2017-06-152-1/+33
| * | | | allow Authorization header which handling got implemented in #1098Krombel2017-06-161-1/+1
| * | | | Merge pull request #2281 from matrix-org/erikj/phone_home_statsErik Johnston2017-06-154-102/+88
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | TypoErik Johnston2017-06-151-1/+3
| | * | Add some more statsErik Johnston2017-06-153-0/+35
| | * | Fix phone home statsErik Johnston2017-06-143-107/+56
| * | | Fix user directory insertion due to missing room_idErik Johnston2017-06-132-4/+9
| * | | Fix up sqlErik Johnston2017-06-131-10/+12
| * | | Fix user dir to not assume existence of userErik Johnston2017-06-131-22/+37
| * | | Merge pull request #2274 from matrix-org/erikj/cache_is_host_joinedErik Johnston2017-06-133-2/+7
| |\ \ \
| | * | | Add cache for is_host_joinedErik Johnston2017-06-133-2/+7
| * | | | Merge pull request #2275 from matrix-org/erikj/tweark_user_directory_searchErik Johnston2017-06-131-13/+40
| |\ \ \ \
| | * | | | Tweak the ranking of PG user dir searchErik Johnston2017-06-131-13/+40
| | |/ / /
| * | | | Merge pull request #2276 from matrix-org/erikj/fix_user_diErik Johnston2017-06-131-3/+6
| |\ \ \ \
| | * | | | Don't assume existance of events when updating user directoryErik Johnston2017-06-131-3/+6
| | |/ / /
| * / / / Throw exception when not retrying when downloading mediaErik Johnston2017-06-131-0/+1
| |/ / /
| * | | Merge pull request #2266 from matrix-org/erikj/host_in_roomErik Johnston2017-06-125-55/+31
| |\ \ \
| | * | | Tweak SQLErik Johnston2017-06-091-3/+6
| | * | | Fix replicationErik Johnston2017-06-091-1/+0
| | * | | Change is_host_joined to use current_state tableErik Johnston2017-06-094-54/+28
| * | | | Fix replicationErik Johnston2017-06-092-2/+2
| * | | | CommentsErik Johnston2017-06-091-0/+3
| * | | | Cache state deltasErik Johnston2017-06-091-3/+12
| * | | | Merge pull request #2268 from matrix-org/erikj/entity_has_changedErik Johnston2017-06-091-4/+4
| |\ \ \ \
| | * | | | Rewrite conditionalErik Johnston2017-06-091-1/+1
| | * | | | Fix has_any_entity_changedErik Johnston2017-06-091-4/+4
| | |/ / /
| * | | | Merge pull request #2267 from matrix-org/erikj/missing_notifierErik Johnston2017-06-091-1/+2
| |\ \ \ \
| | * | | | Add missing notifierErik Johnston2017-06-091-1/+2
| | |/ / /
| * | | | CommentErik Johnston2017-06-091-0/+2
| * | | | Mark remote invite rejections as outliersErik Johnston2017-06-091-0/+1
| |/ / /
| * | | Ensure we don't use unpersisted state group as prev groupErik Johnston2017-06-082-7/+19
| * | | Merge pull request #2259 from matrix-org/erikj/fix_state_woesErik Johnston2017-06-073-10/+24
| |\ \ \
| | * | | Fix bug where state_group tables got corruptedErik Johnston2017-06-073-10/+24
| | |/ /
| * | | Merge pull request #2258 from matrix-org/erikj/user_dirErik Johnston2017-06-072-3/+3
| |\ \ \
| | * | | Don't start user_directory handling on workersErik Johnston2017-06-072-3/+3
| * | | | Merge pull request #2248 from matrix-org/erikj/state_fixupErik Johnston2017-06-076-56/+154
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | CommentsErik Johnston2017-06-072-0/+15
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_fixupErik Johnston2017-06-0716-12/+1175
| | |\ \ \
| | * | | | Remove spurious log linesErik Johnston2017-06-073-4/+0
| | * | | | Handle None state group correctlyErik Johnston2017-05-262-4/+7
| | * | | | Fix typing testsErik Johnston2017-05-261-7/+5
| | * | | | Faster cache for get_joined_hostsErik Johnston2017-05-255-29/+117
| | * | | | Don't return weird prev_groupErik Johnston2017-05-251-8/+13
| | * | | | Remove unused optionsErik Johnston2017-05-251-11/+4
| * | | | | Add some logging to user directoryErik Johnston2017-06-071-0/+7
| * | | | | When pruning, delete from device_lists_outbound_last_successErik Johnston2017-06-071-0/+8
| * | | | | Keep pruning background taskErik Johnston2017-06-071-0/+45
| * | | | | Split up device_lists_outbound_pokes table for faster updates.Erik Johnston2017-06-072-58/+57
| | |/ / / | |/| | |
| * | | | Increase size of IP cacheErik Johnston2017-06-071-1/+6
| | |_|/ | |/| |
| * | | Fix typo when getting app nameErik Johnston2017-06-061-1/+1
| * | | Fix wrong number of argumentsErik Johnston2017-06-061-1/+1
| * | | Handle profile updates in user directoryErik Johnston2017-06-012-0/+74
| * | | Fix sqliteErik Johnston2017-06-011-1/+1
| * | | Split the table in twoErik Johnston2017-06-014-31/+138
| * | | Tweak search queryErik Johnston2017-06-011-1/+1
| * | | Tweak search queryErik Johnston2017-06-011-2/+2
| * | | CommentsErik Johnston2017-06-011-3/+3
| * | | Check if host is still in roomErik Johnston2017-06-011-0/+11
| * | | Remove spurious inlineCallbacksErik Johnston2017-06-011-1/+0
| * | | Fix removing usersErik Johnston2017-06-011-0/+5
| * | | Bug fixes and loggingErik Johnston2017-06-012-2/+22
| * | | Order by if they have profile infoErik Johnston2017-06-011-2/+11
| * | | Use prefix matchingErik Johnston2017-06-011-5/+29
| * | | Comment on why arbitrary commentsErik Johnston2017-05-311-2/+6
| * | | Use unique indicesErik Johnston2017-05-311-2/+2
| * | | Comment briefly on how we keep user_directory up to dateErik Johnston2017-05-311-0/+10
| * | | Convert to intErik Johnston2017-05-311-0/+1
| * | | Lifts things into separate functionErik Johnston2017-05-311-56/+54
| * | | TyposErik Johnston2017-05-311-8/+8
| * | | Fix testsErik Johnston2017-05-312-2/+3
| * | | Fix typoErik Johnston2017-05-311-1/+1
| * | | Limit number of things we fetch out of the dbErik Johnston2017-05-311-9/+30
| * | | Add stream change cacheErik Johnston2017-05-314-1/+34
| * | | Split out directory and search tablesErik Johnston2017-05-312-29/+56
| * | | Pull max id from correct tableErik Johnston2017-05-312-4/+10
| * | | Handle the server leaving a public roomErik Johnston2017-05-314-3/+46
| * | | Add commentsErik Johnston2017-05-314-45/+173
| * | | Weight differentlyErik Johnston2017-05-312-10/+31
| * | | Use POSTErik Johnston2017-05-311-1/+1
| * | | Add REST APIErik Johnston2017-05-312-0/+61
| * | | Add searchErik Johnston2017-05-312-0/+38
| * | | Update room column when room becomes unpublicErik Johnston2017-05-312-2/+31
| * | | Add call laterErik Johnston2017-05-311-0/+2
| * | | Start laterErik Johnston2017-05-311-1/+4
| * | | Don't go round in circlesErik Johnston2017-05-311-4/+2
| * | | Add user_directory to databaseErik Johnston2017-05-316-1/+444
| * | | Add commentErik Johnston2017-05-301-1/+1
| * | | Add clobbered event_idErik Johnston2017-05-302-1/+3
| * | | Add current_state_delta_stream tableErik Johnston2017-05-302-8/+48
| |/ /
| * | Merge pull request #2247 from matrix-org/erikj/auth_eventErik Johnston2017-05-245-13/+118
| |\ \
| | * | Add background task to clear out old event_authErik Johnston2017-05-243-1/+74
| | * | Only store event_auth for state eventsErik Johnston2017-05-243-12/+44
| * | | Merge pull request #2243 from matrix-org/matthew/fix-url-preview-length-againErik Johnston2017-05-231-0/+2
| |\ \ \
| | * | | actually trim oversize og:description metaMatthew Hodgson2017-05-221-0/+2
| * | | | Merge pull request #2237 from matrix-org/erikj/sync_key_countErik Johnston2017-05-234-15/+34
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove redundant invalidationErik Johnston2017-05-231-3/+0
| | * | | Missed an invalidationErik Johnston2017-05-231-0/+3
| | * | | Add missing storage function to slave storeErik Johnston2017-05-221-0/+2
| | * | | Stream count_e2e_one_time_keys cache invalidationErik Johnston2017-05-221-13/+18
| | * | | Add count of one time keys to sync streamErik Johnston2017-05-192-0/+12
| * | | | Only load jinja2 templates onceErik Johnston2017-05-224-60/+105
| * | | | Merge pull request #2241 from matrix-org/erikj/fix_notifsErik Johnston2017-05-221-4/+32
| |\ \ \ \
| | * | | | CommentErik Johnston2017-05-221-0/+2
| | * | | | Remove spurious log level guardsErik Johnston2017-05-221-6/+3
| | * | | | Check if current event is a membership eventErik Johnston2017-05-221-4/+9
| | * | | | Add debug loggingErik Johnston2017-05-221-0/+24
| * | | | | Merge pull request #2240 from matrix-org/erikj/cache_list_fixErik Johnston2017-05-221-16/+40
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Pull out if statement from for loopErik Johnston2017-05-221-6/+14
| | * | | | Update list cache to handle one arg caseErik Johnston2017-05-221-17/+33
| | |/ / /
| * | | | CommentErik Johnston2017-05-221-1/+4
| * | | | Use tuple unpackingErik Johnston2017-05-221-2/+2
| * | | | Speed up calculating push rulesErik Johnston2017-05-191-8/+19
| |/ / /
| * | | Fix invalidation of get_users_with_read_receipts_in_roomErik Johnston2017-05-191-1/+3
| * | | Move invalidation cb to its own structureErik Johnston2017-05-191-6/+15
| * | | Store ActionGenerator in HomeServerErik Johnston2017-05-195-7/+10
| * | | Don't push users who have leftErik Johnston2017-05-181-1/+4
| * | | Increase size of push rule cachesErik Johnston2017-05-181-2/+2
| * | | Make get_if_app_services_interested_in_user fasterErik Johnston2017-05-184-13/+34
| * | | Remove size of push get_rules cacheErik Johnston2017-05-181-1/+1
| * | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-05-181-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Bump changelog and version github/release-v0.21.0 release-v0.21.0Erik Johnston2017-05-181-1/+1
| * | | Merge pull request #2177 from matrix-org/erikj/faster_push_rulesErik Johnston2017-05-183-47/+252
| |\ \ \ | | |_|/ | |/| |
| | * | Add commentErik Johnston2017-05-181-0/+3
| | * | Faster push rule calculation via push specific cacheErik Johnston2017-05-173-47/+249
| * | | Merge pull request #2230 from matrix-org/erikj/speed_up_get_stateErik Johnston2017-05-172-40/+57
| |\ \ \ | | |/ / | |/| |
| | * | Make get_state_groups_from_groups faster.Erik Johnston2017-05-172-40/+57
| | |/
| * | Merge pull request #2216 from slipeer/app_services_interested_in_userErik Johnston2017-05-172-3/+6
| |\ \ | | |/ | |/|
| | * Fix users claimed non-exclusively by an app service don't get notifications #...Slipeer2017-05-112-3/+6
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.21.0Erik Johnston2017-05-171-3/+24
| |\ \
| | * | CommentErik Johnston2017-05-171-0/+5
| | * | Short circuit when we have delta idsErik Johnston2017-05-171-3/+19
| * | | Bump changelog and versionErik Johnston2017-05-171-1/+1
| |/ /
| * | Merge pull request #2228 from matrix-org/erikj/speed_up_get_hostsErik Johnston2017-05-162-2/+4
| |\ \
| | * | Speed up get_joined_hostsErik Johnston2017-05-162-2/+4
| * | | Merge pull request #2227 from matrix-org/erikj/presence_cachesErik Johnston2017-05-162-4/+4
| |\ \ \
| | * | | Make presence use cached users/hosts in roomErik Johnston2017-05-162-4/+4
| | |/ /
| * / / Speed up get_domain_from_idErik Johnston2017-05-161-3/+3
| |/ /
| * | Merge pull request #2224 from matrix-org/erikj/prefill_stateErik Johnston2017-05-163-9/+26
| |\ \
| | * | Remove spurious merge artifactsErik Johnston2017-05-161-13/+0
| | * | Take a copy before prefilling, as it may be a frozendictErik Johnston2017-05-161-1/+1
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/prefill_stateErik Johnston2017-05-155-1/+29
| | |\ \
| | * | | Update commentErik Johnston2017-05-151-1/+2
| | * | | CommentsErik Johnston2017-05-152-3/+6
| | * | | Add more granular event send metricsErik Johnston2017-05-151-0/+12
| | * | | Prefill state cachesErik Johnston2017-05-153-6/+20
* | | | | replaced json.dumps with encode_canonical_jsonKrombel2017-06-211-1/+2
* | | | | Merge branch 'develop' into avoid_duplicate_filtersKrombel2017-05-169-13/+92
|\| | | |
| * | | | Merge pull request #2218 from matrix-org/rav/event_search_indexRichard van der Hoff2017-05-164-12/+63
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add a comment to old deltaRichard van der Hoff2017-05-111-0/+4
| | * | | Don't create event_search index on sqliteRichard van der Hoff2017-05-112-3/+11
| | * | | Add more logging for purgingRichard van der Hoff2017-05-111-7/+14
| | * | | Add an index to event_searchRichard van der Hoff2017-05-113-3/+35
| | |/ /
| * | | Merge pull request #2221 from psaavedra/sync_timeline_limit_filter_by_nameErik Johnston2017-05-154-0/+26
| |\ \ \
| | * | | Fixed syntax nitsPablo Saavedra2017-05-152-5/+6
| | * | | Fixed implementation errorsPablo Saavedra2017-05-152-3/+7
| | * | | Configurable maximum number of events requested by /sync and /messages (#2220)Pablo Saavedra2017-05-134-0/+21
| | |/ /
| * / / Don't log exceptions for NotRetryingDestinationErik Johnston2017-05-151-1/+3
| |/ /
* | | avoid access-error if no filter_id matchesKrombel2017-05-151-3/+3
* | | insert whitespace to fix travis buildKrombel2017-05-121-1/+1
* | | add check to only add a new filter if the same filter does not exist previouslyKrombel2017-05-111-0/+9
|/ /
* | Merge pull request #2214 from matrix-org/rav/hurry_up_purgeRichard van der Hoff2017-05-111-20/+42
|\ \ | |/ |/|
| * Tidy purge code and add some commentsRichard van der Hoff2017-05-111-12/+19
| * Don't de-delta state groups we're about to deleteRichard van der Hoff2017-05-101-11/+9
| * add some logging to purge_historyRichard van der Hoff2017-05-101-4/+21
* | Modify condition on empty localpartLuke Barnard2017-05-101-1/+1
* | Modify register/available to be GET with query paramLuke Barnard2017-05-102-5/+11
|/
* Merge pull request #2208 from matrix-org/erikj/ratelimit_overridErik Johnston2017-05-106-19/+93
|\
| * Add per user ratelimiting overridesErik Johnston2017-05-106-19/+93
* | Merge pull request #2206 from matrix-org/rav/one_time_key_upload_change_sigRichard van der Hoff2017-05-103-36/+107
|\ \
| * | Replace some instances of preserve_context_over_deferredRichard van der Hoff2017-05-091-3/+3
| * | Do some logging when one-time-keys get claimedRichard van der Hoff2017-05-092-0/+20
| * | Allow clients to upload one-time-keys with new sigsRichard van der Hoff2017-05-092-33/+84
| |/
* / Change register/available to POST (from GET)Luke Barnard2017-05-101-1/+1
|/
* Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse into developErik Johnston2017-05-081-1/+1
|\
| * Bump version and changelog v0.21.0-rc2Erik Johnston2017-05-081-1/+1
| * Bump version and changelog v0.21.0-rc1Erik Johnston2017-05-081-1/+1
* | Merge pull request #2203 from matrix-org/erikj/event_cache_hit_ratioErik Johnston2017-05-083-5/+27
|\ \
| * | Expand docstring a bitErik Johnston2017-05-081-1/+7
| * | Don't update event cache hit ratio from get_joined_usersErik Johnston2017-05-083-5/+21
* | | Merge pull request #2201 from matrix-org/erikj/store_device_cacheErik Johnston2017-05-081-3/+22
|\ \ \
| * | | Add missing yieldsErik Johnston2017-05-081-2/+4
| * | | Invalidate cache on device deletionErik Johnston2017-05-081-2/+6
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 14:51:59 +0000