nathan/ptcoffee_django
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • abc4e678ce Merge branch 'hotfix/2.0.16' Nathan Chapman 2022-11-25 07:35:32 -07:00
  • 5bc1f747db Fix shipping weight when sending to USPS Nathan Chapman 2022-11-25 07:35:23 -07:00
  • 363e4bf009 Merge tag 'v2.0.15' into develop Nathan Chapman 2022-11-20 09:57:36 -07:00
  • 180f853486 Merge branch 'release/2.0.15' Nathan Chapman 2022-11-20 09:57:36 -07:00
  • fa01af0adc Add carousel to product list Nathan Chapman 2022-11-20 09:02:24 -07:00
  • 236328e5ea Merge tag 'v1.0.15' into develop Nathan Chapman 2022-11-19 09:56:39 -07:00
  • ff6cf2d6af Merge branch 'release/1.0.15' Nathan Chapman 2022-11-19 09:56:39 -07:00
  • b047bde390 Suspend free shipping for now Nathan Chapman 2022-11-19 09:56:21 -07:00
  • 19e717e02e Merge tag 'v2.0.14' into develop Nathan Chapman 2022-11-13 20:32:22 -07:00
  • 8d5f7fe6b9 Merge branch 'release/2.0.14' Nathan Chapman 2022-11-13 20:32:22 -07:00
  • 0c0e0b0538 Fix shipping message Nathan Chapman 2022-11-13 20:31:54 -07:00
  • f0a9f2c3fa Remove product category link dropdown menu Nathan Chapman 2022-11-13 12:44:53 -07:00
  • 94908d4230 Add free shipping only to coffee Nathan Chapman 2022-11-13 12:38:38 -07:00
  • f52b529c86 Remove contact page Nathan Chapman 2022-11-13 10:56:00 -07:00
  • f644c124b7 Merge tag 'v2.0.13' into develop Nathan Chapman 2022-11-08 18:05:36 -07:00
  • 83ff171986 Merge branch 'release/2.0.13' Nathan Chapman 2022-11-08 18:05:36 -07:00
  • 26f6f032b1 Add options to PP info, add blank to image, add sorting to variants Nathan Chapman 2022-11-08 18:01:23 -07:00
  • fd09f571cd Merge tag 'v2.0.12' into develop Nathan Chapman 2022-11-07 21:02:36 -07:00
  • a69281dc05 Merge branch 'release/2.0.12' Nathan Chapman 2022-11-07 21:02:36 -07:00
  • 55c80e32d8 Make sku blank Nathan Chapman 2022-11-07 21:02:25 -07:00
  • 4b0a03747e Merge tag 'v2.0.11' into develop Nathan Chapman 2022-11-07 21:00:55 -07:00
  • 95c7707f18 Merge branch 'release/2.0.11' Nathan Chapman 2022-11-07 21:00:55 -07:00
  • b9cbcfe923 Remove sku unique requirement Nathan Chapman 2022-11-07 21:00:44 -07:00
  • 3a5448f943 Merge tag 'v2.0.10' into develop Nathan Chapman 2022-11-07 20:58:23 -07:00
  • dfb1d68b7a Merge branch 'release/2.0.10' Nathan Chapman 2022-11-07 20:58:23 -07:00
  • d2cfa8bd83 Remove sku as a required field Nathan Chapman 2022-11-07 20:58:10 -07:00
  • 13d419ed0e Merge tag 'v2.0.9' into develop Nathan Chapman 2022-11-07 20:55:43 -07:00
  • 8544c7ffb0 Merge branch 'release/2.0.9' Nathan Chapman 2022-11-07 20:55:43 -07:00
  • acbf53068d Replace skus with temporary Nathan Chapman 2022-11-07 20:55:23 -07:00
  • c8450594f4 Merge tag 'v2.0.8' into develop Nathan Chapman 2022-11-07 19:25:48 -07:00
  • 93a463020b Merge branch 'release/2.0.8' Nathan Chapman 2022-11-07 19:25:48 -07:00
  • c8b585f7cd Add default price to merch Nathan Chapman 2022-11-07 19:25:36 -07:00
  • 07a270f7cd Merge tag 'v2.0.7' into develop Nathan Chapman 2022-11-07 19:24:29 -07:00
  • acd83341ae Merge branch 'release/2.0.7' Nathan Chapman 2022-11-07 19:24:29 -07:00
  • cb2034e225 Update fixtures Nathan Chapman 2022-11-07 19:23:29 -07:00
  • c071f5036c Merge tag 'v2.0.6' into develop Nathan Chapman 2022-11-06 10:57:16 -07:00
  • c28c309b04 Merge branch 'release/2.0.6' Nathan Chapman 2022-11-06 10:57:16 -07:00
  • a8421e5f96 Remove price from product list views Nathan Chapman 2022-11-06 10:56:33 -07:00
  • e82b2d5d26 Merge tag 'v2.0.5' into develop Nathan Chapman 2022-11-06 10:54:12 -07:00
  • b9af6394f6 Merge branch 'release/2.0.5' Nathan Chapman 2022-11-06 10:54:12 -07:00
  • 8dd14b2c4b Update banner in category Nathan Chapman 2022-11-06 10:53:59 -07:00
  • 601b7e38f6 Merge tag 'v2.0.4' into develop Nathan Chapman 2022-11-06 10:51:07 -07:00
  • 1a3693f2a0 Merge branch 'release/2.0.4' Nathan Chapman 2022-11-06 10:51:07 -07:00
  • 4290fd4e68 Merge tag 'v2.0.3' into develop Nathan Chapman 2022-11-06 10:36:04 -07:00
  • 951562e971 Merge branch 'release/2.0.3' Nathan Chapman 2022-11-06 10:36:04 -07:00
  • 388556723e Suspend free shipping for now Nathan Chapman 2022-11-06 10:00:57 -07:00
  • 087728b827 Update banner styles Nathan Chapman 2022-11-06 10:00:40 -07:00
  • 0e52e1bdfe Add variant photo assoc Nathan Chapman 2022-11-05 20:35:16 -06:00
  • 4b8831035e Add correct image for selected variant Nathan Chapman 2022-11-05 17:46:22 -06:00
  • 4e7453a188 Merge branch 'feature/free-shipping-setting' into develop Nathan Chapman 2022-11-05 11:27:52 -06:00
  • 0dd19b2d5b Add cart stock limits Nathan Chapman 2022-11-05 11:27:48 -06:00
  • 6c8abec2d5 Add free shipping setting Nathan Chapman 2022-11-05 11:27:13 -06:00
  • 4955bf8dd9 Update coupon ordering Nathan Chapman 2022-11-01 18:33:35 -06:00
  • d0621b2d47 Fix product-create "cancel" link to redirect to catalog Nathan Chapman 2022-11-01 18:26:23 -06:00
  • bfeb3718f5 Update database settings and config for testing Nathan Chapman 2022-11-01 18:14:13 -06:00
  • e14aef1040 Fix core test Nathan Chapman 2022-11-01 18:10:28 -06:00
  • 6141468f21 Fix functional tests Nathan Chapman 2022-11-01 18:07:54 -06:00
  • 9696af6b67 Merge tag 'v2.0.2' into develop Nathan Chapman 2022-10-31 17:21:51 -06:00
  • 0453741561 Merge branch 'release/2.0.2' Nathan Chapman 2022-10-31 17:21:51 -06:00
  • bae0447634 Fix tests for new release Nathan Chapman 2022-10-31 17:21:25 -06:00
  • af71508a10 Add error page instructions Nathan Chapman 2022-10-31 17:20:50 -06:00
  • b46495aa21 Merge tag 'v2.0.1' into develop Nathan Chapman 2022-10-30 08:19:39 -06:00
  • f3c840aeff Merge branch 'release/2.0.1' Nathan Chapman 2022-10-30 08:19:39 -06:00
  • c445b60984 Remove subscriptions link Nathan Chapman 2022-10-30 08:19:19 -06:00
  • 7178be4286 Merge tag 'v2.0.0' into develop Nathan Chapman 2022-10-29 22:59:24 -06:00
  • f0e240ee1a Merge branch 'release/2.0.0' Nathan Chapman 2022-10-29 22:59:24 -06:00
  • ec8a518a7f Merge branch 'feature/track-stock-on-checkout' into develop Nathan Chapman 2022-10-29 22:53:48 -06:00
  • 0e1f32d5b9 Finalize stock feature Nathan Chapman 2022-10-29 22:53:32 -06:00
  • 157296db2b Add basic shipping checkout defaults Nathan Chapman 2022-10-29 10:20:52 -06:00
  • 11d3b740aa Add basic stock handling Nathan Chapman 2022-10-26 09:29:51 -06:00
  • 481575e968 Add form Nathan Chapman 2022-10-22 09:09:12 -06:00
  • 8f10b38f9a Stall stripe Nathan Chapman 2022-10-15 20:58:49 -06:00
  • 8b4eb80fbb Merge branch 'feature/updated-products' into develop Nathan Chapman 2022-10-15 20:06:29 -06:00
  • 59aa204860 Add whole system for managing a broader more general range of products Nathan Chapman 2022-10-15 20:05:43 -06:00
  • 504bc3a146 Add more variants Nathan Chapman 2022-10-08 08:04:51 -06:00
  • 34b6eb6bfd Add basic product variations and categories Nathan Chapman 2022-10-03 17:12:45 -06:00
  • 8dfce8e92b Add basic product variant display to detail page Nathan Chapman 2022-09-07 15:26:37 -06:00
  • c62dbcacf8 Adding stripe integration Nathan Chapman 2022-08-20 13:51:50 -06:00
  • 27a0f94c4e Add dynamic subscription calculation Nathan Chapman 2022-08-01 18:53:44 -06:00
  • 41ddfd8952 Merge branch 'feature/subscriptions-stripe' into develop Nathan Chapman 2022-07-30 18:55:31 -06:00
  • 115199a8a3 Remove task for contact form Nathan Chapman 2022-07-30 18:55:02 -06:00
  • 0aafe7f2e5 Add basic subscription outline Nathan Chapman 2022-07-30 18:04:46 -06:00
  • 771e440ba0 Merge tag 'v1.3.17' into develop Nathan Chapman 2022-07-14 19:30:20 -06:00
  • fe48079f9d Merge branch 'release/1.3.17' Nathan Chapman 2022-07-14 19:30:20 -06:00
  • 629544968f Update changelog Nathan Chapman 2022-07-14 19:30:13 -06:00
  • 298998324c Replace contact page with contact email address Nathan Chapman 2022-07-14 19:28:49 -06:00
  • 0562cea479 Add migration Nathan Chapman 2022-07-10 07:47:23 -06:00
  • cd7ba6035c Merge tag 'v1.3.16' into develop Nathan Chapman 2022-07-09 08:13:19 -06:00
  • 3b7377f765 Merge branch 'release/1.3.16' Nathan Chapman 2022-07-09 08:13:19 -06:00
  • 25a174e0bc Update changelog Nathan Chapman 2022-07-09 08:13:09 -06:00
  • be3be2ac74 Add blacklist to site Nathan Chapman 2022-07-04 11:59:58 -06:00
  • 44e73ca790 Add specific shipping choice when 6 bags are in the cart Nathan Chapman 2022-06-14 10:15:20 -06:00
  • b9b5eb5254 Merge tag 'v1.3.15' into develop Nathan Chapman 2022-06-11 17:04:57 -06:00
  • ac68ceef61 Merge branch 'release/1.3.15' Nathan Chapman 2022-06-11 17:04:57 -06:00
  • a9a0a21ce9 Update changelog Nathan Chapman 2022-06-11 17:04:50 -06:00
  • 52ac7fc951 Add simple captcha to contact form to reduce spam Nathan Chapman 2022-06-11 17:01:00 -06:00
  • e960369b16 Merge branch 'master' into develop Nathan Chapman 2022-05-30 19:31:35 -06:00
  • 6df5d28fd7 Merge branch 'hotfix/pixel-duplication' Nathan Chapman 2022-05-30 19:31:35 -06:00
  • af73bd0399 Removed Facebook pixel rendering Nathan Chapman 2022-05-30 19:31:28 -06:00
  • 9a7f99c413 Merge tag 'v1.3.14' into develop Nathan Chapman 2022-05-30 16:47:47 -06:00