Brenda Wallace
3c7688d2ed
Merge branch 'dev' into Br3nda-patch-1
2018-04-09 09:57:24 +12:00
jenkr55
9c0ddb61e7
Prevent error when @matching_plantings is nil
2018-04-08 10:17:06 -05:00
Jennifer Kruse
19acb238fd
Merge branch 'dev' into OnlyShowPlantingSuggestionIfMatch
2018-04-08 09:49:29 -05:00
jenkr55
d38167fd14
Only show planting suggestion if theres a match
2018-04-08 09:47:15 -05:00
Brenda Wallace
6b68e9ee4d
Style fix
2018-04-08 10:04:43 +12:00
Brenda Wallace
3e2b4f4183
Pick the first photo
2018-04-08 09:56:19 +12:00
jenkr55
43813d1318
Fixing various wrapping issues
2018-04-07 14:58:07 -05:00
Brenda Wallace
03c9151ecd
Merge branch 'dev' into feature/ownable
2018-04-03 08:46:34 +12:00
pozorvlak
d0f6d63d36
Merge branch 'dev' into fix/dependents
2018-04-02 15:26:07 +01:00
pozorvlak
a7cfecf82c
Merge branch 'dev' into feature/ownable
2018-04-02 14:47:48 +01:00
pozorvlak
d0f28d4bef
Merge branch 'dev' into fix/ordering
2018-04-02 14:43:40 +01:00
Brenda Wallace
106d187e67
Add dependent clauses on crop model
2018-04-02 10:29:10 +12:00
Brenda Wallace
e3bb43477b
Adding counter caches and ownable concern
2018-04-02 10:13:19 +12:00
Brenda Wallace
b64a294245
Removed duplicate margins in css
2018-04-01 18:45:35 +12:00
Brenda Wallace
b7f78d5dc9
Fix ordering of recent plantings on crops#show
2018-04-01 13:05:23 +12:00
Brenda Wallace
f1afe1ca79
Expanding layout to use full screen
2018-04-01 12:44:59 +12:00
Brenda Wallace
511e89fa58
Merge branch 'dev' into feature/photos-helper
2018-03-19 13:39:02 +13:00
Brenda Wallace
2f81d6c78d
Layout fixes for mobile and smaller screens
2018-03-15 23:01:51 +13:00
Brenda Wallace
8941c577e4
Specs for photos helper
2018-03-14 22:25:30 +13:00
Brenda Wallace
1bf1076076
Photos helper
2018-03-14 19:28:18 +13:00
Brenda Wallace
8906fd38ae
For seeds, use planting photo if no seeds photo
2018-03-14 15:21:40 +13:00
Brenda Wallace
40d71ae070
Merge branch 'dev' into fix/photo-order-1547
2018-03-12 11:41:12 +13:00
Brenda Wallace
2f45041f8c
Fixed ordering of photos on crops#show
2018-03-12 08:56:39 +13:00
Brenda Wallace
f9d4e1d6ae
Ancestry of food. Seeds -> Planting -> Seeds -> Planting ( #1550 )
...
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Removed in-line style
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Moved finishable to a concern
* Seeds.finished_at
* rubocop fixes
* Made seeds sown migration the most recent
* Specs for home page
* Only show current seeds on home page
* Seeds appear for logged in or not
* Buttons to mark seeds finished
* JS for marking seeds finished
* Some actions only appear if seed or planting is active
* Fixed up display of home page
* Fixed typo in admin members#index
* Tidying up actions on all the things
* Harvest description in #index
* Truncate garden description if long
* Updated link label in view spec
* Show planted_from always, becuase it might be a parent seed
* find correct link in spec adding photos to garden
* fixed spec finding link to edit garden
* Better harvest description truncation
* Helping spec find the edit button
* specs for the home page
* Re-instate crops js, but in the correct file now
* Fixed link to garden in actions
* Tweaking mobile view
2018-03-12 08:39:32 +13:00
Brenda Wallace
2217d87b5a
Added back the member's last login
2018-02-09 10:53:05 +13:00
Brenda Wallace
44b2251896
Re-instated the member-since text on profiles
2018-02-09 10:53:05 +13:00
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
7f87ee1018
Fixed default_photo for seeds - uses own photos, not the crop
2018-01-29 09:55:06 +13:00
Brenda Wallace
3453a648fa
Latest versions of bootstrap accessibility plugin
2018-01-23 09:00:34 +13:00
Brenda Wallace
3dc356eb29
order gardens by name on plantings form
2018-01-23 09:00:34 +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
86b9a3650b
Move application.js loading last again
2018-01-23 09:00:34 +13:00
Brenda Wallace
625a035f44
Scope js variables so they are not global
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
Awesome Code
46267b2a1d
Auto corrected by following Style/MutableConstant
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
33276874a8
add google js to gardens#show
2018-01-23 09:00:34 +13:00
Awesome Code
3391f6c392
Auto corrected by following Style/RescueStandardError
2018-01-23 09:00:34 +13:00
Awesome Code
a13acbe087
Auto corrected by following Style/ParallelAssignment
2018-01-23 09:00:34 +13:00
Awesome Code
0c8240d4e8
Auto corrected by following Style/OrAssignment
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
4821bf3b07
Wrapped thre crops show js in a document.ready
2018-01-23 09:00:34 +13:00
