4176 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
deppbot	9d20fafd06	Bundle Update on 2017-04-23	2017-04-23 19:35:23 +12:00
Daniel O'Connor	4b1b5d8a18	Merge pull request #1323 from Growstuff/bundle-update-2017-04-20-122131 ... Bundle Update on 2017-04-20	2017-04-20 15:27:04 +09:30
deppbot	a0770e80e7	Bundle Update on 2017-04-20	2017-04-20 12:21:32 +08:00
Shiny	f39fe94173	Merge branch 'master' into dev	2017-04-18 18:27:43 +00:00
Brenda Wallace	976bdbbd96	Removed owner_matches? ... it's not used anymore	2017-04-18 07:09:47 +00:00
Brenda Wallace	cff1d8bfb9	Photo#show for signed in and not signed in, and other members	2017-04-18 07:09:47 +00:00
Brenda Wallace	bbdc54cb69	Photos#show links to items	2017-04-18 07:09:47 +00:00
Brenda Wallace	36f1f7b71a	updating view spec - link to delete photo has changed	2017-04-18 07:09:47 +00:00
Brenda Wallace	e1731793dd	controller specs for PhotoAssociations	2017-04-18 07:09:47 +00:00
Brenda Wallace	8ea3b27612	Responsive image on photos#show	2017-04-18 07:09:47 +00:00
Brenda Wallace	9469a69078	Deleting photo's association with another item	2017-04-18 07:09:47 +00:00
Brenda Wallace	cc46fe3336	Only delete own associations	2017-04-18 07:09:47 +00:00
Brenda Wallace	52b4064a2d	Don't overwrite edited photo titles	2017-04-18 07:09:47 +00:00
Brenda Wallace	d367b9ef21	UI for removing photos from plantings	2017-04-18 07:09:47 +00:00
Brenda Wallace	4711e4669f	Layout change on photos	2017-04-18 07:09:47 +00:00
Brenda Wallace	3e55024f98	Editing title of photos	2017-04-18 07:09:47 +00:00
Daniel O'Connor	ccf56bf944	Merge pull request #1321 from Br3nda/harvests-display ... bugfix: Only show harvests if we have some	2017-04-18 12:24:01 +09:30
Shiny	42e51a9cf6	Merge branch 'dev' into harvests-display	2017-04-17 10:00:20 +00:00
Brenda Wallace	667e0cc0e3	bugfix: Only show harvests if we have some	2017-04-17 21:59:31 +12:00
Brenda Wallace	339830b3bb	gardens#show Include crop, owner, harvesss and garden in query	2017-04-17 08:59:34 +00:00
Brenda Wallace	7770164672	Include owner in query, because we need it later	2017-04-17 08:59:34 +00:00
Brenda Wallace	f333607572	Reduced query count by .includes() on plantings	2017-04-17 08:59:34 +00:00
Brenda Wallace	87d3764eeb	Route for flickr auth callback -- Fixes #1106	2017-04-17 08:28:52 +00:00
Cesy	faf487b719	Merge pull request #1314 from Br3nda/members-controller ... Rubocop compliance for members controller	2017-04-17 09:13:26 +01:00
Shiny	53eb171dfc	Merge pull request #1317 from Growstuff/dev ... release 22 release22	2017-04-17 05:00:59 +00:00
Shiny	3dbf0df19e	Merge branch 'dev' into members-controller	2017-04-17 03:49:54 +00:00
deppbot	b0b6931678	Bundle Update on 2017-04-17	2017-04-17 03:45:39 +00:00
Shiny	cd272a6443	Merge branch 'dev' into members-controller	2017-04-16 09:44:32 +00:00
Daniel O'Connor	d515dba7f2	Merge pull request #1316 from Br3nda/garden-thumbnail ... Garden thumbnail display cleanup	2017-04-16 15:50:52 +09:30
Shiny	4958330c9e	Merge branch 'master' into dev	2017-04-16 02:42:38 +00:00
Brenda Wallace	17236a4a8a	Garden thumbnail display cleanup	2017-04-16 13:48:22 +12:00
Brenda Wallace	936a8778ed	Rubocop compliance for members controller	2017-04-16 12:03:48 +12:00
Daniel O'Connor	3ccab3f857	Merge pull request #1309 from Br3nda/fix_1305 ... Fix 1305	2017-04-15 17:11:02 +09:30
Daniel O'Connor	0201e873eb	Merge branch 'dev' into fix_1305	2017-04-15 17:03:15 +09:30
Daniel O'Connor	20289e6566	Merge pull request #1310 from Br3nda/counter-caches ... Adding counter caches	2017-04-15 17:01:20 +09:30
Shiny	85ded414ec	Merge branch 'dev' into fix_1305	2017-04-15 06:50:16 +00:00
Shiny	299c95c5f5	Merge branch 'dev' into counter-caches	2017-04-14 07:40:19 +00:00
Taylor Griffin	8f51090098	make mentionbot settings file	2017-04-14 07:40:01 +00:00
deppbot	5551eeba24	Bundle Update on 2017-04-14	2017-04-14 07:10:10 +00:00
Shiny	7a5a68f511	Merge branch 'dev' into counter-caches	2017-04-14 01:44:44 +00:00
Shiny	6d4ec9ad34	Merge branch 'dev' into fix_1305	2017-04-14 01:44:35 +00:00
Brenda Wallace	fffef75813	Ignore ConsecutiveComments and IdNames in haml for now	2017-04-14 01:43:42 +00:00
Brenda Wallace	0e2d7b4393	Allow instance variables in partials for now	2017-04-14 01:43:42 +00:00
Brenda Wallace	f08068c289	Upgrade haml_lint	2017-04-14 01:43:42 +00:00
deppbot	ff653934ad	Bundle Update on 2017-04-08	2017-04-14 01:43:42 +00:00
Brenda Wallace	c4bed2cf4d	Merge branch 'haml-lint-fix' into counter-caches	2017-04-14 11:42:02 +12:00
Brenda Wallace	47c0f74f81	Ignore ConsecutiveComments and IdNames in haml for now	2017-04-14 11:40:52 +12:00
Brenda Wallace	171e34914b	Allow instance variables in partials for now	2017-04-14 11:40:46 +12:00
Brenda Wallace	8010a8b56c	Upgrade haml_lint	2017-04-14 11:40:40 +12:00
Brenda Wallace	ac165ce0cd	Adding counter caches	2017-04-14 11:32:31 +12:00