Brenda Wallace
944af28e3c
Merge pull request #1623 from Growstuff/awesomecode-style/expandpatharguments-12138
...
Auto corrected by following Style/ExpandPathArguments
2018-04-21 10:20:18 +12:00
Awesome Code
a5b84403bb
Auto corrected by following Style/ExpandPathArguments
2018-04-20 22:19:28 +00:00
Awesome Code
afc4441ce1
Auto corrected by following FactoryBot/CreateList
2018-04-20 22:19:04 +00:00
Brenda Wallace
b7d4781aef
Split the planting&harvest predictions into files
2018-04-21 10:18:18 +12:00
Brenda Wallace
c2ff3790db
set finished false on planting factory
...
some code+tests doesn't cope with nil
2018-04-21 09:22:35 +12:00
Brenda Wallace
a2f2e24aa1
Merge remote-tracking branch 'upstream/dev' into feature/status
2018-04-21 09:07:10 +12:00
pozorvlak
f1a40e4305
Merge pull request #1621 from jenkr55/SecondCommentButton
...
Show second comment button when many comments on a post
2018-04-20 10:51:18 +01:00
jenkr55
4120069e4c
Fixing trailing whitespace
2018-04-19 12:17:36 -05: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
Brenda Wallace
279c922b34
Rename update predictions methods to have !
2018-04-19 13:45:29 +12:00
Brenda Wallace
3ed90b8d04
Moving predictions to own file
2018-04-19 13:44:39 +12:00
jenkr55
634dc936f9
Show second comment button when many comments
2018-04-18 19:32:24 -05:00
Brenda Wallace
2a8c4d4829
Add finished and finished_at to plantings factory
2018-04-17 10:06:40 +12:00
Brenda Wallace
3ee2537438
Only show time to finished if not finished
2018-04-17 10:03:59 +12:00
Brenda Wallace
934bd9adb8
Fixed bug in spec, wasn't really on member's garden#index
2018-04-16 22:11:36 +12:00
Brenda Wallace
d043613bde
Model specs for harvest time and zombies
2018-04-16 21:14:47 +12:00
Brenda Wallace
d1603a6e7f
Badges showing finished and harvest status
2018-04-16 21:06:20 +12:00
Brenda Wallace
79e0bc5206
Merge pull request #1615 from Growstuff/dev
...
Release 45
2018-04-13 11:25:40 +12:00
pozorvlak
61183509b0
Merge pull request #1612 from Growstuff/Br3nda-patch-1
...
Pick the first photo
2018-04-12 15:34:22 +01:00
Brenda Wallace
6c1bbe9f1c
Merge branch 'dev' into Br3nda-patch-1
2018-04-12 14:15:49 +12:00
Brenda Wallace
bab41143fa
Merge branch 'master' into dev
2018-04-12 11:01:53 +12:00
Brenda Wallace
3c7688d2ed
Merge branch 'dev' into Br3nda-patch-1
2018-04-09 09:57:24 +12:00
Brenda Wallace
ef20d1a333
Merge pull request #1613 from jenkr55/OnlyShowPlantingSuggestionIfMatch
...
Only show planting suggestion if there's a match
2018-04-09 09:57:04 +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
Brenda Wallace
65bb523d16
Merge pull request #1609 from jenkr55/FixVariousWrappingIssues
...
Fix various wrapping issues
2018-04-08 09:03:26 +12:00
jenkr55
efa8c513ea
Adding myself as a contributor
2018-04-07 14:59:14 -05:00
jenkr55
43813d1318
Fixing various wrapping issues
2018-04-07 14:58:07 -05:00
Cesy
7e2aec9ec3
Merge pull request #1608 from Growstuff/dev
...
Release 44
2018-04-06 07:23:07 +01:00
Brenda Wallace
952224b2e1
Merge branch 'master' into dev
2018-04-03 17:46:37 +12:00
Brenda Wallace
26b1a3a6ca
Merge pull request #1605 from Br3nda/feature/ownable
...
Adding counter caches and ownable concern
2018-04-03 08:54:15 +12:00
Brenda Wallace
03c9151ecd
Merge branch 'dev' into feature/ownable
2018-04-03 08:46:34 +12:00
pozorvlak
1dd3d658eb
Merge pull request #1606 from Br3nda/fix/dependents
...
Set the behaviour of dependent models when crops are deleted from the database:
- plantings, seeds and harvests are deleted
- child crops are orphaned.
2018-04-02 15:52:10 +01:00
pozorvlak
c3b694ea7d
Merge branch 'dev' into fix/dependents
2018-04-02 15:39:16 +01:00
pozorvlak
a3e2b892d1
Merge pull request #1596 from Br3nda/fix/coverage
...
Adding codeclimate coverage
2018-04-02 15:36:48 +01:00
pozorvlak
d0f6d63d36
Merge branch 'dev' into fix/dependents
2018-04-02 15:26:07 +01:00
pozorvlak
879ce26de7
Merge branch 'dev' into fix/coverage
2018-04-02 15:21:51 +01:00
pozorvlak
98e27b5af4
Merge pull request #1602 from Br3nda/fix/ordering
...
Fix ordering of recent plantings on crops#show
2018-04-02 15:21:29 +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
pozorvlak
2c090757cc
Merge pull request #1601 from Br3nda/feature/fluid-layout
...
Feature/fluid layout
2018-04-02 14:40:44 +01:00
Brenda Wallace
af0c9a490b
Redirect :back deprecated. updating follows controller
2018-04-02 16:28:34 +12:00
Brenda Wallace
59cca1b8cb
Upgraded controller specs for rails 5
2018-04-02 16:18:46 +12:00
