Commit Graph

  • 17708a8122 Bump faker from 1.9.5 to 1.9.6 dependabot-preview[bot] 2019-07-08 10:18:15 +00:00
  • 9f9bf5012a Make headers consistent Brenda Wallace 2019-07-08 22:27:33 +12:00
  • 46a7e3fb42 Merge branch 'dev' into fix-1989 Brenda Wallace 2019-07-08 22:21:54 +12:00
  • bd9a6f7620 Merge branch 'dev' into likeable-photos Brenda Wallace 2019-07-08 22:20:41 +12:00
  • 4f43f2e998 Merge branch 'dev' into following-page Brenda Wallace 2019-07-08 22:20:26 +12:00
  • d23a94c691 Move open service badge into asset pipeline Brenda Wallace 2019-07-08 22:19:02 +12:00
  • 036010bb39 Bump coveralls from 0.7.1 to 0.8.19 dependabot-preview[bot] 2019-07-08 09:40:07 +00:00
  • 80a1066efe Added alt tag Brenda Wallace 2019-07-08 22:15:53 +12:00
  • bdbb44e4a3 fix mix content warnings Brenda Wallace 2019-07-08 22:14:58 +12:00
  • 2c7183c097 Merge branch 'dev' into likeable-photos Brenda Wallace 2019-07-08 22:04:02 +12:00
  • 6ad694cf30 Tidy up member edit Brenda Wallace 2019-07-08 21:56:37 +12:00
  • d09ac4b6d7 Bump rubocop-rails from 2.1.0 to 2.2.0 dependabot-preview[bot] 2019-07-08 08:53:36 +00:00
  • def17e020e New line at end of file Brenda Wallace 2019-07-08 21:28:39 +12:00
  • 05ed9de8b6 Add leaflet initializer Brenda Wallace 2019-07-08 20:51:14 +12:00
  • 5d07a30d17 [CodeFactor] Apply fixes codefactor-io 2019-07-08 08:16:24 +00:00
  • dd6446b195 fix icon method name Brenda Wallace 2019-07-08 20:13:21 +12:00
  • e40a2c3176 remove debugger Brenda Wallace 2019-07-08 20:12:42 +12:00
  • cfab855a0f revert adding id Brenda Wallace 2019-07-08 20:06:48 +12:00
  • f1df90f189 Remove debugger Brenda Wallace 2019-07-08 20:05:48 +12:00
  • bff31ddb5c Removed extra blank lines Brenda Wallace 2019-07-08 20:04:27 +12:00
  • 6fc9a858a9 Merge branch 'dev' into likeable-photos Brenda Wallace 2019-07-08 20:03:41 +12:00
  • f638d0c2d3 rubocop lint Brenda Wallace 2019-07-08 20:03:27 +12:00
  • 61047df429 Merge branch 'dev' into following-page Brenda Wallace 2019-07-08 20:02:47 +12:00
  • 3b9aee3f67 Merge pull request #2041 from Br3nda/post-photos Brenda Wallace 2019-07-08 20:02:29 +12:00
  • a66add6568 Merge branch 'dev' into likeable-photos Brenda Wallace 2019-07-08 20:02:09 +12:00
  • cbed8cc259 likes for photos Brenda Wallace 2019-07-08 20:00:55 +12:00
  • 8baf8757ca Merge branch 'dev' into following-page Brenda Wallace 2019-07-08 17:07:55 +12:00
  • 4845211429 Merge branch 'dev' into post-photos Brenda Wallace 2019-07-08 17:07:45 +12:00
  • 72cf7365a2 Merge branch 'master' into dev Brenda Wallace 2019-07-08 17:07:19 +12:00
  • bda0712234 Merge pull request #2047 from Growstuff/imgbot Brenda Wallace 2019-07-08 17:06:42 +12:00
  • 680111add7 Merge branch 'dev' into post-photos Brenda Wallace 2019-07-08 17:06:04 +12:00
  • 253c0cb939 Merge branch 'dev' into following-page Brenda Wallace 2019-07-08 16:44:03 +12:00
  • 770c6f45fd [ImgBot] Optimize images ImgBotApp 2019-07-08 04:43:51 +00:00
  • e7cfe0b5c4 Update spec to look for placeholder_600 Brenda Wallace 2019-07-08 16:32:27 +12:00
  • 6d7b990797 Remove unused rails.png Brenda Wallace 2019-07-08 16:18:54 +12:00
  • f7af2bf816 Higher res photo placeholder Brenda Wallace 2019-07-08 16:13:38 +12:00
  • cf0d648b31 Merge branch 'dev' into post-photos Daniel O'Connor 2019-07-08 13:45:26 +09:30
  • 76c18014e2 Merge pull request #2042 from Br3nda/active-gardens Daniel O'Connor 2019-07-08 13:40:08 +09:30
  • 0a030c56bb files should end with a new line Brenda Wallace 2019-07-08 11:47:02 +12:00
  • bbd43f57bc Prevent post images going off screen Brenda Wallace 2019-07-08 11:45:10 +12:00
  • 9c25fd043f only show active gardens on planting form Brenda Wallace 2019-07-08 13:24:27 +12:00
  • 5cef4d728c Adding photos directly to a post Brenda Wallace 2019-07-08 13:20:57 +12:00
  • 4acf165f24 specs for event_helper Brenda Wallace 2019-07-08 12:35:11 +12:00
  • acad29dab0 Feature spec for timeline/activity page Brenda Wallace 2019-07-08 12:26:11 +12:00
  • 1427441163 No link to the planting with no date Brenda Wallace 2019-07-08 11:49:13 +12:00
  • 7054787870 fix up members#show spec Brenda Wallace 2019-07-08 11:04:23 +12:00
  • 029beab1dd timeline service specs Brenda Wallace 2019-07-08 10:39:46 +12:00
  • 3d9791cb96 update spec, now that resolve_model has moved Brenda Wallace 2019-07-08 10:10:01 +12:00
  • e080407deb update spec to not have links to plantings with not dates Brenda Wallace 2019-07-08 10:07:52 +12:00
  • 5c6e65cd01 remove quotes in haml Brenda Wallace 2019-07-08 10:05:53 +12:00
  • 013b388beb remove quotes in haml Brenda Wallace 2019-07-08 10:05:36 +12:00
  • 07945e9f69 remove quotes in haml Brenda Wallace 2019-07-08 10:05:13 +12:00
  • e6a60e93c9 remove quotes in haml Brenda Wallace 2019-07-08 10:04:56 +12:00
  • 3859122fa5 tidy Brenda Wallace 2019-07-08 10:04:08 +12:00
  • c61f13625c Moved html into haml instead of html_safe in helper Brenda Wallace 2019-07-08 09:52:33 +12:00
  • 1c50d9e50d rename blog_icon to post_icon Brenda Wallace 2019-07-08 09:42:06 +12:00
  • b1edf8542e Removed slug from query Brenda Wallace 2019-07-08 09:40:21 +12:00
  • 81723d99d9 make comment icon match other icons Brenda Wallace 2019-07-08 09:36:47 +12:00
  • b1fdb5242a simplifying resolving models Brenda Wallace 2019-07-08 09:34:48 +12:00
  • e26c6d52a4 Further DRYing Brenda Wallace 2019-07-08 09:31:50 +12:00
  • 933c78b4e5 DRY members#show view Brenda Wallace 2019-07-08 09:19:38 +12:00
  • 7a4312f41e Dry up timeline code Brenda Wallace 2019-07-08 09:19:26 +12:00
  • 03dfcdcc57 rubocop lint fix ups Brenda Wallace 2019-07-08 09:04:58 +12:00
  • fe81923ae1 DRY timeline view Brenda Wallace 2019-07-08 09:04:19 +12:00
  • ca281b84cb Merge remote-tracking branch 'upstream/dev' into following-page Brenda Wallace 2019-07-07 22:09:39 +12:00
  • 528e4c2c85 button to get to timeline Brenda Wallace 2019-07-07 22:08:42 +12:00
  • 050dfda77e Timeline Brenda Wallace 2019-07-07 22:03:15 +12:00
  • d40c985d49 Merge pull request #2006 from Growstuff/dev Brenda Wallace 2019-07-07 08:38:57 +12:00
  • cc271b2cc3 Back out the max homepage items change Brenda Wallace 2019-07-06 10:43:11 +12:00
  • eda77365a5 truncate long locations Brenda Wallace 2019-07-05 15:05:31 +12:00
  • 8528f80678 Layout fix up on hompage for large screens Brenda Wallace 2019-07-05 15:05:19 +12:00
  • 7266f6b590 include some interesting members in percy spec Brenda Wallace 2019-07-06 12:08:34 +12:00
  • f8aff32168 Back out the max homepage items change Brenda Wallace 2019-07-06 10:43:11 +12:00
  • 1281f78d40 truncate long locations Brenda Wallace 2019-07-05 15:05:31 +12:00
  • 997a30d1bc Layout fix up on hompage for large screens Brenda Wallace 2019-07-05 15:05:19 +12:00
  • ba1512a85a Delete duplicate percentage_grown attribute Miles Gould 2019-07-05 11:21:24 +01:00
  • b483c47258 Bump faker from 1.9.4 to 1.9.5 dependabot-preview[bot] 2019-07-05 07:16:52 +00:00
  • 77f309c083 Merge pull request #2017 from Br3nda/upgrade/bootstrap-43 Brenda Wallace 2019-07-05 10:18:33 +12:00
  • cdc3be0414 Merge branch 'dev' into upgrade/bootstrap-43 Brenda Wallace 2019-07-05 10:05:44 +12:00
  • 136aff87ac Removign empty class in scss Brenda Wallace 2019-07-03 13:06:35 +12:00
  • 826c8845a2 Removing commented out cruft Brenda Wallace 2019-07-03 13:05:53 +12:00
  • 5e7445f770 Merge branch 'dev' into UTFGardenNames Brenda Wallace 2019-07-04 10:56:46 +12:00
  • a880aae748 Merge branch 'dev' into upgrade/bootstrap-43 Brenda Wallace 2019-07-04 08:07:29 +12:00
  • 5cb220caeb Merge pull request #2025 from Growstuff/dependabot/npm_and_yarn/js-yaml-3.13.1 Brenda Wallace 2019-07-04 07:27:10 +12:00
  • 0fa6fa9e5a Bump js-yaml from 3.12.1 to 3.13.1 dependabot[bot] 2019-07-03 10:51:41 +00:00
  • 904e30c9dd Merge branch 'dev' into upgrade/bootstrap-43 Brenda Wallace 2019-07-03 22:47:20 +12:00
  • d53393b0ca Fix downcase Brenda Wallace 2019-07-03 20:36:08 +12:00
  • ea18c722ef lower caseon pluralizing Brenda Wallace 2019-07-03 18:10:08 +12:00
  • ac91450827 Fixes count on members'cards Brenda Wallace 2019-07-03 13:03:16 +12:00
  • b0a47f1319 Bump webdrivers from 4.0.1 to 4.1.0 dependabot-preview[bot] 2019-07-03 07:26:50 +00:00
  • bd1f8e1e05 Merge branch 'upgrade/bootstrap-43' of github.com:br3nda/growstuff into upgrade/bootstrap-43 Brenda Wallace 2019-07-03 12:04:23 +12:00
  • 52b6ab3931 Output and stop on error Brenda Wallace 2019-07-03 12:04:13 +12:00
  • 8b22004066 Merge branch 'dev' into upgrade/bootstrap-43 Brenda Wallace 2019-07-03 09:58:04 +12:00
  • a18ff03599 Fix remaining uses of devise_error_messages! Miles Gould 2019-07-02 10:49:09 +01:00
  • 9e1415dedd fixes flex/wrap on home page members Brenda Wallace 2019-07-03 08:54:08 +12:00
  • 4495d03899 Move percy specs to static check run Brenda Wallace 2019-07-03 08:48:35 +12:00
  • cc7ebf086f Merge remote-tracking branch 'origin/upgrade/bootstrap-43' into upgrade/bootstrap-43 Brenda Wallace 2019-07-03 08:41:34 +12:00
  • 50945c6f75 Files should end with a trailing newline Brenda Wallace 2019-07-03 08:41:23 +12:00
  • c791b21c47 Merge branch 'dev' into upgrade/bootstrap-43 Brenda Wallace 2019-07-03 08:41:01 +12:00
  • 8c02ea943a Tidy up photo display (line up) Brenda Wallace 2019-07-03 08:25:23 +12:00