Commit Graph

4100 Commits

Author SHA1 Message Date
Brenda Wallace
6c94337047 Added Plantings modal form 2020-02-29 10:23:00 +13:00
Brenda Wallace
68d157b048 Removed extra harvest button on plantings#show 2020-02-29 10:22:46 +13:00
Brenda Wallace
8dd47e0639 Added harvest button to crop info card 2020-02-29 10:09:06 +13:00
Brenda Wallace
a6ce1e05cf Lower case in form title 2020-02-29 10:02:47 +13:00
Brenda
8955aab2bb caching plant parts 2020-02-29 09:59:44 +13:00
Brenda Wallace
5d43575eae Merge branch 'feature/crop-action-modals' of github.com:Br3nda/growstuff into feature/crop-action-modals
Conflicts:
app/views/harvests/_modal.html.haml
2020-02-29 09:38:21 +13:00
Brenda Wallace
b2ff247a31 Apply suggestions from code review
Co-Authored-By: Martina  <922964+simicic@users.noreply.github.com>
2020-02-29 09:36:05 +13:00
Brenda
d2509afca2 Harvest button on plantings 2020-02-29 09:33:40 +13:00
Brenda Wallace
a5c770c2b5 Update app/views/crops/_thumbnail.html.haml
Co-Authored-By: Martina  <922964+simicic@users.noreply.github.com>
2020-02-27 09:42:09 +13:00
Brenda Wallace
33091fbadc Merge branch 'dev' into feature/crop-action-modals 2020-02-26 11:38:38 +13:00
Brenda
9abb84ccba Harvesting modal form 2020-02-24 11:51:37 +13:00
Brenda
435c164e15 Fixed typo error in view 2020-02-23 15:47:23 +13:00
codefactor-io
28ff058366 [CodeFactor] Apply fixes 2020-02-22 23:04:59 +00:00
Brenda Wallace
71ccd52c59 Fix harvest thumbnails 2020-02-23 12:03:14 +13:00
Brenda
36bad1cda0 Fix mobile display of member profiles 2020-02-23 11:42:07 +13:00
Brenda Wallace
878ae9073c Tidy up member planting progress section 2020-02-22 07:49:56 +13:00
Brenda Wallace
b72e866362 Remove reference to current member 2020-02-21 14:40:53 +13:00
Brenda
d3cdaea218 Show member plantings summary on member page 2020-02-20 23:01:04 +13:00
Brenda
3ab67786e0 Wrapping the whole layout, to center the page 2020-02-20 22:39:12 +13:00
Brenda Wallace
e986eafc0b Move search bar to middle, hide sitename on small screens 2020-02-20 16:04:09 +13:00
Brenda Wallace
aa2893f666 Added breadcrumbs to members 2020-02-20 15:03:35 +13:00
Brenda Wallace
2006210d4e Fix wrapping of admin menu, and put profile link (with image) last 2020-02-20 15:03:35 +13:00
Brenda Wallace
b208850b7d Full width on mobile 2020-02-19 20:25:06 +13:00
Brenda Wallace
724ba246a3 More crops 2020-02-19 17:00:06 +13:00
Brenda Wallace
00a984a3a5 Removed cute icon that was making sections not line up 2020-02-19 16:59:13 +13:00
Brenda Wallace
bc59827009 Col for recent crops 2020-02-19 16:45:45 +13:00
Brenda Wallace
2208a35b2f More space on home 2020-02-19 16:43:33 +13:00
Brenda Wallace
3764544965 Ten crops on home page 2020-02-19 16:27:03 +13:00
Brenda Wallace
a60a1ded32 Nine seeds on home page 2020-02-19 16:25:36 +13:00
Brenda
88615a55f4 CSS for seeds cards 2020-02-15 10:05:14 +13:00
Brenda Wallace
c12580ed8d Shrink seed card and fix links 2020-02-14 10:07:26 +13:00
Brenda Wallace
9a6c6e73f1 Bump posts and members count to 6 2020-02-12 14:02:14 +13:00
Brenda
24ae63a339 add link to gardens for members#show 2020-02-10 21:49:38 +13:00
Brenda
20e878e9fe style "inactive" checkbox on gardens#index 2020-02-10 21:49:27 +13:00
Brenda
3a1f6c9d0b fix specs 2020-02-10 11:12:44 +13:00
Brenda
f7f62bb7dc tidy up posts on crops page 2020-02-10 10:03:49 +13:00
Brenda
12db6b5fa0 Tidy up index pages 2020-02-10 09:47:37 +13:00
Brenda Wallace
abecbab6c5 Tidy up mobile display on homepage, including member cards changes (#2417)
* Tidy up mobile display on homepage, including member cards changes
2020-02-09 22:38:12 +13:00
Brenda Wallace
4f5245f7e7 Show all of a harvest's photos on harvest#show 2020-02-07 08:02:20 +13:00
Brenda Wallace
019d94f1cb Show the default photo for social media 2020-02-04 11:52:13 +13:00
Martina Simicic
b0a5223d97 Account for finished planting when counting days of life 2020-02-04 10:50:00 +13:00
Martina Simicic
10008ca30d Removing method since it is defined in predict planting 2020-02-04 10:50:00 +13:00
Brenda Wallace
fc1bd1893c Added perennial to plantings 2020-02-03 15:06:45 +13:00
Brenda Wallace
7bf5ab2df3 One per person on home page 2020-02-03 11:54:26 +13:00
Brenda Wallace
793bc17692 Fix owner name in harvests on homepage 2020-01-25 08:12:21 +13:00
Brenda Wallace
d2d2c5f685 Fixed planting owner name on homepage 2020-01-25 08:11:41 +13:00
codefactor-io
34ddf8e98f [CodeFactor] Apply fixes 2020-01-21 13:12:28 +13:00
Brenda Wallace
f1b5eb1fdd Turn off Replicas (#2388)
* Control number of ES replicas

* So, let's have zero replicas on ES
2020-01-20 13:29:19 +13:00
Brenda Wallace
6279e169de approved crops only, and only 1 shard (#2385)
reducing our elastic search usage
2020-01-18 18:11:24 +13:00
Brenda Wallace
cd344c2605 Fix error when no latitude or longitude 2020-01-17 18:00:45 +13:00