Commit Graph

150 Commits (3066423e43468875426fbb8a432f7ccad1b8bc99)

Author SHA1 Message Date
xjm de32f3ca2d Issue #3133033 by munish.kumar, xjm, Hardik_Patel_12, daffie, swatichouhan012: Fix Drupal.Array.Array.LongLineDeclaration coding standard for instances of the drupalCreateUser() test method 2020-06-21 16:39:19 -05:00
xjm d836a915d8 SA-CORE-2020-006 by BR0kEN, Wim Leers, xjm, larowlan
(cherry picked from commit 54cc80e4db)
2020-06-17 13:04:13 -05:00
xjm 40b0e163ea Issue #3138774 by sja112, mohrerao, shalinigaur: Fix "DoesNot" relevant typos in core 2020-05-29 12:48:30 -05:00
xjm f72ff0bd50 Issue #3138785 by sja112, ankit.singh: Fix "Picasso" relevant typos in core 2020-05-28 19:41:41 -05:00
catch 421c588c16 Issue #3131343 by mondrake, dww, jungle: Replace assertions involving calls to in_array() with assertContains()/assertNotContains() 2020-05-11 09:10:55 +01:00
xjm 7590d5b5df Issue #3126906 by jungle, longwave, AndyF: MenuLinkContentTest.php is recognized as a binary file by git 2020-05-09 21:23:55 -05:00
catch 40a5bd7e0a Issue #3126965 by jungle, quietone, longwave, mondrake, dww: Replace assert* involving count() and an integer literal with assertCount() 2020-05-07 19:07:00 +01:00
catch ca1aa9e4ba Issue #3094398 by martin107, alexpott, andypost, klausi: Update Symfony response and request events to new classes 2020-05-06 15:39:38 +01:00
xjm 8b7aee5be4 Issue #3115772 by saurabh.rocksoul, swatichouhan012, Wim Leers, alexpott: User::load calls should be avoided in classes, use dependency injection instead in jsonapi module 2020-05-03 03:07:52 -05:00
xjm 9ea59d229e Issue #3126957 by Suresh Prabhu Parkala, Neslee Canil Pinto, Kristen Pol, jungle: Add missing curly brackets around @inheritdoc 2020-04-29 17:45:17 -05:00
catch 222e10447b Issue #3131088 by Spokje, longwave: Replace assertions involving calls to file_exists with assertFileExists()/assertFileNotExists() or assertDirectoryExists()/assertDirectoryNotExists() 2020-04-27 14:13:40 +01:00
catch bcec845d85 Issue #3128575 by longwave, jungle, daffie: Replace assert*(*, is_null()) with assertNotNull()/assertNull() 2020-04-27 09:20:37 +01:00
catch 4fe0b034a9 Issue #3128905 by jungle, longwave, Kristen Pol, mondrake: Replace assert* involving an instanceof operator with assertInstanceOf()/assertNotInstanceOf() 2020-04-24 21:27:52 +01:00
catch 8f7f02c661 Issue #3129508 by Lal_, daffie, Suresh Prabhu Parkala: Change multiple dirname()'s into a single dirname() with the use of the second parameter of dirname() 2020-04-23 17:15:14 +01:00
Alex Pott cc564e260e
Issue #3121362 by jungle, Meenakshi.g, dww, xjm, alexpott, tim.plunkett: Fix duplicate word typos (the the, to to, etc.) for code comments 2020-04-17 20:37:16 +01:00
catch 5132c83fac Issue #3082415 by Krzysztof Domański, mondrake, alexpott, longwave, jungle: Replace assert(Not)Same/Identical() on booleans with assert(Not)True/False() in PHPUnit tests 2020-04-17 16:00:07 +01:00
catch 09be91a395 Issue #3126564 by longwave, mondrake: Replace usage of assertArraySubset(), that is deprecated 2020-04-16 19:40:52 +01:00
catch 6eda65df14 Issue #3127641 by mglaman, longwave: Typo in ResourceIdentifierNormalizer, "mach" instead of "match" 2020-04-15 15:04:32 +01:00
Alex Pott 6bf02d966d
Issue #2822382 by voleger, pfrenssen, erozqba, jungle, RytoEX, borisson_, jofitz, shashikant_chauhan, sidharthap, dawehner, xjm, kiamlaluno, catch, daffie, klausi: Make every $modules property protected on classes extending BrowserTestBase and KernelTestBase 2020-04-13 12:05:00 +01:00
Alex Pott 0dc28534c8
Issue #3107732 by mondrake, longwave, swatichouhan012, salah1, xjm, catch, alexpott, Berdir: Between April 13 and April 17, 2020: Add return typehints to setUp/tearDown methods in concrete test classes 2020-04-13 09:56:30 +01:00
Alex Pott 6108526c9c
Issue #3113077 by mondrake, Hardik_Patel_12, Neslee Canil Pinto, swatichouhan012, prabha1997, neelam_wadhwani, Berdir, longwave: Replace assertContains() on strings with assertStringContainsString() or assertStringContainsStringIgnoringCase() 2020-04-12 12:34:00 +01:00
xjm 5c457b5509 Issue #3113876 by Hardik_Patel_12, himmatbhatia, jungle, klausi, longwave: The "Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent::getException()" method is deprecated since Symfony 4.4, use "getThrowable()" instead 2020-03-31 20:19:01 -05:00
catch e79723c3ef Issue #3074585 by mikelutz, alexpott, Berdir, Mile23, heddn, effulgentsia, Wim Leers: [Symfony 5] Replace app.root and site.path string services with container parameters 2020-03-05 11:22:39 +00:00
Gábor Hojtsy 973a74ad93 Issue #3114785 by slootjes, longwave: [Symfony 5] Update deprecated short factory configurators in Yaml 2020-02-20 23:10:47 +01:00
catch 2f2dc410e1 Issue #3100591 by Hardik_Patel_12, Wim Leers, Krzysztof Domański: Address jsonapi.module TODOs that were blocked on Drupal requiring PHP >= 5.6 2020-02-03 18:09:27 +00:00
catch f6ee10b4b1 Issue #3103993 by Hardik_Patel_12, Rangaswini, alexpott: Value returned from FileSystem methods are not checked in streamUploadData() function 2020-01-29 09:49:45 +00:00
catch 720924f719 Issue #2893804 by Wim Leers, Stefdewa, Berdir, catch: Remove rest.module BC layers 2020-01-27 17:41:43 +00:00
catch e1a041c493 Issue #3087644 by jibran, Berdir, alexpott, longwave, Wim Leers, amateescu, catch, xjm, larowlan, dpi, quietone: Remove Drupal 8 updates up to and including 88** 2020-01-24 23:52:03 +00:00
Lee Rowlands 2e53ac1699
Revert "Issue #3087644 by jibran, Berdir, alexpott, longwave, Wim Leers, amateescu, catch, larowlan, dpi, quietone: Remove Drupal 8 updates up to and including 88**"
This reverts commit 136f055066.
2020-01-22 10:30:15 +10:00
Lee Rowlands 136f055066
Issue #3087644 by jibran, Berdir, alexpott, longwave, Wim Leers, amateescu, catch, larowlan, dpi, quietone: Remove Drupal 8 updates up to and including 88** 2020-01-22 09:33:30 +10:00
Alex Pott 0ef5863112
Issue #3093752 by bbrala, Wim Leers: Call to JSON:API test helper method passes an argument that no longer exists 2019-12-04 17:18:40 +00:00
catch 8173c25cdc Issue #3092459 by Wim Leers, Mile23: Remove jsonapi.module BC layers 2019-11-28 12:25:09 +00:00
Alex Pott f2469de972
Issue #3087546 by Berdir, alexpott, martin107, jibran: Remove deprecated entity manager 2019-11-14 10:49:28 +00:00
catch c388f669f8 Issue #3094007 by jibran, mikelutz, alexpott, Berdir: Update the 9.0.x branch to Symfony 4.4-beta2 2019-11-13 17:40:51 +00:00
catch 19f9474b9b Issue #2742585 by ZeiP, alexpott, mondrake, klausi, tomasnagy, Krzysztof Domański, sokru, kristiaanvandeneynde, dawehner, jeroenbegyn: Deprecate dangerous assertTrue/False() compatibility overrides in PHPUnit Kernel, Functional and FunctionalJavascript tests 2019-11-08 13:53:52 +00:00
catch 32d95eccd7 Issue #3082655 by Wim Leers, alexpott, iyyappan.govind, dww, lauriii: Specify the $defaultTheme property in all functional tests 2019-11-08 13:39:33 +00:00
catch 2c08ab2b31 Issue #3084983 by plach, amateescu, catch, Berdir, xjm: Move all the code related to path aliases to a new (required) "path_alias" module 2019-11-07 19:47:09 +00:00
Lee Rowlands 1368057e15
Issue #3034786 by Wim Leers, BR0kEN, gabesullice, dutchyoda, eelkeblok, axicdv: ResourceIdentifier::getVirtualOrMissingResourceIdentifier() ignores field aliases; causes $relatable_resource_types field to be empty and results in an error 2019-11-06 19:51:28 +10:00
catch 56fd1b600b Issue #3086408 by Krzysztof Domański, mglaman, el7cosmos: Error code should be string in HttpExceptionNormalizer 2019-10-28 11:07:18 +00:00
catch bc6aabc9cd Issue #3087692 by Wim Leers, alexpott: Remove the core key from views configuration 2019-10-22 20:40:16 +01:00
effulgentsia 68bacadce5 Issue #3080259 by gabesullice, alexpott, Wim Leers: Links with different target attributes are improperly merged 2019-10-16 09:47:06 -07:00
catch e37031e09a Issue #3072702 by alexpott, Wim Leers, mikelutz, xjm, catch, Berdir, tedbow, webchick, shaal, Mixologic, heddn: Core extensions should not need to specify the new core_version_requirement in *.info.yml files so that 9.0.x can be installed 2019-10-15 15:34:52 +01:00
effulgentsia e68662396d Issue #3085035 by gabesullice, Wim Leers: Add a public API for aliasing and disabling JSON:API resource type fields 2019-10-14 12:49:15 -07:00
Lee Rowlands 1108909656
Issue #2863188 by acbramley, Erik Frèrejean, Maouna, andypost, init90, larowlan, hchonov, sathish.redcrackle, vasi1186, chr.fritsch, tstoeckler, Krzysztof Domański, phjou, jibran, alexpott, catch, xjm: Hardcoded result size limit in the entity reference autocomplete widget 2019-10-11 10:54:43 +10:00
webchick e0c5f41ff4 Issue #3007669 by amateescu, Berdir, catch: Add publishing status to path aliases 2019-10-10 10:27:16 -07:00
webchick 1c299c6d91 Issue #3068275 by Wim Leers, alexpott, shimpy, gabesullice, xjm: Add status report message about JSON:API's read-only mode 2019-10-09 23:33:02 -07:00
xjm bd5908ad2e Revert "Issue #2863188 by acbramley, Erik Frèrejean, Maouna, andypost, init90, larowlan, sathish.redcrackle, vasi1186, chr.fritsch, tstoeckler, phjou, jibran, hchonov, alexpott, catch: Hardcoded result size limit in the entity reference autocomplete widget"
This reverts commit 438f38397b.
2019-10-09 06:09:51 -05:00
Lee Rowlands 438f38397b
Issue #2863188 by acbramley, Erik Frèrejean, Maouna, andypost, init90, larowlan, sathish.redcrackle, vasi1186, chr.fritsch, tstoeckler, phjou, jibran, hchonov, alexpott, catch: Hardcoded result size limit in the entity reference autocomplete widget 2019-10-09 13:27:41 +10:00
Alex Pott 9aa7d13c9f
Issue #3023015 by Berdir, kim.pepper, tinko, mikelutz: Replace usages of deprecated constants in file.inc 2019-10-08 21:50:39 +01:00
Lee Rowlands 6625869666
Issue #3085885 by gabesullice, e0ipso, Wim Leers: Follow-up to #3014277: Wrong variable used as argument in BC layer-providing ResourceType::updateDeprecatedFieldMapping() 2019-10-05 09:55:40 +10:00
Lee Rowlands 9b41f7f8fd
Issue #3037039 by gabesullice, rajanvalecha12, e0ipso, Wim Leers, effulgentsia, xjm, jibran, larowlan, dww, alexpott, amateescu, webchick: Create a public API for indicating resource types should not be exposed 2019-10-04 09:44:27 +10:00
catch 099ce08ac8 Issue #2336597 by amateescu, slashrsm, jibran, Wim Leers, saki007ster, Berdir, catch, plach, Charlie ChX Negyesi, dawehner, gabesullice: Convert path aliases to full featured entities 2019-10-01 11:30:19 +01:00
Lee Rowlands 7dfe3876f5
Issue #3014277 by gabesullice, e0ipso, Wim Leers, larowlan, jibran, ndobromirov, catch: ResourceTypes should know about their fields 2019-10-01 11:17:01 +10:00
Lee Rowlands 7af2d3d309
Issue #3036285 by gabesullice, Wim Leers, Spokje, larowlan, catch: Add a \JsonApiResource\Relationship object to carry relationship data, metadata and a link collection 2019-10-01 07:14:22 +10:00
Alex Pott e10377015e
Issue #2869855 by mcdruid, Krzysztof Domański, wturrell, rjg, manarth, dpagini, Wim Leers, catch, xjm, cilefen: Race condition in file_save_upload causes data loss 2019-09-23 08:55:26 +01:00
Alex Pott 65491ce4f8
Issue #3077287 by gabesullice: Followup to #2819335: ResourceObjectNormalizationCacher doesn't merge link normalization cacheability 2019-09-20 10:50:20 +01:00
Alex Pott 12b47612f2
Issue #3070204 by gabesullice, ravi.shankar, Wim Leers, mglaman, catch, larowlan, jibran: Refactor the JSON:API FieldResolver to use a resource type instead of an entity type ID and bundle ID pair 2019-09-20 10:34:40 +01:00
catch d9936f2817 Issue #3077661 by cspitzlay, Wim Leers: Check for conflict in fieldname mapping does not work 2019-09-17 12:02:36 +01:00
catch 4f05e52621 Issue #3055832 by BR0kEN, Wim Leers: Remove ResourceResponseValidator's unused $serializer property/service dependency 2019-09-17 11:45:11 +01:00
catch 3d27d76d71 Issue #3051231 by TR, cindytwilliams: Class names in *.routing.yml inconsistently use leading \ 2019-09-17 11:30:36 +01:00
catch bdc5bcdcad Issue #3077755 by gabesullice, mmenavas, sokru, Wim Leers: Spec compliance bug: Links object member names must not use colons 2019-09-17 10:56:40 +01:00
catch 5fabcffb44 Issue #3057175 by Wim Leers, gabesullice, Berdir: Implementation of user name in JSON:API can result in overwriting data 2019-09-13 12:21:53 +01:00
catch 5cd49004e4 Issue #3078639 by gabesullice, gambry: PostgreSQL automated test failing for JsonApiRegressionTest after latest changes on json_api FieldItemNormalizer 2019-09-06 11:10:16 +01:00
catch d881bd0abb Issue #2935780 by amateescu, Manuel Garcia, Fabianx, Sam152, kunalkursija: Remove the concept of a 'live' default workspace 2019-08-30 12:59:59 +01:00
catch 0e29b534a4 Issue #3074710 by bucefal91, sokru, Wim Leers, larowlan: Losing cacheability while normalizing EntityAccessDeniedHttpException for an inaccessible include 2019-08-29 12:59:08 +01:00
Lee Rowlands 6aec5a3f88
Issue #3048348 by Wim Leers, yogeshmpawar, logickal, alexpott, adamspe: Denormalizing NULL for an optional @FieldType=address or @FieldType=geolocation field fails due to either no main property name or computed read-only main property 2019-08-29 13:13:05 +10:00
catch e0a8d33711 Issue #3052954 by Wim Leers, gabesullice, garphy: Incorrect use of UnprocessableHttpEntityException in EntityResource::deserialize() 2019-08-23 11:42:49 +01:00
Lee Rowlands cf5ad5feba
Issue #3075831 by mr.baileys: Failing assertions when bundle ID contains only numbers 2019-08-22 12:26:30 +10:00
Lee Rowlands 5699dcb45e
Issue #3043168 by Wim Leers, Niklan, gabesullice, joelstein, plach, mglaman: PATCH 405 for untranslatable content entities with different default language than English 2019-08-22 12:24:11 +10:00
Lee Rowlands 39909cea86
Issue #3073880 by Wim Leers, gabesullice: Add JSON:API test coverage for SA-CORE-2019-003 2019-08-20 12:09:52 +10:00
Lee Rowlands 50a700f950
Issue #3075422 by Wim Leers: Follow-up for #2821077: address forgotten @todo in UserTest::testPatchDxForSecuritySensitiveBaseFields() 2019-08-20 11:41:44 +10:00
Lee Rowlands 09f2d2c1f6
Revert "Issue #3043168 by Wim Leers, Niklan, gabesullice, joelstein, mglaman: PATCH 405 for untranslatable content entities with different default language than English"
This reverts commit bfd08b8c2b.
2019-08-20 08:37:00 +10:00
Francesco Placella bfd08b8c2b Issue #3043168 by Wim Leers, Niklan, gabesullice, joelstein, mglaman: PATCH 405 for untranslatable content entities with different default language than English 2019-08-19 23:32:04 +02:00
Lee Rowlands f944ef3f47
Issue #3052931 by gabesullice, Wim Leers, larowlan: Permit arrays as target attribute values in Drupal\jsonapi\JsonApiResource\Link 2019-08-15 10:32:38 +10:00
Lee Rowlands 103d362599
Issue #3060836 by Wim Leers, shreyal999, alexpott, bnjmnm: Remove 99% of \Drupal\Tests\jsonapi\Kernel\Controller\EntityResourceTest since it is a subset of the functional tests 2019-08-14 10:39:31 +10:00
Lee Rowlands 9eca7bba0b
Issue #2952522 by Wim Leers, gabesullice, e0ipso, Berdir: Remove @todo that is no longer relevant 2019-08-14 10:21:15 +10:00
Lee Rowlands 4b03338f2e
Revert "Issue #3029540 by mikelutz, catch, alexpott, larowlan, Gábor Hojtsy: [Symfony 4] Sub class \Symfony\Component\Validator\ConstraintViolation and use that in \Drupal\Core\TypedData\Validation\ExecutionContext::addViolation()"
This reverts commit 20496dd2e7.
2019-08-14 10:17:08 +10:00
Lee Rowlands d6bc614643
Issue #2982060 by Wim Leers: Un-skip skipped JSON:API tests because LinkNotExistingInternalConstraintValidator is no longer incorrectly bubbling cacheability 2019-08-10 07:02:55 +10:00
Lee Rowlands a7847919c4
Issue #2940038 by Sweetchuck, drunken monkey, rajeshwari10, borisson_: Use $this in @return PhpDoc comments instead of the name of the current class or interface 2019-08-06 15:56:28 +10:00
catch ffe69958b0 Issue #2450793 by Berdir, Mile23, Wim Leers, mikelutz, xjm, TR: Properly deprecate support for entity type label callbacks 2019-07-31 08:52:27 +01:00
catch c9b93297ec Issue #3065261 by gabesullice, Wim Leers: Add a local task for JSON:API's settings page so other modules can add their own tasks 2019-07-18 14:11:36 +01:00
catch 22a2503d7a Issue #3018287 by ndobromirov, Wim Leers, gabesullice, e0ipso: ResourceTypeRepository computes ResourceType value objects on *every request* 2019-07-18 13:47:05 +01:00
Lee Rowlands 6033d3976a
Issue #2819335 by Wim Leers, e0ipso, gabesullice, jibran, kristiaanvandeneynde, itsekhmistro, steven.wichers, ndobromirov, larowlan, btully, kim.pepper, yogeshmpawar: Resource (entity) normalization should use partial caching 2019-07-10 11:42:03 +10:00
Alex Pott c1b9f95417
Issue #3039730 by ndobromirov, Wim Leers, e0ipso, l0ke, webchick, xjm: Include paths are resolved for every resource in a resource collection, instead of once per unique resource type 2019-06-12 10:30:31 +03:00
Alex Pott e82e0c0573
Issue #3059090 by clepson, mondrake, alexpott: Deprecate \Drupal\Tests\PhpunitCompatibilityTrait::setExpectedException() 2019-06-11 12:38:53 +03:00
Alex Pott 6d3ac6c727
Issue #3042745 by dwebpoint, Berdir, emacoti, jefftrnr, Wim Leers, alexpott, voleger, sjhuda, bnjmnm: Remove group @legacy from jsonapi tests and fix deprecation messages 2019-06-11 12:18:24 +03:00
Alex Pott 20496dd2e7
Issue #3029540 by mikelutz, catch, alexpott, larowlan, Gábor Hojtsy: [Symfony 4] Sub class \Symfony\Component\Validator\ConstraintViolation and use that in \Drupal\Core\TypedData\Validation\ExecutionContext::addViolation() 2019-06-04 14:31:13 +01:00
Alex Pott 23fad5b6a5
Issue #2926068 by almaudoh, andypost, voleger, claudiu.cristea, Oleksiy, YurkinPark, yo30, alexpott, dawehner, Berdir: Deprecate system_rebuild_module_data() and remove usages in core 2019-06-03 12:49:38 +01:00
Alex Pott cc7f7b1ecf
Issue #3051908 by Roensby, gabesullice: Documentation in json.api.php describes wrong query parameter 2019-05-29 15:01:09 +01:00
Lee Rowlands 21b1b01789
Issue #3053827 by gabesullice: Leaked cache metadata detected when using JSON:API to GET a threaded comment when RDF module is installed 2019-05-27 17:43:47 +10:00
catch 43cb1b5cce Issue #3053363 by alexpott, Wim Leers, Berdir, mondrake, xjm: Remove support for PHP 5 in Drupal 8.8 2019-05-24 11:36:30 +01:00
Lee Rowlands ba509afbc9
Issue #3047866 by mikelutz, Berdir, TR, alexpott, andypost, Satyanarayan Reddy: Remove usage of deprecated \Drupal::entityManager() in core 2019-05-24 16:44:36 +10:00
Alex Pott 49a7dfcb47
Issue #3042124 by gabesullice, Wim Leers, logickal, benjy, Grimreaper: [regression] Empty response body when user is an administrator and an exception is thrown; some traces cannot be encoded because of recursion detection 2019-05-18 14:43:24 +02:00
Lee Rowlands 31a5cba35c
Issue #3049021 by kim.pepper, Berdir: Deprecate file_default_scheme() and just use config 2019-05-17 12:15:25 +10:00
Alex Pott 0df3be0e23
Issue #3042694 by mikelutz, jibran: [Symfony 4] JSON:API ResourceResponseSubscriber can pass NULL to Symfony\Component\HttpFoundation\Response::setCharset() 2019-03-28 09:10:11 +00:00
effulgentsia 9cd5ccca8e Issue #2889855 by seanB, chr.fritsch, vijaycs85, phenaproxima, marcoscano, Wim Leers, govind.maloo, larowlan, pk188, Dinesh18, balazswmann, michael_wojcik, catch, effulgentsia, alexpott, Berdir, dawehner: Unpublished media entity can not be accessed by owner and update any media/delete any media access possibly cached by user 2019-03-26 09:18:11 -07:00
effulgentsia d0ec4df02d Issue #3042198 by Wim Leers, tim.plunkett, phenaproxima, xjm: Add JSON:API integration test for LayoutBuilderEntityViewDisplay 2019-03-25 20:33:45 -07:00
xjm 195a3c9bf0 Revert "Issue #3042198 by Wim Leers, tim.plunkett, phenaproxima: Add JSON:API integration test for LayoutBuilderEntityViewDisplay"
This reverts commit 46d0fc7afd.
2019-03-25 21:32:55 -05:00
xjm 46d0fc7afd Issue #3042198 by Wim Leers, tim.plunkett, phenaproxima: Add JSON:API integration test for LayoutBuilderEntityViewDisplay 2019-03-25 18:45:06 -05:00
effulgentsia e59ec93f50 Issue #2843147 by Wim Leers, e0ipso, gabesullice, dagmar, xjm, effulgentsia, webchick, dww, Berdir, dawehner, colan, mgalalm, govind.maloo, das-peter, jludwig, ndobromirov, martin107, abhisekmazumdar, nuez, catch, amateescu, pwolanin, mallezie, borisson_, jibran, voleger, plach, GeduR, Grimreaper, apupiales, Sutharsan, RenatoG, michaellander, sergesemashko, dbt102, hampercm, dremy, rpayanm, chriscalip, tstoeckler, keopx, skyredwang, Spleshka, RajeevK, matthew.perry, kaysenlau, jazzdrive3, dsdeiz, ebeyrent, acbramley, deviantintegral, samuel.mortenson, DamienMcKenna, mohit_aghera, ibustos, dpolant, garphy: Add JSON:API to core as a stable module 2019-03-20 16:41:11 -07:00