Commit Graph

11959 Commits

Author SHA1 Message Date
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
Brenda Wallace
771730c916 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-08 08:28:05 +12:00
Brenda Wallace
fde3f06bdb Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap
Conflicts:
	Gemfile.lock
2019-06-08 08:27:20 +12:00
Brenda Wallace
96eaba2a79 Needs bonsai to deploy on heroku 2019-06-08 08:23:56 +12:00
codefactor-io
b62f648042 [CodeFactor] Apply fixes 2019-06-07 10:38:58 +00:00
Brenda Wallace
ee7ea523e1 capitalise name in spec to match new view 2019-06-07 20:44:44 +12:00
Brenda Wallace
9e1d531de9 nil for perennial doesn't mean annual 2019-06-07 20:44:30 +12:00
Brenda Wallace
4fc460b2a2 Match to crops specs 2019-06-07 20:42:57 +12:00
Brenda Wallace
49069f4c4a seeds button helper, for actions links 2019-06-07 20:36:14 +12:00
Brenda Wallace
06650a790d active scopes on plantings and seeds 2019-06-07 20:36:02 +12:00
Brenda Wallace
3bcb34d336 Member cards with only the active data counted 2019-06-07 20:35:42 +12:00
Brenda Wallace
ffeaa08ff7 restore crops sidebar to match specs 2019-06-07 20:35:24 +12:00
Brenda Wallace
b1b24f5e0a mark delete link as danger 2019-06-07 20:35:02 +12:00
Brenda Wallace
81f1a55aca actions menu for seeds 2019-06-07 20:34:37 +12:00
Brenda Wallace
74bae31557 Max size for hero photo 2019-06-07 20:34:18 +12:00
Brenda Wallace
b608a0e3ac Scientific name matching alt names 2019-06-07 14:08:13 +12:00
Brenda Wallace
a93aecdb3b Alternate names specs 2019-06-07 14:01:21 +12:00
Brenda Wallace
c708608e9b Tidy up members#show photo display 2019-06-07 13:09:29 +12:00