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

Large develop merge #33

Draft
wants to merge 255 commits into
base: master
Choose a base branch
from
Draft

Large develop merge #33

wants to merge 255 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Mar 15, 2023

  1. Increase width of slide card grid

    @ingridtv
    ingridtv committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    bb277a8 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2023

  1. Work on logic for general pathology + add styling to buttons

    @ingridtv
    ingridtv committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    3dd5720 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Merge remote-tracking branch 'origin/master' into image-browser-redesign

    @ingridtv
    ingridtv committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    5aae956 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. Fixed logic for search/filtering in image browser

    @ingridtv
    ingridtv committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    8737afc View commit details
    Browse the repository at this point in the history

  2. Minor fix

    @ingridtv
    ingridtv committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    b7a2ae4 View commit details
    Browse the repository at this point in the history

  3. Update general pathology buttons to match other buttons

    @ingridtv
    ingridtv committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    b2b0384 View commit details
    Browse the repository at this point in the history

  4. Have 6 slides per row in slide grid (large screens)

    @ingridtv
    ingridtv committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    92070d3 View commit details
    Browse the repository at this point in the history

  5. Update slide grid card design 

    Fit everything inside card. Also, added some classes that can be used if we want to fit the image to the card header area (instead of displaying whole WSI thumbnail, which can be landscape/portrait/other)
    @ingridtv
    ingridtv committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    e96ec5d View commit details
    Browse the repository at this point in the history

  6. Sort slides

    @ingridtv
    ingridtv committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    18c7973 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Add 'Clear selection' button to slide browser

    @ingridtv
    ingridtv committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    8cdbe7e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #25 from AICAN-Research/image-browser-redesign 

    Image browser search, filtering & redesign
    @ingridtv
    ingridtv committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    da8e4b5 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. Fix typos in BoundingBox html

    @ingridtv
    ingridtv committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    9077c11 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. Check whether slide has pathology before accessing general pathology … 

    …tags
    @ingridtv
    ingridtv committed May 22, 2023
    Configuration menu
    Copy the full SHA
    54826fe View commit details
    Browse the repository at this point in the history

  2. Merge branch 'general-pathology-tags-check' into develop

    @ingridtv
    ingridtv committed May 22, 2023
    Configuration menu
    Copy the full SHA
    2a48e7f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into image-browser-redesign

    @ingridtv
    ingridtv committed May 22, 2023
    Configuration menu
    Copy the full SHA
    b331d2c View commit details
    Browse the repository at this point in the history

  4. Add image browser filtering logic to slide selection 

    TODO:
- Add styling (e.g. green border) to cards that are currently in the course.
- Avoid reloading page every time a slide is added/removed
- Add pagination?
    @ingridtv
    ingridtv committed May 22, 2023
    Configuration menu
    Copy the full SHA
    5508879 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. Add styling (green border + check mark) to selected slides

    @ingridtv
    ingridtv committed May 23, 2023
    Configuration menu
    Copy the full SHA
    de6787c View commit details
    Browse the repository at this point in the history

  2. Remove reference to slide_selection_add.html/slide_selection_remove.h… 

    …tml.

+ rename `add_border` parameter in template to `slide_selected`
    @ingridtv
    ingridtv committed May 23, 2023
    Configuration menu
    Copy the full SHA
    906ea78 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. Merge pull request #26 from AICAN-Research/image-browser-redesign 

    Apply image browser redesign to slide selection for courses
    @ingridtv
    ingridtv committed May 30, 2023
    Configuration menu
    Copy the full SHA
    37c9b12 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Initial layout with collapsible left sidebar for menu

    @ingridtv
    ingridtv committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    a8e13bc View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Update Bootstrap icons version to v1.10.5

    @ingridtv
    ingridtv committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    a92ae9d View commit details
    Browse the repository at this point in the history

  2. Experiment with sidebar styling

    @ingridtv
    ingridtv committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    b43731b View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Align header logo of menu bar

    @ingridtv
    ingridtv committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    75d687f View commit details
    Browse the repository at this point in the history

  2. WIP on sidebar

    @ingridtv
    ingridtv committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    cd6922a View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. More color + sidebar work 

    Sidebar layout looks okay. Have to adjust font size and add colour to active tab/item.

