mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-08 14:12:04 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,339 Commits 66 Branches 92 Tags
89b4b3bee0fe29c1c29bf4e4e9f2cd58f7beac36
Commit Graph
833 Commits
Author SHA1 Message Date
Brenda Wallace 1eea251f95 Merge branch 'dev' into plantings-show 2019-04-19 10:39:26 +12:00
Brenda Wallace 74e6a7cf2f Rename @matches to @crops 2019-04-08 21:39:20 +12:00
Brenda Wallace 77d1fc7347 Move crop searching specs from the crop model to the crop search service 2019-04-08 21:39:20 +12:00
Brenda Wallace 789cffeca1 Eager loading 2019-04-08 21:39:20 +12:00
Brenda Wallace 150d44ad6f named arguments for search 2019-04-08 21:39:20 +12:00
Brenda Wallace 61e0c2eb1d Swap elasticssearch for searchkick 2019-04-08 21:39:20 +12:00
Brenda Wallace a58ce0f6a2 Tidy up mobile 2019-03-30 18:01:55 +13:00
Brenda Wallace 0c9702e1a4 Move photo query, so we use eager loading 2019-03-27 22:28:06 +13:00
Brenda Wallace e7b0b6f18e Remove table display on plantings#show, replace with boxes 2019-03-27 21:04:56 +13:00
Brenda Wallace 5395aefa66 Rename containers to garden types 2019-03-26 20:56:11 +13:00
Brenda Wallace 02e0dd091a Merge remote-tracking branch 'upstream/dev' into bb-track-types-of-gardens 2019-03-26 19:35:16 +13:00
Brenda Wallace 0c868d3edb Merge branch 'dev' into photos/seeds 2019-02-16 12:37:53 +13:00
Brenda Wallace d3a542727c Fixing crop deleting and adding tests 2019-02-15 08:45:18 +13:00
Brenda Wallace e446c14bd7 Use the new Photo.by_cropscope on photos controller 2019-02-05 12:44:34 +13:00
Brenda Wallace 6167af700d Rubocop lint tidy 2019-02-05 12:37:09 +13:00
Brenda Wallace 9c4e649c5d Split up photos on crops#show by model type 2019-02-05 12:31:59 +13:00
Brenda Wallace f1ad9cc3c7 Rubocop fix up 2019-02-04 20:55:04 +13:00
Brenda Wallace 5822764c1d Fetch photos in the controller 2019-02-04 20:52:13 +13:00
Brenda Wallace ab880514c2 Further tidy of photo display 2019-02-04 20:43:52 +13:00
Brenda Wallace 87d2c8b4c8 Fixed bug - look up photos by crop 2019-02-04 19:39:21 +13:00
Brenda Wallace 8c03e3f4ab Merge branch 'dev' into bb-track-types-of-gardens 2019-01-30 16:45:14 +13:00
Brenda Wallace b35d13d5e5 Update seeds_controller.rb 2019-01-18 20:05:41 +13:00
Brenda Wallace d1a3f41462 Throw if can't find the @crop 2019-01-18 20:04:19 +13:00
Brenda Wallace 3212f748b4 Update crops_controller.rb 2019-01-18 20:03:22 +13:00
Brenda Wallace cb6a06feb6 find by slug 2019-01-18 20:02:15 +13:00
Brandon Baker a00ed5a176 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-08 12:03:39 -05:00
Brenda Wallace 8cb9361462 only look up member/crop if an slug is passed 2019-01-06 08:45:42 +13:00
Brenda Wallace c0e957b051 Places params is :place 2019-01-06 08:45:42 +13:00
Brenda Wallace 4587dc711f Use to_param to make parts of the csv filename 2019-01-06 08:45:42 +13:00
Brenda Wallace 061bd31220 Use owner param in filename 2019-01-06 08:45:42 +13:00
Brenda Wallace df7a59c629 Use slug in filename, not name/login_name 2019-01-06 08:45:42 +13:00
Brenda Wallace 1e6c204df2 Rubcop fix up 2019-01-06 08:45:42 +13:00
Brenda Wallace 62a8f6b8d3 Fixed look up of reply notification 2019-01-06 08:45:42 +13:00
Brenda Wallace e8d2226ac6 Look up crop by slug 2019-01-06 08:45:42 +13:00
Brenda Wallace b44b7fdd2e Move follows from members controller to follows controller 2019-01-06 08:45:42 +13:00
Brenda Wallace 59bc036565 Follow/Unfollow updated for routes 2019-01-06 08:45:42 +13:00
Brenda Wallace 07f06705af Fixed pi charts path 2019-01-06 08:45:42 +13:00
Brenda Wallace b2bceb5873 Fixed planting display by crop 2019-01-06 08:45:42 +13:00
Brenda Wallace e313a7160f Active plantings option on plantings#index 2019-01-06 08:45:42 +13:00
Brenda Wallace 1e266a92f6 Members slug used in rotes 2019-01-06 08:45:42 +13:00
Brenda Wallace 387200abf7 Moving garden data under members 2019-01-06 08:45:42 +13:00
Brenda Wallace 99a69bf192 Tidy up places routes 2019-01-06 08:45:42 +13:00
Brenda Wallace 68953188f8 Update to new path names 2019-01-06 08:45:42 +13:00
Brenda Wallace f4df42d136 Fixes not being able to find the 404 page file 2019-01-01 13:42:53 +13:00
Brenda Wallace 2faa2fd6f0 Content for other formats on photos#show 2018-12-30 15:42:51 +13:00
Brenda Wallace 98e492ad11 DRY 2018-12-30 15:33:10 +13:00
Brenda Wallace 468dded162 Remove controller actions for method that don't exist 2018-12-30 15:32:59 +13:00
Brenda Wallace 7b01fcbd4b Align all the hashes 2018-12-30 15:22:29 +13:00
Brenda Wallace 7399346354 one line method 2018-12-30 15:18:11 +13:00
Brenda Wallace 914e9ef3be photos needs a show method 2018-12-30 15:05:10 +13:00