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

Feature colour preferences #48

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
Open

Feature colour preferences #48

wants to merge 33 commits into from

Commits on Jul 27, 2024

  1. Resolving issues filtering with no organizations

    @SamuelVch98
    SamuelVch98 committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    16bec2f View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. use toast to display errors

    @SamuelVch98
    SamuelVch98 committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    585ace3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'UCL-INGI:main' into main

    @SamuelVch98
    SamuelVch98 authored Jul 29, 2024
    Configuration menu
    Copy the full SHA
    0da87f0 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Fix small issues

    @SamuelVch98
    SamuelVch98 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    eada3ca View commit details
    Browse the repository at this point in the history

  2. create unique file for toast and use it

    @SamuelVch98
    SamuelVch98 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    7cae218 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'UCL-INGI:main' into main

    @SamuelVch98
    SamuelVch98 authored Jul 30, 2024
    Configuration menu
    Copy the full SHA
    4a633f6 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Merge branch 'UCL-INGI:main' into main

    @SamuelVch98
    SamuelVch98 authored Aug 20, 2024
    Configuration menu
    Copy the full SHA
    99f16d6 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Merge branch 'UCL-INGI:main' into main

    @SamuelVch98
    SamuelVch98 authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    cf3938d View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Merge branch 'UCL-INGI:main' into main

    @SamuelVch98
    SamuelVch98 authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    ad8658c View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. indicate the type of user to be displayed

    @SamuelVch98
    SamuelVch98 committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    1177b11 View commit details
    Browse the repository at this point in the history

  2. Fix the bug that prevents you from changing organisation if none was … 

    …selected
    @SamuelVch98
    SamuelVch98 committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    9f8b4cc View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2024

  1. Merge branch 'UCL-INGI:main' into main

    @SamuelVch98
    SamuelVch98 authored Oct 13, 2024
    Configuration menu
    Copy the full SHA
    ec2bdc1 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Merge branch 'UCL-INGI:main' into main

    @SamuelVch98
    SamuelVch98 authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    97023c8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'UCL-INGI:main' into main

    @SamuelVch98
    SamuelVch98 authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    af8da85 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Merge branch 'UCL-INGI:main' into main

    @SamuelVch98
    SamuelVch98 authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    4db087a View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Merge branch 'UCL-INGI:main' into main

    @SamuelVch98
    SamuelVch98 authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    d40c27b View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Add handsontable to the app 

    # Conflicts:
#	app.py
    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    8efbfd2 View commit details
    Browse the repository at this point in the history

  2. Finish integrating the handsontable panel

    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    4f35393 View commit details
    Browse the repository at this point in the history

  3. update README

    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    5d66fe5 View commit details
    Browse the repository at this point in the history

  4. Fix PR request

    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    7fbef2e View commit details
    Browse the repository at this point in the history

  5. Check semicolon and fix small issues

    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    c67c38a View commit details
    Browse the repository at this point in the history

  6. Modify the conditions when changing the value of a cell to ensure the… 

    …re is no undesirable behaviour
    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    f5b545a View commit details
    Browse the repository at this point in the history

  7. use more constants and place them in a separate file if possible to m… 

    …ake them easier to read
    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    173b1c0 View commit details
    Browse the repository at this point in the history

  8. rabse + modifying the code to display several promoters

    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    5c36f64 View commit details
    Browse the repository at this point in the history

  9. disable cells that contains user's preferences

    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    79c0ebb View commit details
    Browse the repository at this point in the history

  10. fix small issue

    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    0c7d480 View commit details
    Browse the repository at this point in the history

  11. Disable the row that contains user preferences 

    # Conflicts:
#	static/scripts/assignment_table.js
    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    15badb2 View commit details
    Browse the repository at this point in the history

  12. add some comments

    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    e7f6c73 View commit details
    Browse the repository at this point in the history

  13. remove useless code

    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    adcaa5c View commit details
    Browse the repository at this point in the history

  14. Add a way of displaying the number of times an assistant has given a … 

    …lesson using colours
    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    c78149a View commit details
    Browse the repository at this point in the history

  15. small fix 

    # Conflicts:
#	db.py
#	user.py
    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    301e2ab View commit details
    Browse the repository at this point in the history

  16. small fix

    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    f113f91 View commit details
    Browse the repository at this point in the history

  17. Colour the user's preferences according to the number of times they h… 

    …ave already given a lesson
    @SamuelVch98
    SamuelVch98 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    bab2aee View commit details
    Browse the repository at this point in the history