Can move on to work on the rest of the layout
    @ingridtv
    ingridtv committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    7404ec7 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. Add styling to selected sidebar item + some other design adjustments

    @ingridtv
    ingridtv committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    d2c213a View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Correct mix-up of warning/error colors

    @ingridtv
    ingridtv committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    947767c View commit details
    Browse the repository at this point in the history

  2. Move expand/collapse button while working on page content (and sidebar)

    @ingridtv
    ingridtv committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    1f4d084 View commit details
    Browse the repository at this point in the history

  3. Initial formatting of (+ placeholders for) page header and content

    @ingridtv
    ingridtv committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    ae6b95f View commit details
    Browse the repository at this point in the history

  4. Remove previous icons

    @ingridtv
    ingridtv committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    4a12fdc View commit details
    Browse the repository at this point in the history

  5. Rename 'Home' to 'Dashboard'

    @ingridtv
    ingridtv committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    32eb473 View commit details
    Browse the repository at this point in the history

  6. Un-indent lists

    @ingridtv
    ingridtv committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    368b697 View commit details
    Browse the repository at this point in the history

  7. Move h1 tag outside page_title block

    @ingridtv
    ingridtv committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    6481175 View commit details
    Browse the repository at this point in the history

  8. Some search bar and one/two column layout work 

    Added some div's + test button
    @ingridtv
    ingridtv committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    b358619 View commit details
    Browse the repository at this point in the history

  9. WIP on search bar and single content/two column layout work 

    Added some div's + test button
    @ingridtv
    ingridtv committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    39dd8e4 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Add DM Sans as default font 

    Uses Google Font CSS API from with URL https://fonts.google.com/specimen/DM+Sans
    @ingridtv
    ingridtv committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    cec58f1 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Update background colour + minor edit to two-column layout

    @ingridtv
    ingridtv committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    12a1779 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #27 from AICAN-Research/design/base-layout-and-men… 

    …u-bar

Design/base layout and menu bar
    @ingridtv
    ingridtv committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    2e34566 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. Start new two-column layout for image browser

    @ingridtv
    ingridtv committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    1a0561e View commit details
    Browse the repository at this point in the history

  2. Update fonts for base layout/design + white search bar

    @ingridtv
    ingridtv committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    9ab4f89 View commit details
    Browse the repository at this point in the history

  3. Merge font changes

    @ingridtv
    ingridtv committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    add8fdb View commit details
    Browse the repository at this point in the history

  4. Remove list view + change display style parameter 

    `display: flex` made the div `content-right` become narrower when fewer WSI cards when using filters and displaying
    @ingridtv
    ingridtv committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    8889345 View commit details
    Browse the repository at this point in the history

  5. Start single content layout for WSI viewer

    @ingridtv
    ingridtv committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    a7d928b View commit details
    Browse the repository at this point in the history

  6. Add breadcrumbs + other blocks to viewer template

    @ingridtv
    ingridtv committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    9bee7f2 View commit details
    Browse the repository at this point in the history

  7. Temporary setting absolute height for WSI viewer 

    Otherwise, viewer collapses and is very small. Should check `display` and `height` settings
    @ingridtv
    ingridtv committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    c7cdf42 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Fix sidebar + remove collapse button + adjust gaps

    @ingridtv
    ingridtv committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    1ffa5ad View commit details
    Browse the repository at this point in the history

  2. Merge branch 'design/base-layout-and-menu-bar' into design/layout-ima… 

    …ge-browser-viewer

