3145 Commits

Author	SHA1	Message	Date
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
Will Marshall	7d39c30dbd	Fixing a taxon bug	2014-07-09 10:54:40 +10:00
Will Marshall	0b27040dcb	Taxon selection finesse	2014-07-09 10:53:52 +10:00
summerscope	730fbc5e94	New texture for hubs background	2014-07-04 17:41:42 +10:00
summerscope	ac5c8ccfd4	Modal styling for active table removing background	2014-07-04 17:34:26 +10:00
summerscope	9ed0ebaa43	Hubs styling for bit sexy search	2014-07-04 17:33:02 +10:00
summerscope	5d2d4fd007	More styling adjustments for big sexy search	2014-07-04 17:32:43 +10:00
summerscope	56a1a66d3f	Styling for big sexy search bar	2014-07-04 17:00:03 +10:00
summerscope	b50541fd15	Less padding below search bar	2014-07-04 15:50:00 +10:00
summerscope	7f00f66e82	Styling for filter systems against search	2014-07-04 15:47:51 +10:00
Will Marshall	eb8f59d65b	Tests for the taxon filtering	2014-07-04 15:19:45 +10:00
Rohan Mitchell	30262e1969	Clean up specs, fix broken spec, remove JS log	2014-07-04 14:39:27 +10:00
Will Marshall	6d4dfad336	OK address no longer being lazy-loaded	2014-07-04 14:39:26 +10:00
Will Marshall	61d8be3ddc	Removing old file, renaming one to match naming conventions	2014-07-04 14:39:26 +10:00
Will Marshall	24d3abf6d5	Adding dereferencing to taxons and reducing our data-set	2014-07-04 14:38:27 +10:00
Will Marshall	4a116570d1	adding by producer id filtering	2014-07-04 14:38:27 +10:00
Will Marshall	e858c0d434	Moving taxon filter to ID instead of name	2014-07-04 14:38:27 +10:00
Will Marshall	8b98c72336	Adding all the Angular filters required to make this work	2014-07-04 14:38:27 +10:00
Will Marshall	f335b6a576	Taxon selectors and show/hide behaviour	2014-07-04 14:09:53 +10:00
Will Marshall	a8fde53715	Removing old file, renaming one to match naming conventions	2014-07-04 13:51:23 +10:00
Will Marshall	487b8616c0	Adding dereferencing to taxons and reducing our data-set	2014-07-04 13:51:22 +10:00
Will Marshall	55bf59ba96	adding by producer id filtering	2014-07-04 13:51:22 +10:00
Will Marshall	1955048502	Moving taxon filter to ID instead of name	2014-07-04 13:51:22 +10:00
Will Marshall	f19a02264e	Adding all the Angular filters required to make this work	2014-07-04 13:51:22 +10:00
summerscope	9d9dd777c1	Add in simple text style for global use	2014-07-04 13:39:55 +10:00
summerscope	ab4b72b9c7	Styling to make the taxons sit right for 1 and 2 lines	2014-07-04 13:39:19 +10:00
summerscope	87c6feec97	Remove padding - tighten up fat view	2014-07-04 11:32:32 +10:00
summerscope	9060e18a81	Tweak timings on the modal animations	2014-07-04 11:32:09 +10:00
summerscope	ae8ae1fe41	Fix styling on hubs list to make accordion icons sit vertically aligned	2014-07-03 15:10:07 +10:00
summerscope	42c9dcf3de	Remove @include csstrans from all SASS to stop conflicts with ngAnimate classes	2014-07-03 14:55:39 +10:00
summerscope	06400c6202	Remove unused @include	2014-07-03 14:54:34 +10:00
Rob H	29fde37ba3	Merge branch 'bug-herd' into working	2014-07-03 14:24:39 +10:00
Rafael Schouten	e89b782787	Use Kilolitres instead of Megalitres. Megalitres are REALLY big!	2014-07-02 23:20:54 +01:00
summerscope	0301a97bfe	Merge branch 'master' into laura_and_will	2014-07-02 14:45:11 +10:00
summerscope	75f3358e2a	Adding CTA button for crowdfunding site to homepage & countdown timer directive	2014-07-02 14:44:46 +10:00
Will Marshall	106c9f63bb	Adding animation hooks for Laura	2014-07-02 11:33:38 +10:00
Will Marshall	434e087a73	Merge branch 'master' into laura_and_will	2014-07-02 11:30:43 +10:00
summerscope	9d397430d4	Add styling for filters block	2014-06-27 17:27:19 +10:00
Will Marshall	f316b8dec5	Adding product modals in new format	2014-06-27 15:15:41 +10:00
Will Marshall	e8ba36041b	Tests and patch for group filter	2014-06-27 15:01:12 +10:00
Will Marshall	8bd8d811b1	Unbreaking the groups page	2014-06-27 14:51:55 +10:00
Will Marshall	e4c8c19fea	Tweaking the producer modal	2014-06-27 14:39:50 +10:00
Rohan Mitchell	4075854440	Navigation.go supports full URLs	2014-06-27 11:51:53 +10:00
Will Marshall	821724b01e	Merge branch 'master' into laura_and_will	2014-06-26 15:33:51 +10:00
Rob H	934f960336	Add display as to new product page	2014-06-26 15:27:24 +10:00
Will Marshall	0b8ca9af47	Adding visibility filtering to map	2014-06-26 14:49:40 +10:00
Will Marshall	a4e675e675	Refactoring visibility handling	2014-06-26 14:48:46 +10:00
Will Marshall	8862fd555c	Removing ng-animate, changing our enterprise restriction	2014-06-26 14:36:16 +10:00
summerscope	fdb1c64c63	Merge branch 'master' into laura_and_will	2014-06-26 11:16:42 +10:00
Will Marshall	a49fe2bf65	Fixing a regression bug	2014-06-25 16:30:23 +10:00