Commit Graph

  • 4a1e57e42a Merge remote-tracking branch 'upstream/dev' into dev Brenda Wallace 2019-10-21 14:20:23 +13:00
  • 9efd9d0544 Merge remote-tracking branch 'upstream/dev' into dev Brenda Wallace 2019-10-21 14:19:57 +13:00
  • 8c694b3dca Only show companions of active plantings Brenda Wallace 2019-10-20 14:13:30 +13:00
  • edea87ab5d Merge branch 'dev' into planting-reminders Brenda Wallace 2019-10-21 12:33:58 +13:00
  • fb5b17741d Merge pull request #2222 from Br3nda/puma Brenda Wallace 2019-10-21 12:30:16 +13:00
  • e1faedfc78 Merge branch 'dev' into planting-reminders Brenda Wallace 2019-10-20 21:36:42 +13:00
  • ca11792286 Only show companions of active plantings Brenda Wallace 2019-10-20 14:13:30 +13:00
  • 94452ee62e polish up the plantings reminders Brenda Wallace 2019-10-20 14:12:22 +13:00
  • e0dc38e7a3 add perennials Brenda Wallace 2019-10-19 15:07:49 +13:00
  • 4af89d2b2c Change reminder email into monthly summary Brenda Wallace 2019-04-22 20:06:14 +12:00
  • c19d09bb37 Switch from unicorn to puma Brenda Wallace 2019-10-19 18:30:05 +13:00
  • 7f0113a188 Merge remote-tracking branch 'upstream/master' into dev Brenda Wallace 2019-10-19 18:46:53 +13:00
  • d81df50dc5 Suggest companions for a garden based on existing crops Brenda Wallace 2019-10-19 18:45:11 +13:00
  • a75803d456 Merge branch 'dev' Brenda Wallace 2019-10-19 18:20:20 +13:00
  • bb72d2b974 Fix bug showing plantings with no planted_at Brenda Wallace 2019-10-19 18:20:01 +13:00
  • 3c50705d5f Merge pull request #2220 from Growstuff/dev Brenda Wallace 2019-10-19 16:43:10 +13:00
  • c26cec4868 Merge pull request #2219 from Br3nda/feature-2207 Brenda Wallace 2019-10-19 16:42:55 +13:00
  • 6bd7e139a6 Move views specs to admin Brenda Wallace 2019-10-19 16:04:16 +13:00
  • f2dc2aeaa0 Merge branch 'dev' into feature-2207 Brenda Wallace 2019-10-19 16:01:11 +13:00
  • 95ec89f6a0 Merge branch 'dev' into role-admin Brenda Wallace 2019-10-19 13:23:25 +13:00
  • 1d97250726 Merge pull request #2216 from Br3nda/wider-gardens Brenda Wallace 2019-10-19 13:23:00 +13:00
  • ecb0c53c80 Merge branch 'dev' into feature-2207 Brenda Wallace 2019-10-19 13:22:19 +13:00
  • 0965168750 Group previous plantings by year Brenda Wallace 2019-10-19 11:24:17 +13:00
  • dc909132ef Merge branch 'dev' into role-admin Brenda Wallace 2019-10-19 10:52:18 +13:00
  • 95affc8ca8 Merge branch 'dev' into wider-gardens Brenda Wallace 2019-10-19 10:50:16 +13:00
  • f50417cc04 Merge pull request #2218 from Br3nda/gem-asset-fix Brenda Wallace 2019-10-19 10:49:50 +13:00
  • 75897bad51 Update routing specs for admin roles Brenda Wallace 2019-10-19 10:28:24 +13:00
  • fc07571ee1 Rename is_admin? to admin?. Brenda Wallace 2019-10-19 10:25:12 +13:00
  • 35c9b70bc9 Remove email from display in admin/members Brenda Wallace 2019-10-19 10:23:39 +13:00
  • 5a6d0f6342 Check admin before roles controller runs Brenda Wallace 2019-10-19 10:22:27 +13:00
  • 2ddddb1652 Updated specs for admin editing roles Brenda Wallace 2019-10-19 10:16:02 +13:00
  • c940ba447e Add source for leaflet, fixes #2217 Brenda Wallace 2019-10-19 09:47:29 +13:00
  • dc3bc85777 Remove comments Brenda Wallace 2019-10-19 09:44:05 +13:00
  • 1a34bfb9a2 Merge remote-tracking branch 'origin/role-admin' into role-admin Brenda Wallace 2019-10-19 09:43:12 +13:00
  • 21848bf5b4 Merge branch 'dev' into role-admin Brenda Wallace 2019-10-19 09:42:49 +13:00
  • a6cb81f4d1 Widen gardens on gardens#index Brenda Wallace 2019-10-18 09:37:08 +13:00
  • 80b82a99fe Fix broken spec on dev Brenda Wallace 2019-10-19 09:41:09 +13:00
  • 88a771459c Merge branch 'dev' into role-admin Brenda Wallace 2019-10-18 09:43:44 +13:00
  • fd39d6ef8c More per page Brenda Wallace 2019-10-08 15:54:53 +13:00
  • 6d472c5d66 [CodeFactor] Apply fixes codefactor-io 2019-10-07 23:35:39 +00:00
  • f77a0e37b9 Merge branch 'dev' into role-admin Brenda Wallace 2019-10-08 11:22:13 +13:00
  • ca0915585c Merge pull request #2193 from Growstuff/dev Brenda Wallace 2019-10-08 11:21:18 +13:00
  • b0c8b11246 📝 Inline editing and display tidy ups (#2200) Brenda Wallace 2019-10-08 11:06:53 +13:00
  • d72ec5890a address code climate issues bestest-mensch 2019-10-06 16:53:34 -05:00
  • 1e1b9f5ef5 scope conversations delete multiple to current user bestest-mensch 2019-10-06 16:13:07 -05:00
  • 9f8e2e65be update/add specs bestest-mensch 2019-10-06 16:12:46 -05:00
  • 80fb4f5fe6 add ability to delete multiple conversations at once bestest-mensch 2019-10-05 21:23:37 -05:00
  • 01df35e5a6 update contributors bestest-mensch 2019-10-05 22:18:21 -05:00
  • d39dc65c4e small ui tweak bestest-mensch 2019-10-05 22:06:22 -05:00
  • 3422a0d899 Administer member's roles Brenda Wallace 2019-10-06 14:19:39 +13:00
  • f297fdc677 Inline editing and display tidy ups Brenda Wallace 2019-10-05 13:23:54 +13:00
  • 0a71807237 Stop using rails-assets.org (#2194) Brenda Wallace 2019-09-28 18:38:58 +12:00
  • 3eb30a5555 Removed duplicate crop info Brenda Wallace 2019-09-28 17:44:37 +12:00
  • 7b5698f977 👩‍🌾 Import openfarm data (#2177) Brenda Wallace 2019-09-28 17:23:25 +12:00
  • 6a4158ae04 👭 Crop companions (#2176) Brenda Wallace 2019-09-28 10:38:01 +12:00
  • e043199866 Bump uglifier from 4.1.20 to 4.2.0 dependabot-preview[bot] 2019-09-26 09:42:34 +00:00
  • eaa6ecec98 Merge pull request #2179 from Br3nda/post-comments Brenda Wallace 2019-09-27 08:14:47 +12:00
  • 9c0c0eeb18 Merge branch 'dev' into post-comments Brenda Wallace 2019-09-27 08:13:33 +12:00
  • 66a3b2c52b If we delete a photo, delete the associations records Brenda Wallace 2019-09-21 10:21:54 +12:00
  • 99e2ca4920 If a crop is deleted, delete association (gerund) records too Brenda Wallace 2019-09-21 10:21:37 +12:00
  • 719fec24d0 if someone is destroy, delete all likes Brenda Wallace 2019-09-21 10:21:12 +12:00
  • f7f7638540 Merge branch 'dev' into post-comments Brenda Wallace 2019-09-26 21:52:47 +12:00
  • 8dc56c48e2 Bump scout_apm from 2.6.0 to 2.6.1 dependabot-preview[bot] 2019-09-24 10:24:46 +00:00
  • e08daa0b2b Merge branch 'dev' into post-comments Brenda Wallace 2019-09-26 21:51:17 +12:00
  • 5072353293 Only save location (used for post-signin redirect) if this is a format html page Brenda Wallace 2019-09-24 14:56:40 +12:00
  • bcb2464b53 Bump friendly_id from 5.2.5 to 5.3.0 dependabot-preview[bot] 2019-09-25 09:34:45 +00:00
  • 685fddb2be Merge remote-tracking branch 'origin/post-comments' into post-comments Brenda Wallace 2019-09-26 21:14:53 +12:00
  • 7acdc6c96f Merge remote-tracking branch 'upstream/dev' into post-comments Brenda Wallace 2019-09-26 21:14:12 +12:00
  • 758db158cb Bump font-awesome-sass from 5.10.2 to 5.11.2 dependabot-preview[bot] 2019-09-25 09:35:34 +00:00
  • 5da0f1fda0 Merge pull request #2175 from Br3nda/photo-sources Brenda Wallace 2019-09-26 20:42:19 +12:00
  • ee093db0e6 Merge branch 'dev' into photo-sources Brenda Wallace 2019-09-25 10:30:19 +12:00
  • 17b468d440 Bump factory_bot_rails from 5.0.2 to 5.1.0 dependabot-preview[bot] 2019-09-24 09:50:10 +00:00
  • 93921a9a23 Merge pull request #2166 from Growstuff/dev Brenda Wallace 2019-09-24 19:10:57 +12:00
  • 61bede6031 Bump bootstrap_form from 4.2.0 to 4.3.0 dependabot-preview[bot] 2019-09-23 10:04:05 +00:00
  • 743d10e098 Bump puma from 4.1.1 to 4.2.0 dependabot-preview[bot] 2019-09-23 10:01:36 +00:00
  • fab9560c46 Apply suggestions from code review Brenda Wallace 2019-09-22 13:22:02 +12:00
  • 90035e79b8 Crop to post relationship made more rails standard Brenda Wallace 2019-09-22 10:06:53 +12:00
  • 5fab14dc8a Fixed associations view Brenda Wallace 2019-09-21 10:28:52 +12:00
  • 87e1a7571b Photo source in the schema Brenda Wallace 2019-09-21 09:45:34 +12:00
  • 60ceef4fce Only show photo associations if we have any Brenda Wallace 2019-09-21 09:43:36 +12:00
  • 367377088b Fix specs for photo sources Brenda Wallace 2019-09-21 09:37:55 +12:00
  • c97e380187 Merge branch 'dev' into photo-sources Brenda Wallace 2019-09-20 22:28:30 +12:00
  • b7321ed46f Add source to photos Brenda Wallace 2019-09-20 22:07:14 +12:00
  • 9e216e3ae9 Bump font-awesome-sass from 5.9.0 to 5.10.2 dependabot-preview[bot] 2019-09-20 09:57:37 +00:00
  • 2fc34bf612 Bump faker from 2.3.0 to 2.4.0 dependabot-preview[bot] 2019-09-20 09:32:50 +00:00
  • c19bf8ea72 Bump faker from 2.2.2 to 2.3.0 dependabot-preview[bot] 2019-09-14 10:45:54 +00:00
  • 835f831e26 Bump puma from 4.1.0 to 4.1.1 dependabot-preview[bot] 2019-09-10 08:37:43 +00:00
  • 1c192bd51d Fixing apt install errors on travis runs (#2171) Brenda Wallace 2019-09-14 22:43:19 +12:00
  • 8fae9a225b Comment out chromium Brenda Wallace 2019-09-14 11:26:49 +12:00
  • 64066e1556 Bump scout_apm from 2.5.2 to 2.6.0 dependabot-preview[bot] 2019-09-10 08:36:24 +00:00
  • 413d759ce5 Bump faker from 2.2.1 to 2.2.2 dependabot-preview[bot] 2019-09-09 12:25:57 +00:00
  • 3cbb79981e Merge pull request #2152 from Br3nda/display Brenda Wallace 2019-09-10 00:25:07 +12:00
  • 1a0cd5f7a7 Merge pull request #2150 from Br3nda/fix/2106-followers Brenda Wallace 2019-09-10 00:24:31 +12:00
  • 012b8a4ec0 Bump devise from 4.7.0 to 4.7.1 dependabot-preview[bot] 2019-09-09 09:28:40 +00:00
  • 43f35ac6df Bump newrelic_rpm from 6.5.0.357 to 6.6.0.358 dependabot-preview[bot] 2019-09-06 08:46:36 +00:00
  • 29643810fe Merge branch 'dev' into display Brenda Wallace 2019-09-05 12:07:17 +12:00
  • c7e4883332 Update README.md Brenda Wallace 2019-09-05 12:04:32 +12:00
  • f28958be18 Merge branch 'dev' into fix/2106-followers Brenda Wallace 2019-09-05 12:02:13 +12:00
  • 2d6c022d43 Merge branch 'dev' into display Brenda Wallace 2019-09-05 10:13:54 +12:00
  • f3ac6c9a37 Merge pull request #2151 from Br3nda/fix/2105-padding Brenda Wallace 2019-09-05 10:13:28 +12:00