Brenda Wallace
d3faa75d1d
Merge branch 'dev' into feature/i18n
2018-04-26 17:26:55 +12:00
Brenda Wallace
85eea89792
i18n for plantings#index
2018-04-23 15:40:56 +12:00
Brenda Wallace
fc46685ab9
Renamed should_be_finshed? to late?
2018-04-23 13:44:53 +12:00
Brenda Wallace
db0c60be0d
Rename zombie to super_late
2018-04-23 13:33:38 +12:00
Brenda Wallace
91e851c802
Merge remote-tracking branch 'upstream/dev' into feature/status
2018-04-23 13:00:53 +12:00
jenkr55
25bba9c126
format fixes
2018-04-21 21:55:29 -05:00
jenkr55
028c2a28a5
unneeded class
2018-04-21 21:52:55 -05:00
jenkr55
fa28fe25b6
Fixing responsive design issues
2018-04-21 21:43:19 -05:00
jenkr55
77978a76f2
Fixing notes display bug on harvest card
2018-04-21 21:27:40 -05:00
jenkr55
7be10957ec
WIP different profile page
2018-04-21 21:05:58 -05:00
jenkr55
c94d08c816
Moving bio to be by other profile information
2018-04-21 20:09:23 -05:00
jenkr55
0b191049b2
Undo this
2018-04-21 10:46:27 -05:00
jenkr55
e767ea6b38
Fixing planting wrapping issue
2018-04-21 10:36:33 -05:00
jenkr55
6310c51879
Only show data prompt when there are plantings
2018-04-21 09:08:02 -05:00
Brenda Wallace
caa5bcec4b
Only show finish button if can edit planting
2018-04-21 21:55:33 +12:00
Brenda Wallace
78f021c2f2
style fix up
2018-04-21 16:26:40 +12:00
Brenda Wallace
34145f7b64
Translation of string in haml
2018-04-21 16:19:51 +12:00
Brenda Wallace
ef9bb01fc9
Wrapped a long line
2018-04-21 15:34:18 +12:00
Brenda Wallace
4df3354020
Style fix up
2018-04-21 15:17:17 +12:00
Brenda Wallace
87d43f1eb2
Move planting delete action into the bar
2018-04-21 14:26:27 +12:00
Brenda Wallace
2e4378f025
Add css class to show finished/zombie/harvesting etc
2018-04-21 14:17:50 +12:00
Brenda Wallace
aae7688a0e
Classes for planting badge colours
2018-04-21 13:05:15 +12:00
Brenda Wallace
9b16abd373
Render perenial progress bar the same as others
2018-04-21 13:04:31 +12:00
Brenda Wallace
87b04f60f7
Order garden's plantings by planted_at
2018-04-21 13:03:46 +12:00
Brenda Wallace
ca8dae4b78
Moving the planting buttons lower
2018-04-21 13:02:09 +12:00
Brenda Wallace
935aebcb0d
Tidy up visual link between planting thumbnail and crop name
2018-04-21 12:38:32 +12:00
Brenda Wallace
9188bd384d
Futher simplifying planting badges
2018-04-21 11:36:48 +12:00
Brenda Wallace
a2f2e24aa1
Merge remote-tracking branch 'upstream/dev' into feature/status
2018-04-21 09:07:10 +12:00
jenkr55
18a7306fd0
Merge branch 'SecondCommentButton' of github.com:jenkr55/growstuff into SecondCommentButton
2018-04-19 12:11:03 -05:00
jenkr55
b3962bc9bc
Comment button same style
2018-04-19 12:10:19 -05:00
Brenda Wallace
7a112aeecf
Grammar correction in method name
2018-04-19 13:49:54 +12:00
Jennifer Kruse
296daa7a56
Merge branch 'dev' into SecondCommentButton
2018-04-18 20:47:53 -05:00
Brenda Wallace
5bf75fa36f
Only show finish prediction badges if we have enough data
2018-04-19 13:45:47 +12:00
jenkr55
634dc936f9
Show second comment button when many comments
2018-04-18 19:32:24 -05:00
Brenda Wallace
3ee2537438
Only show time to finished if not finished
2018-04-17 10:03:59 +12:00
Brenda Wallace
d1603a6e7f
Badges showing finished and harvest status
2018-04-16 21:06:20 +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
jenkr55
43813d1318
Fixing various wrapping issues
2018-04-07 14:58:07 -05:00
pozorvlak
d0f28d4bef
Merge branch 'dev' into fix/ordering
2018-04-02 14:43:40 +01: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
1bf1076076
Photos helper
2018-03-14 19:28:18 +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
