Skip to content

Checkpoint4.2#3

Open
kevinhennessy wants to merge 153 commits intomasterfrom
checkpoint4.2
Open

Checkpoint4.2#3
kevinhennessy wants to merge 153 commits intomasterfrom
checkpoint4.2

Conversation

@kevinhennessy
Copy link
Collaborator

@kevinhennessy kevinhennessy commented Apr 16, 2016

No description provided.

chandermani and others added 30 commits November 16, 2015 07:02
@chandermani
Fixed gulp and package.json file, added .gitignore and tsconfig
3acc24e
@chandermani
Added nav bar and fixed container style
6b8e7ed
@chandermani
Fixed readme and package urls
01cbac6
@chandermani
Bumped Angular package.
604166c
@chandermani
Upgraded to angular beta.
0bec2c5
@chandermani
Added history tracking capabilities
4383096
@chandermani
Refactor to move the history tracker as global dependency.
f395163
@chandermani
Added local-storage support for history save.
8f86f73
@chandermani
Moved the html template to app.ts
58b5d7d
@chandermani
Moved the index template to app component. Index now only has trainer…
be16841 
…-app
@kevinhennessy
Initial commit to Checkpoint 4.1
51a55a6
@chandermani
Removed audio implementation from checkpoint3.2
2c531e6
@chandermani
Merge branch 'checkpoint3.2' into checkpoint3.3
ec0f1db 
Conflicts:
	trainer/src/components/app/app.ts
@chandermani
Added workout history page.
2fb5c6a
@kevinhennessy
Change App name to Personal Trainer; fix component name for top-nav
f61a379
@chandermani
Added workout history page.
c06c432
@chandermani
Fixed workout-audio. Fixed circular reference issue between parent an…
fc8fd11 
…d child.

http://stackoverflow.com/questions/34540615/how-do-i-inject-a-parent-component-into-a-child-component
Made variables private
@chandermani
Remove @ViewChild from workout-runner
4fbead1
@kevinhennessy
Implement Child Routing in Workout Builder
8a1b5e0
@kevinhennessy
Delete workout-builder.tpl.html
0842c1f
@chandermani
Removed the deprecated next, replaced it with emit
ca4112d
@chandermani
Refactored audio implementation to use inter component communication …
310e635 
…using events and template variables
@chandermani
Made types for event for easy understanding.
067de7a
@chandermani
Made types for event for easy understanding.
edcda39
@chandermani
Added filters for search and order by,
dc501f7
@kevinhennessy
Change TopNav to SubNav -- other minor fixes
1d6ad99
@kevinhennessy
Delete duplicate file reference
98f202b
@chandermani
Fixed search pipe and commented the filtering html.
7d375b0
@chandermani
Fixes to bring checkpoint3.2 in sync with book code.
7ebb8ad
@chandermani
Merge branch 'checkpoint3.2' into checkpoint3.3
023620a 
Conflicts:
	trainer/src/components/app/app.ts
	trainer/src/components/app/workout-history.tpl.html
	trainer/src/components/app/workout-history.ts
	trainer/src/tsconfig.json
chandermani and others added 30 commits August 28, 2016 18:46
@chandermani
Update README.md
c4db493
@chandermani
Update README.md
9002700
@chandermani
Update README.md
06c46c2 
# Conflicts:
#	trainer/README.md
@chandermani
Update README.md
737eb33 
# Conflicts:
#	trainer/README.md
@chandermani
Update README.md
83cbaa4 
# Conflicts:
#	trainer/README.md
@kevinhennessy
Merge branch 'checkpoint4.1' of https://github.com/chandermani/angula…
830b50c 
…r2byexample into checkpoint4.1
@chandermani
Fixed router with 3.0.0 beta.2
7a35390
@chandermani
Fixed router with 3.0.0 beta.2
2bc8abd 
# Conflicts:
#	trainer/src/components/app/app.routes.ts
@kevinhennessy
Upgrade GTN to final release
5eb432a
@kevinhennessy
Upgrade GTN to final release
f6dbf6f
@kevinhennessy
Upgrade GTN to final release
899a994
@kevinhennessy
Replace npmcdn.com with unpkg.com
2faf549
@kevinhennessy
Replace npmcdn.com with unpkg.com
f509aca
@kevinhennessy
Replace npmcdn.com with unpkg.com
d7accbc
@chandermani
Upgraded to Angular 2.0.0. Added module for workout-runner
a362552
@kevinhennessy
Upgraded to Angular 2.0.0. Added module for workout-builder.
4700bd8
@kevinhennessy
Upgraded to Angular 2.0.0. Added module for workout-builder.
67b1353
@kevinhennessy
Upgraded to Angular 2.0.0. Added child routes for workout-builder.
7577a8a
@kevinhennessy
Upgraded to Angular 2.0.0. Added child routes for workout-builder.
7b4e449
@kevinhennessy
Change import in Workout Builder Module from BrowserModule to CommonM…
b97f8be 
…odule
@kevinhennessy
Change import in Workout Builder Module from BrowserModule to CommonM…
9144313 
…odule
@chandermani
Merge branch 'checkpoint3.3' into checkpoint4.1
3385cb6
@chandermani
Merge branch 'checkpoint3.3' into checkpoint4.1
0922817
@kevinhennessy
Merge Checkpoint 4.1 into Checkpoint 4.2
070aaba
@kevinhennessy
Merge branch 'checkpoint4.2' of https://github.com/chandermani/angula…
b530618 
…r2byexample into checkpoint4.2
@kevinhennessy
Remove builder route from app.routes.ts
5321b30
@chandermani
Removed typings tool. Typings will come as npm package. Upgraded gulp…
7e42242 
…-typescript

# Conflicts:
#	trainer/package.json
#	trainer/typings.json

# Conflicts:
#	trainer/package.json
@chandermani
Updated readme describing the new way to instal typings
d2f70bf 
# Conflicts:
#	trainer/README.md
@chandermani
Removed extra typing install instructions.
bbddc0f
@kevinhennessy
lock dependency on types core js to 0 9 36
5114329
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@kevinhennessy @chandermani