Commit Graph

  • e9e7d18784 Merge branch 'release/1.3.14' Nathan Chapman 2022-05-30 16:47:47 -06:00
  • 9c3aace861 Update changelog Nathan Chapman 2022-05-30 16:47:39 -06:00
  • ca58b65791 Add Facebook pixel integration Nathan Chapman 2022-05-30 16:46:09 -06:00
  • 105750238f Merge branch 'master' into develop Nathan Chapman 2022-05-30 12:34:56 -06:00
  • 7028e71ea5 Merge branch 'hotfix/pipfilx-psycopg2-fix' Nathan Chapman 2022-05-30 12:34:56 -06:00
  • 5277fa2d94 Update Pipfile Nathan Chapman 2022-05-30 12:34:47 -06:00
  • 74ee2687e7 Merge tag 'v1.3.13' into develop Nathan Chapman 2022-05-30 12:28:40 -06:00
  • e96c5e9af4 Merge branch 'release/1.3.13' Nathan Chapman 2022-05-30 12:28:40 -06:00
  • 9793e16d8d Update changelog Nathan Chapman 2022-05-30 12:28:32 -06:00
  • d22eab79ed Update Address forms to use localflavor USPS_CHOICES Nathan Chapman 2022-05-30 12:26:32 -06:00
  • 6da6e347a1 Update changelog Nathan Chapman 2022-05-29 08:27:03 -06:00
  • f3f01aa734 Add basic Sentry integration Nathan Chapman 2022-05-29 08:17:09 -06:00
  • 519939125c Merge tag 'v1.3.12' into develop Nathan Chapman 2022-05-25 19:06:20 -06:00
  • 9c69ae6816 Merge branch 'release/1.3.12' Nathan Chapman 2022-05-25 19:06:20 -06:00
  • 007dcb4355 Update changelog Nathan Chapman 2022-05-25 19:06:12 -06:00
  • 206f10cc96 Add post only requirement on respective views Nathan Chapman 2022-05-25 19:03:40 -06:00
  • e2c9b197b1 Update newsletter with captcha Nathan Chapman 2022-05-24 19:35:18 -06:00
  • 0cfc0638a3 Merge tag 'vlogging' into develop Nathan Chapman 2022-05-21 10:23:06 -06:00
  • e5390f6be8 Merge branch 'hotfix/logging' Nathan Chapman 2022-05-21 10:23:06 -06:00
  • 318d01b097 Update changelog Nathan Chapman 2022-05-21 10:23:00 -06:00
  • fbfb897839 Change logging propagation Nathan Chapman 2022-05-21 10:22:07 -06:00
  • c2f72b5d30 Merge tag 'v1.3.10' into develop Nathan Chapman 2022-05-21 08:35:15 -06:00
  • 0a32eec8d6 Merge branch 'release/1.3.10' Nathan Chapman 2022-05-21 08:35:15 -06:00
  • 125d6d410b Update changelog Nathan Chapman 2022-05-21 08:35:08 -06:00
  • 931c1ac84f Add tests to storefront views Nathan Chapman 2022-05-21 08:27:49 -06:00
  • 2be8b17c48 Merge tag 'vserver-admin-email' into develop Nathan Chapman 2022-05-20 17:26:09 -06:00
  • a7bcc1ee6b Merge branch 'hotfix/server-admin-email' Nathan Chapman 2022-05-20 17:26:09 -06:00
  • 409c59bdde Add better admin email handling Nathan Chapman 2022-05-20 17:25:57 -06:00
  • 46dc80729e Merge tag 'vaddress-xml-parse' into develop Nathan Chapman 2022-05-20 17:17:13 -06:00
  • 8d0788049a Merge branch 'hotfix/address-xml-parse' Nathan Chapman 2022-05-20 17:17:13 -06:00
  • dd656a7dcf Fix payment name params in PayPal Nathan Chapman 2022-05-20 17:17:03 -06:00
  • 05506503bf Add urllib quote to address validation Nathan Chapman 2022-05-20 17:16:34 -06:00
  • 2883b42117 Merge tag 'vcustomer-detail-styling' into develop Nathan Chapman 2022-05-19 19:16:49 -06:00
  • c09e166381 Merge branch 'hotfix/customer-detail-styling' Nathan Chapman 2022-05-19 19:16:49 -06:00
  • 332840aa3b Proper order filtering for customer view Nathan Chapman 2022-05-19 19:16:41 -06:00
  • 1667b7566c Merge tag 'v1.3.7' into develop Nathan Chapman 2022-05-19 18:53:40 -06:00
  • c60433c8d2 Merge branch 'release/1.3.7' Nathan Chapman 2022-05-19 18:53:40 -06:00
  • 4c48a9e39e Add changelog Nathan Chapman 2022-05-19 18:50:52 -06:00
  • 178c0b61f2 Add ability for customers to change password from account Nathan Chapman 2022-05-19 18:50:23 -06:00
  • 0cdfafca57 Merge tag 'vnew-site-banner' into develop Nathan Chapman 2022-05-17 20:16:53 -06:00
  • 8f88dc7b97 Merge branch 'release/new-site-banner' Nathan Chapman 2022-05-17 20:16:53 -06:00
  • eb09862803 Change header text Nathan Chapman 2022-05-17 20:16:17 -06:00
  • 2e55d3f3d8 Merge tag 'v1.3.6' into develop Nathan Chapman 2022-05-15 21:29:11 -06:00
  • a6fb7feb1b Merge branch 'release/1.3.6' Nathan Chapman 2022-05-15 21:29:11 -06:00
  • 340111b94d Add password reset correct templates Nathan Chapman 2022-05-15 21:28:41 -06:00
  • 30ff196203 Lowercase email when signing up Nathan Chapman 2022-05-15 15:22:20 -06:00
  • 0c9af1a7fa Add pagination to order list in dashboard Nathan Chapman 2022-05-15 15:16:37 -06:00
  • 020819b1a9 Merge branch 'bugfix/contact-form-styling' into develop Nathan Chapman 2022-05-15 15:11:53 -06:00
  • 527d592e20 Fix contact for on mobile screens to display as a single column Nathan Chapman 2022-05-15 15:11:40 -06:00
  • 8b6b5a298c pep8 fixes Nathan Chapman 2022-05-15 10:30:49 -06:00
  • 38058a51d3 Merge tag 'v1.3.5' into develop Nathan Chapman 2022-05-15 07:44:54 -06:00
  • 6caa61a5f8 Merge branch 'release/1.3.5' Nathan Chapman 2022-05-15 07:44:53 -06:00
  • 62031b72fd Change grind details location to name Nathan Chapman 2022-05-15 07:44:11 -06:00
  • af52ac5940 Merge tag 'vallowed-hosts' into develop Nathan Chapman 2022-05-14 21:35:10 -06:00
  • 9c4e680f19 Merge branch 'hotfix/allowed-hosts' Nathan Chapman 2022-05-14 21:35:10 -06:00
  • b7f317a379 Add extra urls to allowed hosts Nathan Chapman 2022-05-14 21:34:54 -06:00
  • 3aec36429e Merge tag 'v1.3.4' into develop Nathan Chapman 2022-05-14 07:51:38 -06:00
  • c7c3aa3411 Merge branch 'release/1.3.4' Nathan Chapman 2022-05-14 07:51:37 -06:00
  • 35ef1f606a Fix dashboard totals Nathan Chapman 2022-05-14 07:51:10 -06:00
  • 6aab1b3462 Merge tag 'vpayment-capture' into develop Nathan Chapman 2022-05-14 07:38:56 -06:00
  • 73c1c69736 Merge branch 'hotfix/payment-capture' Nathan Chapman 2022-05-14 07:38:56 -06:00
  • 63eae6897c Fix coupon instance Nathan Chapman 2022-05-14 07:35:31 -06:00
  • 59fa609918 Merge tag 'v1.3.3' into develop Nathan Chapman 2022-05-14 07:33:07 -06:00
  • 77e302f853 Merge branch 'hotfix/1.3.3' Nathan Chapman 2022-05-14 07:33:07 -06:00
  • adb3b73d5f Remove self Nathan Chapman 2022-05-14 07:32:59 -06:00
  • c1d5801d77 Merge tag 'v1.3.2' into develop Nathan Chapman 2022-05-12 21:48:36 -06:00
  • cf772a00b3 Merge branch 'release/1.3.2' Nathan Chapman 2022-05-12 21:48:36 -06:00
  • 63a15b8935 Add try/catch when fetching user Nathan Chapman 2022-05-12 21:48:18 -06:00
  • 28e6c9001b Merge tag 'v1.3.1' into develop Nathan Chapman 2022-05-12 21:23:52 -06:00
  • 0d7c2446e2 Merge branch 'release/1.3.1' Nathan Chapman 2022-05-12 21:23:52 -06:00
  • 4f205cd504 Change link position and fix grammar Nathan Chapman 2022-05-12 21:23:24 -06:00
  • 09f164dc0c Merge tag 'v1.3.0' into develop Nathan Chapman 2022-05-12 18:44:11 -06:00
  • 356c759155 Merge branch 'release/1.3.0' Nathan Chapman 2022-05-12 18:44:11 -06:00
  • 06d809f7f4 Add functionality to cancel an order from dashboard Nathan Chapman 2022-05-12 18:43:55 -06:00
  • d93f266861 Merge tag 'v1.2.2' into develop Nathan Chapman 2022-05-12 17:39:01 -06:00
  • 8e223c5426 Merge branch 'hotfix/1.2.2' Nathan Chapman 2022-05-12 17:39:01 -06:00
  • cc40d3e4db Move coupon save to appropriate place Nathan Chapman 2022-05-12 17:38:51 -06:00
  • 53a407c588 Merge tag 'v1.2.1' into develop Nathan Chapman 2022-05-11 20:39:21 -06:00
  • dd97a7cfc4 Merge branch 'hotfix/1.2.1' Nathan Chapman 2022-05-11 20:39:21 -06:00
  • ee186f047e Fix when no coupon error Nathan Chapman 2022-05-11 20:39:14 -06:00
  • 16c308a67b Merge tag 'v1.2.0' into develop Nathan Chapman 2022-05-11 20:10:16 -06:00
  • 56dd5e98b0 Merge branch 'release/1.2.0' Nathan Chapman 2022-05-11 20:10:15 -06:00
  • 37ef9d3928 Merge branch 'feature/user-permissions' into develop Nathan Chapman 2022-05-11 20:09:52 -06:00
  • 4f43cc6a80 Add coupon check Nathan Chapman 2022-05-11 20:09:45 -06:00
  • 058d682ddb Error templates Nathan Chapman 2022-05-11 17:39:33 -06:00
  • 60896a2835 pep8 Nathan Chapman 2022-05-11 17:39:22 -06:00
  • 750afa6033 Merge tag 'v1.1.1' into develop Nathan Chapman 2022-05-08 14:47:11 -06:00
  • 3f20c97b43 Merge branch 'release/1.1.1' Nathan Chapman 2022-05-08 14:47:11 -06:00
  • 2521beea74 Add custom filter and remove individual grinds functionality Nathan Chapman 2022-05-08 14:46:55 -06:00
  • 0f7a36a569 Merge tag 'v1.1.0' into develop Nathan Chapman 2022-05-08 12:14:40 -06:00
  • b24b65da5c Merge branch 'release/1.1.0' Nathan Chapman 2022-05-08 12:14:40 -06:00
  • 89b40d639d Add ability for customer to add their own shipping address Nathan Chapman 2022-05-08 12:14:21 -06:00
  • 2ce2b59118 Merge branch 'feature/addresses' into develop Nathan Chapman 2022-05-08 10:24:26 -06:00
  • 8587366e9e Add functional tests to test addresses Nathan Chapman 2022-05-08 10:24:23 -06:00
  • e68a6080f2 Better Logging Nathan Chapman 2022-05-08 10:24:00 -06:00
  • 4d22f87657 Merge tag 'v1.0.13' into develop Nathan Chapman 2022-05-05 18:19:36 -06:00
  • c93709324a Merge branch 'release/1.0.13' Nathan Chapman 2022-05-05 18:19:36 -06:00
  • 98b6f5e9c4 Add tests Nathan Chapman 2022-05-05 18:17:53 -06:00
  • 46bc3ff0ff Fixes Nathan Chapman 2022-05-02 19:40:15 -06:00
  • e2dbe4cec6 Merge branch 'master' into develop Nathan Chapman 2022-05-01 10:47:32 -06:00