Commit Graph

  • 41cee3b416 Bump capybara from 3.16.2 to 3.17.0 dependabot[bot] 2019-04-20 00:13:35 +00:00
  • 7b08ad6091 Merge pull request #1929 from Growstuff/dependabot/bundler/oj-3.7.12 dependabot[bot] 2019-04-20 00:12:09 +00:00
  • 7c113f0e1c Back to using thumbnails Brenda Wallace 2019-04-20 10:01:18 +12:00
  • e899634696 lint Brenda Wallace 2019-04-20 09:54:21 +12:00
  • 7ea13c40ed Isotope not needed for photo thumbnails Brenda Wallace 2019-04-20 09:54:02 +12:00
  • 01beb6ac7e Merge remote-tracking branch 'origin/plantings-show' into plantings-show Brenda Wallace 2019-04-20 09:47:32 +12:00
  • 54146a3a9f javascript lint Brenda Wallace 2019-04-20 09:47:19 +12:00
  • 9da4ccd6de Merge branch 'dev' into plantings-show Brenda Wallace 2019-04-20 09:46:14 +12:00
  • 63788e4844 Bump oj from 3.7.11 to 3.7.12 dependabot[bot] 2019-04-19 21:45:27 +00:00
  • 91b7f58e9d No longer have 100% on plantings that are finished Brenda Wallace 2019-04-20 09:45:06 +12:00
  • a8009c49e8 Merge pull request #1931 from Growstuff/dependabot/bundler/searchkick-4.0.0 Brenda Wallace 2019-04-20 09:43:57 +12:00
  • b71df87ac3 better use of fullsize crop image Brenda Wallace 2019-04-20 09:40:31 +12:00
  • 03bdb45b2d Higher res photo, so it doesn't look pixelated Brenda Wallace 2019-04-20 09:36:18 +12:00
  • 94a2127c04 Tidy up small screen display Brenda Wallace 2019-04-20 09:35:59 +12:00
  • 837111f6dc Checks we have a planted_from before we pluralize it Brenda Wallace 2019-04-20 09:27:07 +12:00
  • c66ee04690 Only suggest recording harvests if they planting isn't finished Brenda Wallace 2019-04-20 09:19:13 +12:00
  • 31c628e950 Put back our own progress bar Brenda Wallace 2019-04-20 09:18:52 +12:00
  • 27d12bf07e Isotope making nice layout on plantings#show Brenda Wallace 2019-04-20 09:09:07 +12:00
  • 89b4b3bee0 Use fas icons everywhere Brenda Wallace 2019-04-20 09:06:21 +12:00
  • d4b487846d Fixed space in image name Brenda Wallace 2019-04-20 07:27:06 +12:00
  • 4c0c9047f9 Merge branch 'dev' into reindex-rake Brenda Wallace 2019-04-19 20:50:32 +12:00
  • b221b13856 Bump searchkick from 3.1.2 to 4.0.0 dependabot[bot] 2019-04-19 07:22:15 +00:00
  • 1eea251f95 Merge branch 'dev' into plantings-show Brenda Wallace 2019-04-19 10:39:26 +12:00
  • 1ad88c91f4 Merge pull request #1858 from Br3nda/feature/memcachier Brenda Wallace 2019-04-19 10:37:56 +12:00
  • d7e3d2e9db Reindex in batches Brenda Wallace 2019-04-19 10:10:35 +12:00
  • e81e4146e7 Merge remote-tracking branch 'origin/feature/memcachier' into feature/memcachier Brenda Wallace 2019-04-19 09:31:24 +12:00
  • f60174a8b9 Merge remote-tracking branch 'upstream/dev' into feature/memcachier Brenda Wallace 2019-04-19 09:30:48 +12:00
  • 5908d9f9dd Merge pull request #1901 from Br3nda/feature/searchkick Brenda Wallace 2019-04-19 09:26:48 +12:00
  • eb46b8113f Merge remote-tracking branch 'upstream/dev' into plantings-show Brenda Wallace 2019-04-19 09:16:32 +12:00
  • 32a88b4482 Merge remote-tracking branch 'origin/plantings-show' into plantings-show Brenda Wallace 2019-04-19 09:16:01 +12:00
  • a2e2362594 Linter fix ups Brenda Wallace 2019-04-19 09:15:41 +12:00
  • 6af61d0e86 Add someone else's plantings, to ensure test is valid Brenda Wallace 2019-04-19 09:11:56 +12:00
  • 909ce99ab8 Merge remote-tracking branch 'origin/feature/searchkick' into feature/searchkick Brenda Wallace 2019-04-19 09:06:55 +12:00
  • 3829db6bc2 Specs for biasing results from elastic search Brenda Wallace 2019-04-19 09:05:53 +12:00
  • b3385663e8 Fix spelling of portobello pozorvlak 2019-04-19 08:47:08 +12:00
  • 453242d04e Merge remote-tracking branch 'upstream/dev' into feature/searchkick Brenda Wallace 2019-04-19 08:43:28 +12:00
  • 10006599eb Merge branch 'dev' into feature/memcachier Brenda Wallace 2019-04-19 08:36:40 +12:00
  • d7497e4342 Fixed comment pozorvlak 2019-04-19 08:32:38 +12:00
  • 1df411f162 Merge pull request #1926 from Growstuff/dependabot/bundler/selenium-webdriver-3.141.5926 Daniel O'Connor 2019-04-18 17:38:53 +09:30
  • 8a14a7bc0d Merge branch 'dev' into plantings-show Daniel O'Connor 2019-04-18 17:33:30 +09:30
  • fcd7ad8ed6 Bump selenium-webdriver from 3.141.0 to 3.141.5926 dependabot[bot] 2019-04-18 07:20:57 +00:00
  • 85ba701045 Merge branch 'dev' into feature/searchkick Brenda Wallace 2019-04-17 12:35:09 +12:00
  • 3868201c73 Merge branch 'dev' into feature/memcachier Brenda Wallace 2019-04-17 10:38:10 +12:00
  • 8b0ecd568e Auto corrected by following Lint Ruby RSpec/ImplicitSubject Awesome Code 2019-04-16 09:56:19 +00:00
  • d0001691d5 Auto corrected by following Lint Ruby EmptyLine Awesome Code 2019-04-14 19:40:49 +00:00
  • a4e398bb62 Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace Awesome Code 2019-04-16 09:55:51 +00:00
  • deef508b9c Bump cancancan from 3.0.0 to 3.0.1 dependabot[bot] 2019-04-16 07:22:06 +00:00
  • b9a7c24da6 Bump sidekiq from 5.2.5 to 5.2.6 dependabot[bot] 2019-04-15 07:49:43 +00:00
  • b9ca89b336 Auto corrected by following Lint Ruby RSpec/LetBeforeExamples Awesome Code 2019-04-14 19:38:16 +00:00
  • ff3ea5c52f Auto corrected by following Lint Ruby RSpec/HookArgument Awesome Code 2019-04-14 18:38:05 +00:00
  • b84b1e89c1 Auto corrected by following Lint Ruby RSpec/ExampleWording Awesome Code 2019-04-14 18:37:51 +00:00
  • e54c13afe3 Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace Awesome Code 2019-04-14 18:36:34 +00:00
  • 50a2de3709 Auto corrected by following Lint Ruby RSpecEmptyLine Awesome Code 2019-04-14 10:01:46 +00:00
  • 0ae33d9b03 Merge branch 'dev' into plantings-show Brenda Wallace 2019-04-13 21:02:56 +12:00
  • 9ed955d94c Merge branch 'dev' into feature/searchkick Brenda Wallace 2019-04-13 13:09:31 +12:00
  • 5a8404e356 Bump leaflet-rails from 1.3.1 to 1.4.0 dependabot[bot] 2019-04-13 00:15:24 +00:00
  • 9a17df1786 Merge branch 'dev' into feature/searchkick Brenda Wallace 2019-04-13 12:14:07 +12:00
  • 331a5c9a99 Merge branch 'master' into dev Brenda Wallace 2019-04-13 12:13:44 +12:00
  • fb133b97b0 Bump capybara from 3.16.1 to 3.16.2 (#1915) dependabot[bot] 2019-04-13 12:12:35 +12:00
  • b733a91064 Merge branch 'dev' into feature/searchkick Brenda Wallace 2019-04-13 12:10:40 +12:00
  • cb680a5a0e Auto corrected by following Lint Ruby Space (#1917) Brenda Wallace 2019-04-13 12:09:47 +12:00
  • 12d5632b63 Merge branch 'dev' into feature/searchkick Brenda Wallace 2019-04-13 12:06:37 +12:00
  • 3e01da0036 Remove waffle link, replace with github projects (#1916) Brenda Wallace 2019-04-13 12:05:58 +12:00
  • e322c863b2 Removed unused arg to dbsearch Brenda Wallace 2019-04-13 10:20:33 +12:00
  • e34a2d609b Plurals spec only when we have elastic search Brenda Wallace 2019-04-13 10:17:21 +12:00
  • 174f54cb75 Linting Brenda Wallace 2019-04-13 10:13:36 +12:00
  • 0a0cd24e2a Removed extra reindex Brenda Wallace 2019-04-13 10:06:44 +12:00
  • 347d751935 More plurals and misspellings in search specs Brenda Wallace 2019-04-13 10:03:18 +12:00
  • 026efe5d15 Rubocop lint Brenda Wallace 2019-04-13 09:50:49 +12:00
  • fa1913c8b6 Split a method to reduce the complexity Brenda Wallace 2019-04-13 09:50:36 +12:00
  • 3ecb81300a Re-index before we use autocomplete Brenda Wallace 2019-04-13 09:36:07 +12:00
  • 526450f0eb Added search controller specs Brenda Wallace 2019-04-13 09:35:41 +12:00
  • 9683983f23 Merge branch 'dev' into feature/searchkick Brenda Wallace 2019-04-10 20:02:35 +12:00
  • 7ac410c499 varieties info on crops#show (#1848) Brenda Wallace 2019-04-10 20:02:05 +12:00
  • bd1a1c53f4 Removed unneeded rubocop disable Brenda Wallace 2019-04-08 21:59:44 +12:00
  • ccb69c5f7d Style/lint tidy up models Brenda Wallace 2019-04-08 21:59:26 +12:00
  • e165c77d64 Force autocomplete to json format Brenda Wallace 2019-04-08 21:38:26 +12:00
  • 74e6a7cf2f Rename @matches to @crops Brenda Wallace 2019-04-08 14:15:30 +12:00
  • 5b35e3fe95 remove an unnecesary index Brenda Wallace 2019-04-08 13:22:07 +12:00
  • 55e89e95fe Fix a deprecation warning Brenda Wallace 2019-04-08 13:21:54 +12:00
  • 302e19776f code style fix up Brenda Wallace 2019-04-08 11:25:22 +12:00
  • 01a3654d41 Working without elastic search too Brenda Wallace 2019-04-08 11:24:18 +12:00
  • 77d1fc7347 Move crop searching specs from the crop model to the crop search service Brenda Wallace 2019-04-08 11:00:53 +12:00
  • ca743e421d Add matching ES methods for when no elastic search configured Brenda Wallace 2019-04-07 15:48:49 +12:00
  • f3ae1a8ec3 Fix dangerous sql warning Brenda Wallace 2019-04-04 10:51:35 +13:00
  • 789cffeca1 Eager loading Brenda Wallace 2019-04-04 10:51:08 +13:00
  • e5c0edb0d0 Tidy up specs Brenda Wallace 2019-04-04 10:50:56 +13:00
  • e465b6f19c Elastic search spec helper Brenda Wallace 2019-04-04 10:50:44 +13:00
  • 150d44ad6f named arguments for search Brenda Wallace 2019-04-03 20:07:05 +13:00
  • ab57451b17 only reindex our one crop Brenda Wallace 2019-04-02 20:58:33 +13:00
  • bd797a4d8e Change call to reindex crops in specs Brenda Wallace 2019-04-02 20:50:46 +13:00
  • c8716b6a1a Add oj gem, to speed up json use Brenda Wallace 2019-04-01 22:31:03 +13:00
  • 370747390a Add default pagination to crop search service Brenda Wallace 2019-04-01 21:41:33 +13:00
  • 61e0c2eb1d Swap elasticssearch for searchkick Brenda Wallace 2019-04-01 21:17:26 +13:00
  • ae4ad3a62a Change to use searchkick Brenda Wallace 2019-04-01 19:24:51 +13:00
  • f5c7f5e6d7 Merge pull request #1883 from Growstuff/dev Brenda Wallace 2019-04-08 15:07:13 +12:00
  • a998a8b0f6 Update README.md Brenda Wallace 2019-04-08 14:50:29 +12:00
  • ad90dd6dfa Fixes wrong host name in emails Brenda Wallace 2019-04-08 14:21:04 +12:00
  • a48acc0253 Bump rubocop from 0.66.0 to 0.67.2 dependabot[bot] 2019-04-05 20:19:38 +00:00
  • 7ca263aa64 Bump capybara from 3.16.0 to 3.16.1 dependabot[bot] 2019-04-05 09:42:52 +00:00