3040 Commits

Author	SHA1	Message	Date
Brenda Wallace	89b4b3bee0	Use fas icons everywhere	2019-04-20 09:06:21 +12:00
Brenda Wallace	d4b487846d	Fixed space in image name	2019-04-20 07:27:06 +12:00
Brenda Wallace	1eea251f95	Merge branch 'dev' into plantings-show	2019-04-19 10:39:26 +12:00
Brenda Wallace	32a88b4482	Merge remote-tracking branch 'origin/plantings-show' into plantings-show	2019-04-19 09:16:01 +12:00
Brenda Wallace	a2e2362594	Linter fix ups	2019-04-19 09:15:41 +12:00
Brenda Wallace	0ae33d9b03	Merge branch 'dev' into plantings-show	2019-04-13 21:02:56 +12:00
Brenda Wallace	e322c863b2	Removed unused arg to dbsearch	2019-04-13 10:20:33 +12:00
Brenda Wallace	174f54cb75	Linting	2019-04-13 10:13:36 +12:00
Brenda Wallace	347d751935	More plurals and misspellings in search specs	2019-04-13 10:03:18 +12:00
Brenda Wallace	fa1913c8b6	Split a method to reduce the complexity	2019-04-13 09:50:36 +12:00
Brenda Wallace	9683983f23	Merge branch 'dev' into feature/searchkick	2019-04-10 20:02:35 +12:00
Brenda Wallace	7ac410c499	varieties info on crops#show (#1848) ... * Tests for crop.photos * More info on a crop's varieties, and parent * Update spec for new crop varieties display * Add varieties div wrapper, so test can find the area of the page	2019-04-10 20:02:05 +12:00
Brenda Wallace	bd1a1c53f4	Removed unneeded rubocop disable	2019-04-08 21:59:44 +12:00
Brenda Wallace	ccb69c5f7d	Style/lint tidy up models	2019-04-08 21:59:26 +12:00
Brenda Wallace	e165c77d64	Force autocomplete to json format	2019-04-08 21:39:20 +12:00
Brenda Wallace	74e6a7cf2f	Rename @matches to @crops	2019-04-08 21:39:20 +12:00
Brenda Wallace	302e19776f	code style fix up	2019-04-08 21:39:20 +12:00
Brenda Wallace	01a3654d41	Working without elastic search too	2019-04-08 21:39:20 +12:00
Brenda Wallace	77d1fc7347	Move crop searching specs from the crop model to the crop search service	2019-04-08 21:39:20 +12:00
Brenda Wallace	ca743e421d	Add matching ES methods for when no elastic search configured	2019-04-08 21:39:20 +12:00
Brenda Wallace	f3ae1a8ec3	Fix dangerous sql warning	2019-04-08 21:39:20 +12:00
Brenda Wallace	789cffeca1	Eager loading	2019-04-08 21:39:20 +12:00
Brenda Wallace	150d44ad6f	named arguments for search	2019-04-08 21:39:20 +12:00
Brenda Wallace	370747390a	Add default pagination to crop search service	2019-04-08 21:39:20 +12:00
Brenda Wallace	61e0c2eb1d	Swap elasticssearch for searchkick	2019-04-08 21:39:20 +12:00
Brenda Wallace	a58ce0f6a2	Tidy up mobile	2019-03-30 18:01:55 +13:00
Brenda Wallace	4d95130216	Move phtos to a gallery	2019-03-29 15:48:57 +13:00
Brenda Wallace	43bb606a2b	Cleaning up small screen presentation	2019-03-29 15:48:47 +13:00
Brenda Wallace	e4d4cdc3fa	Fix up seed description helper	2019-03-29 10:45:51 +13:00
Brenda Wallace	9be4c4179f	Updating specs	2019-03-28 15:49:39 +13:00
Brenda Wallace	5722859a24	Move notes higher	2019-03-28 10:01:05 +13:00
Brenda Wallace	2bc12570c4	Consistent display of seeds/harvests	2019-03-27 22:38:28 +13:00
Brenda Wallace	0c9702e1a4	Move photo query, so we use eager loading	2019-03-27 22:28:06 +13:00
Brenda Wallace	626d5f8d7c	Move harvest and seeds to the right on plantings#show	2019-03-27 21:19:35 +13:00
Brenda Wallace	d35dfeea21	Show date taken, not data the database record was created	2019-03-27 21:19:22 +13:00
Brenda Wallace	e7b0b6f18e	Remove table display on plantings#show, replace with boxes	2019-03-27 21:04:56 +13:00
Brenda Wallace	1e240cf4b8	replace a rubocop ignore	2019-03-26 22:12:09 +13:00
Brenda Wallace	2d2304d8c0	Rubocop lint	2019-03-26 22:07:54 +13:00
Brenda Wallace	5d32bc8010	don't allow spaces in slug	2019-03-26 22:07:47 +13:00
Brenda Wallace	55f6636da5	change "required" to "optional"	2019-03-26 22:06:41 +13:00
Brenda Wallace	48022fb541	nullify gardens.garden_type when garden_type is destroyed	2019-03-26 21:18:14 +13:00
Brenda Wallace	cc88f5c6c7	Update subtitler	2019-03-26 21:11:25 +13:00
Brenda Wallace	721a8694a0	Removing plots	2019-03-26 21:09:26 +13:00
Brenda Wallace	b446e44ac0	Moved garden types to admin menu	2019-03-26 21:02:48 +13:00
Brenda Wallace	5395aefa66	Rename containers to garden types	2019-03-26 20:56:11 +13:00
Brenda Wallace	02e0dd091a	Merge remote-tracking branch 'upstream/dev' into bb-track-types-of-gardens	2019-03-26 19:35:16 +13:00
Brenda Wallace	db5bdab055	Set planting.finished as a boolean	2019-03-20 09:43:01 +13:00
Brenda Wallace	37693e8d12	Add filters for the members api	2019-03-20 09:43:01 +13:00
Brenda Wallace	0c868d3edb	Merge branch 'dev' into photos/seeds	2019-02-16 12:37:53 +13:00
Brenda Wallace	d3a542727c	Fixing crop deleting and adding tests	2019-02-15 08:45:18 +13:00