Commit Graph

4128 Commits

Author SHA1 Message Date
Brenda Wallace
88ae62fef4 Merge pull request #2453 from Br3nda/fix/member-link
BUGFIX: member slug needed on photos, to make link
2020-03-03 15:23:42 +13:00
Brenda Wallace
89400e7677 Send reminder on mondays 2020-03-03 11:37:30 +13:00
Brenda Wallace
b61f6dd54d Added link to profile page 2020-03-03 11:35:08 +13:00
Brenda Wallace
e8e5c936d5 Remove broken image from planting reminder 2020-03-03 11:33:59 +13:00
Brenda Wallace
0ae2aeb4a7 Apply suggestions from code review
Use delegated attributes
2020-03-02 15:51:29 +13:00
Brenda Wallace
9fa3f36436 BUGFUX: member slug needed on photos, to make link 2020-03-02 15:01:34 +13:00
Brenda Wallace
35f8289b06 Turn off caching on modal form 2020-03-02 12:53:29 +13:00
Brenda Wallace
a864a018d5 Fix icon images 2020-03-02 12:27:57 +13:00
Brenda Wallace
9594c2a63f Always show photos on harvests 2020-03-02 12:22:48 +13:00
Brenda Wallace
3c14496936 BUGFIX - caching on harvest form 2020-03-02 12:22:00 +13:00
ImgBotApp
d33db24f3c [ImgBot] Optimize images
*Total -- 7.73kb -> 7.71kb (0.24%)

/app/assets/images/icons/plant_parts/other.svg -- 0.96kb -> 0.96kb (0.41%)
/app/assets/images/icons/plant_parts/seed.svg -- 1.86kb -> 1.86kb (0.26%)
/app/assets/images/icons/plant_parts/stem.svg -- 2.29kb -> 2.28kb (0.21%)
/app/assets/images/icons/plant_parts/root.svg -- 2.62kb -> 2.62kb (0.19%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
2020-03-01 22:50:49 +00:00
Brenda Wallace
85d473d65c Adding descriptions 2020-03-02 11:49:50 +13:00
Brenda
5c7b8254b0 plant_part is on harvest not planting 2020-03-01 08:32:53 +13:00
Brenda
7039240bdc always show photos section on harvests 2020-03-01 07:57:19 +13:00
Brenda
cc83cb23bc fix plant part selection bug on editing harvests 2020-03-01 07:57:04 +13:00
Brenda
88ac147dda Restore old labels on buttons 2020-03-01 07:56:34 +13:00
Brenda
7e42d84a21 group crop actions in to button bar 2020-03-01 07:55:47 +13:00
Brenda Wallace
52e28f4ae2 Link new harvest to planting 2020-02-29 20:07:30 +13:00
Brenda Wallace
f4acbaa89a Use pokemon for plant parts 2020-02-29 19:53:39 +13:00
Brenda
3c392d43ee Crop#show with seeds modal 2020-02-29 19:49:49 +13:00
Brenda
bb400dabda Add new garden button on modal planting form 2020-02-29 13:37:27 +13:00
Brenda
f3cd341659 add an id to the harvest modal so the test can find it 2020-02-29 13:26:36 +13:00
Brenda
fd80fc98f1 use a default icon if no plant_part icon 2020-02-29 13:26:20 +13:00
Brenda Wallace
d0154a8b60 Fall back on planting icon when plant part icon does not exist 2020-02-29 12:34:28 +13:00
Brenda
cbec6b2743 Remove harvest button from crop info card until we can distinguish between it and the planting crop button 2020-02-29 12:20:53 +13:00
Brenda
1503b39ad3 Seed saving modal 2020-02-29 11:19:19 +13:00
Brenda Wallace
97208b99c5 Plantings modal form on crops#show 2020-02-29 10:28:32 +13:00
Brenda Wallace
777877ab06 Added plantings modal button to crop info card 2020-02-29 10:25:45 +13:00
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