mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-08 14:12:04 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,843 Commits 66 Branches 92 Tags
0699716c19fd975e2cc8bc7cdcfc9e4a3c5e944e
Commit Graph
718 Commits
Author SHA1 Message Date
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
Brenda Wallace d07fd1a277 Added seeds and harvests to api, and tidied up resources 2017-11-13 19:19:18 +13:00
Brenda Wallace c96695258b Basic read only api 2017-11-13 19:19:18 +13:00
Brenda Wallace 1e86cf7662 Update planting medians after updating record 
So changes to the planted_at are re-calculated
 2017-11-06 23:07:44 +13:00
Brenda Wallace b3fd8e32d0 Fixed ordering of Harvests - don't order in scope. 2017-11-05 17:42:59 +13:00
Brenda Wallace 4cc0f77bd0 Predicting first harvest - updating medians 2017-11-05 13:42:30 +13:00
Brenda Wallace d5a1a683f1 Rubocop fix 2017-11-04 15:44:56 +13:00
Brenda Wallace f5bb47e4ca DRY plantings controller a bit more - update crop means in one place 2017-11-04 15:36:51 +13:00
Brenda Wallace 8359218294 Update crop medians after deletion of planting (not before) 2017-11-04 11:53:40 +13:00
Brenda Wallace 267f27b3f8 rubocop fix up 2017-11-01 14:48:42 +13:00
Brenda Wallace d1951b8b65 Edit and show perennial plants 2017-11-01 14:22:39 +13:00
Brenda Wallace 3b81affbe5 include child records when reading plantings from db 2017-11-01 13:57:49 +13:00
Brenda Wallace 47ecbe3f94 Call the predictions update on planting modifications from controller 2017-11-01 13:57:49 +13:00
Brenda Wallace 7d6c49d8c3 Set harvest preductions on plantings 2017-11-01 13:57:49 +13:00
Brenda Wallace f3e88f5aae Include harvest photos on crop page 2017-10-24 09:34:10 +13:00
Brenda Wallace 1e81dac699 All crop photos; crops-> photos route 2017-10-24 09:34:03 +13:00
Brenda Wallace 68768c4d6a Fixed redirection after planting is deleted 2017-10-21 22:48:37 +01:00
Brenda Wallace 8d681dd90a Another code style fixup 2017-10-17 17:29:48 +13:00
Brenda Wallace 01333bf965 Use string.start_with? instead of a regexp 2017-09-01 12:11:57 +12:00
Brenda Wallace a145abff56 Changed regex to matches? to appease rubocop 2017-08-31 21:27:22 +12:00