Merge remote-tracking branch 'origin/master' into develop

Fix collection query
Merge branch 'develop' of timw4mail/HummingBirdAnimeClient into master
2018-11-05 13:25:42 -05:00 · 2018-11-05 13:25:18 -05:00 · 2018-11-05 13:15:58 -05:00 · 2018-08-14 11:37:43 -04:00
1 changed files with 1 additions and 1 deletions
--- a/src/Model/AnimeCollection.php
+++ b/src/Model/AnimeCollection.php
@ -121,7 +121,7 @@ final class AnimeCollection extends Collection {
 			->join('media', 'media.id=a.media_id', 'inner')
 			->order_by('media')
 			->order_by('title')
-			->group_by('a.hummingbird_id')
+			->group_by('a.hummingbird_id, media.type')
 			->get();

 		// Add genres associated with each item
Author	SHA1	Message	Date
Timothy Warren	f88f1578a8	Merge remote-tracking branch 'origin/master' into develop timw4mail/HummingBirdAnimeClient/develop There was a failure building this commit Details	2018-11-05 13:25:42 -05:00
Timothy Warren	b9e8ddfc9a	Fix collection query timw4mail/HummingBirdAnimeClient/master This commit looks good Details	2018-11-05 13:25:18 -05:00
Timothy Warren	99c94963e6	Merge branch 'develop' of timw4mail/HummingBirdAnimeClient into master timw4mail/HummingBirdAnimeClient/master This commit looks good Details	2018-11-05 13:15:58 -05:00
Timothy Warren	6df059fe75	Merge remote-tracking branch 'origin/develop'	2018-08-14 11:37:43 -04:00