# Conflicts:
#	learnpathology/templates/learnpathology/base.html
    @ingridtv
    ingridtv committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    36ae193 View commit details
    Browse the repository at this point in the history

  3. Add breadcrumb to image browser page + move js inside content block

    @ingridtv
    ingridtv committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    9061060 View commit details
    Browse the repository at this point in the history

  4. Move js from content block to separate 'javascript' block

    @ingridtv
    ingridtv committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    2c86aae View commit details
    Browse the repository at this point in the history

  5. Update breadcrumb + collapse sidebar

    @ingridtv
    ingridtv committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    604dd6f View commit details
    Browse the repository at this point in the history

  6. Start new layout on course index

    @ingridtv
    ingridtv committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    116b2cc View commit details
    Browse the repository at this point in the history

  7. Start new layout on course page

    @ingridtv
    ingridtv committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    fb4d5b8 View commit details
    Browse the repository at this point in the history

  8. Add breadcrumbs in course index

    @ingridtv
    ingridtv committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    e93f5bb View commit details
    Browse the repository at this point in the history

  9. Add some button styling for course page

    @ingridtv
    ingridtv committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    82ce495 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. Adjust styling for course content

    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    8dbf259 View commit details
    Browse the repository at this point in the history

  2. Adjust width of search container

    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    4a3ea38 View commit details
    Browse the repository at this point in the history

  3. Update toggleSidebar function to adjust position of other content

    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    85b3a13 View commit details
    Browse the repository at this point in the history

  4. Stretch wrapper (incl. background) to full viewport height

    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    8a53ef2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'design/develop-design' into design/base-layout-and-menu… 

    …-bar
    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    369b7db View commit details
    Browse the repository at this point in the history

  6. Merge branch 'design/base-layout-and-menu-bar' into design/develop-de… 

    …sign
    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    1a0a0a4 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'design/develop-design' into design/layout-image-browser… 

    …-viewer
    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    3861588 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'design/layout-image-browser-viewer' into design/develop… 

    …-design
    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    1b60eab View commit details
    Browse the repository at this point in the history

  9. Merge branch 'design/develop-design' into design/course-layouts

    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    63a527f View commit details
    Browse the repository at this point in the history

  10. Merge branch 'design/course-layouts' into design/develop-design

    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    c2063db View commit details
    Browse the repository at this point in the history

  11. Ensure sidebar is expanded correctly on frontpage

    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    caf4526 View commit details
    Browse the repository at this point in the history

  12. Remove border (used to visualize when implementing design)

    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    b3517d8 View commit details
    Browse the repository at this point in the history

  13. Remove placeholder for title

    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    ee61f5b View commit details
    Browse the repository at this point in the history

  14. Update button styling

    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    26dc195 View commit details
    Browse the repository at this point in the history

  15. Remove TODO + unused sample code

    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    f21dc22 View commit details
    Browse the repository at this point in the history

  16. Implemented highlighting of the active menu item

    @ingridtv
    ingridtv committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    b6561d5 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Add Slide information and Zoom button to WSI View

    @UteSpiske
    UteSpiske committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    d913441 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Add buttons to toolbar

    @UteSpiske
    UteSpiske committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    5e0931a View commit details
    Browse the repository at this point in the history

  2. Put task/new into design template

    @ingridtv
    ingridtv committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    224f8d8 View commit details
    Browse the repository at this point in the history

  3. Update course index

    @ingridtv
    ingridtv committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    437350f View commit details
    Browse the repository at this point in the history

  4. Started new design (progress bar, header) 

    Did not start new and improved display of the different task types
    @ingridtv
    ingridtv committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    05a475a View commit details
    Browse the repository at this point in the history

  5. Add block on search bar + update button template

    @ingridtv
    ingridtv committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    14dcef2 View commit details
    Browse the repository at this point in the history

  6. Start new template on multiple_choice/new

    @ingridtv
    ingridtv committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    cecb749 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Add buttons to toolbar

    @UteSpiske
    UteSpiske committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    b915214 View commit details
    Browse the repository at this point in the history

  2. Implement toggle annotation functionality

    @UteSpiske
    UteSpiske committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    634279b View commit details
    Browse the repository at this point in the history

  3. Code cleanup

    @UteSpiske
    UteSpiske committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    f0c1df1 View commit details
    Browse the repository at this point in the history

  4. Add annotation list

    @UteSpiske
    UteSpiske committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    9b60a7e View commit details
    Browse the repository at this point in the history

  5. Add annotation list

    @UteSpiske
    UteSpiske committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    817236a View commit details
    Browse the repository at this point in the history

  6. Fix annotation highlight functionality

    @UteSpiske
    UteSpiske committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    a104552 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. toolbar fixed on the left hand side vertically

    @UteSpiske
    UteSpiske committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    433d02e View commit details
    Browse the repository at this point in the history

  2. toolbar format changes

    @UteSpiske
    UteSpiske committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    955c34b View commit details
    Browse the repository at this point in the history

  3. ajust scalebar

    @UteSpiske
    UteSpiske committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    d0dd875 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Started annotation task

    @etiennegaucher
    etiennegaucher committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    db3cb80 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Update frontpage.html

    @ingridtv
    ingridtv committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    d87a7d3 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. Completing edit function - annotation task

    @etiennegaucher
    etiennegaucher committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    25842e2 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. WIP on improved workflow for making tasks

    @ingridtv
    ingridtv committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    47c39cf View commit details
    Browse the repository at this point in the history

  2. Update design on course pages 

    Pages:
- Course page
- Edit pages (edit, edit description, edit outcomes)
- Slide and task selection pages
- Course material upload
    @ingridtv
    ingridtv committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    2050f04 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Merge branch 'design/develop-design' into design/new-task-workflow

    @ingridtv
    ingridtv committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    d523007 View commit details
    Browse the repository at this point in the history

  2. Working (ish) version of step-by-step task generation 

    ONLY for multiple choice, and looks terrible, but the functionality/back-end stuff is on its way
    @ingridtv
    ingridtv committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    46c18e7 View commit details
    Browse the repository at this point in the history

  3. Add new template + step-by-step to other task types 

    Functionality and step by step works.

