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

#2 Best in place working on settings page. Some other styling changes. The form to create organization/coach doesn't work. #94

Open
wants to merge 483 commits into
base: Julia
Choose a base branch
from
Open

#2 Best in place working on settings page. Some other styling changes. The form to create organization/coach doesn't work. #94

wants to merge 483 commits into from

Conversation

jharmison
Copy link

No description provided.

aalpizar and others added 30 commits June 4, 2015 11:42
@aalpizar
created partials for coach dashboard elements
9933266
@shimieshimshim
capitalizing all division names
1a91596
Sidekiq running, working on invoking rake task
6ed3f33
@shimieshimshim
changed top scores to display top scores for each event instead of sc…
fdc44b6 
…ores for the highest ranked team in relevant division. However kept method to find the top standing team for in relevant division
@shimieshimshim
Merge branch 'master' of https://github.com/cmu-is-projects/quizzing
38eea16
@shimieshimshim
changed find_top_teams method in TeamStandings to find the rankings o…
c2d42f3 
…f the division instead of just the first rank
@shimieshimshim
working on show_top_four method in TeamStandings for showing top team…
286ac21 
…/student on show pages
@shimieshimshim
syntax error fixed
16d0da7
@snatu
no changes really, struggling with pagination
220dbef
@snatu
Fixing small edits
b1ca798
@snatu
Merge branch 'master' of https://github.com/seohyuns/quizzing
d14051c
Sidekiq task runs Rake task
1a49883
@snatu
Working on finding top 3 students
395ea26
Added settings controller/view, routes now point update standings to …
7b9b10e 
…settings controller
@snatu
Fixed top students functionality and cleaned up some of the code
6fc5abc
@shimieshimshim
added second graph
3425684
@snatu
Fixed top students showing up for the different tabs
52bd3b9
@snatu
Cleaning up code
1e55d92
@snatu
Fixed team index page but need to add in pagination
7fcc55a
@snatu
fixed top students in team show page
ecb117c
@snatu
Added average and top scores to student performance graph
32ed61f
@snatu
Started bar graph for wins
e921eef
@profh
Added place to quiz_teams
040c28a
changes made so server will run
5beb013
@profh
Update db dump to handle place
54cd972
Sidekiq fully working, added options to update individual/team separa…
eec158b 
…tely
Resolved merge conflict in Gemfile with Sidekiq branch
7c7882b
Migrated
479290a
@shimieshimshim
both graph showing:needed a different id, tabs working on team show page
a2d66bb
@shimieshimshim
bar graphs now displaying for team members
f04b699
profh and others added 30 commits June 25, 2015 14:24
@profh
Setting defaults for visible in app.js
a0b4c53
@profh
Moved stray code in application.js to functionality.js
69c7896
@profh
Removed require highcharts
0b87273
Added specific versions in Gemfile
8320f42
Working on cap
7d32158
@profh
Handling merge conflicts for Clara's commit
8528f8c
added Capistrano-sidekiq
bbaf317
Merge in Gemfile explicit version
acca1fe
Merge conflict in Gemfile resolved
53315cc
@profh
Merge pull request #90 from ngasbarr/master
795cfc7 
Toast color
@profh
Updating Gemfile.lock to include cap-sidekiq
1c1cecd
@aalpizar
best in place for area admin dashboard
4c4d9f9
@shimieshimshim
commit
432ca23
@shimieshimshim
Merge branch 'master' of https://github.com/cmu-is-projects/quizzing
2ee5780
best in place not working in start and end date
f041681
@aalpizar
best in place area admin dashboard
77a2f2f
@aalpizar
merge conflict resolved
e41486d
@aalpizar
removed functionality.js and kept all javascript in application.js file
9388822
@aalpizar
on login, redirects to coach or area admin dashboard
fe456ae
@aalpizar
cleaned up events page
fcb1235
@profh
Merge pull request #91 from aalpizar/master
dc61ac0 
Area Admin Dashboard & Application.js
@shimieshimshim
Merge branch 'master' of https://github.com/cmu-is-projects/quizzing
7523170
@shimieshimshim
creating coach's list on admin page
84ac3c8
@profh
Fixed session store to handle subdomains
41de430
@shimieshimshim
took out coach list button
3b0f093
@shimieshimshim
teams dashboard display coaches if exist
f663b87
best in place form working for start and end grade on settings page
bc7637d
fixed merge conflicts when pulling from master
9d07a35
@profh
Merge pull request #92 from seohyuns/master
952a3fb 
added coach on team page and deleted the coach list on home page
fixing merge conflict from clara's push to master
41ec4fc
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.
5 participants
@jharmison @aalpizar @shimieshimshim @snatu @profh