|
|
a87b8f1db1
|
Merge branch 'feature/wholesale' into develop
|
2023-08-22 22:00:47 -06:00 |
|
|
|
b61114babb
|
Finalize wholesale orders
|
2023-08-22 21:59:08 -06:00 |
|
|
|
10cd9cf0c5
|
Update form
|
2023-08-22 21:59:08 -06:00 |
|
|
|
f5ae448c98
|
Add intermediary page for wholesale
|
2023-08-22 21:59:08 -06:00 |
|
Nathan Chapman
|
c598f805e2
|
Add base for wholesale orders
|
2023-08-22 21:59:08 -06:00 |
|
Nathan Chapman
|
e514d72c8d
|
Remove username field as it is no longer used
|
2023-08-17 08:44:56 -06:00 |
|
Nathan Chapman
|
499b95f74e
|
Merge tag '3.5.1' into develop
3.5.1 3.5.1
|
2023-08-02 12:15:37 -06:00 |
|
Nathan Chapman
|
10e4af2a7b
|
Merge branch 'release/3.5.1'
|
2023-08-02 12:15:37 -06:00 |
|
Nathan Chapman
|
ba6aa1039f
|
Update free-sample banner image
|
2023-08-02 12:15:03 -06:00 |
|
|
|
6a95facf9e
|
Merge branch 'release/3.5.0'
|
2023-07-31 20:31:45 -06:00 |
|
|
|
6a7ea43f79
|
Merge tag 'v3.5.0' into develop
3.5.0 v3.5.0
|
2023-07-31 20:31:45 -06:00 |
|
|
|
9884014229
|
Remove django-allauth and replace with basic user creation/login with just email
|
2023-07-31 20:04:49 -06:00 |
|
Nathan Chapman
|
b0ba350c14
|
Merge branch 'release/3.4.2'
|
2023-07-31 14:45:51 -06:00 |
|
Nathan Chapman
|
61f98295ee
|
Merge tag '3.4.2' into develop
3.4.2 3.4.2
|
2023-07-31 14:45:51 -06:00 |
|
Nathan Chapman
|
2bd2e35308
|
Add free sample banner
|
2023-07-31 14:44:52 -06:00 |
|
Nathan Chapman
|
105e3023ab
|
Merge branch 'hotfix/fix-make-password'
|
2023-07-24 08:09:08 -06:00 |
|
Nathan Chapman
|
111757be35
|
Merge tag 'fix-make-password' into develop
3.3.5 fix-make-password
|
2023-07-24 08:09:08 -06:00 |
|
Nathan Chapman
|
0e47679e9a
|
Fix wrong function call for auto-creating a new user
|
2023-07-24 08:08:51 -06:00 |
|
Nathan Chapman
|
b50b10208f
|
Merge branch 'hotfix/subscription-has-no-attr-address'
|
2023-07-17 08:05:25 -06:00 |
|
Nathan Chapman
|
41b898e942
|
Merge branch 'master' into develop
|
2023-07-17 08:05:25 -06:00 |
|
Nathan Chapman
|
468948a2c8
|
Correct shipping fields when creating an Order from a Subscription
|
2023-07-17 08:05:16 -06:00 |
|
|
|
71f7db9827
|
Merge tag 'v3.4.0' into develop
v3.4.0
|
2023-07-16 12:43:46 -06:00 |
|
|
|
adf275331c
|
Merge branch 'release/3.4.0'
|
2023-07-16 12:43:38 -06:00 |
|
|
|
e75f1dc1bc
|
Finish address template changes
|
2023-07-16 12:42:58 -06:00 |
|
|
|
cf4a1e5ec7
|
Add host name check in nginx conf
|
2023-07-14 23:04:41 -06:00 |
|
|
|
9108c7ea1a
|
Merge branch 'feature/remove-address-model' into develop
|
2023-07-14 23:02:51 -06:00 |
|
|
|
faf9b5b734
|
Remove address model and unnecessary apps
|
2023-07-14 22:59:03 -06:00 |
|
|
|
de329a5340
|
Move address to the User, Order, and Subscription models respectively
|
2023-07-14 21:04:20 -06:00 |
|
Nathan Chapman
|
c09184078a
|
Merge tag '3.3.4' into develop
3.3.4
|
2023-07-11 09:38:04 -06:00 |
|
Nathan Chapman
|
f6d15bd30c
|
Merge branch 'release/3.3.4'
|
2023-07-11 09:37:59 -06:00 |
|
Nathan Chapman
|
29950b4e6a
|
Add Terms and conditions and Privacy Policy
|
2023-07-11 09:37:14 -06:00 |
|
Nathan Chapman
|
a6e0b1a276
|
Merge tag '3.3.3' into develop
v3.3.3
|
2023-07-06 10:35:37 -06:00 |
|
Nathan Chapman
|
a9970244f4
|
Merge branch 'release/3.3.3'
|
2023-07-06 10:35:29 -06:00 |
|
Nathan Chapman
|
239bfa200b
|
Increase pagination td colspan
|
2023-07-06 10:34:43 -06:00 |
|
|
|
721fbe1986
|
Merge tag 'v3.3.2' into develop
v3.3.2
|
2023-07-04 15:08:07 -06:00 |
|
|
|
689413989f
|
Merge branch 'release/3.3.2'
|
2023-07-04 15:07:49 -06:00 |
|
|
|
156b90a213
|
Add search to dashboard customer and order lists
|
2023-07-04 15:06:45 -06:00 |
|
Nathan Chapman
|
b095585372
|
Merge branch 'hotfix/checkout-nonetype-operand'
|
2023-06-26 08:10:07 -06:00 |
|
Nathan Chapman
|
cb6f311d68
|
Merge tag 'checkout-nonetype-operand' into develop
3.3.3 checkout-nonetype-operand
|
2023-06-26 08:10:07 -06:00 |
|
Nathan Chapman
|
5a6fa1d17b
|
Fix unsupported operand type(s) for -: 'NoneType' and 'int'
|
2023-06-26 08:09:54 -06:00 |
|
Nathan Chapman
|
021313b5a6
|
Merge branch 'hotfix/cart-add-nonetype'
|
2023-06-26 07:39:56 -06:00 |
|
Nathan Chapman
|
bc7067495c
|
Merge tag 'cart-add-nonetype' into develop
3.3.2 cart-add-nonetype
|
2023-06-26 07:39:56 -06:00 |
|
Nathan Chapman
|
c62207a16f
|
Add check for NoneType
|
2023-06-26 07:39:41 -06:00 |
|
|
|
b4764c4e18
|
Merge tag 'v3.3.1' into develop
3.3.1
|
2023-06-21 18:24:30 -06:00 |
|
|
|
a3c1cb9ce9
|
Merge branch 'release/3.3.1'
|
2023-06-21 18:24:05 -06:00 |
|
|
|
7a676de22d
|
Fix order limit on cart add
|
2023-06-21 18:20:01 -06:00 |
|
Nathan Chapman
|
ed5e8891ce
|
Merge branch 'release/3.3.0'
|
2023-06-20 10:35:34 -06:00 |
|
Nathan Chapman
|
8281b774c1
|
Merge tag '3.3.0' into develop
3.3.0 3.3.0
|
2023-06-20 10:35:34 -06:00 |
|
Nathan Chapman
|
94b12c9f3a
|
Merge branch 'feature/free-sample-form' into develop
|
2023-06-20 10:23:52 -06:00 |
|
Nathan Chapman
|
2d4e4ba631
|
Add free order checkout process
|
2023-06-20 10:19:06 -06:00 |
|