To dos:
- Have *not* added code for adding task directly to a course if it was made inside the course.
 - The design is not implemented (e.g. radio buttons instead of slide cards).
 - Update text on buttons and remove unused buttons
 - Other clean-up
    @ingridtv
    ingridtv committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    8d73370 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. WIP on new task workflow

    @ingridtv
    ingridtv committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    b9217f7 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Set default sidebar status to collapsed 

    Then only the dashboard expands the sidebar, while we remove the need for collapsing (with some animation/delay) on other pages
    @ingridtv
    ingridtv committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    591d864 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'design/develop-design' into design/new-task-workflow

    @ingridtv
    ingridtv committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    fbb5b28 View commit details
    Browse the repository at this point in the history

  3. Minor change to do_random after moving button

    @ingridtv
    ingridtv committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    400cbd1 View commit details
    Browse the repository at this point in the history

  4. Completing do task - annotation task

    @etiennegaucher
    etiennegaucher committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    eb2543a View commit details
    Browse the repository at this point in the history

  5. [WIP] Update slide selection for tasks 

    Note: This is NOT finished, but selection works, and cards are also clickable for selection
    @ingridtv
    ingridtv committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    bc82fb4 View commit details
    Browse the repository at this point in the history

  6. Fix steps of new task generation + update buttons

    @ingridtv
    ingridtv committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    fb53121 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Merge pull request #29 from AICAN-Research/annotation-task 

    This saves the teachers a bit of work. Nicely done. 
