We present a framework to compute and study two-dimensional water waves that are quasi-periodic in space and/or time. This means they can be represented as periodic functions on a higher-dimensional torus by evaluating along irrational directions. In the spatially quasi-periodic case, we consider both traveling waves and the general initial value problem. In both cases, the nonlocal Dirichlet-Neumann operator is computed using conformal mapping methods and a quasi-periodic variant of the Hilbert transform.  We obtain traveling waves either as a generalization of the Wilton ripple problem or through bifurcation from large-amplitude periodic waves. In the temporally quasi-periodic case, we devise a shooting method to compute standing waves with 3 quasi-periods as well as hybrid traveling-standing waves that return to a spatial translation of their initial condition at a later time. Many examples will be given to illustrate the types of behavior that can occur.