11959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brenda Wallace	dfe67d5308	Move thumbnail title up a bit	2019-02-09 12:13:22 +13:00
Brenda Wallace	aa8ed5bb3a	Fix up translation on badges	2019-02-09 11:47:13 +13:00
Brenda Wallace	fcd147412c	Tidy up display on gardens#index	2019-02-09 11:47:13 +13:00
Brenda Wallace	61548e02d1	Merge branch 'dev' into contributors-bots	2019-02-09 11:03:36 +13:00
Awesome Code	404fafd700	Auto corrected by following Lint Ruby EmptyLine	2019-02-08 21:10:48 +00:00
Awesome Code	39a7de8754	Auto corrected by following Lint Ruby EmptyLine	2019-02-08 20:26:29 +00:00
Brenda Wallace	7a94920966	Merge pull request #1823 from Growstuff/awesomecode-lint-ruby-rspec-layout-28889 ... Auto corrected by following Lint Ruby rspec layout	2019-02-09 09:24:16 +13:00
Awesome Code	c4a3c03c34	Auto corrected by following Lint Ruby rspec layout	2019-02-08 20:23:08 +00:00
Brenda Wallace	1539aaa140	Merge pull request #1821 from Br3nda/api-additions ... Adding more attributes and filters to the api	2019-02-09 09:20:38 +13:00
Brenda Wallace	cde61a1c4f	Use Regex to search for author	2019-02-09 09:04:24 +13:00
Brenda Wallace	bffbd94462	Read the file contents in ruby	2019-02-09 09:03:34 +13:00
Brenda Wallace	9a4f1058e1	Adding more attributes and filters to the api	2019-02-09 08:43:59 +13:00
Brenda Wallace	c8e5cecaf6	Fixes checking for github bots in contributors	2019-02-08 09:51:41 +13:00
Brenda Wallace	452007dc5d	Merge pull request #1817 from Growstuff/dev ... Release to production	2019-02-07 18:57:56 +13:00
Brenda Wallace	e6de37c8ce	Tests for crop.photos	2019-02-07 15:02:11 +13:00
Brenda Wallace	b7fe5e156e	Fixed brackets, because ruby needs those sometimes	2019-02-05 17:18:36 +13:00
Brenda Wallace	c0fdf262f4	Fixed method name in spec	2019-02-05 17:11:59 +13:00
Brenda Wallace	f6ba22fb28	Fixed typo in spec	2019-02-05 17:10:34 +13:00
Brenda Wallace	e446c14bd7	Use the new Photo.by_cropscope on photos controller	2019-02-05 12:44:34 +13:00
Brenda Wallace	9ff95506bd	Spects for Photo.by_crop	2019-02-05 12:40:15 +13:00
Brenda Wallace	5c0e31721f	tests for crops.by_model_type scope	2019-02-05 12:37:35 +13:00
Brenda Wallace	51e6da7da6	Rubocop lint tidxy	2019-02-05 12:37:23 +13:00
Brenda Wallace	6167af700d	Rubocop lint tidy	2019-02-05 12:37:09 +13:00
Brenda Wallace	9c4e649c5d	Split up photos on crops#show by model type	2019-02-05 12:31:59 +13:00
Brenda Wallace	f640e41b55	Add seeds to crops api spec	2019-02-05 10:23:10 +13:00
Brenda Wallace	18ab0c8697	Add photos back into crop resources	2019-02-05 10:22:58 +13:00
Brenda Wallace	1ea19bee9d	Not planted means the percent_grown is 0	2019-02-05 09:59:20 +13:00
Brenda Wallace	49f7e57334	Make use of factory bot	2019-02-05 09:59:09 +13:00
Brenda Wallace	8d58edf083	Set hte crops in photos#show view spec	2019-02-04 22:35:42 +13:00
Brenda Wallace	b61c2290be	Removed unnecesary helper wrapper	2019-02-04 22:15:18 +13:00
Brenda Wallace	6be8f05223	Set the planted at date to the past (so we don't end up with 0%)	2019-02-04 22:11:50 +13:00
Brenda Wallace	1ead9e333b	Fixed up planting_status when planting no planted yet	2019-02-04 21:55:23 +13:00
Brenda Wallace	dd38a69be7	Fixed up planting status text to match tests	2019-02-04 21:52:13 +13:00
Brenda Wallace	862bdf35f5	Look for crop card on photo#show	2019-02-04 21:43:31 +13:00
Brenda Wallace	bb5a606240	Updated string to look for when planting	2019-02-04 21:43:10 +13:00
Brenda Wallace	d2c63db59b	Translate planting status	2019-02-04 21:42:54 +13:00
Brenda Wallace	6a1954b1e7	added dependent: destroy	2019-02-04 21:22:19 +13:00
Brenda Wallace	8e29a86edf	Merge remote-tracking branch 'origin/photos/seeds' into photos/seeds	2019-02-04 21:19:30 +13:00
Brenda Wallace	d71f6f9fc4	Rubocop tidy up	2019-02-04 21:17:41 +13:00
Brenda Wallace	b29c830f65	Merge branch 'dev' into photos/seeds	2019-02-04 21:17:08 +13:00
Brenda Wallace	b8747d7c52	Controller specs for photos#index	2019-02-04 21:15:10 +13:00
Brenda Wallace	a074810988	FEature specs for showing photos on crops#show	2019-02-04 21:03:31 +13:00
Brenda Wallace	81c899079e	Removed commented out code	2019-02-04 20:57:35 +13:00
Brenda Wallace	f1ad9cc3c7	Rubocop fix up	2019-02-04 20:55:04 +13:00
Brenda Wallace	0759ca9039	Schema update for crops added to photogaphings table	2019-02-04 20:53:04 +13:00
Brenda Wallace	5822764c1d	Fetch photos in the controller	2019-02-04 20:52:13 +13:00
Brenda Wallace	42de920352	Removed display of status	2019-02-04 20:44:20 +13:00
Brenda Wallace	ab880514c2	Further tidy of photo display	2019-02-04 20:43:52 +13:00
Brenda Wallace	dbf707d80e	Crops have seeds	2019-02-04 20:32:23 +13:00
Brenda Wallace	e8ac207fa7	Save the crop on the photo association	2019-02-04 20:32:11 +13:00