Code

Feature/pairing exercises#75

Code

Open

KaiBirkenstock wants to merge 8 commits intomazurio:mastermazurio/bodyweight-fitness-android:masterfrom KaiBirkenstock:feature/pairing_exercisesKaiBirkenstock/bodyweight-fitness-android:feature/pairing_exercisesCopy head branch name to clipboard

+2,234-2,034

Commits

Commits on Mar 27, 2018

• change recommended routine.json

  

  Kai-Sebastian Birkenstock

  committed
  f3806c2

  Copy full SHA for f3806c2

Commits on Mar 28, 2018

• add skin_the_cat video and section

  

  Kai-Sebastian Birkenstock

  committed
  6c4bbd5

  Copy full SHA for 6c4bbd5

• extend json to reflect static number of sets per exercise; add bundle id to pair sections

  

  Kai-Sebastian Birkenstock

  committed
  c2b7007

  Copy full SHA for c2b7007

• wip

  KaiBirkenstock

  committed
  3e46adc

  Copy full SHA for 3e46adc

Commits on Mar 29, 2018

• wip

  

  Kai-Sebastian Birkenstock

  committed
  649191b

  Copy full SHA for 649191b

• wip

  

  Kai-Sebastian Birkenstock

  committed
  0f658a6

  Copy full SHA for 0f658a6

Commits on Mar 30, 2018

• add progression levels for skin the cat exercise. add bundling to exercise according Recommend Routine. (next exercise is either the bundled exercise or next bundle if all sets from bundle are full…

  Show description for b24eaed
  KaiBirkenstock

  committed
  b24eaed

  Copy full SHA for b24eaed

Commits on Apr 1, 2018

• fix exercise id's for skin the cat progression

  KaiBirkenstock

  committed
  e62ea06

  Copy full SHA for e62ea06