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

master <- trunk #871

Merged
merged 101 commits into from Nov 10, 2019
Merged

master <- trunk #871

merged 101 commits into from Nov 10, 2019

Commits on Oct 30, 2019

  1. major refactoring to most components

    @hisahi
    hisahi committed Oct 30, 2019
    Copy the full SHA
    edf518d View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2019

  1. merge

    @hisahi
    hisahi committed Oct 31, 2019
    Copy the full SHA
    780e6b9 View commit details
    Browse the repository at this point in the history

  2. refactor & split WeekReview

    @hisahi
    hisahi committed Oct 31, 2019
    Copy the full SHA
    4ca7c12 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2019

  1. merge

    @hisahi
    hisahi committed Nov 2, 2019
    Copy the full SHA
    68816b0 View commit details
    Browse the repository at this point in the history

  2. backend eslint

    @hisahi
    hisahi committed Nov 2, 2019
    Copy the full SHA
    df0093e View commit details
    Browse the repository at this point in the history

  3. merge

    @hisahi
    hisahi committed Nov 2, 2019
    Copy the full SHA
    9725b39 View commit details
    Browse the repository at this point in the history

  4. snaps

    @hisahi
    hisahi committed Nov 2, 2019
    Copy the full SHA
    5274d61 View commit details
    Browse the repository at this point in the history

  5. only CoursePage remains

    @hisahi
    hisahi committed Nov 2, 2019
    Copy the full SHA
    50a04d6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/labtool int… 

    …o refactor/components-2
    @hisahi
    hisahi committed Nov 2, 2019
    Copy the full SHA
    17c795d View commit details
    Browse the repository at this point in the history

  7. CoursePage split, finally

    @hisahi
    hisahi committed Nov 2, 2019
    Copy the full SHA
    7f9af35 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2019

  1. merge

    @hisahi
    hisahi committed Nov 4, 2019
    Copy the full SHA
    8b5dd4f View commit details
    Browse the repository at this point in the history

  2. merge

    @hisahi
    hisahi committed Nov 4, 2019
    Copy the full SHA
    d073aae View commit details
    Browse the repository at this point in the history

  3. Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/labtool int… 

    …o refactor/components-2
    @hisahi
    hisahi committed Nov 4, 2019
    Copy the full SHA
    488a529 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'trunk' into refactor/components-2

    @hisahi
    hisahi committed Nov 4, 2019
    Copy the full SHA
    c8fc555 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2019

  1. Merge branch 'trunk' into refactor/components-2

    @hisahi
    hisahi committed Nov 6, 2019
    Copy the full SHA
    4a0372d View commit details
    Browse the repository at this point in the history

  2. prevent selection leak

    @hisahi
    hisahi committed Nov 6, 2019
    Copy the full SHA
    16dbaf3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #823 from UniversityOfHelsinkiCS/fix/select-studen… 

    …ts-leak

