Commit Graph

  • 4ef16accf6 Merge branch 'dev' into upgrade/bootstrap Brenda Wallace 2019-06-12 09:36:32 +12:00
  • 4f1eddd631 specs want 30 on a page - so telling the controller Brenda Wallace 2019-06-12 09:35:51 +12:00
  • 2386fe7afe new hash syntax Brenda Wallace 2019-06-12 09:27:49 +12:00
  • 040c414827 find translation of some_of_our_crops Brenda Wallace 2019-06-12 09:27:40 +12:00
  • 85b2d3d2c3 Bump jsonapi-resources from 0.9.7 to 0.9.8 dependabot-preview[bot] 2019-06-11 21:27:11 +00:00
  • 001b8c2079 Bump newrelic_rpm from 6.3.0.355 to 6.4.0.356 dependabot-preview[bot] 2019-06-10 23:22:44 +00:00
  • 0b44acc90e Merge branch 'dev' into upgrade/bootstrap Brenda Wallace 2019-06-12 09:23:41 +12:00
  • d44d6a0b19 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap Brenda Wallace 2019-06-12 09:23:10 +12:00
  • 571f4298bb [CodeFactor] Apply fixes codefactor-io 2019-06-11 21:22:53 +00:00
  • 4086e6dd00 remove comments from json Brenda Wallace 2019-06-12 09:22:33 +12:00
  • 4b7705fcad wrap a context link in before in specs Brenda Wallace 2019-06-12 09:20:32 +12:00
  • ee152b3ba3 Match sign in for to the older labels, so tests pass without changes Brenda Wallace 2019-06-12 09:20:09 +12:00
  • 78f3badcd7 upgrade rubocop Brenda Wallace 2019-06-12 09:11:22 +12:00
  • 7e3d43c47c add missing translations for buttons Brenda Wallace 2019-06-12 09:10:37 +12:00
  • c80cbf203c follow, edit, and message buttons on members#show Brenda Wallace 2019-06-12 09:10:25 +12:00
  • b92cef4c02 view all buttons on home page Brenda Wallace 2019-06-12 09:10:07 +12:00
  • 4d2318ea68 Bump searchkick from 4.0.1 to 4.0.2 dependabot-preview[bot] 2019-06-10 22:43:02 +00:00
  • 16f981813a Bump haml from 5.0.4 to 5.1.1 dependabot-preview[bot] 2019-06-10 14:02:38 +00:00
  • 0d02f5758b actions menu for harvests Brenda Wallace 2019-06-09 15:53:01 +12:00
  • b617468e26 remove commented out code Brenda Wallace 2019-06-09 14:03:20 +12:00
  • 8762b11555 tidy plantings action menu Brenda Wallace 2019-06-09 14:02:55 +12:00
  • 7bc641fb55 fix gardens action menu Brenda Wallace 2019-06-09 14:02:41 +12:00
  • 80e8364de0 title on planting thumbnails Brenda Wallace 2019-06-09 14:02:30 +12:00
  • 2fa4590315 gardens breadcrumbs Brenda Wallace 2019-06-09 14:02:05 +12:00
  • 4255cde5ff member cards on home page fix up Brenda Wallace 2019-06-09 13:24:05 +12:00
  • 5957309dea Update harvest spec Brenda Wallace 2019-06-09 10:16:34 +12:00
  • cf3068dc08 card display on small screens Brenda Wallace 2019-06-09 10:05:31 +12:00
  • 0572c4678b Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap Brenda Wallace 2019-06-09 09:54:47 +12:00
  • c7ae520d66 add missing translation for "Record Harvest" Brenda Wallace 2019-06-09 09:54:28 +12:00
  • 4fd24e61d9 harvest own on card Brenda Wallace 2019-06-09 09:54:09 +12:00
  • 0cbc224298 remove commented out code Brenda Wallace 2019-06-09 09:53:56 +12:00
  • 5c5abcde30 fix up titles Brenda Wallace 2019-06-09 09:53:46 +12:00
  • 0c4b9a800e Use our own index-cards class for card layout instead of bootstrap grid Brenda Wallace 2019-06-09 09:53:31 +12:00
  • 6587b7349f Bump rubocop from 0.70.0 to 0.71.0 dependabot-preview[bot] 2019-06-08 07:23:03 +00:00
  • f5fb95c975 Bump haml_lint from 0.31.0 to 0.32.0 dependabot-preview[bot] 2019-06-04 12:38:50 +00:00
  • 3d11dac718 Fixing harvest specs Brenda Wallace 2019-06-08 18:21:15 +12:00
  • 977ff7d174 [CodeFactor] Apply fixes codefactor-io 2019-06-08 05:20:29 +00:00
  • 628a7e3ae1 Fix planting specs Brenda Wallace 2019-06-08 17:02:59 +12:00
  • 1526cea92a required explanation test on plantings form Brenda Wallace 2019-06-08 16:02:19 +12:00
  • f4457f877f fixing planting specs Brenda Wallace 2019-06-08 16:02:06 +12:00
  • eb628635e2 fix logic on planting.active Brenda Wallace 2019-06-08 15:39:14 +12:00
  • 8d3e080afb classes for gardens button Brenda Wallace 2019-06-08 15:38:39 +12:00
  • 9b8638a3b6 tests for plantings.active scope Brenda Wallace 2019-06-08 15:38:27 +12:00
  • 532699a1ec menu on the left, works better on mobile Brenda Wallace 2019-06-08 15:38:18 +12:00
  • d2c062a3f1 garden actions Brenda Wallace 2019-06-08 14:57:29 +12:00
  • fae3155237 match to spec Brenda Wallace 2019-06-08 14:57:11 +12:00
  • 51133359fb tidy Brenda Wallace 2019-06-08 10:29:52 +12:00
  • 9b62d4609b added back the plantings quick actions menu Brenda Wallace 2019-06-08 10:29:17 +12:00
  • e3ddf61c4d asterisk for required fields Brenda Wallace 2019-06-08 09:47:28 +12:00
  • 47fbfa815a More room on gardens form Brenda Wallace 2019-06-08 09:31:53 +12:00
  • e9103f500d put autosuggest at tooltip level Brenda Wallace 2019-06-08 09:24:41 +12:00
  • 5f705c47c5 garden form name is required Brenda Wallace 2019-06-08 09:24:29 +12:00
  • 7965845ab2 crops show sidebar tidy up harvests and plantings Brenda Wallace 2019-06-08 09:24:18 +12:00
  • 8cc3bada0a update spec to find elements on the new forms Brenda Wallace 2019-06-08 09:23:27 +12:00
  • 5a2f9f84d8 Comment for post deploy script in heroku config Brenda Wallace 2019-06-08 08:34:50 +12:00
  • 771730c916 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap Brenda Wallace 2019-06-08 08:28:05 +12:00
  • fde3f06bdb Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap Brenda Wallace 2019-06-08 08:27:20 +12:00
  • 96eaba2a79 Needs bonsai to deploy on heroku Brenda Wallace 2019-06-08 08:23:56 +12:00
  • b62f648042 [CodeFactor] Apply fixes codefactor-io 2019-06-07 10:38:58 +00:00
  • ee7ea523e1 capitalise name in spec to match new view Brenda Wallace 2019-06-07 20:44:44 +12:00
  • 9e1d531de9 nil for perennial doesn't mean annual Brenda Wallace 2019-06-07 20:44:30 +12:00
  • 4fc460b2a2 Match to crops specs Brenda Wallace 2019-06-07 20:42:57 +12:00
  • 49069f4c4a seeds button helper, for actions links Brenda Wallace 2019-06-07 20:36:14 +12:00
  • 06650a790d active scopes on plantings and seeds Brenda Wallace 2019-06-07 20:36:02 +12:00
  • 3bcb34d336 Member cards with only the active data counted Brenda Wallace 2019-06-07 20:35:42 +12:00
  • ffeaa08ff7 restore crops sidebar to match specs Brenda Wallace 2019-06-07 20:35:24 +12:00
  • b1b24f5e0a mark delete link as danger Brenda Wallace 2019-06-07 20:34:51 +12:00
  • 81f1a55aca actions menu for seeds Brenda Wallace 2019-06-07 20:34:37 +12:00
  • 74bae31557 Max size for hero photo Brenda Wallace 2019-06-07 20:33:23 +12:00
  • b608a0e3ac Scientific name matching alt names Brenda Wallace 2019-06-07 14:04:51 +12:00
  • a93aecdb3b Alternate names specs Brenda Wallace 2019-06-07 14:01:21 +12:00
  • c708608e9b Tidy up members#show photo display Brenda Wallace 2019-06-07 13:09:29 +12:00
  • b2ee3ee299 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap Brenda Wallace 2019-06-07 10:56:42 +12:00
  • 4ab140a15e actions are now in the actoins menu. update spec Brenda Wallace 2019-06-06 22:30:28 +12:00
  • 78ea7d6a53 Crop wrangling is now under the admin menu - update spec Brenda Wallace 2019-06-06 22:27:05 +12:00
  • 2786476faa [CodeFactor] Apply fixes codefactor-io 2019-06-06 08:37:27 +00:00
  • 6daca910ab Fixed buttons on crops#show Brenda Wallace 2019-06-05 23:24:34 +12:00
  • 0715646688 Change crop autosuggest styles Brenda Wallace 2019-06-05 23:12:12 +12:00
  • 84ca2154f4 fix up footer Brenda Wallace 2019-06-05 22:58:12 +12:00
  • fad43f18c8 missing titles, icons, and breadcrumps Brenda Wallace 2019-06-05 22:46:41 +12:00
  • 9cc97e10cd tidy up crops sort form Brenda Wallace 2019-06-05 22:37:13 +12:00
  • a7e83202fb a margin below every card Brenda Wallace 2019-06-05 22:31:39 +12:00
  • d346ae8e4b tidy up crops#index on a small screen Brenda Wallace 2019-06-05 22:29:29 +12:00
  • 04d941111b tidy up harvests#index on a small screen Brenda Wallace 2019-06-05 22:29:18 +12:00
  • 385ecac46f Revert "Tidy up crops#index on small screens" Brenda Wallace 2019-06-05 22:27:05 +12:00
  • 5a5e0c8f82 Tidy up crops#index on small screens Brenda Wallace 2019-06-05 22:18:46 +12:00
  • eb1cb31f6a fix alignment of header on members#show Brenda Wallace 2019-06-05 17:22:09 +12:00
  • 6af4bb9ecf Fix tiny crop photos on small screens Brenda Wallace 2019-06-05 17:21:44 +12:00
  • 9b0eb212b1 Button back needs to wrap Brenda Wallace 2019-06-05 17:21:30 +12:00
  • 75cc2040b1 Expand maincontainer on small screens Brenda Wallace 2019-06-05 17:21:20 +12:00
  • 70afa97b80 only shrink the member card on the homepage Brenda Wallace 2019-06-05 08:35:39 +12:00
  • 75b04ffe04 attempting to make posts appear nice on mobile Brenda Wallace 2019-06-04 20:02:28 +12:00
  • 16f9f4c66e plantings actions as dropdown menu Brenda Wallace 2019-06-04 20:02:02 +12:00
  • 0235f233ab plantigns tidy for small screens Brenda Wallace 2019-06-04 15:45:23 +12:00
  • abfe1ace20 harvest -> planting assignment form tidy for small screens Brenda Wallace 2019-06-04 15:45:13 +12:00
  • b3bcce9583 plantings form tidy for small screens Brenda Wallace 2019-06-04 15:44:55 +12:00
  • 357b70f068 harvest form tidy for small screens Brenda Wallace 2019-06-04 15:44:45 +12:00
  • 92c69af977 Bump chartkick from 3.0.2 to 3.1.0 dependabot-preview[bot] 2019-06-03 22:19:21 +00:00
  • 1fb7b435e4 [Security] Bump axios from 0.18.0 to 0.18.1 dependabot-preview[bot] 2019-06-03 22:02:10 +00:00
  • bd7adb5123 Bump capybara from 3.19.1 to 3.22.0 dependabot-preview[bot] 2019-05-31 21:52:44 +00:00