Definitely the manga.

Hmm. And, glancing through episode descriptions, it's possible they shuffled the order of some events, since I found a description of the "tape stuck to Chi" incident (manga vol. 5) among the episodes of season 1, which I haven't seen. Season 2 starts with them opting to move to a new, pet-friendly place (manga vol. 3).