Will Marshall
|
8496609cc2
|
Fixing up a couple of regressions
|
2014-07-29 13:46:38 +10:00 |
|
Will Marshall
|
c640233ee5
|
Merge branch 'master' into laura_and_will
Conflicts:
app/assets/javascripts/darkswarm/filters/taxons.js.coffee
app/models/enterprise.rb
app/serializers/api/enterprise_serializer.rb
db/migrate/20140702053145_add_fields_to_distributors_shipping_methods.rb
db/schema.rb
spec/helpers/shared_helper_spec.rb
spec/javascripts/unit/darkswarm/filters/shipping_spec.js.coffee
spec/javascripts/unit/darkswarm/filters/taxons_spec.js.coffee
spec/javascripts/unit/darkswarm/services/taxon_spec.js.coffee
spec/models/enterprise_spec.rb
|
2014-07-09 11:40:54 +10:00 |
|
Rohan Mitchell
|
94902268e2
|
Initialise enterprise country in controller, not model. Fixes address SQL load every time an enterprise is instanciated.
|
2014-07-04 14:39:27 +10:00 |
|
Will Marshall
|
c57148340c
|
Fixing spec regression
|
2014-07-04 14:39:26 +10:00 |
|
Will Marshall
|
fab96b58a7
|
Fixing spec regression
|
2014-07-04 13:51:23 +10:00 |
|
Will Marshall
|
f8d51c3105
|
Fixing intermittent spec failure
|
2014-06-26 15:43:33 +10:00 |
|
Will Marshall
|
9eb43e6c09
|
Removing visible scopes from enteprise distributors and producers
|
2014-06-26 15:26:15 +10:00 |
|
Will Marshall
|
1ed634239d
|
Major refactoring
|
2014-06-20 16:31:49 +10:00 |
|
Rohan Mitchell
|
0139c4bda2
|
Set producer property
|
2014-06-18 15:22:03 +10:00 |
|
Will Marshall
|
df7ee03cbf
|
Adding presenters to the social media fields
|
2014-06-04 17:13:18 +10:00 |
|
Rohan Mitchell
|
15d8299efb
|
Fix enterprises spec - primary taxons change
|
2014-05-30 15:28:53 +10:00 |
|
Rohan Mitchell
|
e951f80070
|
Merge branch 'new-product-form'
Conflicts:
app/assets/javascripts/admin/admin.js.coffee
|
2014-05-24 17:14:32 +10:00 |
|
Rohan Mitchell
|
acbe49b8de
|
Revert primary taxons
|
2014-05-24 17:13:01 +10:00 |
|
Rohan Mitchell
|
e6461ba01e
|
Fix enterprises spec - primary taxons change
|
2014-05-24 10:34:22 +10:00 |
|
Rob H
|
ed3c23cd90
|
Split 'My Enterprises' dashboard item into Hubs and Producers
|
2014-05-22 15:28:25 +10:00 |
|
Rohan Mitchell
|
4f1b8d06e7
|
Construct enterprise relationships with a factory
|
2014-05-21 11:29:11 +10:00 |
|
Will Marshall
|
eae12da24a
|
Adding distributors display to producers page
|
2014-05-15 12:20:17 +10:00 |
|
Will Marshall
|
575ce9fe01
|
Adding producers to home and distributors to producers
|
2014-05-15 12:02:58 +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
|
563976c084
|
Adding an active scope and test to Enterprise
|
2014-04-30 12:02:11 +10:00 |
|
Will Marshall
|
cf67b5fcac
|
Adding a taxon collection mechanism to Enterprise
|
2014-04-25 12:45:03 +10:00 |
|
Rob H
|
5345e8d339
|
Add accessible_by scope to enterprises model and accessible action to enterprises API
|
2014-04-17 12:23:09 +10:00 |
|
Rohan Mitchell
|
20745825bf
|
Fix finding producers for shopfront, moving to SQL-land in the process. Woo.
|
2014-03-26 12:56:58 +11:00 |
|
Rohan Mitchell
|
abf83b0e58
|
Find only outgoing exchanges for Enterprise scopes using with_order_cycles_outer
|
2014-03-26 12:07:06 +11:00 |
|
Rohan Mitchell
|
ac8990f7e7
|
Rename enterprises_spec to singular for consistency
|
2014-03-26 11:46:51 +11:00 |
|