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

The updated version of enrollme #136

Open
wants to merge 222 commits into
base: master
Choose a base branch
from
Open

The updated version of enrollme #136

wants to merge 222 commits into from

Commits on Oct 11, 2017

  1. Update README.md 

    Updated CodeClimate
    @yonas024
    yonas024 authored Oct 11, 2017
    Configuration menu
    Copy the full SHA
    398cdd0 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @msun908
    msun908 authored Oct 11, 2017
    Configuration menu
    Copy the full SHA
    d4e7808 View commit details
    Browse the repository at this point in the history

  3. Update iter0.md

    @yonas024
    yonas024 authored Oct 11, 2017
    Configuration menu
    Copy the full SHA
    b64013c View commit details
    Browse the repository at this point in the history

  4. Update README.md

    @yonas024
    yonas024 authored Oct 11, 2017
    Configuration menu
    Copy the full SHA
    dff9690 View commit details
    Browse the repository at this point in the history

  5. Update iter0.md

    @yonas024
    yonas024 authored Oct 11, 2017
    Configuration menu
    Copy the full SHA
    84a2f5e View commit details
    Browse the repository at this point in the history

  6. specified the ruvy version

    @minjoosur
    minjoosur committed Oct 11, 2017
    Configuration menu
    Copy the full SHA
    ccc4346 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/yonas024/enrollme

    @minjoosur
    minjoosur committed Oct 11, 2017
    Configuration menu
    Copy the full SHA
    d41ab9e View commit details
    Browse the repository at this point in the history

  8. Update README.md

    @msun908
    msun908 authored Oct 11, 2017
    Configuration menu
    Copy the full SHA
    86bbab6 View commit details
    Browse the repository at this point in the history

  9. Update README.md

    @msun908
    msun908 authored Oct 11, 2017
    Configuration menu
    Copy the full SHA
    1b90010 View commit details
    Browse the repository at this point in the history

  10. Update Gemfile

    @msun908
    msun908 authored Oct 11, 2017
    Configuration menu
    Copy the full SHA
    da94c26 View commit details
    Browse the repository at this point in the history

  11. Update Gemfile 

    Testing Travis
    @msun908
    msun908 authored Oct 11, 2017
    Configuration menu
    Copy the full SHA
    7d6303e View commit details
    Browse the repository at this point in the history

  12. Update iter0.md

    @yonas024
    yonas024 authored Oct 11, 2017
    Configuration menu
    Copy the full SHA
    1f9725a View commit details
    Browse the repository at this point in the history

  13. Update iter0.md

    @yonas024
    yonas024 authored Oct 11, 2017
    Configuration menu
    Copy the full SHA
    8032fff View commit details
    Browse the repository at this point in the history

  14. Update README.md

    @yonas024
    yonas024 authored Oct 11, 2017
    Configuration menu
    Copy the full SHA
    eefddd0 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2017

  1. Update README.md

    @msun908
    msun908 authored Oct 19, 2017
    Configuration menu
    Copy the full SHA
    338b43b View commit details
    Browse the repository at this point in the history

  2. monty's deployment

    @yonas024
    yonas024 committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    1f39ee1 View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @msun908
    msun908 authored Oct 19, 2017
    Configuration menu
    Copy the full SHA
    22f4c80 View commit details
    Browse the repository at this point in the history

  4. Update README.md

    @msun908
    msun908 authored Oct 19, 2017
    Configuration menu
    Copy the full SHA
    2ca1fc8 View commit details
    Browse the repository at this point in the history

  5. oauth done

    @yonas024
    yonas024 committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    17784d5 View commit details
    Browse the repository at this point in the history

  6. added admins

    @yonas024
    yonas024 committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    f2c34b5 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2017

  1. Update README.md

    @yonas024
    yonas024 authored Oct 20, 2017
    Configuration menu
    Copy the full SHA
    bb59547 View commit details
    Browse the repository at this point in the history

  2. Update .travis.yml

    @yonas024
    yonas024 authored Oct 20, 2017
    Configuration menu
    Copy the full SHA
    a322167 View commit details
    Browse the repository at this point in the history

  3. Update .travis.yml

    @yonas024
    yonas024 authored Oct 20, 2017
    Configuration menu
    Copy the full SHA
    4fc52bc View commit details
    Browse the repository at this point in the history

  4. coverage changes

    @yonas024
    yonas024 committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    fe7fd6e View commit details
    Browse the repository at this point in the history

  5. Update .travis.yml

    @yonas024
    yonas024 authored Oct 20, 2017
    Configuration menu
    Copy the full SHA
    8490108 View commit details
    Browse the repository at this point in the history

  6. Update seeds.rb

    @yonas024
    yonas024 authored Oct 20, 2017
    Configuration menu
    Copy the full SHA
    18d6ec8 View commit details
    Browse the repository at this point in the history

  7. added admin env

    @yonas024
    yonas024 committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    7159eb7 View commit details
    Browse the repository at this point in the history

  8. fixed merge

    @yonas024
    yonas024 committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    929b20c View commit details
    Browse the repository at this point in the history

  9. passing cucumber:

    @yonas024
    yonas024 committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    5282a66 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2017

  1. seeds update, create group button

    @yonas024
    yonas024 committed Oct 21, 2017
    Configuration menu
    Copy the full SHA
    8f513b0 View commit details
    Browse the repository at this point in the history

  2. seeds update, create group button

    @yonas024
    yonas024 committed Oct 21, 2017
    Configuration menu
    Copy the full SHA
    ada85aa View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2017

  1. discussionid to group

    @yonas024
    yonas024 committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    3460749 View commit details
    Browse the repository at this point in the history

  2. gitignore now ignores all in tmp

    @Tstepro
    Tstepro committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    3ec1ca0 View commit details
    Browse the repository at this point in the history

  3. Including ruby 2.3.4 in gemfile

    @Tstepro
    Tstepro committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    cc9388f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:yonas024/enrollme

    @Tstepro
    Tstepro committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    512338e View commit details
    Browse the repository at this point in the history

  5. monty group

    @yonas024
    yonas024 committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    3422339 View commit details
    Browse the repository at this point in the history

  6. Group View

    @Tstepro
    Tstepro committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    c052544 View commit details
    Browse the repository at this point in the history

  7. Fixed Group View and Resolved Merge Conflict

    @Tstepro
    Tstepro committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    e98b31f View commit details
    Browse the repository at this point in the history

  8. View Groups bug fixed and Cucumber Test passed

    @Tstepro
    Tstepro committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    f2b2aca View commit details
    Browse the repository at this point in the history

  9. Monty's random method commit

    Monty committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    a3da907 View commit details
    Browse the repository at this point in the history

  10. Merge conflict resolved - random is working

    Monty committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    86d20b4 View commit details
    Browse the repository at this point in the history

  11. Email feature

    Vikram Baid committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    fbabc61 View commit details
    Browse the repository at this point in the history

  12. Added test for email feature

    Vikram Baid committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    c573f3e View commit details
    Browse the repository at this point in the history

  13. create group finished

    @yonas024
    yonas024 committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    f309fb1 View commit details
    Browse the repository at this point in the history

  14. merged

    @yonas024
    yonas024 committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    a58bf86 View commit details
    Browse the repository at this point in the history

  15. merged new

    @yonas024
    yonas024 committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    cd06e47 View commit details
    Browse the repository at this point in the history

  16. working create group/cucumber

    @yonas024
    yonas024 committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    60e2c8b View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' of github.com:yonas024/enrollme

    Vikram Baid committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    3276151 View commit details
    Browse the repository at this point in the history

  18. unmerge button

    @yonas024
    yonas024 committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    cdc41fc View commit details
    Browse the repository at this point in the history

  19. comment seeds

    @yonas024
    yonas024 committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    0fcf8c1 View commit details
    Browse the repository at this point in the history

  20. heroku deploy

    @yonas024
    yonas024 committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    86c3f86 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' of github.com:yonas024/enrollme

    Vikram Baid committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    1084eb7 View commit details
    Browse the repository at this point in the history

  22. coveralls

    @yonas024
    yonas024 committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    549b4bc View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2017

  1. coverall yml

    @yonas024
    yonas024 committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    579a3a4 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2017

  1. Update README.md

    @yonas024
    yonas024 authored Oct 25, 2017
    Configuration menu
    Copy the full SHA
    a5769cc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:yonas024/enrollme

    Vikram Baid committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    2142aaa View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2017

  1. Done with iter1-2

    Vikram Baid committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    a0f63f1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from msun908/new_email_feature 

    New email feature
    @msun908
    msun908 authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    a6938a4 View commit details
    Browse the repository at this point in the history

  3. cucumber passed

    @minjoosur
    minjoosur committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    c13924d View commit details
    Browse the repository at this point in the history

  4. Update README.md

    @yonas024
    yonas024 authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    03b8982 View commit details
    Browse the repository at this point in the history

  5. Update README.md

    @yonas024
    yonas024 authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    3332dd5 View commit details
    Browse the repository at this point in the history

  6. .travisci changes

    @yonas024
    yonas024 committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    0b28fd2 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/msun908/enrollme

    @yonas024
    yonas024 committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    5cc4c10 View commit details
    Browse the repository at this point in the history

  8. deleted tmp

    @yonas024
    yonas024 committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    d5bf290 View commit details
    Browse the repository at this point in the history

  9. Update README.md

    @yonas024
    yonas024 authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    b1ea617 View commit details
    Browse the repository at this point in the history

  10. Update README.md

    @yonas024
    yonas024 authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    ad8ad66 View commit details
    Browse the repository at this point in the history

  11. Update .travis.yml

    @yonas024
    yonas024 authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    b8ba10c View commit details
    Browse the repository at this point in the history

  12. Update README.md

    @yonas024
    yonas024 authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    50a8d72 View commit details
    Browse the repository at this point in the history

  13. cucumber test done for select_teams ver.1

    @minjoosur
    minjoosur committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    af683e4 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #3 from msun908/minjoo 

    cucumber test done for select_teams ver.1
    @imnotanoob
    imnotanoob authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    5292eae View commit details
    Browse the repository at this point in the history

  15. travis change

    @yonas024
    yonas024 committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    962fa0a View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' of https://github.com/msun908/enrollme

    @yonas024
    yonas024 committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    6fb1b1a View commit details
    Browse the repository at this point in the history

  17. Change back config

    @msun908
    msun908 committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    2d04676 View commit details
    Browse the repository at this point in the history

  18. coveralls

    @msun908
    msun908 committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    4ca73d0 View commit details
    Browse the repository at this point in the history

  19. Update README.md

    @msun908
    msun908 authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    dd1d9da View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2017

  1. Small css commit

    Vikram Baid committed Oct 28, 2017
    Configuration menu
    Copy the full SHA
    cec1142 View commit details
    Browse the repository at this point in the history

  2. Added a feature file

    Vikram Baid committed Oct 28, 2017
    Configuration menu
    Copy the full SHA
    1c1622a View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2017

  1. no change

    Monty committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    9a2054d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/msun908/enrollme

    @yonas024
    yonas024 committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    9cd5799 View commit details
    Browse the repository at this point in the history

  3. updated ccuke tests

    @minjoosur
    minjoosur committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    664414a View commit details
    Browse the repository at this point in the history

  4. create group bug checking

    @minjoosur
    minjoosur committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    f49b98a View commit details
    Browse the repository at this point in the history

  5. fixing Discussion.find_by_number in add_group tests

    @Tstepro
    Tstepro committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    cfa4338 View commit details
    Browse the repository at this point in the history

  6. cucumber test added so that users can see their groups

    @minjoosur
    minjoosur committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    cbbbf6c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/csv_confirmation' of https://github.com/msun908… 

    …/enrollme
    @yonas024
    yonas024 committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    3b1652c View commit details
    Browse the repository at this point in the history

  8. random feature is working

    Monty committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    6c48229 View commit details
    Browse the repository at this point in the history

  9. resolving merge conflict

    Monty committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    a7df1e8 View commit details
    Browse the repository at this point in the history

  10. Should now be able to search for teams by id and add_group is now pro… 

    …perly checking for valid teams
    @Tstepro
    Tstepro committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    24a116b View commit details
    Browse the repository at this point in the history

  11. Added a header for the users (students) to be able to see their team id

    @Tstepro
    Tstepro committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    8986f5a View commit details
    Browse the repository at this point in the history

  12. Just cleaning up the team.html.erb

    @Tstepro
    Tstepro committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    9ab03d8 View commit details
    Browse the repository at this point in the history

  13. Forgot to add the step definitions and fixed admin_view_groups feature

    @Tstepro
    Tstepro committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    6432e7a View commit details
    Browse the repository at this point in the history

  14. forgot to comment out the seeds

    @Tstepro
    Tstepro committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    f05feab View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2017

  1. CSV upload feature

    @msun908
    msun908 committed Nov 2, 2017
    Configuration menu
    Copy the full SHA
    2cddfa1 View commit details
    Browse the repository at this point in the history

  2. Fixing bugs and corner cases

    @msun908
    msun908 committed Nov 2, 2017
    Configuration menu
    Copy the full SHA
    a26c7c2 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2017

  1. Edit bug fix

    @msun908
    msun908 committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    1a706f3 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2017

  1. Merge pull request #6 from msun908/feature/add_team_id_for_user 

    Feature/add team id for user
    @yonas024
    yonas024 authored Nov 4, 2017
    Configuration menu
    Copy the full SHA
    dee16e5 View commit details
    Browse the repository at this point in the history

  2. random feature is now working

    Monty committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    5eda598 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7 from msun908/test/add_group 

    Test/add group
    @yonas024
    yonas024 authored Nov 4, 2017
    Configuration menu
    Copy the full SHA
    858c840 View commit details
    Browse the repository at this point in the history

  4. Delete test.log

    Muntadher Inaya authored Nov 4, 2017
    Configuration menu
    Copy the full SHA
    31835e2 View commit details
    Browse the repository at this point in the history

  5. blah

    @yonas024
    yonas024 committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    199a3a8 View commit details
    Browse the repository at this point in the history

  6. he

    @yonas024
    yonas024 committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    e91d392 View commit details
    Browse the repository at this point in the history

  7. Almost done

    @msun908
    msun908 committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    96bd2ac View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into csv_upload_final

    @msun908
    msun908 committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    94e4147 View commit details
    Browse the repository at this point in the history

  9. CodeClimate fixes, need to finish later

    @msun908
    msun908 committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    6ae8310 View commit details
    Browse the repository at this point in the history

  10. small changes

    @yonas024
    yonas024 committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    d82ef8b View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into feature-random

    @Tstepro
    Tstepro committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    618d5c1 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2017

  1. Codeclimate

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    745a1bc View commit details
    Browse the repository at this point in the history

  2. Codeclimate

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    bed25de View commit details
    Browse the repository at this point in the history

  3. codeclimate

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    e69e9e3 View commit details
    Browse the repository at this point in the history

  4. codeclimate

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    14c574b View commit details
    Browse the repository at this point in the history

  5. refactored slightly

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    0b9248a View commit details
    Browse the repository at this point in the history

  6. Refactored and checked

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    c02ca7d View commit details
    Browse the repository at this point in the history

  7. codeclimate

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    ed56c0c View commit details
    Browse the repository at this point in the history

  8. Refactored some more

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    e1e8860 View commit details
    Browse the repository at this point in the history

  9. Some more refactoring

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    f16ac1d View commit details
    Browse the repository at this point in the history

  10. fix bug

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    16df9f8 View commit details
    Browse the repository at this point in the history

  11. Added coverage for random grouping

    @Tstepro
    Tstepro committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    20408ad View commit details
    Browse the repository at this point in the history

  12. Csv upload final (#9) 

    * CSV upload feature

* Fixing bugs and corner cases

* Edit bug fix

* Almost done

* CodeClimate fixes, need to finish later

* Codeclimate

* Codeclimate

* codeclimate

* codeclimate

* refactored slightly

* Refactored and checked

* codeclimate

* Refactored some more

* Some more refactoring

* fix bug
    @msun908
    msun908 authored Nov 5, 2017
    Configuration menu
    Copy the full SHA
    2813c8b View commit details
    Browse the repository at this point in the history

  13. users can view group

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    64213dc View commit details
    Browse the repository at this point in the history

  14. monty pull to yonas

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    f6fc8c4 View commit details
    Browse the repository at this point in the history

  15. merged master

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    243d927 View commit details
    Browse the repository at this point in the history

  16. added new feature file, working on writing the test

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    f25325e View commit details
    Browse the repository at this point in the history

  17. added rspec tests

    Monty committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    9d1d97a View commit details
    Browse the repository at this point in the history

  18. Merge branch 'feature-random' of https://github.com/msun908/enrollme … 

    …into feature-random
    Monty committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    3b82624 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'feature-random' of https://github.com/msun908/enrollme

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    d6e7ab3 View commit details
    Browse the repository at this point in the history

  20. pull from monty coverage

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    3f0d633 View commit details
    Browse the repository at this point in the history

  21. travis change

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    fd58b61 View commit details
    Browse the repository at this point in the history

  22. new feature

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    8a7b8a7 View commit details
    Browse the repository at this point in the history

  23. Added feature file

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    ba8e357 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'csv_upload_final'

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    4f2d784 View commit details
    Browse the repository at this point in the history

  25. show_mygroup.feature added

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    6cb1005 View commit details
    Browse the repository at this point in the history

  26. merged

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    18ce5e3 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'master' into yonas

    @msun908
    msun908 authored Nov 5, 2017
    Configuration menu
    Copy the full SHA
    166f6d4 View commit details
    Browse the repository at this point in the history

  28. Fixed Coveralls for rails app

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    cab7dca View commit details
    Browse the repository at this point in the history

  29. csv change

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    43e7b8f View commit details
    Browse the repository at this point in the history

  30. Added coverage for undoing an approval for a team

    @Tstepro
    Tstepro committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    4b5adde View commit details
    Browse the repository at this point in the history

  31. merged

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    8e3baab View commit details
    Browse the repository at this point in the history

  32. Merge branch 'test/undo_approve_admin' of https://github.com/msun908/… 

    …enrollme into yonas
    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    0a5ba84 View commit details
    Browse the repository at this point in the history

  33. merged tims features

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    49f2750 View commit details
    Browse the repository at this point in the history

  34. Merge branch 'yonas' of https://github.com/msun908/enrollme into yonas

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    e3773e7 View commit details
    Browse the repository at this point in the history

  35. merged with yonas branch

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    051f06b View commit details
    Browse the repository at this point in the history

  36. merged with yonas branch

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    15551e2 View commit details
    Browse the repository at this point in the history

  37. merged with yonas branch

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    9ac15a5 View commit details
    Browse the repository at this point in the history

  38. Change env.rb Coveralls to track rails app, not all files

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    4b3170d View commit details
    Browse the repository at this point in the history

  39. Yonas (#12) 

    * travis change

* Added a feature file

* no change

* random feature is working

* random feature is now working

* Delete test.log

* blah

* small changes

* Added coverage for random grouping

* users can view group

* added rspec tests

* pull from monty coverage

* travis change

* new feature

* show_mygroup.feature added

* csv change

* Added coverage for undoing an approval for a team

* merged

* merged tims features

* merged with yonas branch

* Change env.rb Coveralls to track rails app, not all files
    @yonas024 @msun908
    yonas024 authored and msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    c05859e View commit details
    Browse the repository at this point in the history

  40. Update README.md

    @yonas024
    yonas024 authored Nov 5, 2017
    Configuration menu
    Copy the full SHA
    363a288 View commit details
    Browse the repository at this point in the history

  41. Update README.md

    @yonas024
    yonas024 authored Nov 5, 2017
    Configuration menu
    Copy the full SHA
    4c7df54 View commit details
    Browse the repository at this point in the history

  42. Update README.md

    @yonas024
    yonas024 authored Nov 5, 2017
    Configuration menu
    Copy the full SHA
    d76902a View commit details
    Browse the repository at this point in the history

  43. Update README.md

    @yonas024
    yonas024 authored Nov 5, 2017
    Configuration menu
    Copy the full SHA
    ff88369 View commit details
    Browse the repository at this point in the history

  44. Merge branch 'master' of https://github.com/msun908/enrollme into yonas

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    67690d4 View commit details
    Browse the repository at this point in the history

  45. Update README.md

    @msun908
    msun908 authored Nov 5, 2017
    Configuration menu
    Copy the full SHA
    ca90c94 View commit details
    Browse the repository at this point in the history

  46. Update README.md

    @msun908
    msun908 authored Nov 5, 2017
    Configuration menu
    Copy the full SHA
    5a7a001 View commit details
    Browse the repository at this point in the history

  47. admin controller changes

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    aa2482e View commit details
    Browse the repository at this point in the history

  48. Merge branch 'master' of https://github.com/msun908/enrollme into yonas

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    f685215 View commit details
    Browse the repository at this point in the history

  49. merged

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    e2c5dd1 View commit details
    Browse the repository at this point in the history

  50. admin controller changes

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    e7e7399 View commit details
    Browse the repository at this point in the history

  51. admin controller changes

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    e4c63fc View commit details
    Browse the repository at this point in the history

  52. admin controller changes

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    beaadd9 View commit details
    Browse the repository at this point in the history

  53. admin controller changes

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    14a9832 View commit details
    Browse the repository at this point in the history

  54. admin controller changes

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    b609106 View commit details
    Browse the repository at this point in the history

  55. clock.rb syntax issues

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    0bcb8de View commit details
    Browse the repository at this point in the history

  56. Update README.md

    @yonas024
    yonas024 authored Nov 5, 2017
    Configuration menu
    Copy the full SHA
    8803f5a View commit details
    Browse the repository at this point in the history

  57. Update README.md

    @yonas024
    yonas024 authored Nov 5, 2017
    Configuration menu
    Copy the full SHA
    971fcef View commit details
    Browse the repository at this point in the history

  58. Update README.md

    @yonas024
    yonas024 authored Nov 5, 2017
    Configuration menu
    Copy the full SHA
    de64e12 View commit details
    Browse the repository at this point in the history

  59. revert changes because of build failure

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    6901c58 View commit details
    Browse the repository at this point in the history

  60. CodeClimate

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    4e7bf03 View commit details
    Browse the repository at this point in the history

  61. admin controller changes

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    d09f65b View commit details
    Browse the repository at this point in the history

  62. Merge branch 'master' of https://github.com/msun908/enrollme

    @yonas024
    yonas024 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    56884b5 View commit details
    Browse the repository at this point in the history

  63. Setting up travis with codecoverage

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    75c2b70 View commit details
    Browse the repository at this point in the history

  64. Setting up travis with codecoverage

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    701938f View commit details
    Browse the repository at this point in the history

  65. coveralls token updated

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    6b1640e View commit details
    Browse the repository at this point in the history

  66. travis change didn't work, reverting

    @msun908
    msun908 committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    a05e986 View commit details
    Browse the repository at this point in the history

  67. Update README.md

    @msun908
    msun908 authored Nov 5, 2017
    Configuration menu
    Copy the full SHA
    fe3e53c View commit details
    Browse the repository at this point in the history

  68. Update README.md

    @msun908
    msun908 authored Nov 5, 2017
    Configuration menu
    Copy the full SHA
    399da13 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2017

  1. feature changes

    @yonas024
    yonas024 committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    2b1bb68 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2017

  1. fixed features

    @yonas024
    yonas024 committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    7f7b264 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/msun908/enrollme

    @yonas024
    yonas024 committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    929eae9 View commit details
    Browse the repository at this point in the history

  3. fixed features

    @yonas024
    yonas024 committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    4d7326b View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2017

  1. added features

    @yonas024
    yonas024 committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    2ce5ca8 View commit details
    Browse the repository at this point in the history

  2. gitignore

    @yonas024
    yonas024 committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    474bfa0 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2017

  1. Csv upload final (#13) 

    * Working on changing automatic enrollment of teams to factor in their preferences

* Changed automatic enrollment to enroll in discussion with least number of students out of each team's preferred discussion

* fixed bug
    @msun908
    msun908 authored Nov 19, 2017
    Configuration menu
    Copy the full SHA
    a145514 View commit details
    Browse the repository at this point in the history

  2. Got rid of puts calls in passing tests (#14) 

    * Working on changing automatic enrollment of teams to factor in their preferences

* Changed automatic enrollment to enroll in discussion with least number of students out of each team's preferred discussion

* fixed bug

* Getting rid of puts
    @msun908
    msun908 authored Nov 19, 2017
    Configuration menu
    Copy the full SHA
    a0d43a9 View commit details
    Browse the repository at this point in the history

  3. Adding a page to show the list of unapproved teams

    Vikram Baid committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    05aecbc View commit details
    Browse the repository at this point in the history

  4. Also commenting out the seeds

    Vikram Baid committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    5ec2e33 View commit details
    Browse the repository at this point in the history

  5. Few styling changes

    Vikram Baid committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    2c9243d View commit details
    Browse the repository at this point in the history

  6. Added a few more testing feature

    Vikram Baid committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    db53320 View commit details
    Browse the repository at this point in the history

  7. removed testing print statents

    Vikram Baid committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    0fd234c View commit details
    Browse the repository at this point in the history

  8. Merge pull request #15 from msun908/feature/show_unapproved_teams 

    Feature/show unapproved teams
    @msun908
    msun908 authored Nov 19, 2017
    Configuration menu
    Copy the full SHA
    c74abdb View commit details
    Browse the repository at this point in the history

  9. Added two new TAs

    @Tstepro
    Tstepro committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    9555ad3 View commit details
    Browse the repository at this point in the history

  10. Merged master with new admins feature

    @Tstepro
    Tstepro committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    fa4d92e View commit details
    Browse the repository at this point in the history

  11. Merge branch 'feature/new_admin_types' of https://github.com/msun908/… 

    …enrollme
    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    379128b View commit details
    Browse the repository at this point in the history

  12. fixed admins features

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    6e22592 View commit details
    Browse the repository at this point in the history

  13. fixed admins features

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    f5f8d1f View commit details
    Browse the repository at this point in the history

  14. fixed admins features

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    6f2e4d0 View commit details
    Browse the repository at this point in the history

  15. heroku add seeds

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    9dbe894 View commit details
    Browse the repository at this point in the history

  16. heroku add seeds

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    5d14740 View commit details
    Browse the repository at this point in the history

  17. heroku add seeds

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    3fd6cbc View commit details
    Browse the repository at this point in the history

  18. mail changes

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    dcb0e89 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'yonas' of https://github.com/msun908/enrollme

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    87cfce5 View commit details
    Browse the repository at this point in the history

  20. fixed mailing

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    4b8b568 View commit details
    Browse the repository at this point in the history

  21. config.ru change

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    d49567c View commit details
    Browse the repository at this point in the history

  22. config.ru change

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    02dce2d View commit details
    Browse the repository at this point in the history

  23. add steven to seeds

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    ed8b678 View commit details
    Browse the repository at this point in the history

  24. heroku email test

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    303e0f3 View commit details
    Browse the repository at this point in the history

  25. heroku email test

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    a39008d View commit details
    Browse the repository at this point in the history

  26. heroku email test

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    65544ea View commit details
    Browse the repository at this point in the history

  27. heroku email test

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    cdbd3a4 View commit details
    Browse the repository at this point in the history

  28. heroku email test

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    e77c323 View commit details
    Browse the repository at this point in the history

  29. heroku email test

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    56a7d26 View commit details
    Browse the repository at this point in the history

  30. heroku email test

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    b1129c3 View commit details
    Browse the repository at this point in the history

  31. heroku email test

    @yonas024
    yonas024 committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    83d89d7 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2017

  1. enrollment api

    @yonas024
    yonas024 committed Nov 28, 2017
    Configuration menu
    Copy the full SHA
    3762750 View commit details
    Browse the repository at this point in the history

  2. enrollment api

    @yonas024
    yonas024 committed Nov 28, 2017
    Configuration menu
    Copy the full SHA
    e6b6b40 View commit details
    Browse the repository at this point in the history

  3. enrollment api

    @yonas024
    yonas024 committed Nov 28, 2017
    Configuration menu
    Copy the full SHA
    b346e20 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2017

  1. README changes

    @yonas024
    yonas024 committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    9c6edd0 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @msun908
    msun908 authored Nov 29, 2017
    Configuration menu
    Copy the full SHA
    bd02348 View commit details
    Browse the repository at this point in the history

  3. feature changes

    @yonas024
    yonas024 committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    a59821c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #20 from msun908/yonas 

    Yonas
    @yonas024
    yonas024 authored Nov 29, 2017
    Configuration menu
    Copy the full SHA
    7c0cb94 View commit details
    Browse the repository at this point in the history

  5. README changes

    @yonas024
    yonas024 committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    53f8845 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/msun908/enrollme

    @yonas024
    yonas024 committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    5cd8843 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2017

  1. tests coverage went up to 97%

    @minjoosur
    minjoosur committed Dec 2, 2017
    Configuration menu
    Copy the full SHA
    0d645f1 View commit details
    Browse the repository at this point in the history

  2. fixed the travis issue

    @minjoosur
    minjoosur committed Dec 2, 2017
    Configuration menu
    Copy the full SHA
    d569845 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #21 from msun908/iter4-tests 

    tests coverage went up to 97%
    Muntadher Inaya authored Dec 2, 2017
    Configuration menu
    Copy the full SHA
    a1745d6 View commit details
    Browse the repository at this point in the history