mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-01-31 20:51:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,243 Commits 62 Branches 76 Tags
release47
Commit Graph

2647 Commits

Author SHA1 Message Date
Brenda Wallace
857c9e9d7a whitespace fixups 2018-09-09 12:44:52 +12:00
Brenda Wallace
913ac45127 Changed query syntax for elasticsearch 2018-09-09 12:40:40 +12:00
Brenda Wallace
27c4dbedf2 Elasticsearch has dropped the string type and is now using text 2018-09-09 12:18:50 +12:00
Brenda Wallace
77d2dc6144 Merge branch 'dev' into issue-565-create-harvests-rss 2018-06-17 20:58:32 +12:00
Brenda Wallace
a5fa69c7c7 Merge branch 'dev' into fix/plants-parts-dupe 2018-06-17 08:47:27 +12:00
Brenda Wallace
1d8c2db674 Merge branch 'dev' into issue-565-create-harvests-rss 2018-06-17 08:47:12 +12:00
robotscissors
dff6827761 create rss feed for harvests 2018-06-10 20:38:43 -07:00
Brenda Wallace
0d303ee6df Don't allow duplicate plant parts names 
Make factort's plant_part.name unique
Setting plant_part.name in specs
Unique names for plant parts
 2018-06-04 17:42:41 +12:00
Brenda Wallace
5dc8bc5ec5 Order plantings and harvests in email 2018-06-04 17:35:06 +12:00
Brenda Wallace
ed3ae8bbd6 Remove some old currency methods from application helper 2018-05-01 13:47:25 +12:00
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
ef74cc293d Rubocop 2018-04-21 10:51:19 -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
6cbf7d0bba Fixing parmas issue for owner 2018-04-21 10:29:13 -05:00
jenkr55
cb5d490b1c Fixing params not being passed to plantings controller 2018-04-21 10:26:19 -05:00
jenkr55
585e45487a Fixing button layout issue 2018-04-21 09:16:17 -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
6677f8641f If not crop lifespan data, use parent data 2018-04-21 17:40:22 +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
e103e6be35 Reducing complexity in planting predictions code 2018-04-21 15:32:04 +12:00
Brenda Wallace
4ad4dd0c7f Style fix up 2018-04-21 15:17:51 +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
a8509acd49 Zombie status needs 90 days 2018-04-21 13:02:51 +12:00
Brenda Wallace
ca8dae4b78 Moving the planting buttons lower 2018-04-21 13:02:09 +12:00
Brenda Wallace
1b3e00fba0 Colours for badges on plantings 2018-04-21 13:00:24 +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
4fe8cd566b USe finished not finished? 
because some plants have finished_at in the past but haven't had their .finished set to true yet
 2018-04-21 12:37:00 +12:00
Brenda Wallace
9188bd384d Futher simplifying planting badges 2018-04-21 11:36:48 +12:00
Brenda Wallace
8ce0717c0f Fixing up planting helper predictions 2018-04-21 11:36:02 +12:00
Brenda Wallace
f8b76e9c84 Reducing complexity in planting predictions 2018-04-21 11:12:25 +12:00
Brenda Wallace
b7d4781aef Split the planting&harvest predictions into files 2018-04-21 10:18:18 +12:00