Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New #50

Merged
merged 41 commits into from
May 1, 2015
Merged

New #50

merged 41 commits into from
May 1, 2015

Conversation

SeifKeshk
Copy link
Contributor

Merged all finished sprint tasks except for #39 #40.
I want @marinasamy to review my code, @NohaGomaa to review my scenarios and @Ericphilippe to review my documentation.

SeifKeshk and others added 30 commits April 13, 2015 17:47
@SeifKeshk
creating new branch
550eb32
@SeifKeshk
new branch
d320e38
@SeifKeshk
new homepage and new design for home, signin & signup
53b87fc
@SeifKeshk
client profile updated
5c8746f
@SeifKeshk
client schedule
d383c3e
@SeifKeshk
new updates for client homepage & profile
736a7af
@SeifKeshk
new template updates
15360f8
@SeifKeshk
schedule updates
fd29d8e
@SeifKeshk
merging with master
0d7ee86
@SeifKeshk
1-trainer_home 2- trainer_profile 3-follow me button 4-add workout &…
2b41cae 
… workout schedule buttons in clients profile
@NohaGomaa
working on models for tasks #43 #44
5303621
@SeifKeshk
removed extra tabs buttons and pictures
daad19a
@NohaGomaa
Add workouts now working #43
83a33ff
@Ericphilippe
follow request working now
55ea1f4
@SeifKeshk
clients profile and home page updated
d079aac
@Ericphilippe
friendship package
0aa394d
@SeifKeshk
merging with eric2
e4d7e6c
@SeifKeshk
removing lines in profile_trainer
44167c2
@NohaGomaa
views for adding exercises #43
e5ca258
@Ericphilippe
updates in trainer home
75b18a1
@Ericphilippe
updates in client home
107ebfa
@Ericphilippe
Login page updates
c74e9a3
@Ericphilippe
Trainer updates
e5f0799
@SeifKeshk
register , client_info and trainer_info design
413c2a0
@NohaGomaa
Finalizing #43 and updated UserCreateForm for signup
d7357b1
@SeifKeshk
add workouts new design , trainer can view client schedule , my clie…
be10eaa 
…nts redirections
@SeifKeshk
merging with workouts branch
13fcf4f
@Ericphilippe
view schedule method is now working
fdb8cd9
@Ericphilippe
changes in front-end
4efdeaf
@SeifKeshk
merging with branch eric
c0f33fc
@NohaGomaa
Copy link
Contributor

Scenarios are followed

@Ericphilippe
Copy link
Contributor

Good work @SeifKeshk

@marinasamy
Copy link
Contributor

Good job with the code

SeifKeshk added a commit that referenced this pull request May 1, 2015
@SeifKeshk
Merge pull request #50 from GUC-SE-2015/new
9618f61 
New
@SeifKeshk SeifKeshk merged commit 9618f61 into master May 1, 2015
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
Code Reviewed Documentation Reviewed Merge Approved Scenarios Reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@SeifKeshk @NohaGomaa @Ericphilippe @marinasamy