raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,291 Commits 21 Branches 450 Tags
75a59eb5ccdf1be448dbebc86c2b2861baa687d0
Commit Graph

152 Commits

Author SHA1 Message Date
Rohan Mitchell
8b67fc4d61 Make DSM timestamp columns NOT NULL 2014-07-04 14:39:27 +10:00
Will Marshall
23034a55d4 Adding tests and full touch behaviour for caching 2014-07-04 14:39:26 +10:00
Rohan Mitchell
9d8629f41f Add producer property model 2014-06-18 15:22:02 +10:00
Rob H
bd41ee8b97 Commit schema version 2014-06-18 10:38:59 +10:00
Will Marshall
f7c71568df Merge branch 'laura_and_will' 
Conflicts:
	app/models/spree/variant_decorator.rb
	db/schema.rb
	spec/models/spree/product_spec.rb
	spec/models/spree/variant_spec.rb
 2014-06-13 12:42:14 +10:00
Rohan Mitchell
8cea6d53ed Correctly designate primary_taxon_id as NOT NULL 2014-06-12 14:59:27 +10:00
Rohan Mitchell
b23430375c Add migration to remove deleted variants from order cycles 2014-06-12 14:59:27 +10:00
Will Marshall
901cde73df Adding not-null constraint 2014-06-12 12:58:40 +10:00
Rob H
fa567ac607 Change variant name to display name 2014-06-12 12:58:10 +10:00
Rob H
248c38fd2c Adding name and display_as fields to variants 2014-06-12 12:56:44 +10:00
Rob H
970b5f3061 Change variant name to display name 2014-06-12 11:49:53 +10:00
Rob H
c915c5fe78 Adding name and display_as fields to variants 2014-06-12 11:49:52 +10:00
Rob H
8e960c817a Merge branch 'master' into units 2014-06-11 12:43:40 +10:00
Rob H
1eac76fbba Change variant name to display name 2014-06-05 13:39:53 +10:00
Rob H
f4c15bfc48 Adding name and display_as fields to variants 2014-06-04 15:21:31 +10:00
Rohan Mitchell
1ccfc46e50 Update primary taxons migration - take more care in setting the default primary taxon 2014-06-04 14:27:05 +10:00
Rohan Mitchell
60711301c1 Initialise primary taxon in migration instead of in model callback 2014-06-03 11:29:54 +10:00
Will Marshall
b736145552 Adding primary taxon to admin forms 
Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
	spec/features/admin/products_spec.rb
 2014-05-30 14:31:27 +10:00
Will Marshall
1c31ac56ea Adding primary taxon field to product 
Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
 2014-05-30 14:31:03 +10:00
Will Marshall
dd0907addd Adding back the primary taxon migration 2014-05-30 11:24:37 +10:00
Rohan Mitchell
9c1528607a Merge branch 'user-import-export' 2014-05-24 17:13:34 +10:00
Rohan Mitchell
acbe49b8de Revert primary taxons 2014-05-24 17:13:01 +10:00
Will Marshall
0a8f5d91ba Adding primary taxon to admin forms 2014-05-24 09:29:26 +10:00
Will Marshall
17f09d1852 Adding primary taxon field to product 2014-05-24 09:29:19 +10:00
Rohan Mitchell
ad1f852bdd Revert "Adding primary taxon field to product" 
This reverts commit fd1e7ebaa3.
 2014-05-24 09:07:57 +10:00
Rohan Mitchell
79393476b0 Revert "Adding primary taxon to admin forms" 
This reverts commit 110a6f2d14.
 2014-05-24 09:07:56 +10:00
Rohan Mitchell
2987ca763d Add additional data sanitisation for foreign key migration 2014-05-23 17:51:19 +10:00
Will Marshall
110a6f2d14 Adding primary taxon to admin forms 2014-05-23 15:59:06 +10:00
Will Marshall
fd1e7ebaa3 Adding primary taxon field to product 2014-05-23 15:59:06 +10:00
Will Marshall
c69a4a5f1a Adding social media links 2014-05-22 12:12:10 +10:00
Will Marshall
0958602418 Starting on migrations and admin forms 2014-05-20 12:18:27 +10:00
Rohan Mitchell
6c5172c567 Add EnterpriseRelationship. An Enterprise can find its relatives. 2014-05-14 15:50:25 +10:00
Will Marshall
f68a637609 Renaming Enterprise.active to Enterprise.visible 2014-04-30 12:09:22 +10:00
Will Marshall
c33fa03736 Merging into master 2014-04-29 10:35:05 +10:00
Rohan Mitchell
c35112a40c Migration works without countries or states (ie. in CI) 2014-04-25 16:18:30 +10:00
Will Marshall
22b87cc236 Adding active flag to enterprises 2014-04-25 16:17:37 +10:00
Rohan Mitchell
8dd9260163 Do not add dummy distributor to orders without one - they don't need it 2014-04-24 13:20:16 +10:00
Rohan Mitchell
f7658ad250 Add foreign keys, sanitising data first 2014-04-24 13:20:15 +10:00
Rohan Mitchell
3d0b24cc97 Add missing foreign key indexes 2014-04-09 15:02:41 +10:00
Rohan Mitchell
ac92d0919a Add incoming boolean field to Exchange, determine exchange direction from this field rather than sender/receiver roles 2014-03-26 11:19:35 +11:00
Will Marshall
25916caeb4 Starting on Angular models for Checkout, pretties 2014-02-13 16:14:11 +11:00
Will Marshall
7f58007c45 Adding some fields to Shipping Methods 2014-02-13 16:12:42 +11:00
Will Marshall
2bb004ebaa Adding notes field to products 2014-02-04 14:11:32 +11:00
Will Marshall
aec5894c70 Adding a promo image to enterprises 2014-01-21 16:32:55 +11:00
Will Marshall
0ddef9626e First working image upload for enterprise logos 2014-01-16 15:47:38 +11:00
Rohan Mitchell
29235cd2cb Merge branch 'master' into product-amount-units 
Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb
 2014-01-14 15:34:05 +11:00
Rohan Mitchell
9c28b5baae Fix product lists not matching when saving changes to product unit+values fields 2014-01-10 15:43:45 +11:00
Rob H
530d38c7d0 Add basic pagination informaion to BPE 2013-12-22 16:58:48 +08:00
Rohan Mitchell
0bae3e58b8 Add product units and amount fields to product and variant models, add validations 2013-12-05 15:16:51 +11:00
Will Marshall
f0d335a454 Fixing up the failing spec for distributor changes, reworking a method to SharedHelper 2013-11-07 11:47:05 +11:00