I think in the future we could try to improve this task by relying only on the annotations and creating the dabase entries from that
    @UteSpiske
    UteSpiske committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    51854f5 View commit details
    Browse the repository at this point in the history

  2. Update id's of forms so they submit + fix indents

    @ingridtv
    ingridtv committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    4ba56c2 View commit details
    Browse the repository at this point in the history

  3. Update id of form

    @ingridtv
    ingridtv committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    0b69db0 View commit details
    Browse the repository at this point in the history

  4. Set fixed height for WSI viewer in task/do-related templates 

    Before this, the WSI canvas didn't display properly. Should find a way to make this adaptive to screen sizes/shapes
    @ingridtv
    ingridtv committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    9aa8749 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'design/develop-design' into design/new-task-workflow

    @ingridtv
    ingridtv committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    df56b5c View commit details
    Browse the repository at this point in the history

  6. Generating thumbnails using FAST when importing images with insert_sl… 

    …ide_data_into_database
    @etiennegaucher
    etiennegaucher committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    fefeca8 View commit details
    Browse the repository at this point in the history

  7. New template on task/do

    @ingridtv
    ingridtv committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    442d4bf View commit details
    Browse the repository at this point in the history

  8. Made create_thumbnail function to avoid duplicate code

    @ingridtv
    ingridtv committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    61fc845 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #32 from AICAN-Research/thumbnails 

    Generating thumbnails using FAST when importing images
    @ingridtv
    ingridtv committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    d3737e6 View commit details
    Browse the repository at this point in the history

  10. Use fluent icons for buttons

    @ingridtv
    ingridtv committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    c077fa2 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #31 from AICAN-Research/design/design-toolbar 

    Toolbar for WSI
    @UteSpiske
    UteSpiske committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    eab57fa View commit details
    Browse the repository at this point in the history

  12. Automatically add tasks made from course to the course

    @ingridtv
    ingridtv committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    dbe4aaf View commit details
    Browse the repository at this point in the history

  13. Remove 'Create new task' buttons in new workflow

    @ingridtv
    ingridtv committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    4fe41ff View commit details
    Browse the repository at this point in the history

  14. Merge branch 'design/develop-design' into design/new-task-workflow

    @ingridtv
    ingridtv committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    410cb39 View commit details
    Browse the repository at this point in the history

  15. Merging create_thumbnail functions

    @etiennegaucher
    etiennegaucher committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    117e4af View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. Remove filter/search options from slide selection in new task 

    These are not yet implemented.
    @ingridtv
    ingridtv committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    20ea112 View commit details
    Browse the repository at this point in the history

  2. Add TODO for form validation

    @ingridtv
    ingridtv committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    3271a4b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #34 from AICAN-Research/thumbnail_cor 

    Merging create_thumbnail functions
    @smistad
    smistad committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    ac5edca View commit details
    Browse the repository at this point in the history

  4. Merge pull request #30 from AICAN-Research/design/new-task-workflow 

    [Design] Improved workflow for making new tasks
    @UteSpiske
    UteSpiske committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    d54a43f View commit details
    Browse the repository at this point in the history

  5. fix of task redirection if no task are available in a course

    @UteSpiske
    UteSpiske committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    5751163 View commit details
    Browse the repository at this point in the history

  6. Fix button if now slides are available for task in course

    @UteSpiske
    UteSpiske committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    dd991cb View commit details
    Browse the repository at this point in the history

  7. Fix button if now slides are available for task in course

    @UteSpiske
    UteSpiske committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    8d6b8b4 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #36 from AICAN-Research/design/new-task-in-course 

    fix of task redirection if no task are available in a course
    @UteSpiske
    UteSpiske committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    a08ea9f View commit details
    Browse the repository at this point in the history

  9. Cleaning code urls.py

    @etiennegaucher
    etiennegaucher committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    289f983 View commit details
    Browse the repository at this point in the history

  10. Cleaning code models.py

    @etiennegaucher
    etiennegaucher committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    0708b1e View commit details
    Browse the repository at this point in the history

  11. Cleaning code forms.py

    @etiennegaucher
    etiennegaucher committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    1463e92 View commit details
    Browse the repository at this point in the history

  12. Cleaning code do function

    @etiennegaucher
    etiennegaucher committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    e3065b2 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Cleaning code new function

    @etiennegaucher
    etiennegaucher committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    04e9e12 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'design/develop-design' into design/update-task-do

    @ingridtv
    ingridtv committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    902b9dc View commit details
    Browse the repository at this point in the history

  3. Remove dual colon in two-column task/do

    @ingridtv
    ingridtv committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    a0b69f8 View commit details
    Browse the repository at this point in the history

  4. Update task breadcrumbs and menu highlighting

    @ingridtv
    ingridtv committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    eaee885 View commit details
    Browse the repository at this point in the history

  5. Update task breadcrumbs (required passing course to <task type>/do vi… 

    …ews)
    @ingridtv
    ingridtv committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    8efc5c4 View commit details
    Browse the repository at this point in the history

  6. Add missing task javascript (e.g. move annotations) to task/do template

    @ingridtv
    ingridtv committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    6da97dc View commit details
    Browse the repository at this point in the history

  7. Merge pull request #37 from AICAN-Research/design/update-task-do 

    Design: Update task/do template
    @UteSpiske
    UteSpiske committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    8fd1dd0 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. Remove "Profile" option from user menu + add possibility to log out

    @ingridtv
    ingridtv committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    6570a77 View commit details
    Browse the repository at this point in the history

  2. New tag/list layout

    @ingridtv
    ingridtv committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    6e7c14d View commit details
    Browse the repository at this point in the history

  3. Add decorators to buttons that are only for admins/teachers

    @ingridtv
    ingridtv committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    f97b13f View commit details
    Browse the repository at this point in the history

  4. Fix issue with sidebar menus being displayed behind content

    @ingridtv
    ingridtv committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    87e59b8 View commit details
    Browse the repository at this point in the history

  5. Remove task->delete button for students

    @ingridtv
    ingridtv committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    31417c7 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Add title field to menu items for improved accessibility/user-frien… 

    …dliness
    @ingridtv
    ingridtv committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    59d2ffe View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Fixed deletion bug when editing + cleaning code edit function

    @etiennegaucher
    etiennegaucher committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    e43dddf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'design/develop-design' into design/one_to_one_bugs

    @ingridtv
    ingridtv committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    7f92471 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. update openseadragon to 4.1.0

    @UteSpiske
    UteSpiske committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    28cbe85 View commit details
    Browse the repository at this point in the history

  2. update openseadragon to 4.1.0

    @UteSpiske
    UteSpiske committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    a3ad253 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Cleaning code do function

    @etiennegaucher
    etiennegaucher committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    63cfe56 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. Cleaning code do_random function

    @etiennegaucher
    etiennegaucher committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    a2055b1 View commit details
    Browse the repository at this point in the history

  2. Cleaning code new function

    @etiennegaucher
    etiennegaucher committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    f5c9e34 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. Cleaning code edit function

    @etiennegaucher
    etiennegaucher committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    125f5c1 View commit details
    Browse the repository at this point in the history

  2. Annotorious toolbar frontend/UI works! (Annotorious v2.7.16)

    @ingridtv
    ingridtv committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    85e3a33 View commit details
    Browse the repository at this point in the history

  3. Unindent

    @ingridtv
    ingridtv committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    35240c8 View commit details
    Browse the repository at this point in the history

  4. Configure Annotorious + add empty 

    create/update/delete functions
    @ingridtv
    ingridtv committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    b447c0b View commit details
    Browse the repository at this point in the history

  5. Fix drag and drop in one-to-one task

    @etiennegaucher
    etiennegaucher committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    b209b3f View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. Basic login with FEIDE now works, no authorization yet

    @smistad
    smistad committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    53037da View commit details
    Browse the repository at this point in the history

  2. Check that user is emploeyed at NTNU or is enrolled in relevant courses

    @smistad
    smistad committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    d881b37 View commit details
    Browse the repository at this point in the history

  3. Handle authorization errors in feide login

    @smistad
    smistad committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    a232b4a View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. implementation of annotorious toolbar

    @UteSpiske
    UteSpiske committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    36ef476 View commit details
    Browse the repository at this point in the history

  2. hide annotorious for students

    @UteSpiske
    UteSpiske committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    82ba2a3 View commit details
    Browse the repository at this point in the history

  3. add annotorious to tasks

    @UteSpiske
    UteSpiske committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    a6ce8e3 View commit details
    Browse the repository at this point in the history

  4. add annotorious to click tasks

    @UteSpiske
    UteSpiske committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    3879823 View commit details
    Browse the repository at this point in the history

  5. fix zoom button

    @UteSpiske
    UteSpiske committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    31768ad View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. apply styling to annotorious toolbar

    @UteSpiske
    UteSpiske committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    164e604 View commit details
    Browse the repository at this point in the history

  2. fix min and max zoom while using +/- button

    @UteSpiske
    UteSpiske committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    87b2533 View commit details
    Browse the repository at this point in the history

  3. add functionality to annotation list

    @UteSpiske
    UteSpiske committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    953f678 View commit details
    Browse the repository at this point in the history

  4. implementation to focus on clicked annotation

    @UteSpiske
    UteSpiske committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    0198f93 View commit details
    Browse the repository at this point in the history

  5. WIP retrieving annotations for saving in DB

    @ingridtv
    ingridtv committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    b56dac0 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. [WIP] Started asynchronous saving of annotations

    @ingridtv
    ingridtv committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    20b253c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/design/update-openseadragon' int… 

    …o design/annotorious-storing-backend

