Commit Graph

  • d4644ccdf8 Added join to members to fix error caused by discard gem Brenda Wallace 2019-08-10 11:37:52 +12:00
  • 5226eadfd8 fix crop join to members Brenda Wallace 2019-08-10 11:07:12 +12:00
  • 843e15a107 Removed notification view spec Brenda Wallace 2019-08-10 10:53:20 +12:00
  • 86540c3352 Removed feature plantings code and spec Brenda Wallace 2019-08-10 10:52:49 +12:00
  • 0a919d8599 Remove notifications spec Brenda Wallace 2019-08-10 10:50:57 +12:00
  • c137d5e285 update signin spec to use messages and converations Brenda Wallace 2019-08-10 10:48:48 +12:00
  • 9de51d8a9a Merge remote-tracking branch 'origin/mailbox' into mailbox Brenda Wallace 2019-08-10 10:39:59 +12:00
  • c29f0c15ee don't join to owners when fetching gardens Brenda Wallace 2019-08-10 10:39:40 +12:00
  • b726d0c9bf Bump puma from 4.0.1 to 4.1.0 dependabot-preview[bot] 2019-08-09 08:37:26 +00:00
  • 2764c3f0e0 Merge branch 'dev' into mailbox Brenda Wallace 2019-08-09 22:33:22 +12:00
  • 1dfbecfac0 Don't re-look up planting Brenda Wallace 2019-08-09 22:32:36 +12:00
  • b33ab3bd71 Bump js-routes from 1.4.7 to 1.4.9 dependabot-preview[bot] 2019-08-07 23:31:42 +00:00
  • b04bdd111a Merge remote-tracking branch 'upstream/dev' into mailbox Brenda Wallace 2019-08-08 11:23:41 +12:00
  • e49878ff7f Delete stale.yml Brenda Wallace 2019-08-08 11:15:36 +12:00
  • 523eda01a0 Merge branch 'master' into dev Brenda Wallace 2019-08-08 11:15:22 +12:00
  • 8641c13c06 Merge pull request #2112 from Br3nda/harvest-show Brenda Wallace 2019-08-08 11:14:49 +12:00
  • 548bc1581a Removing notification mailer spec Brenda Wallace 2019-08-08 10:21:39 +12:00
  • 4a81b18159 Merge remote-tracking branch 'origin/mailbox' into mailbox Brenda Wallace 2019-08-08 09:32:09 +12:00
  • 12c1002dc6 Removing unused notifications code Brenda Wallace 2019-08-08 09:31:53 +12:00
  • 0fa1966c68 Merge branch 'dev' into mailbox Brenda Wallace 2019-08-08 09:25:30 +12:00
  • 6ebd22c8a3 Bump percy-capybara from 4.0.1 to 4.0.2 dependabot-preview[bot] 2019-08-07 08:07:29 +00:00
  • 4306ab12c7 Bump haml from 5.1.1 to 5.1.2 dependabot-preview[bot] 2019-08-07 10:54:39 +00:00
  • 9a106d4ba6 Bump rubocop from 0.73.0 to 0.74.0 dependabot-preview[bot] 2019-08-07 08:04:54 +00:00
  • b6e5a88b32 Bump webdrivers from 4.1.1 to 4.1.2 dependabot-preview[bot] 2019-08-07 08:08:50 +00:00
  • 69d3b89e87 Update install_elasticsearch.sh Brenda Wallace 2019-08-07 22:52:11 +12:00
  • 4d75c59301 back to elastic 6.2.3 Brenda Wallace 2019-08-07 22:51:52 +12:00
  • 920123f58f Merge branch 'dev' into harvest-show Brenda Wallace 2019-08-07 22:43:34 +12:00
  • bccd83c706 Merge branch 'dev' into mailbox Brenda Wallace 2019-08-07 22:43:15 +12:00
  • 329bf16872 Bump rubocop-rspec from 1.34.0 to 1.35.0 dependabot-preview[bot] 2019-08-07 08:03:31 +00:00
  • 21b63d9b62 lint Brenda Wallace 2019-08-07 22:36:43 +12:00
  • 3a87b73620 Merge remote-tracking branch 'origin/mailbox' into mailbox Brenda Wallace 2019-08-07 22:35:02 +12:00
  • 909d9b34ef lint Brenda Wallace 2019-08-07 22:34:53 +12:00
  • 2f5f8985e7 lint Brenda Wallace 2019-08-07 22:34:41 +12:00
  • 2f0e387646 rubocop lint Brenda Wallace 2019-08-07 22:33:39 +12:00
  • 83322becb2 Use guard clause Brenda Wallace 2019-08-07 22:33:01 +12:00
  • 78852e14c9 [CodeFactor] Apply fixes codefactor-io 2019-08-07 10:32:24 +00:00
  • d208cce57b Merge branch 'dev' into mailbox Brenda Wallace 2019-08-07 22:32:00 +12:00
  • dc59b487ca tests for restoring conversations Brenda Wallace 2019-08-07 22:27:01 +12:00
  • cafbfb349f Delete and restore buttons Brenda Wallace 2019-08-07 22:18:24 +12:00
  • 8d12586aa2 Merge remote-tracking branch 'origin/mailbox' into mailbox Brenda Wallace 2019-08-07 21:49:40 +12:00
  • 60671af6ab Conversations spec Brenda Wallace 2019-08-07 21:49:27 +12:00
  • 33c29e54be Merge branch 'dev' into harvest-show Brenda Wallace 2019-08-07 20:00:48 +12:00
  • 3e2d1c806b Bump faker from 1.9.6 to 2.1.0 dependabot-preview[bot] 2019-08-01 07:32:20 +00:00
  • 72fd579045 Merge branch 'dev' into mailbox Daniel O'Connor 2019-08-07 16:41:57 +09:30
  • cf03cf4ad9 Merge branch 'dev' into harvest-show Daniel O'Connor 2019-08-07 16:33:40 +09:30
  • 3345cd200c Bump capybara from 3.26.0 to 3.28.0 dependabot-preview[bot] 2019-08-05 21:26:17 +00:00
  • 9651bc6db5 Changed notifications spec to conversations spec Brenda Wallace 2019-08-07 16:51:46 +12:00
  • ba1c3a7159 add the notifications helper back Brenda Wallace 2019-08-07 16:20:10 +12:00
  • 149f92536d conversations view matching the index (avatar photos on the right) Brenda Wallace 2019-08-07 16:19:43 +12:00
  • 4c045374ff tidy up plantings view Brenda Wallace 2019-08-07 16:19:37 +12:00
  • 6af95fa722 Help percy find the correct link Brenda Wallace 2019-08-07 16:19:11 +12:00
  • 0c8e993006 gardens show all as a button Brenda Wallace 2019-08-07 16:18:59 +12:00
  • d6d5e95050 Bump searchkick from 4.0.2 to 4.1.0 dependabot-preview[bot] 2019-08-02 07:17:28 +00:00
  • e34883d32d Bump oj from 3.8.0 to 3.8.1 dependabot-preview[bot] 2019-07-23 11:02:10 +00:00
  • 5d8a952441 Merge pull request #2119 from Br3nda/fix-travis Brenda Wallace 2019-08-06 07:23:24 +10:00
  • 493a49bb3e Nicer display when there are not gardens Brenda Wallace 2019-08-05 18:57:54 +12:00
  • 17da3bdd96 conversations view changes Brenda Wallace 2019-08-04 17:41:43 +12:00
  • 71c4154563 Merge remote-tracking branch 'origin/dev' into mailbox Brenda Wallace 2019-08-04 16:35:57 +12:00
  • 0dc1720711 Double quote to prevent globbing and word splitting. Brenda Wallace 2019-08-04 16:24:09 +12:00
  • 080e0dbc78 give the caller clues if they don't set a version Brenda Wallace 2019-08-04 16:21:31 +12:00
  • 00fbfc77e7 tidy up inbox view Brenda Wallace 2019-08-04 16:04:23 +12:00
  • 5157793202 wrap long line Brenda Wallace 2019-08-04 15:37:15 +12:00
  • 8d745ed322 Fix bundler cache Brenda Wallace 2019-08-04 13:44:52 +12:00
  • 9fbd4e4110 Tell travis to use trusty Brenda Wallace 2019-08-04 11:30:11 +12:00
  • 19ebb5941e Added comment about postgresql version matchin Brenda Wallace 2019-08-03 11:49:22 +12:00
  • 086ba0610a Install postgresql from APT Brenda Wallace 2019-08-03 11:45:38 +12:00
  • 32a9482d12 Remove sprockets cache Brenda Wallace 2019-08-03 11:39:08 +12:00
  • 953af21e3e prefix namespace into ELASTIC_SEARCH_VERSION for travis-ci Brenda Wallace 2019-08-03 11:23:42 +12:00
  • 2c69b5a99c Echo the elastic search version Brenda Wallace 2019-07-29 16:24:50 +12:00
  • 8975e52521 Merge remote-tracking branch 'origin/harvest-show' into harvest-show Brenda Wallace 2019-07-29 16:20:35 +12:00
  • 4605d6c107 Upgrade to an elastic search version that matches production Brenda Wallace 2019-07-29 16:18:52 +12:00
  • abdfbdd3b1 Merge branch 'dev' into harvest-show Brenda Wallace 2019-07-29 10:25:33 +12:00
  • 4859116577 Tidy up display of harvests#show Brenda Wallace 2019-07-29 10:15:06 +12:00
  • bf77f31777 don't show progress bars on annuals Brenda Wallace 2019-07-28 14:28:08 +12:00
  • c198b7f446 Bump rubocop-rspec from 1.33.0 to 1.34.0 dependabot-preview[bot] 2019-07-24 07:15:14 +00:00
  • 724cac959b Bump rake from 12.3.2 to 12.3.3 dependabot-preview[bot] 2019-07-22 08:19:24 +00:00
  • 17e3998261 Move from tables to lists Brenda Wallace 2019-07-23 11:27:53 +12:00
  • 4a8f737bac Revert "Removed chekcing subject in converation" Brenda Wallace 2019-07-23 09:50:37 +12:00
  • 6622319466 Removed chekcing subject in converation Brenda Wallace 2019-07-23 09:47:16 +12:00
  • 55e0a10dc8 Merge remote-tracking branch 'origin/mailbox' into mailbox Brenda Wallace 2019-07-23 09:45:22 +12:00
  • 8cb21ec79b Removing notifications specs Brenda Wallace 2019-07-23 09:41:18 +12:00
  • 8ca0eef53c Removing notifications controller specs Brenda Wallace 2019-07-23 09:41:18 +12:00
  • fab222f581 Removing rubocop.yml Brenda Wallace 2019-07-23 09:38:59 +12:00
  • 01cb0ca975 Removed todo Brenda Wallace 2019-07-23 09:38:30 +12:00
  • e24c0ee3e8 Removing commented out code Brenda Wallace 2019-07-23 09:38:22 +12:00
  • 01b53a0e69 continuing to replace notifications with conversations Brenda Wallace 2019-07-23 09:37:57 +12:00
  • 57ca80f0eb line up display of posts Brenda Wallace 2019-07-21 20:26:04 +12:00
  • 50560b01eb line up boxes Brenda Wallace 2019-07-21 20:24:56 +12:00
  • 783e4ae046 fixed up comments by deleted members Brenda Wallace 2019-07-21 20:24:39 +12:00
  • e90d719436 fixed unread count on headers Brenda Wallace 2019-07-21 20:24:30 +12:00
  • 3db63aeabf untrash a message Brenda Wallace 2019-07-21 20:05:06 +12:00
  • bcbb020fde newline at end of file Brenda Wallace 2019-07-21 19:27:53 +12:00
  • a9b8003ff3 DRY Brenda Wallace 2019-07-21 19:23:33 +12:00
  • 6b501f13ee Fixed double negative Brenda Wallace 2019-07-21 19:22:25 +12:00
  • 0ac243e129 Remove unused methods Brenda Wallace 2019-07-21 19:21:55 +12:00
  • 6f2e27952c Remove unused methods Brenda Wallace 2019-07-21 19:21:34 +12:00
  • 2b9538c407 Use a guard clause Brenda Wallace 2019-07-21 19:21:13 +12:00
  • 733a8642dd rubocop lint Brenda Wallace 2019-07-21 19:19:14 +12:00
  • 965c9af15a Sort scss lines Brenda Wallace 2019-07-21 19:18:13 +12:00
  • 3f84f5abe1 harvest owner info Brenda Wallace 2019-07-21 19:16:22 +12:00