Prevent student selection leak
    @hisahi
    hisahi committed Nov 6, 2019
    Copy the full SHA
    73fa0e2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'trunk' into refactor/components-2

    @hisahi
    hisahi committed Nov 6, 2019
    Copy the full SHA
    85e3ed8 View commit details
    Browse the repository at this point in the history

  5. use abbr for 'Wk'

    @hisahi
    hisahi committed Nov 6, 2019
    Copy the full SHA
    bcd216c View commit details
    Browse the repository at this point in the history

  6. Bump sequelize from 4.37.6 to 5.15.1 in /backend 

    Bumps [sequelize](https://github.com/sequelize/sequelize) from 4.37.6 to 5.15.1.
- [Release notes](https://github.com/sequelize/sequelize/releases)
- [Commits](sequelize/sequelize@v4.37.6...v5.15.1)

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] committed Nov 6, 2019
    Copy the full SHA
    ef422d3 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'refactor/components-2' of github.com:UniversityOfHelsin… 

    …kiCS/labtool into refactor/components-2
    @hisahi
    hisahi committed Nov 6, 2019
    Copy the full SHA
    376db16 View commit details
    Browse the repository at this point in the history

  8. small proptypes fix

    @hisahi
    hisahi committed Nov 6, 2019
    Copy the full SHA
    ddb73b2 View commit details
    Browse the repository at this point in the history

  9. use clItem.id instead of clItem.name for check

    @hisahi
    hisahi committed Nov 6, 2019
    Copy the full SHA
    9c3b129 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'trunk' into dependabot/npm_and_yarn/backend/sequelize-5… 

    ….15.1
    @gotonode
    gotonode committed Nov 6, 2019
    Copy the full SHA
    367bb0a View commit details
    Browse the repository at this point in the history

  11. Merge pull request #801 from UniversityOfHelsinkiCS/refactor/componen… 

    …ts-2

Major refactoring to most components
    @hisahi
    hisahi committed Nov 6, 2019
    Copy the full SHA
    cbf4aea View commit details
    Browse the repository at this point in the history

  12. Merge branch 'trunk' into dependabot/npm_and_yarn/backend/sequelize-5… 

    ….15.1
    @gotonode
    gotonode committed Nov 6, 2019
    Copy the full SHA
    8b210cb View commit details
    Browse the repository at this point in the history

  13. Merge pull request #840 from UniversityOfHelsinkiCS/dependabot/npm_an… 

    …d_yarn/backend/sequelize-5.15.1

Bump sequelize from 4.37.6 to 5.15.1 in /backend
    @gotonode
    gotonode committed Nov 6, 2019
    Copy the full SHA
    a83c980 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2019

  1. upgrade to sequelize v5

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    e6fe12e View commit details
    Browse the repository at this point in the history

  2. add button

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    74bb205 View commit details
    Browse the repository at this point in the history

  3. more

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    f34ae29 View commit details
    Browse the repository at this point in the history

  4. even more

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    2dbf682 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #846 from UniversityOfHelsinkiCS/fix/sequelize-v5 

    Upgrade to sequelize v5
    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    109a987 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'trunk' into feat/csv-export

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    7864457 View commit details
    Browse the repository at this point in the history

  7. further work

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    4c798cd View commit details
    Browse the repository at this point in the history

  8. fix further errors

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    bb2ac7c View commit details
    Browse the repository at this point in the history

  9. fix courseInstance model

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    f281d7e View commit details
    Browse the repository at this point in the history

  10. Merge pull request #848 from UniversityOfHelsinkiCS/fix/course-modify… 

    …-arrays

Fix further errors caused by upgrade
    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    760e021 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'trunk' into feat/csv-export

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    89a1914 View commit details
    Browse the repository at this point in the history

  12. CSV export works now

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    36ee7e8 View commit details
    Browse the repository at this point in the history

  13. fix repo issue checking

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    4c7a821 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'trunk' into fix/issue-checking

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    3d99767 View commit details
    Browse the repository at this point in the history

  15. Update labtool2.0/src/components/pages/CoursePage/TeacherMain.js 

    Co-Authored-By: Jaakko Malkki <32361480+mjaakko@users.noreply.github.com>
    @hisahi @mjaakko
    hisahi and mjaakko committed Nov 7, 2019
    Copy the full SHA
    c21433b View commit details
    Browse the repository at this point in the history

  16. add test for CSV export

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    6e2faba View commit details
    Browse the repository at this point in the history

  17. Merge branch 'feat/csv-export' of github.com:UniversityOfHelsinkiCS/l… 

    …abtool into feat/csv-export
    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    88ff252 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #849 from UniversityOfHelsinkiCS/fix/issue-checking 

    Fix repo issue checking
    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    5c29856 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'trunk' into feat/csv-export

    @hisahi
    hisahi committed Nov 7, 2019
    Copy the full SHA
    2b99162 View commit details
    Browse the repository at this point in the history

  20. Add new column to studentInstance

    @Mamelukki
    Mamelukki committed Nov 7, 2019
    Copy the full SHA
    14f3fa1 View commit details
    Browse the repository at this point in the history

  21. Student's registration can be marked as invalid

    @Mamelukki
    Mamelukki committed Nov 7, 2019
    Copy the full SHA
    a0e3fb0 View commit details
    Browse the repository at this point in the history

  22. Show warning sign next to the student with invalid registration and w… 

    …ith grey background
    @Mamelukki
    Mamelukki committed Nov 7, 2019
    Copy the full SHA
    42cc1c7 View commit details
    Browse the repository at this point in the history

  23. Leave students with invalid registration out of the code review assig… 

    …ning
    @Mamelukki
    Mamelukki committed Nov 7, 2019
    Copy the full SHA
    1f55e71 View commit details
    Browse the repository at this point in the history

  24. Update snapshots

    @Mamelukki
    Mamelukki committed Nov 7, 2019
    Copy the full SHA
    c6844a4 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2019

  1. Merge pull request #847 from UniversityOfHelsinkiCS/feat/csv-export 

    Export students as CSV
    @hisahi
    hisahi committed Nov 8, 2019
    Copy the full SHA
    88d45ac View commit details
    Browse the repository at this point in the history

  2. Change column name from valid to validRegistration and make necessary… 

    … changes
    @Mamelukki
    Mamelukki committed Nov 8, 2019
    Copy the full SHA
    23fcb60 View commit details
    Browse the repository at this point in the history

  3. security stuff, add userId to Comment

    @hisahi
    hisahi committed Nov 8, 2019
    Copy the full SHA
    59e885b View commit details
    Browse the repository at this point in the history

  4. fix various issues

    @hisahi
    hisahi committed Nov 8, 2019
    Copy the full SHA
    e616fe3 View commit details
    Browse the repository at this point in the history

  5. don't need these anymore

    @hisahi
    hisahi committed Nov 8, 2019
    Copy the full SHA
    22cd7fc View commit details
    Browse the repository at this point in the history

  6. Students with invalid registration are left out of the code review as… 

    …signing
    @Mamelukki
    Mamelukki committed Nov 8, 2019
    Copy the full SHA
    f3321c7 View commit details
    Browse the repository at this point in the history

  7. improve HorizontalScrollable on mobile and add arrow key scrolling

    @hisahi
    hisahi committed Nov 8, 2019
    Copy the full SHA
    efba064 View commit details
    Browse the repository at this point in the history

  8. cleanup

    @hisahi
    hisahi committed Nov 8, 2019
    Copy the full SHA
    454c34d View commit details
    Browse the repository at this point in the history

  9. modify teacher/tag assignment; hide instructor if empty

    @hisahi
    hisahi committed Nov 8, 2019
    Copy the full SHA
    2743982 View commit details
    Browse the repository at this point in the history

  10. notification in frontend

    @yumoL
    yumoL committed Nov 8, 2019
    Copy the full SHA
    3435071 View commit details
    Browse the repository at this point in the history

  11. change comment.isRead to array, function to update comment in backend

    @yumoL
    yumoL committed Nov 8, 2019
    Copy the full SHA
    7d35a4d View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2019

  1. use try-catch

    @yumoL
    yumoL committed Nov 9, 2019
    Copy the full SHA
    85afc18 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #866 from UniversityOfHelsinkiCS/feat/improve-hori… 

    …zontal
    @gotonode
    gotonode committed Nov 9, 2019
    Copy the full SHA
    7d7d718 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'trunk' into fix/security-backend

    @gotonode
    gotonode committed Nov 9, 2019
    Copy the full SHA
    82d4658 View commit details
    Browse the repository at this point in the history

  4. Modify test

    @Mamelukki
    Mamelukki committed Nov 9, 2019
    Copy the full SHA
    a74cb4e View commit details
    Browse the repository at this point in the history

  5. Test to simulate marking student's course registration as valid or in… 

    …valid
    @Mamelukki
    Mamelukki committed Nov 9, 2019
    Copy the full SHA
    19ed370 View commit details
    Browse the repository at this point in the history

  6. Correct github links

    @Mamelukki
    Mamelukki committed Nov 9, 2019
    Copy the full SHA
    df15fc7 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'trunk' into feat/invalid_registration

    @Mamelukki
    Mamelukki committed Nov 9, 2019
    Copy the full SHA
    4b3d257 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'trunk' into feat/improve-student-tag-add

    @Mamelukki
    Mamelukki committed Nov 9, 2019
    Copy the full SHA
    3b12b96 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #867 from UniversityOfHelsinkiCS/feat/improve-stud… 

    …ent-tag-add

Modify teacher/tag assignment; hide instructor if empty
    @Mamelukki
    Mamelukki committed Nov 9, 2019
    Copy the full SHA
    42833e4 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'trunk' into fix/security-backend

    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    38d9b03 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #865 from UniversityOfHelsinkiCS/fix/security-backend 

    Security stuff, add userId to Comment
    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    cab6b8a View commit details
    Browse the repository at this point in the history

  12. Delete old migration file

    @Mamelukki
    Mamelukki committed Nov 9, 2019
    Copy the full SHA
    b973ff3 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'trunk' into feat/invalid_registration

    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    84543f5 View commit details
    Browse the repository at this point in the history

  14. improve code review page; merge new CR column, allow repeats, etc etc

    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    00e5d9e View commit details
    Browse the repository at this point in the history

  15. do not prevent repeats

    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    bed58d2 View commit details
    Browse the repository at this point in the history

  16. teacher can mark comments as read in BrowseReviews page

    @yumoL
    yumoL committed Nov 9, 2019
    Copy the full SHA
    28a1a51 View commit details
    Browse the repository at this point in the history

  17. Merge remote-tracking branch 'origin/trunk' into feat/notification_if… 

    …_new_comment
    @yumoL
    yumoL committed Nov 9, 2019
    Copy the full SHA
    00db0e9 View commit details
    Browse the repository at this point in the history

  18. update snaps

    @yumoL
    yumoL committed Nov 9, 2019
    Copy the full SHA
    fd1d3f5 View commit details
    Browse the repository at this point in the history

  19. only try to display comment notification on CoursePage

    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    444caec View commit details
    Browse the repository at this point in the history

  20. Merge pull request #863 from UniversityOfHelsinkiCS/feat/invalid_regi… 

    …stration

Teacher should be able to mark registration as invalid
    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    e756690 View commit details
    Browse the repository at this point in the history

  21. merge

    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    57fc1cf View commit details
    Browse the repository at this point in the history

  22. teacher can always see notification

    @yumoL
    yumoL committed Nov 9, 2019
    Copy the full SHA
    bf01910 View commit details
    Browse the repository at this point in the history

  23. fix bug when instructor is not assigned

    @yumoL
    yumoL committed Nov 9, 2019
    Copy the full SHA
    5038ab8 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'trunk' into feat/improve-code-review-assign

    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    3bdacb0 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #870 from UniversityOfHelsinkiCS/feat/improve-code… 

    …-review-assign

Code review page improvements
    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    93eafe7 View commit details
    Browse the repository at this point in the history

  26. merge trunk

    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    2824884 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'feat/notification_if_new_comment' of github.com:Univers… 

    …ityOfHelsinkiCS/labtool into feat/notification_if_new_comment
    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    7979c4e View commit details
    Browse the repository at this point in the history

  28. Merge pull request #868 from UniversityOfHelsinkiCS/feat/notification… 

    …_if_new_comment

Feat/notification if new comment
    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    d2abc15 View commit details
    Browse the repository at this point in the history

  29. various bug fixes

    @hisahi
    hisahi committed Nov 9, 2019
    Copy the full SHA
    0103bcb View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2019

  1. Make points field as a required field

    @Mamelukki
    Mamelukki committed Nov 10, 2019
    Copy the full SHA
    436a820 View commit details
    Browse the repository at this point in the history

  2. Update snapshot

    @Mamelukki
    Mamelukki committed Nov 10, 2019
    Copy the full SHA
    0012ab8 View commit details
    Browse the repository at this point in the history

  3. show notification if there are new comments for final review

    @yumoL
    yumoL committed Nov 10, 2019
    Copy the full SHA
    0fb405e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #873 from UniversityOfHelsinkiCS/fix/review_points… 

    …_required

Points should be a required field on week review
    @hisahi
    hisahi committed Nov 10, 2019
    Copy the full SHA
    5d1c478 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'trunk' into fix/sprint-5-master-1

    @hisahi
    hisahi committed Nov 10, 2019
    Copy the full SHA
    1015980 View commit details
    Browse the repository at this point in the history

  6. invalid registration is not shown in other participations

    @yumoL
    yumoL committed Nov 10, 2019
    Copy the full SHA
    fc7f410 View commit details
    Browse the repository at this point in the history

  7. update tests

    @yumoL
    yumoL committed Nov 10, 2019
    Copy the full SHA
    df51b76 View commit details
    Browse the repository at this point in the history

  8. handle null isRead in comment

    @hisahi
    hisahi committed Nov 10, 2019
    Copy the full SHA
    3ac1a9d View commit details
    Browse the repository at this point in the history

  9. make purpose of 'invalid registration' clearer; student messages for … 

    …dropped/invalid
    @hisahi
    hisahi committed Nov 10, 2019
    Copy the full SHA
    f12ede7 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #872 from UniversityOfHelsinkiCS/fix/sprint-5-mast… 

    …er-1

Various bug fixes for sprint 5 master
    @hisahi
    hisahi committed Nov 10, 2019
    Copy the full SHA
    d77770e View commit details
    Browse the repository at this point in the history