11967 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
deppbot	f08d02f4c5	Bundle Update on 2017-12-02	2017-12-02 20:32:08 +13:00
Brenda Wallace	a6a7f789a3	Rubocop upgrade (and some style fixes)	2017-12-01 21:07:39 +13:00
Brenda Wallace	c4c659f159	DRY specs, and use create_list in crops model spec	2017-11-30 13:37:47 +13:00
Brenda Wallace	14b16b0d8c	Moved photo.items's item lookup to a class method	2017-11-30 11:23:34 +13:00
Brenda Wallace	697779e67c	Don't add item to photo is already there	2017-11-30 10:15:05 +13:00
Brenda Wallace	35ce8b84db	Adding a unique index on the items <--> photos table	2017-11-30 09:56:47 +13:00
Brenda Wallace	ccbdfe51f6	Modified a spec to avoid a chicken and an egg	2017-11-29 22:30:11 +13:00
Brenda Wallace	ff57176d60	Simplified the photos controller a bit	2017-11-29 22:13:03 +13:00
Brenda Wallace	12700d6268	Added polymorphic relationship to photos	2017-11-29 21:41:22 +13:00
Brenda Wallace	6ed7376c58	Name garden in spec to ensure it's ordered first	2017-11-29 20:59:37 +13:00
Brenda Wallace	c8a200bf19	Changed selector in view spec ... it was having trouble finding the link	2017-11-29 20:59:37 +13:00
Brenda Wallace	a62b668781	Fix up duplicate order item in controller spec, and DRY	2017-11-29 20:59:37 +13:00
Brenda Wallace	09f82d5995	Tidy up home/crops partial view	2017-11-29 20:59:37 +13:00
Brenda Wallace	8d0bec34a6	Crops controller spec, use let, other cleanup	2017-11-29 20:59:37 +13:00
Brenda Wallace	d7ec4eacee	Fix sort on plant parts	2017-11-29 20:59:37 +13:00
Brenda Wallace	3a3f4eefbf	Added sort to members controller	2017-11-29 20:59:37 +13:00
Brenda Wallace	9e00023332	Fixed post ordering	2017-11-29 20:59:37 +13:00
Brenda Wallace	3058160a59	Removed an orderng spec for gardens	2017-11-29 20:59:37 +13:00
Brenda Wallace	e3886ce5b5	Fixed up unescaped model attribute	2017-11-29 20:59:37 +13:00
Brenda Wallace	48f8085e2d	Fix seeds order	2017-11-29 20:59:37 +13:00
Brenda Wallace	594e466fd4	Fixed photos ordering	2017-11-29 20:59:37 +13:00
Brenda Wallace	b813669d71	Updated shop controller specs	2017-11-29 20:59:37 +13:00
Brenda Wallace	d0b8ae3411	Delete follows records when a member is deleted	2017-11-29 20:59:37 +13:00
Brenda Wallace	9c993e9f47	Plantings controller ordering and specs	2017-11-29 20:59:37 +13:00
Brenda Wallace	d5fece87d0	Tests for comments#index (and bugfix)	2017-11-29 20:59:37 +13:00
Brenda Wallace	33816d4312	Use faker gem, in account types - and add controller specs	2017-11-29 20:59:37 +13:00
Brenda Wallace	00e6aeed5c	seed.tradable was back to front logic. fixed	2017-11-29 20:59:37 +13:00
Brenda Wallace	0205b345d0	A planting's photo is their most recent photo	2017-11-29 20:59:37 +13:00
Brenda Wallace	9f8a32e9f8	Feature plantings need to be ordered	2017-11-29 20:59:37 +13:00
Brenda Wallace	7357524271	Garden's default photo should be the most recent photo	2017-11-29 20:59:37 +13:00
Brenda Wallace	6aa689b0d8	Removed some model ordering specs	2017-11-29 20:59:37 +13:00
Brenda Wallace	962b3b574d	Fixed up planting spec to not care about ordering	2017-11-29 20:59:37 +13:00
Brenda Wallace	d77d1d9a77	spec for notifications needs to be agnostic about the order	2017-11-29 20:59:37 +13:00
Brenda Wallace	4bed6da422	Crop validation methods can be private	2017-11-29 20:59:37 +13:00
Brenda Wallace	023c870d49	Fix up crop.recent	2017-11-29 20:59:37 +13:00
Brenda Wallace	9aff65e956	Added ordering to finding first photo	2017-11-29 20:59:37 +13:00
Brenda Wallace	0446c0a405	Add ordering back into controller #index	2017-11-29 20:59:37 +13:00
Brenda Wallace	7719d1f896	Remote default ordering scopes, and clean up models	2017-11-29 20:59:37 +13:00
Brenda Wallace	17fd6f61a5	Added polymorphic relationship to photos	2017-11-29 20:14:27 +13:00
Brenda Wallace	c9558e4d51	Merge branch 'master' into dev ... Conflicts: Gemfile.lock	2017-11-29 10:46:08 +13:00
deppbot	8a679670e4	Bundle Update on 2017-11-29	2017-11-29 07:00:25 +13:00
pozorvlak	a7586e9d2b	Merge pull request #1448 from Br3nda/fix/1211 ... upgrade leaflet-rails	2017-11-27 20:42:22 +00:00
Shiny	811011419e	Exit if we can't cd	2017-11-26 09:39:43 +13:00
Shiny	dae3ea2789	removed some debug	2017-11-25 19:41:41 +13:00
Shiny	49aa6bb846	Update .travis.yml	2017-11-25 19:41:03 +13:00
Brenda Wallace	c154a9b845	Upgraded leaflet maskercluster	2017-11-25 19:34:05 +13:00
Shiny	ad14ecb41b	Merge branch 'dev' into fix/1211	2017-11-25 17:03:23 +13:00
deppbot	08a73ce503	Bundle Update on 2017-11-24	2017-11-25 09:53:29 +13:00
Brenda Wallace	6663f3ade4	Add id and type back to photos#new release33	2017-11-24 19:02:54 +13:00
deppbot	451030761d	Bundle Update on 2017-11-21	2017-11-24 19:02:54 +13:00