385 Commits

Author SHA1 Message Date
Nathan Chapman
f3c840aeff Merge branch 'release/2.0.1' 2022-10-30 08:19:39 -06:00
Nathan Chapman
b46495aa21 Merge tag 'v2.0.1' into develop
2.0.1 v2.0.1
2022-10-30 08:19:39 -06:00
Nathan Chapman
c445b60984 Remove subscriptions link 2022-10-30 08:19:19 -06:00
Nathan Chapman
f0e240ee1a Merge branch 'release/2.0.0' 2022-10-29 22:59:24 -06:00
Nathan Chapman
7178be4286 Merge tag 'v2.0.0' into develop
2.0.0 v2.0.0
2022-10-29 22:59:24 -06:00
Nathan Chapman
ec8a518a7f Merge branch 'feature/track-stock-on-checkout' into develop 2022-10-29 22:53:48 -06:00
Nathan Chapman
0e1f32d5b9 Finalize stock feature 2022-10-29 22:53:32 -06:00
Nathan Chapman
157296db2b Add basic shipping checkout defaults 2022-10-29 10:20:52 -06:00
Nathan Chapman
11d3b740aa Add basic stock handling 2022-10-26 09:29:51 -06:00
Nathan Chapman
481575e968 Add form 2022-10-22 09:09:12 -06:00
Nathan Chapman
8f10b38f9a Stall stripe 2022-10-15 20:58:49 -06:00
Nathan Chapman
8b4eb80fbb Merge branch 'feature/updated-products' into develop 2022-10-15 20:06:29 -06:00
Nathan Chapman
59aa204860 Add whole system for managing a broader more general range of products 2022-10-15 20:05:43 -06:00
Nathan Chapman
504bc3a146 Add more variants 2022-10-08 08:04:51 -06:00
Nathan Chapman
34b6eb6bfd Add basic product variations and categories 2022-10-03 17:12:45 -06:00
Nathan Chapman
8dfce8e92b Add basic product variant display to detail page 2022-09-07 15:26:37 -06:00
Nathan Chapman
c62dbcacf8 Adding stripe integration 2022-08-20 13:51:50 -06:00
Nathan Chapman
27a0f94c4e Add dynamic subscription calculation 2022-08-01 18:53:44 -06:00
Nathan Chapman
41ddfd8952 Merge branch 'feature/subscriptions-stripe' into develop 2022-07-30 18:55:31 -06:00
Nathan Chapman
115199a8a3 Remove task for contact form 2022-07-30 18:55:02 -06:00
Nathan Chapman
0aafe7f2e5 Add basic subscription outline 2022-07-30 18:04:46 -06:00
Nathan Chapman
fe48079f9d Merge branch 'release/1.3.17' 2022-07-14 19:30:20 -06:00
Nathan Chapman
771e440ba0 Merge tag 'v1.3.17' into develop
1.3.17 v1.3.17
2022-07-14 19:30:20 -06:00
Nathan Chapman
629544968f Update changelog 2022-07-14 19:30:13 -06:00
Nathan Chapman
298998324c Replace contact page with contact email address 2022-07-14 19:28:49 -06:00
Nathan Chapman
0562cea479 Add migration 2022-07-10 07:47:23 -06:00
Nathan Chapman
3b7377f765 Merge branch 'release/1.3.16' 2022-07-09 08:13:19 -06:00
Nathan Chapman
cd7ba6035c Merge tag 'v1.3.16' into develop
1.3.16 v1.3.16
2022-07-09 08:13:19 -06:00
Nathan Chapman
25a174e0bc Update changelog 2022-07-09 08:13:09 -06:00
Nathan Chapman
be3be2ac74 Add blacklist to site 2022-07-09 08:11:33 -06:00
Nathan Chapman
44e73ca790 Add specific shipping choice when 6 bags are in the cart 2022-06-14 10:15:20 -06:00
Nathan Chapman
ac68ceef61 Merge branch 'release/1.3.15' 2022-06-11 17:04:57 -06:00
Nathan Chapman
b9b5eb5254 Merge tag 'v1.3.15' into develop
1.3.15 v1.3.15
2022-06-11 17:04:57 -06:00
Nathan Chapman
a9a0a21ce9 Update changelog 2022-06-11 17:04:50 -06:00
Nathan Chapman
52ac7fc951 Add simple captcha to contact form to reduce spam 2022-06-11 17:01:00 -06:00
Nathan Chapman
6df5d28fd7 Merge branch 'hotfix/pixel-duplication' 2022-05-30 19:31:35 -06:00
Nathan Chapman
e960369b16 Merge branch 'master' into develop 2022-05-30 19:31:35 -06:00
Nathan Chapman
af73bd0399 Removed Facebook pixel rendering 2022-05-30 19:31:28 -06:00
Nathan Chapman
e9e7d18784 Merge branch 'release/1.3.14' 2022-05-30 16:47:47 -06:00
Nathan Chapman
9a7f99c413 Merge tag 'v1.3.14' into develop
1.3.14 v1.3.14
2022-05-30 16:47:47 -06:00
Nathan Chapman
9c3aace861 Update changelog 2022-05-30 16:47:39 -06:00
Nathan Chapman
ca58b65791 Add Facebook pixel integration 2022-05-30 16:46:09 -06:00
Nathan Chapman
7028e71ea5 Merge branch 'hotfix/pipfilx-psycopg2-fix' 2022-05-30 12:34:56 -06:00
Nathan Chapman
105750238f Merge branch 'master' into develop 2022-05-30 12:34:56 -06:00
Nathan Chapman
5277fa2d94 Update Pipfile 2022-05-30 12:34:47 -06:00
Nathan Chapman
e96c5e9af4 Merge branch 'release/1.3.13' 2022-05-30 12:28:40 -06:00
Nathan Chapman
74ee2687e7 Merge tag 'v1.3.13' into develop
1.3.13 v1.3.13
2022-05-30 12:28:40 -06:00
Nathan Chapman
9793e16d8d Update changelog 2022-05-30 12:28:32 -06:00
Nathan Chapman
d22eab79ed Update Address forms to use localflavor USPS_CHOICES 2022-05-30 12:26:32 -06:00
Nathan Chapman
6da6e347a1 Update changelog 2022-05-29 08:27:03 -06:00