# Conflicts:
#	slide/templates/slide/view_wsi_accordion.html
    @ingridtv
    ingridtv committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    377a73e View commit details
    Browse the repository at this point in the history

  3. Indents and line breaks

    @ingridtv
    ingridtv committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    adee431 View commit details
    Browse the repository at this point in the history

  4. Fix bug with text box/editor not showing for some annotation types

    @ingridtv
    ingridtv committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    1c3acc3 View commit details
    Browse the repository at this point in the history

  5. New Annotation model to store annotorious annotations (descriptive)

    @ingridtv
    ingridtv committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    f5b50d6 View commit details
    Browse the repository at this point in the history

  6. Add deserialization method to Annotation model

    @ingridtv
    ingridtv committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    7f7867c View commit details
    Browse the repository at this point in the history

  7. Fix create annotation function. Add update/delete functions.

    @ingridtv
    ingridtv committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    71ecb8f View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Remove rotation when pressing r

    @etiennegaucher
    etiennegaucher committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    c4f6083 View commit details
    Browse the repository at this point in the history

  2. Fix duplicate problem when filtering on tag

    @etiennegaucher
    etiennegaucher committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    e4b49a4 View commit details
    Browse the repository at this point in the history

  3. Align indents

    @ingridtv
    ingridtv committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    d540df3 View commit details
    Browse the repository at this point in the history

  4. Add missing </div> + add comment

    @ingridtv
    ingridtv committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    766aee4 View commit details
    Browse the repository at this point in the history

  5. Indent block

    @ingridtv
    ingridtv committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    9f12687 View commit details
    Browse the repository at this point in the history

  6. Fix redirection problem when exiting new task in a course

    @etiennegaucher
    etiennegaucher committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    09d88fe View commit details
    Browse the repository at this point in the history

  7. Fix filtering problem

    @etiennegaucher
    etiennegaucher committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    e22e95b View commit details
    Browse the repository at this point in the history

  8. Made is_student = True default for new users

    @smistad
    smistad committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    11bd961 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Remove print statement

    @ingridtv
    ingridtv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    769ed7c View commit details
    Browse the repository at this point in the history

  2. Rename id for annotorious toolbar to distinguish it from our custom t… 

    …oolbar
    @ingridtv
    ingridtv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    0ae6075 View commit details
    Browse the repository at this point in the history

  3. Remove some lineshifts + unused code

    @ingridtv
    ingridtv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    f775a0c View commit details
    Browse the repository at this point in the history

  4. Use viewer.zoomPerScroll to adjust zoom with +/- buttons

    @ingridtv
    ingridtv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    60c2040 View commit details
    Browse the repository at this point in the history

  5. Move js functions from HTML template to annotate.js

    @ingridtv
    ingridtv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    3392676 View commit details
    Browse the repository at this point in the history

  6. Rename function to camelCase

    @ingridtv
    ingridtv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    f73f5fa View commit details
    Browse the repository at this point in the history

  7. WIP on panning/zooming to annotation when selected

    @ingridtv
    ingridtv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    7151e09 View commit details
    Browse the repository at this point in the history

  8. Replace own zoom/pan to annotation functions with built-in Annotoriou… 

    …s function
    @ingridtv
    ingridtv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    c81d9df View commit details
    Browse the repository at this point in the history

  9. Adjust minZoomLevel

    @ingridtv
    ingridtv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    3aae4be View commit details
    Browse the repository at this point in the history

  10. Add missing deleteAnnotation() to delete button in annotation list 

    Programmatically removing annotation via anno.removeAnnotation() does not fire the 'deleteAnnotation' event, so the deleteAnnotation() function must be called explicitly.
    @ingridtv
    ingridtv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    45d2b1b View commit details
    Browse the repository at this point in the history

  11. Add if statement when adding annotations

    @ingridtv
    ingridtv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    42d9cce View commit details
    Browse the repository at this point in the history

  12. Remove unnecessary code replaced by anno.fitBoundsWithConstraints()

    @ingridtv
    ingridtv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    6602911 View commit details
    Browse the repository at this point in the history

  13. Fix clear selection functionality

    @etiennegaucher
    etiennegaucher committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    1c00852 View commit details
    Browse the repository at this point in the history

  14. Fix problem when no available slides

    @etiennegaucher
    etiennegaucher committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    63ccdaa View commit details
    Browse the repository at this point in the history

  15. Remove radio buttons on slide selection page

    @etiennegaucher
    etiennegaucher committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    68dcb97 View commit details
    Browse the repository at this point in the history

  16. Remove radio buttons on slide selection page

    @etiennegaucher
    etiennegaucher committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    a6c2658 View commit details
    Browse the repository at this point in the history

  17. Merge remote-tracking branch 'origin/design/fix_minor_bugs' into desi… 

    …gn/fix_minor_bugs
    @etiennegaucher
    etiennegaucher committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    7df8334 View commit details
    Browse the repository at this point in the history

  18. Undo commit radio buttons

    @etiennegaucher
    etiennegaucher committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    664b626 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. Merge branch 'design/update-openseadragon' into design/annotorious-st… 

    …oring-backend

