Commit Graph

6758 Commits

Author SHA1 Message Date
Brenda Wallace
040c414827 find translation of some_of_our_crops 2019-06-12 09:27:40 +12:00
Brenda Wallace
0b44acc90e Merge branch 'dev' into upgrade/bootstrap 2019-06-12 09:23:41 +12:00
Brenda Wallace
d44d6a0b19 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-12 09:23:10 +12:00
codefactor-io
571f4298bb [CodeFactor] Apply fixes 2019-06-11 21:22:53 +00:00
Brenda Wallace
4086e6dd00 remove comments from json 2019-06-12 09:22:33 +12:00
Brenda Wallace
4b7705fcad wrap a context link in before in specs 2019-06-12 09:20:32 +12:00
Brenda Wallace
ee152b3ba3 Match sign in for to the older labels, so tests pass without changes 2019-06-12 09:20:09 +12:00
Brenda Wallace
78f3badcd7 upgrade rubocop 2019-06-12 09:12:23 +12:00
Brenda Wallace
7e3d43c47c add missing translations for buttons 2019-06-12 09:10:37 +12:00
Brenda Wallace
c80cbf203c follow, edit, and message buttons on members#show 2019-06-12 09:10:25 +12:00
Brenda Wallace
b92cef4c02 view all buttons on home page 2019-06-12 09:10:07 +12:00
dependabot-preview[bot]
4d2318ea68 Bump searchkick from 4.0.1 to 4.0.2
Bumps [searchkick](https://github.com/ankane/searchkick) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/ankane/searchkick/releases)
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/searchkick/compare/v4.0.1...v4.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-10 23:21:07 +00:00
dependabot-preview[bot]
16f981813a Bump haml from 5.0.4 to 5.1.1
Bumps [haml](https://github.com/haml/haml) from 5.0.4 to 5.1.1.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/haml/haml/compare/v5.0.4...v5.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-10 22:41:05 +00:00
Brenda Wallace
0d02f5758b actions menu for harvests 2019-06-09 15:53:01 +12:00
Brenda Wallace
b617468e26 remove commented out code 2019-06-09 14:03:20 +12:00
Brenda Wallace
8762b11555 tidy plantings action menu 2019-06-09 14:02:55 +12:00
Brenda Wallace
7bc641fb55 fix gardens action menu 2019-06-09 14:02:41 +12:00
Brenda Wallace
80e8364de0 title on planting thumbnails 2019-06-09 14:02:30 +12:00
Brenda Wallace
2fa4590315 gardens breadcrumbs 2019-06-09 14:02:13 +12:00
Brenda Wallace
4255cde5ff member cards on home page fix up 2019-06-09 13:24:05 +12:00
Brenda Wallace
5957309dea Update harvest spec 2019-06-09 10:16:34 +12:00
Brenda Wallace
cf3068dc08 card display on small screens 2019-06-09 10:05:31 +12:00
Brenda Wallace
0572c4678b Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-09 09:54:47 +12:00
Brenda Wallace
c7ae520d66 add missing translation for "Record Harvest" 2019-06-09 09:54:28 +12:00
Brenda Wallace
4fd24e61d9 harvest own on card 2019-06-09 09:54:09 +12:00
Brenda Wallace
0cbc224298 remove commented out code 2019-06-09 09:53:56 +12:00
Brenda Wallace
5c5abcde30 fix up titles 2019-06-09 09:53:46 +12:00
Brenda Wallace
0c4b9a800e Use our own index-cards class for card layout instead of bootstrap grid 2019-06-09 09:53:31 +12:00
dependabot-preview[bot]
6587b7349f Bump rubocop from 0.70.0 to 0.71.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.70.0 to 0.71.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.70.0...v0.71.0)
2019-06-08 07:52:00 +00:00
dependabot-preview[bot]
f5fb95c975 Bump haml_lint from 0.31.0 to 0.32.0
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.31.0 to 0.32.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.31.0...v0.32.0)
2019-06-08 07:21:09 +00:00
Brenda Wallace
3d11dac718 Fixing harvest specs 2019-06-08 18:21:15 +12:00
codefactor-io
977ff7d174 [CodeFactor] Apply fixes 2019-06-08 05:20:29 +00:00
Brenda Wallace
628a7e3ae1 Fix planting specs 2019-06-08 17:02:59 +12:00
Brenda Wallace
1526cea92a required explanation test on plantings form 2019-06-08 16:02:19 +12:00
Brenda Wallace
f4457f877f fixing planting specs 2019-06-08 16:02:06 +12:00
Brenda Wallace
eb628635e2 fix logic on planting.active 2019-06-08 15:39:14 +12:00
Brenda Wallace
8d3e080afb classes for gardens button 2019-06-08 15:38:39 +12:00
Brenda Wallace
9b8638a3b6 tests for plantings.active scope 2019-06-08 15:38:27 +12:00
Brenda Wallace
532699a1ec menu on the left, works better on mobile 2019-06-08 15:38:18 +12:00
Brenda Wallace
d2c062a3f1 garden actions 2019-06-08 14:57:29 +12:00
Brenda Wallace
fae3155237 match to spec 2019-06-08 14:57:11 +12:00
Brenda Wallace
51133359fb tidy 2019-06-08 10:29:52 +12:00
Brenda Wallace
9b62d4609b added back the plantings quick actions menu 2019-06-08 10:29:17 +12:00
Brenda Wallace
e3ddf61c4d asterisk for required fields 2019-06-08 09:47:28 +12:00
Brenda Wallace
47fbfa815a More room on gardens form 2019-06-08 09:31:53 +12:00
Brenda Wallace
e9103f500d put autosuggest at tooltip level 2019-06-08 09:24:41 +12:00
Brenda Wallace
5f705c47c5 garden form name is required 2019-06-08 09:24:29 +12:00
Brenda Wallace
7965845ab2 crops show sidebar tidy up harvests and plantings 2019-06-08 09:24:18 +12:00
Brenda Wallace
8cc3bada0a update spec to find elements on the new forms 2019-06-08 09:23:27 +12:00
Brenda Wallace
5a2f9f84d8 Comment for post deploy script in heroku config 2019-06-08 08:34:50 +12:00