 Brenda Wallace
|
e489831241
|
Debugging phantom on travis
|
2017-11-13 23:00:05 +13:00 |
|
|
Shiny
|
df7a9448b0
|
Underscore prefix on our last unused args (#1442)
|
2017-11-13 09:54:55 +00:00 |
|
|
Brenda Wallace
|
3d4f5c6917
|
upgrade leaflet-rails
|
2017-11-13 21:49:00 +13:00 |
|
|
Brenda Wallace
|
1b4d77e017
|
Requests spec for member api
|
2017-11-13 20:03:39 +13:00 |
|
|
Brenda Wallace
|
08e7c7dd29
|
Request specs for harvests api
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
5fec826c41
|
Add more attributes to crops
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
c29234c40c
|
Request specs for crops api
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
2f0cb5c815
|
DRY the api specs
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
b6cbfe25d2
|
Factory girl becomes factory bot
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
d8f5876518
|
Added predictions to planting api, and added specs
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
ae2cbf0bec
|
requests spec for modifying immutable gardens on api
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
c9d5c42814
|
Plantings have many harvests
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
b60f47f502
|
Add more relationships to members on the api
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
d86e0af5ad
|
Request for for getting api gardens#index
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
fc0058d677
|
all our api controllers inheriting from base
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
41110f96d1
|
Put immutable on every resource
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
33822abf93
|
crops have harvests
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
5877da95a6
|
Added a base resource, a little more DRY
|
2017-11-13 19:19:18 +13:00 |
|
|
Brenda Wallace
|
88a119deac
|
Add a default paginator for api responses
|
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
|
2fbba52bc8
|
Updating specs to use same owner for garden and planting
|
2017-11-13 19:18:14 +13:00 |
|
|
Brenda Wallace
|
a2ae429f6b
|
If a harvest has a planting, it must have the same owner
|
2017-11-13 19:18:14 +13:00 |
|
|
Brenda Wallace
|
7ca76e69cf
|
Get planting factory's owner from its garden
|
2017-11-13 19:18:14 +13:00 |
|
|
Brenda Wallace
|
c6824b1262
|
Planting's owner must be the same as its garden's owner
|
2017-11-13 19:18:14 +13:00 |
|
|
Shiny
|
2a74c057f3
|
Merge branch 'master' into dev
|
2017-11-12 09:30:45 +13:00 |
|
|
deppbot
|
85cc9e77c6
|
Bundle Update on 2017-11-12
|
2017-11-12 09:29:21 +13:00 |
|
|
pozorvlak
|
a0d6d154f0
|
Merge pull request #1439 from Growstuff/dev
Release 32
release32
|
2017-11-10 16:25:42 +00:00 |
|
|
pozorvlak
|
7e9707e3b0
|
Merge pull request #1437 from Br3nda/feature/harvest-predictions
Feature/harvest predictions
|
2017-11-10 11:59:00 +00:00 |
|
|
Brenda Wallace
|
4fe0dba28e
|
Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions
|
2017-11-09 18:30:18 +13:00 |
|
|
Shiny
|
328037b8c0
|
Merge branch 'master' into dev
|
2017-11-09 18:19:57 +13:00 |
|
|
Brenda Wallace
|
e4ab5114f7
|
Remove duplicate setting of medians in migration
|
2017-11-09 17:51:18 +13:00 |
|
|
Brenda Wallace
|
a5d43af899
|
Drop the plantings.days_before_maturity column
it's not used anywhere
|
2017-11-09 17:43:00 +13:00 |
|
|
Brenda Wallace
|
2d384c9851
|
Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions
|
2017-11-09 17:36:50 +13:00 |
|
|
Brenda Wallace
|
205247b136
|
Shorter condition in haml view (progress)
|
2017-11-09 17:36:37 +13:00 |
|
|
Brenda Wallace
|
963a182981
|
simplified logic in planting's first/last harvest fetcher
|
2017-11-09 17:36:33 +13:00 |
|
|
Daniel O'Connor
|
1090db6d21
|
Merge pull request #1438 from Growstuff/bundle-update-2017-11-08-201231
Bundle Update on 2017-11-08
|
2017-11-09 09:27:31 +11:00 |
|
|
deppbot
|
f187b31653
|
Bundle Update on 2017-11-08
|
2017-11-08 20:12:32 +08:00 |
|
|
Brenda Wallace
|
809dd81378
|
"Changed last_harvest" to "days_to_last_harvest"
|
2017-11-08 17:17:58 +13:00 |
|
|
Brenda Wallace
|
62beec23a1
|
"Changed first_harvest" to "days_to_first_harvest"
|
2017-11-08 17:17:15 +13:00 |
|
|
Brenda Wallace
|
a60a5ce591
|
Added a space, to please hound
|
2017-11-07 09:46:19 +13:00 |
|
|
Brenda Wallace
|
7206f99510
|
Updated spec to match new crop detail page text
|
2017-11-07 08:39:45 +13:00 |
|
|
Brenda Wallace
|
bf6475da57
|
annual? perennial!=true
|
2017-11-06 23:15:08 +13:00 |
|
|
Brenda Wallace
|
c5971cd46b
|
A little bit of eager loading
|
2017-11-06 23:13:36 +13:00 |
|
|
Brenda Wallace
|
2f47eeb7b3
|
Bug fix. Can only predict if we have harvested_at and planted_at
|
2017-11-06 23:12:28 +13:00 |
|
|
Brenda Wallace
|
928749aaad
|
Changed a "Pictures" header to "Photos" to be consistent
|
2017-11-06 23:11:39 +13:00 |
|
|
Brenda Wallace
|
1d64d4d1d2
|
Clearer message that predctions are for days after planting
|
2017-11-06 23:10:55 +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
|
941dab7c4a
|
Crop.annual? method
|
2017-11-06 23:00:16 +13:00 |
|
|
Brenda Wallace
|
2696d12771
|
Removed duplicate display of last harvest
|
2017-11-06 22:59:04 +13:00 |
|