# Conflicts:
#	slide/templates/slide/view_wsi_accordion.html
    @ingridtv
    ingridtv committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    c98cab9 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Remove freehand drawing from annotation toolbar in tasks

    @ingridtv
    ingridtv committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    f6122b9 View commit details
    Browse the repository at this point in the history

  2. Minor change

    @ingridtv
    ingridtv committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    99ceaf5 View commit details
    Browse the repository at this point in the history

  3. Lines and indents

    @ingridtv
    ingridtv committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    a2cc795 View commit details
    Browse the repository at this point in the history

  4. Simplify expression

    @ingridtv
    ingridtv committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    c40ee2f View commit details
    Browse the repository at this point in the history

  5. New annotation setup with Annotorious for tasks

    @ingridtv
    ingridtv committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    aedb0d9 View commit details
    Browse the repository at this point in the history

  6. Collect common task/do context setup in a function

    @ingridtv
    ingridtv committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    d5a2fe9 View commit details
    Browse the repository at this point in the history

  7. Update saving of annotations when making new tasks

    @ingridtv
    ingridtv committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    fbc09df View commit details
    Browse the repository at this point in the history

  8. Make common function for processing of new tasks

    @ingridtv
    ingridtv committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    0a7aefc View commit details
    Browse the repository at this point in the history

  9. Add new task processing function to other question types

    @ingridtv
    ingridtv committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    ea5a648 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'design/refactor-and-simplify-task' into design/annotori… 

    …ous-storing-backend
    @ingridtv
    ingridtv committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    81f34dc View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Started on a privacy information page

    @smistad
    smistad committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    4d72cba View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. WIP on edit task

    @etiennegaucher
    etiennegaucher committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    6d853fb View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/design/annotorious-storing-backe… 

    …nd' into design/design-edit-task
    @etiennegaucher
    etiennegaucher committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    f39b7ab View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. Edit new_info_and_annotation.html

    @etiennegaucher
    etiennegaucher committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    b98ac8f View commit details
    Browse the repository at this point in the history

  2. Edit multiple_choice\views.py

    @etiennegaucher
    etiennegaucher committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    2c9948d View commit details
    Browse the repository at this point in the history

  3. Edit one_to_one\views.py

    @etiennegaucher
    etiennegaucher committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    0fac182 View commit details
    Browse the repository at this point in the history

  4. Edit free_text\views.py

    @etiennegaucher
    etiennegaucher committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    8fdd469 View commit details
    Browse the repository at this point in the history

  5. Edit click_question\views.py

    @etiennegaucher
    etiennegaucher committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    b48db9d View commit details
    Browse the repository at this point in the history

  6. Edit Exit & discard task button when editing

    @etiennegaucher
    etiennegaucher committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    82b3088 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Merge remote-tracking branch 'origin/design/design-edit-task' into de… 

    …sign/annotorious-storing-backend
    @ingridtv
    ingridtv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    3517490 View commit details
    Browse the repository at this point in the history

  2. Move and rename file

    @ingridtv
    ingridtv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    547d443 View commit details
    Browse the repository at this point in the history

  3. Add space

    @ingridtv
    ingridtv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    b5c1460 View commit details
    Browse the repository at this point in the history

  4. Fixes to task/edit 

    - Collect common task-related actions
