 Brenda Wallace
|
f8a404a88b
|
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
Conflicts:
Gemfile
Gemfile.lock
app/models/crop.rb
app/models/forum.rb
app/models/photo.rb
app/models/planting.rb
app/models/seed.rb
db/schema.rb
spec/models/garden_spec.rb
spec/models/planting_spec.rb
|
2018-04-28 21:25:06 +12:00 |
|
|
Brenda Wallace
|
832cfde28d
|
Merge pull request #1635 from Growstuff/bundle-update-2018-04-26-092357
Bundle Update on 2018-04-26
|
2018-04-28 21:15:22 +12:00 |
|
|
Brenda Wallace
|
aa9841dc7d
|
Pinned elastic search to 5.0.0. or later
|
2018-04-28 18:34:26 +12:00 |
|
|
pozorvlak
|
caa59df3bd
|
Merge pull request #1625 from Growstuff/dev
Release 46
|
2018-04-27 17:04:31 +01:00 |
|
|
Brenda Wallace
|
102eaf3d6b
|
Merge branch 'dev' into bundle-update-2018-04-26-092357
|
2018-04-26 17:39:03 +12:00 |
|
|
Brenda Wallace
|
61ebd5fe99
|
Merge pull request #1632 from Br3nda/feature/i18n
i18n for plantings#index
release46
|
2018-04-26 17:38:32 +12:00 |
|
|
Brenda Wallace
|
7e0e936509
|
Merge branch 'dev' into bundle-update-2018-04-26-092357
|
2018-04-26 17:27:13 +12:00 |
|
|
Brenda Wallace
|
d3faa75d1d
|
Merge branch 'dev' into feature/i18n
|
2018-04-26 17:26:55 +12:00 |
|
|
Brenda Wallace
|
1575ee1ddd
|
Merge pull request #1620 from Br3nda/feature/status
Badges for ready to harvest, days to finished
|
2018-04-26 17:26:36 +12:00 |
|
|
deppbot
|
5b5eacb738
|
Bundle Update on 2018-04-26
|
2018-04-26 09:23:58 +08: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 |
|
|
Brenda Wallace
|
9112d4e2bb
|
Merge pull request #1630 from jenkr55/ProfileGardenDisplayImprovements
Profile garden display improvements
|
2018-04-22 15:33:42 +12:00 |
|
|
jenkr55
|
eed0b257fa
|
Fixing test because I removed this line
|
2018-04-21 22:03:31 -05: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 |
|
|
Brenda Wallace
|
9fdc9e76df
|
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
|
2018-04-22 12:14:23 +12:00 |
|
|
Brenda Wallace
|
eba03d0662
|
Merge pull request #1627 from jenkr55/InActiveFixes
Fixing broken "in-active" checkbox
|
2018-04-22 12:11:34 +12:00 |
|
|
Brenda Wallace
|
53d7cddea1
|
Merge branch 'dev' into InActiveFixes
|
2018-04-22 08:54:27 +12:00 |
|
|
Brenda Wallace
|
89cfd49616
|
Merge pull request #1626 from Br3nda/bundle-update
Bundle upgrade
|
2018-04-22 08:52:08 +12: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
|
4c33e5ea2d
|
Merge remote-tracking branch 'origin/feature/status' into feature/status
|
2018-04-21 22:11:52 +12:00 |
|
|
Brenda Wallace
|
caa5bcec4b
|
Only show finish button if can edit planting
|
2018-04-21 21:55:33 +12:00 |
|
|
Brenda Wallace
|
55bfd50123
|
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
|
2018-04-21 21:18:30 +12:00 |
|
|
Brenda Wallace
|
86781f3491
|
Bundle upgrade
|
2018-04-21 21:14:18 +12:00 |
|
|
Brenda Wallace
|
48bf7bb2f4
|
Merge branch 'dev' into feature/status
|
2018-04-21 17:41:10 +12:00 |
|
|
Brenda Wallace
|
6677f8641f
|
If not crop lifespan data, use parent data
|
2018-04-21 17:40:22 +12:00 |
|
|
Brenda Wallace
|
e5cf8b6091
|
added spec for finished_predicted_at
|
2018-04-21 17:25:04 +12:00 |
|
|
Brenda Wallace
|
a7acf72f56
|
Merge branch 'master' into dev
|
2018-04-21 17:05:14 +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
|
6077d4da34
|
Fixed bug in garden spec
|
2018-04-21 15:01:33 +12:00 |
|
|
Brenda Wallace
|
34b6b54616
|
Name goes on garden, not planting
|
2018-04-21 14:33:39 +12:00 |
|
|
Brenda Wallace
|
87d43f1eb2
|
Move planting delete action into the bar
|
2018-04-21 14:26:27 +12:00 |
|