4522 Commits

Author	SHA1	Message	Date
Brenda Wallace	66fae333a9	Rename crops js file so it gets included correctly ... this crops.js.erb file was being ignored because a crops.coffee exists	2019-11-16 11:21:40 +13:00
Brenda Wallace	2b7c21bf2e	Fix marker on member map too	2019-11-16 11:16:53 +13:00
Brenda Wallace	f27cf0caf6	Added link to icon documentation	2019-11-16 11:11:41 +13:00
Brenda Wallace	df55a5b0a8	Add marker for leaflet maps, and use asset pipeline to serve file	2019-11-16 10:42:22 +13:00
Brenda Wallace	69d9e1e76e	Merge pull request #2271 from Br3nda/jump-to-garden ... Link to jump to garden	2019-11-15 12:16:39 +13:00
Brenda Wallace	cfef6f5eb2	Link to jump to garden	2019-11-15 11:47:32 +13:00
Brenda Wallace	75037c7e21	Order the garden names	2019-11-15 11:32:13 +13:00
ImgBotApp	be884ad1fb	[ImgBot] Optimize images ... *Total -- 24.17kb -> 22.54kb (6.78%) /app/assets/images/icons/timeline.svg -- 2.00kb -> 1.78kb (11.09%) /app/assets/images/icons/finished.svg -- 2.00kb -> 1.78kb (11.09%) /app/assets/images/icons/planting-add.svg -- 2.81kb -> 2.52kb (10.45%) /app/assets/images/icons/seed-add.svg -- 4.21kb -> 3.91kb (7.07%) /app/assets/images/icons/sprout-add.svg -- 3.81kb -> 3.58kb (6%) /app/assets/images/icons/seeds.svg -- 3.45kb -> 3.29kb (4.69%) /app/assets/images/icons/harvest-add.svg -- 4.98kb -> 4.78kb (3.9%) /app/assets/images/icons/trade.svg -- 0.91kb -> 0.89kb (2.14%) Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>	2019-11-11 05:00:09 +00:00
Brenda Wallace	b8b579a5ba	rubycop fix up	2019-11-11 17:45:37 +13:00
codefactor-io	e0ea039347	[CodeFactor] Apply fixes to commit a651f07	2019-11-11 04:42:30 +00:00
Brenda Wallace	a651f079d8	Simplify garden.name validation regexp	2019-11-11 17:41:46 +13:00
Brenda Wallace	cfaa18daaf	Merge remote-tracking branch 'upstream/dev' into UTFGardenNames	2019-11-11 14:14:34 +13:00
Brenda Wallace	d0bee45c0c	show all varieties (including grandchildren)	2019-11-01 21:33:43 +13:00
Brenda Wallace	b214f7ad8d	linking existing plantings to their parent seeds	2019-11-01 02:23:14 +00:00
Brenda Wallace	2f2169f89a	tidy up display of seeds	2019-10-28 22:12:08 +13:00
Brenda Wallace	b2e90cddc6	Merge branch 'dev' into weeks	2019-10-25 13:41:30 +13:00
André Aubin	a3fa774d84	Force ssl on gravatar-ultimate gem	2019-10-24 23:51:52 +00:00
André Aubin	66045866b3	Switch to HTTPS for Gravatar urls	2019-10-24 23:51:52 +00:00
Brenda Wallace	9d232e26cb	Update app/views/crops/_predictions.html.haml	2019-10-25 06:42:00 +13:00
Brenda Wallace	2d6d02d0b3	added in_weeks helper	2019-10-24 21:03:30 +13:00
Brenda Wallace	95ae4d41ba	rounding on weeks	2019-10-24 20:58:13 +13:00
Brenda Wallace	627d97155f	Tidy up	2019-10-24 19:59:18 +13:00
Brenda Wallace	329262e2f5	show "finished" when planting is finished	2019-10-24 19:45:08 +13:00
Brenda Wallace	5d4f1abacd	show unknown date when unknown finish date	2019-10-24 19:44:58 +13:00
Brenda Wallace	f7f3ac695f	better name for css class progress-fade	2019-10-24 19:16:41 +13:00
Brenda Wallace	a1479c9126	fixed call to missing method	2019-10-24 19:13:41 +13:00
Brenda Wallace	dfe533dda1	DRY and tidy	2019-10-24 19:13:20 +13:00
Brenda Wallace	f4c4e1c93f	Collapse crop card content	2019-10-24 19:10:44 +13:00
Brenda Wallace	1a0e30491f	Removed unused methods	2019-10-24 19:04:37 +13:00
Brenda Wallace	053a33cd72	Removed commented out code	2019-10-24 18:58:50 +13:00
Brenda Wallace	0cc62c2b98	show planted_at, even when we can't predict finish	2019-10-24 18:57:16 +13:00
Brenda Wallace	38713af603	plantings timeline with icons	2019-10-24 16:36:16 +13:00
Brenda Wallace	ae48844d87	Merge branch 'dev' into search	2019-10-23 15:55:27 +13:00
Brenda Wallace	c6f4eef291	Show more results in searches	2019-10-21 16:24:31 +13:00
Brenda Wallace	6d6d1930d1	Merge branch 'dev' into planting-reminders	2019-10-21 15:53:25 +13:00
Brenda Wallace	798883be1c	Typo/spelling fix	2019-10-21 14:45:21 +13:00
Brenda Wallace	abd91fa37b	Use bang! to indicate method can explode	2019-10-21 14:43:46 +13:00
Brenda Wallace	47be6ad631	Merge branch 'dev' into role-admin	2019-10-21 14:24:31 +13:00
Brenda Wallace	8c694b3dca	Only show companions of active plantings	2019-10-21 14:19:47 +13:00
Brenda Wallace	e1faedfc78	Merge branch 'dev' into planting-reminders	2019-10-20 21:36:42 +13:00
Brenda Wallace	ca11792286	Only show companions of active plantings	2019-10-20 14:13:30 +13:00
Brenda Wallace	94452ee62e	polish up the plantings reminders	2019-10-20 14:12:34 +13:00
Brenda Wallace	e0dc38e7a3	add perennials	2019-10-20 09:49:03 +13:00
Brenda Wallace	4af89d2b2c	Change reminder email into monthly summary	2019-10-20 09:49:03 +13:00
Brenda Wallace	d81df50dc5	Suggest companions for a garden based on existing crops	2019-10-19 18:45:11 +13:00
Brenda Wallace	bb72d2b974	Fix bug showing plantings with no planted_at	2019-10-19 18:20:01 +13:00
Brenda Wallace	f2dc2aeaa0	Merge branch 'dev' into feature-2207	2019-10-19 16:01:11 +13:00
Brenda Wallace	95ec89f6a0	Merge branch 'dev' into role-admin	2019-10-19 13:23:25 +13:00
Brenda Wallace	0965168750	Group previous plantings by year	2019-10-19 11:25:19 +13:00
Brenda Wallace	fc07571ee1	Rename is_admin? to admin?.	2019-10-19 10:25:17 +13:00