- Add annotations to edit task
- Test with multiple choice
    @ingridtv
    ingridtv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    64fb7dc View commit details
    Browse the repository at this point in the history

  5. Fix typo

    @ingridtv
    ingridtv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    3902e8b View commit details
    Browse the repository at this point in the history

  6. Simplify common code

    @ingridtv
    ingridtv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    1ca8d66 View commit details
    Browse the repository at this point in the history

  7. Update edit task for task types + annotations

    @ingridtv
    ingridtv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    459a272 View commit details
    Browse the repository at this point in the history

  8. Remove old annotation-related html/js

    @ingridtv
    ingridtv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    4ec6714 View commit details
    Browse the repository at this point in the history

  9. Rename templates for new/edit task to more explanatory names. Delete … 

    …unused template
    @ingridtv
    ingridtv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    e58c66a View commit details
    Browse the repository at this point in the history

  10. Update styling for prev/next buttons

    @ingridtv
    ingridtv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    7369c4b View commit details
    Browse the repository at this point in the history

  11. Use organ system tag of selected slide if no organ tag is set for a n… 

    …ew task
    @ingridtv
    ingridtv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    89e5b19 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. In task/edit, use organ system tag of selected slide if no organ tag … 

    …is set for a new task
    @ingridtv
    ingridtv committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    0a16a18 View commit details
    Browse the repository at this point in the history

  2. Reimplementation of click question

    @UteSpiske
    UteSpiske committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    0ccef34 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/design/fix_minor_bugs' into desi… 

    …gn/annotorious-storing-backend

# Conflicts:
#	multiple_choice/views.py
#	task/templates/task/new.html
    @UteSpiske
    UteSpiske committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    6e1b990 View commit details
    Browse the repository at this point in the history

  4. Remove pointer in new clickquestion

    @UteSpiske
    UteSpiske committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    bec3c5e View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. Fixed firefox annotorious flickering issue

    @smistad
    smistad committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    e49b78e View commit details
    Browse the repository at this point in the history

  2. Set specific versions for css includes, removed a file, updated admin… 

    ….py for slide app
    @smistad
    smistad committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    a61fadc View commit details
    Browse the repository at this point in the history

  3. Merge pull request #40 from AICAN-Research/design/annotorious-storing… 

    …-backend

Update OpenSeadragon and add Annotorious
    @smistad
    smistad committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    a1fee53 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'design/develop-design' into feature/feide-login

    @smistad
    smistad committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    dbbb0d2 View commit details
    Browse the repository at this point in the history

  5. disable feide login by default

    @smistad
    smistad committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    63bf81e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #42 from AICAN-Research/feature/feide-login 

    Feature FEIDE login
    @smistad
    smistad committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    aaba6b5 View commit details
    Browse the repository at this point in the history

  7. Fixed thumbnail issues

    @smistad
    smistad committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    c9615ed View commit details
    Browse the repository at this point in the history

  8. Removed conflicting migrations in one_to_one and fixed css error

    @smistad
    smistad committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    8db740a View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/design/develop-design' into desi… 

    …gn/develop-design
    @smistad
    smistad committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    e8922a0 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #43 from AICAN-Research/thumbnail-fix 

    Fixed thumbnail issues
    @smistad
    smistad committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    af0963e View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Merge branch 'design/develop-design' into design/one_to_one_bugs

    @etiennegaucher
    etiennegaucher committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    e3c3421 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #39 from AICAN-Research/design/one_to_one_bugs 

    Fixed bugs and cleaned code of one-to-one task
    @etiennegaucher
    etiennegaucher committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    6a27d85 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Merge branch 'design/develop-design' into develop

    @etiennegaucher
    etiennegaucher committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    9599e9b View commit details
    Browse the repository at this point in the history

  2. Added comma

    @etiennegaucher
    etiennegaucher committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    99c96ce View commit details
    Browse the repository at this point in the history

  3. Remove thumbnail_dir argument in create_thumbnail function

    @etiennegaucher
    etiennegaucher committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    69112d3 View commit details
    Browse the repository at this point in the history

  4. Change import fast position

    @etiennegaucher
    etiennegaucher committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    28b1e6b View commit details
    Browse the repository at this point in the history