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
106d187e67
Add dependent clauses on crop model
2018-04-02 10:29:10 +12:00
Brenda Wallace
8521047803
Merge branch 'dev' into feature/ownable
2018-04-02 10:23:07 +12:00
Brenda Wallace
e173d0c130
Merge branch 'dev' into fix/ordering
2018-04-02 10:22:20 +12:00
Brenda Wallace
53197f27eb
Merge branch 'dev' into feature/fluid-layout
2018-04-02 10:22:03 +12:00
Brenda Wallace
2460f73673
Merge branch 'dev' into fix/coverage
2018-04-02 10:21:22 +12:00
Brenda Wallace
324dcfc821
Merge pull request #1598 from Growstuff/bundle-update-2018-03-22-131347
...
Bundle Update on 2018-03-22
2018-04-02 10:21:04 +12:00
Brenda Wallace
e3bb43477b
Adding counter caches and ownable concern
2018-04-02 10:13:19 +12:00
Brenda Wallace
2d309b7645
Removing jasmine, we have no jasmine specs
2018-04-02 09:58:02 +12:00
Brenda Wallace
a59f7dd137
Merge branch 'dev' into fix/coverage
2018-04-02 09:50:11 +12:00
Brenda Wallace
1fb3c4e0f9
Regnerated and secured code climate key
2018-04-02 09:47:04 +12:00
Brenda Wallace
b64a294245
Removed duplicate margins in css
2018-04-01 18:45:35 +12:00
Brenda Wallace
31d2aa052a
More bundle updates
2018-04-01 14:16:50 +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
e029ef17ab
Merge remote-tracking branch 'upstream/dev' into dev
2018-04-01 09:21:37 +12:00
Brenda Wallace
d5c8b9ae27
Merge branch 'dev' into bundle-update-2018-03-22-131347
2018-03-31 18:15:25 +13:00
Brenda Wallace
f907ba9e4b
Merge pull request #1599 from Growstuff/dev
...
Release 43
2018-03-30 16:14:06 +13:00
Brenda Wallace
25070f73d7
Merge pull request #1591 from Br3nda/feature/photos-helper
...
Use photos helpers to find photos
2018-03-26 18:14:32 +13:00
Brenda Wallace
2fe6012342
Merge branch 'dev' into feature/photos-helper
2018-03-23 15:03:01 +13:00
deppbot
61468b3587
Bundle Update on 2018-03-22
2018-03-22 13:13:48 +08:00
Brenda Wallace
58c4d82087
Merge pull request #1590 from Growstuff/dev
...
Release 42
2018-03-22 15:01:52 +13:00
deppbot
c80685bf0d
Security Update on 2018-03-20 ( #1597 )
...
* Security Update on 2018-03-20
* Ordered gems, to please rubocop
2018-03-22 14:14:19 +13:00
Brenda Wallace
69018f2c5c
Merge remote-tracking branch 'upstream/dev' into dev
2018-03-22 11:53:29 +13:00
Brenda Wallace
00ea96a73e
Can't rename GROWSTUFF_ELASTICSEARCH
2018-03-20 11:35:01 +13:00
