Commit Graph

4522 Commits

Author SHA1 Message Date
Brenda Wallace
92ae1a7bd2 Merge branch 'dev' into upgrade/bootstrap 2019-06-13 20:52:25 +12:00
Brenda Wallace
10475cb711 Matching labels on seeds form to specs 2019-06-13 20:32:00 +12:00
Brenda Wallace
6825f8810f tidy up seeds form 2019-06-13 20:01:21 +12:00
Daniel O'Connor
949c57bf7d Line length 2019-06-13 07:58:52 +00:00
Brenda Wallace
740fdb3ec5 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-13 19:43:53 +12:00
Daniel O'Connor
dcc10273ef Update search placeholder 2019-06-13 13:59:19 +09:30
Daniel O'Connor
347dfc3258 Apply similar layout to app/views/crops/index.html.haml 2019-06-13 13:56:53 +09:30
Daniel O'Connor
a26003940d Crop search result page - doubled breadcrumbs 2019-06-13 13:54:59 +09:30
Brenda Wallace
9285ffaec7 Update app/views/members/_actions.html.haml 2019-06-12 16:51:55 +12:00
Brenda Wallace
329e856569 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-12 16:27:49 +12:00
Brenda Wallace
39586cc1ba Update app/controllers/plantings_controller.rb 2019-06-12 16:23:29 +12:00
Brenda Wallace
878c692b27 posts display 2019-06-12 14:48:00 +12:00
Brenda Wallace
44e861dc6f block buttons 2019-06-12 14:47:43 +12:00
Brenda Wallace
6d8c02f282 Make the member icon tiny on comments 2019-06-12 14:39:37 +12:00
Brenda Wallace
e8865ba528 More alerty message about no messages 2019-06-12 12:36:56 +12:00
Brenda Wallace
64dcb62c03 Fix tabulated 2019-06-12 11:24:16 +12:00
Brenda Wallace
b52dc34381 Header on notifications 2019-06-12 11:22:25 +12:00
Brenda Wallace
2d9d8c45a2 Update index.html.haml 2019-06-12 11:21:07 +12:00
Brenda Wallace
690afc1747 One more button from homepage 2019-06-12 09:39:57 +12:00
Brenda Wallace
7cb4bf2314 LArge buttons on home page 2019-06-12 09:39:29 +12:00
Brenda Wallace
4f1eddd631 specs want 30 on a page - so telling the controller 2019-06-12 09:35:51 +12:00
Brenda Wallace
2386fe7afe new hash syntax 2019-06-12 09:27:49 +12:00
Brenda Wallace
040c414827 find translation of some_of_our_crops 2019-06-12 09:27:40 +12:00
codefactor-io
571f4298bb [CodeFactor] Apply fixes 2019-06-11 21:22:53 +00:00
Brenda Wallace
ee152b3ba3 Match sign in for to the older labels, so tests pass without changes 2019-06-12 09:20:09 +12:00
Brenda Wallace
c80cbf203c follow, edit, and message buttons on members#show 2019-06-12 09:10:25 +12:00
Brenda Wallace
b92cef4c02 view all buttons on home page 2019-06-12 09:10:07 +12:00
Brenda Wallace
0d02f5758b actions menu for harvests 2019-06-09 15:53:01 +12:00
Brenda Wallace
b617468e26 remove commented out code 2019-06-09 14:03:20 +12:00
Brenda Wallace
8762b11555 tidy plantings action menu 2019-06-09 14:02:55 +12:00
Brenda Wallace
7bc641fb55 fix gardens action menu 2019-06-09 14:02:41 +12:00
Brenda Wallace
80e8364de0 title on planting thumbnails 2019-06-09 14:02:30 +12:00
Brenda Wallace
2fa4590315 gardens breadcrumbs 2019-06-09 14:02:13 +12:00
Brenda Wallace
4255cde5ff member cards on home page fix up 2019-06-09 13:24:05 +12:00
Brenda Wallace
cf3068dc08 card display on small screens 2019-06-09 10:05:31 +12:00
Brenda Wallace
4fd24e61d9 harvest own on card 2019-06-09 09:54:09 +12:00
Brenda Wallace
0cbc224298 remove commented out code 2019-06-09 09:53:56 +12:00
Brenda Wallace
5c5abcde30 fix up titles 2019-06-09 09:53:46 +12:00
Brenda Wallace
0c4b9a800e Use our own index-cards class for card layout instead of bootstrap grid 2019-06-09 09:53:31 +12:00
Brenda Wallace
3d11dac718 Fixing harvest specs 2019-06-08 18:21:15 +12:00
Brenda Wallace
628a7e3ae1 Fix planting specs 2019-06-08 17:02:59 +12:00
Brenda Wallace
1526cea92a required explanation test on plantings form 2019-06-08 16:02:19 +12:00
Brenda Wallace
eb628635e2 fix logic on planting.active 2019-06-08 15:39:14 +12:00
Brenda Wallace
8d3e080afb classes for gardens button 2019-06-08 15:38:39 +12:00
Brenda Wallace
532699a1ec menu on the left, works better on mobile 2019-06-08 15:38:18 +12:00
Brenda Wallace
d2c062a3f1 garden actions 2019-06-08 14:57:29 +12:00
Brenda Wallace
fae3155237 match to spec 2019-06-08 14:57:11 +12:00
Brenda Wallace
51133359fb tidy 2019-06-08 10:29:52 +12:00
Brenda Wallace
9b62d4609b added back the plantings quick actions menu 2019-06-08 10:29:17 +12:00
Brenda Wallace
e3ddf61c4d asterisk for required fields 2019-06-08 09:47:28 +12:00