737 Commits

Author	SHA1	Message	Date
Brenda Wallace	42de726405	Removing shop, products, accounts, orders	2018-02-09 10:53:05 +13:00
Brenda Wallace	65b4c7dbc1	Revert "Auto corrected by following Style/StringLiterals" ... This reverts commit ab56a3c6b3.	2018-02-09 07:58:47 +13:00
Awesome Code	ab56a3c6b3	Auto corrected by following Style/StringLiterals	2018-02-07 10:20:26 +13:00
Brenda Wallace	88da0da616	Re-fetches from flickr	2018-02-05 12:52:59 +13:00
Meir Taffel	a69afd87e7	Add date_taken to photos	2018-02-05 12:52:59 +13:00
Brenda Wallace	16ad5384d1	Moved gardens chart to dedicated controller	2018-01-23 09:00:34 +13:00
Brenda Wallace	cf93489af7	Fixed crops chart permissions by moving to another controller	2018-01-23 09:00:34 +13:00
Brenda Wallace	196d37dee9	Re-instated the extra fields on crop.json	2018-01-23 09:00:34 +13:00
Brenda Wallace	9db4736229	Permissions (and specs) for charts json	2018-01-23 09:00:34 +13:00
Brenda Wallace	78b8be1fc2	Use .presence to find finished ts in timeline	2018-01-23 09:00:34 +13:00
Brenda Wallace	b6e9539127	Use predicted finish times to put current plantings on the timeline	2018-01-23 09:00:34 +13:00
Brenda Wallace	5ea7ae8af0	Added Harvested for chart	2018-01-23 09:00:34 +13:00
Brenda Wallace	eb1b890eec	Add planted_from chart	2018-01-23 09:00:34 +13:00
Brenda Wallace	59c3edcf82	Add timeline to gardens	2018-01-23 09:00:34 +13:00
Brenda Wallace	1bf05f81ab	Convert to use chartkick gem ... Conflicts: Gemfile Gemfile.lock config/initializers/assets.rb	2018-01-23 09:00:34 +13:00
Shiny	9d47b2b029	Merge branch 'dev' into feature/admin-nicer	2017-12-18 15:10:36 +13:00
Brenda Wallace	25d2773464	Use nested module/class definitions instead of compact style.	2017-12-17 17:50:30 +13:00
Brenda Wallace	8a446ecbfc	Member admin	2017-12-17 12:45:19 +13:00
Brenda Wallace	2394f4d237	One view for showing photos on an item	2017-12-17 11:40:55 +13:00
Brenda Wallace	3aa2f0bd3b	Paginate photos on seeds#show (inc feature specs)	2017-12-17 08:55:08 +13:00
Shiny	82149d4565	Merge branch 'dev' into feature/photos-1457	2017-12-14 08:44:31 +13:00
Brenda Wallace	72f52230a1	Fix Growstuff::OauthSignupAction not found error when connecting flickr account	2017-12-13 22:19:41 +13:00
Brenda Wallace	14551b6ec8	Merge remote-tracking branch 'upstream/dev' into feature/photos-1457 ... Conflicts: spec/models/crop_spec.rb	2017-12-09 20:59:20 +13:00
Shiny	96bb345ca9	Merge branch 'dev' into ordering	2017-12-08 20:20:27 +13:00
Brenda Wallace	4ce3e8968f	crops#show order posts by most recent first	2017-12-07 14:58:57 +13:00
Brenda Wallace	ea2fcd09dc	Fixed last old style word array	2017-12-06 14:18:51 +13:00
Brenda Wallace	a6a7f789a3	Rubocop upgrade (and some style fixes)	2017-12-01 21:07:39 +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	ff57176d60	Simplified the photos controller a bit	2017-11-29 22:13:03 +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	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	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	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	0446c0a405	Add ordering back into controller #index	2017-11-29 20:59:37 +13:00
Brenda Wallace	229396d9e7	Add id and type back to photos#new	2017-11-22 22:06:41 +13:00
Brenda Wallace	7906d50d13	Shaved some yaks to remove a rescue from a controller	2017-11-18 22:25:58 +13:00
Brenda Wallace	faed8b019e	Removed rescue in a controller	2017-11-18 22:25:58 +13:00
Brenda Wallace	c8974a869f	Use the ||= operator	2017-11-18 22:25:58 +13:00
Brenda Wallace	3969f410f1	Tidy up photos logic, and test of signin/out on photos#new	2017-11-18 22:25:58 +13:00
Logan Gingerich	6304f230a5	Refactored and specs updated	2017-11-18 22:25:58 +13:00
Logan Gingerich	73524b8883	Now displays correctly for planting, harvest or garden	2017-11-18 22:25:58 +13:00
Logan Gingerich	fd9fc38def	fixes #1433 Says what item you're adding a photo to on photos#new	2017-11-18 22:25:58 +13:00
Brenda Wallace	13e8d1f5a5	Merge remote-tracking branch 'upstream/dev' into api	2017-11-17 21:51:39 +13:00
Shiny	df7a9448b0	Underscore prefix on our last unused args (#1442)	2017-11-13 09:54:55 +00:00
Brenda Wallace	fc0058d677	all our api controllers inheriting from base	2017-11-13 19:19:18 +13:00