4522 Commits

Author	SHA1	Message	Date
Brenda Wallace	abc796605d	Tidier path the member data	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	1c44ef2192	Active/not active tick box on plantings#index	2019-01-06 08:45:42 +13:00
Brenda Wallace	cd98f38c5d	DRY the nav bars and make all the same	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	5a8bc73099	Simplify places routes	2019-01-06 08:45:42 +13:00
Brenda Wallace	6167d02e66	Fixed path in auto suggest helper	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	72be3e3a41	Merge branch 'dev' into UTFGardenNames	2019-01-04 23:06:43 +13:00
Brenda Wallace	db53d33ede	Merge branch 'dev' into photos/seeds	2019-01-04 22:22:51 +13:00
Brenda Wallace	b13ddf9c92	Add photos of seeds	2019-01-04 22:21:48 +13:00
Brenda Wallace	e9ead68e94	Revert "Auto corrected by following Format Javascript Code" ... This reverts commit 334b33c555.	2019-01-04 18:17:27 +13:00
Awesome Code	334b33c555	Auto corrected by following Format Javascript Code	2019-01-04 05:15:13 +00:00
Brenda Wallace	4218688d8e	Revert "Auto corrected by following Format Javascript Code" ... This reverts commit f83a2b6397.	2019-01-04 18:14:36 +13:00
Awesome Code	f83a2b6397	Auto corrected by following Format Javascript Code	2019-01-03 10:00:13 +00:00
Brenda Wallace	d89c8f0fbc	Merge branch 'dev' into upgrade/rails-5-2	2019-01-03 12:31:37 +13:00
Brenda Wallace	5a73f57454	Merge branch 'dev' into UTFGardenNames	2019-01-03 08:46:15 +13:00
Brenda Wallace	a76f5d3a22	More locations with production email addresses	2019-01-01 13:56:08 +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	9a88a9f7e0	Remove trailing whitespace	2018-12-30 17:00:47 +13:00
Brenda Wallace	ac660e986c	Wrap all action bar button groups in a div ... So we can find them in specs	2018-12-30 16:14:00 +13:00
Brenda Wallace	60f72652da	URI.escape -> CGI.escape	2018-12-30 15:55:10 +13:00
Brenda Wallace	2faa2fd6f0	Content for other formats on photos#show	2018-12-30 15:42:51 +13:00
Brenda Wallace	3f5c63eb04	URI.escape -> CGI.escape	2018-12-30 15:39:06 +13:00
Brenda Wallace	93e1c5e5fc	Disabled # rubocop:disable Rails/OutputSafety	2018-12-30 15:38:37 +13:00
Brenda Wallace	b1d2c46cff	Whitespace fixup	2018-12-30 15:34:31 +13:00
Brenda Wallace	0083d1279a	Marked htmlsafe as # rubocob:ignore Rails/OutputSafety	2018-12-30 15:33:26 +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
Brenda Wallace	8e160a4c93	Fixed another wrong method name	2018-12-30 15:05:00 +13:00
Brenda Wallace	24b58c5ac2	FIXED wrong method name	2018-12-30 15:04:50 +13:00
Brenda Wallace	b82b4fa642	Comments controller has no show	2018-12-30 15:04:38 +13:00
Brenda Wallace	276accc314	Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 ... Conflicts: Gemfile.lock	2018-12-30 13:02:02 +13:00
Brandon Baker	178c6cd944	fixes bug in setting slug on container	2018-12-06 15:51:00 -07:00
Brandon Baker	bb97082868	adds friendly_id to containers	2018-12-01 19:46:49 -07:00
Brandon Baker	f35284c403	adds more basic specs	2018-12-01 14:08:11 -07:00
Brandon Baker	02174a0acb	builds views for containers	2018-11-30 11:56:58 -07:00
Brandon Baker	f5abc592f1	cleans up rubocop violations	2018-11-29 14:30:02 -07:00
Brandon Baker	5f6852b45c	adds basic specs for container and adds a plot spec for garden	2018-11-29 13:22:35 -07:00
Brandon Baker	c898a958a5	adds container to garden form	2018-11-29 12:51:15 -07:00
Brandon Baker	45ba5ff48a	creates containers, plots, and associations among gardens, plots, and containers	2018-11-29 10:54:04 -07:00
Brandon Baker	beab7fcfda	hides crop varieties that have not been approved	2018-11-26 17:29:27 +13:00
Brenda Wallace	92939ca204	Spec updates	2018-10-16 14:08:37 +13:00
Brenda Wallace	510124758d	Inverse relation ships	2018-10-16 13:26:54 +13:00