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

Fix/fragment ordering #375

Merged
merged 103 commits into from
Apr 25, 2023
Merged

Fix/fragment ordering #375

merged 103 commits into from
Apr 25, 2023

Commits on Jan 23, 2023

  1. making books orderable and ordering w/i works

    @acholyn
    acholyn committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    4b49dc5 View commit details
    Browse the repository at this point in the history

  2. migration for book ordering

    @acholyn
    acholyn committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    5997baa View commit details
    Browse the repository at this point in the history

  3. updating function calls to match new names re. ordering by book

    @acholyn
    acholyn committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    1b9fcae View commit details
    Browse the repository at this point in the history

  4. removing unknown bk function

    @acholyn
    acholyn committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    cd459ab View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2023

  1. before overhaul

    @acholyn
    acholyn committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    69f7a5f View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. updating work detail for showing frags in books

    @acholyn
    acholyn committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    53ce850 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2023

  1. added definite indicator to all types

    @acholyn
    acholyn committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    274eef2 View commit details
    Browse the repository at this point in the history

  2. overhauled grouped dict function

    @acholyn
    acholyn committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    a2068ac View commit details
    Browse the repository at this point in the history

  3. cleaning up and rewriting docstring

    @acholyn
    acholyn committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    b22f4b7 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. updating list styling

    @acholyn
    acholyn committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    c755ad3 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2023

  1. allowing for books to be reordered within works

    @acholyn
    acholyn committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    30d2206 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. ordered book area template

    @acholyn
    acholyn committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    7fff278 View commit details
    Browse the repository at this point in the history

  2. Update src/rard/research/views/antiquarian.py 

    Co-authored-by: Tom Couch <t.couch@ucl.ac.uk>
    @acholyn @tcouch
    acholyn and tcouch committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    3116483 View commit details
    Browse the repository at this point in the history

  3. moving ordered materials to model

    @acholyn
    acholyn committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    abd6ac2 View commit details
    Browse the repository at this point in the history

  4. cleaning up

    @acholyn
    acholyn committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    57045f0 View commit details
    Browse the repository at this point in the history

  5. fixing ordered materials context

    @acholyn
    acholyn committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    ae89dde View commit details
    Browse the repository at this point in the history

  6. passing context to movelink view

    @acholyn
    acholyn committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    bd52ac7 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. adding empty book removal to model

    @acholyn
    acholyn committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    8eb14fa View commit details
    Browse the repository at this point in the history

  2. streamlining code

    @acholyn
    acholyn committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    f63732b View commit details
    Browse the repository at this point in the history

  3. fixing render duplication and cleaning up

    @acholyn
    acholyn committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    f8a25dd View commit details
    Browse the repository at this point in the history

  4. removing empty div

    @acholyn
    acholyn committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    c69feb7 View commit details
    Browse the repository at this point in the history

  5. trying to address frag ordering on ant detail page

    @acholyn
    acholyn committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    3a0b658 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. adding basis for unlinked frag view

    @acholyn
    acholyn committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    7ebbd32 View commit details
    Browse the repository at this point in the history

  2. disabling removal of empty books

    @acholyn
    acholyn committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    4ae2f4d View commit details
    Browse the repository at this point in the history

  3. adding def/pos to AF on ant page, making subhd smaller

    @acholyn
    acholyn committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    72fb6d8 View commit details
    Browse the repository at this point in the history

  4. preventing unknown book from having order buttons

    @acholyn
    acholyn committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    773b8df View commit details
    Browse the repository at this point in the history

  5. showing all books only when editing

    @acholyn
    acholyn committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    5f00cd7 View commit details
    Browse the repository at this point in the history

  6. allowing for unlinked frag menu item

    @acholyn
    acholyn committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    bd65585 View commit details
    Browse the repository at this point in the history

  7. fixing rendering problem

    @acholyn
    acholyn committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    703a8be View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. fixing render problem

    @acholyn
    acholyn committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    5cd8b8f View commit details
    Browse the repository at this point in the history

  2. cleaning up

    @acholyn
    acholyn committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    9134edd View commit details
    Browse the repository at this point in the history

  3. unlinked fragment list page

    @acholyn
    acholyn committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    9e23bdc View commit details
    Browse the repository at this point in the history

  4. small adjustments

    @acholyn
    acholyn committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    010f588 View commit details
    Browse the repository at this point in the history

  5. beginnings of the inline form

    @acholyn
    acholyn committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    09fe46c View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. fixing pre-commit flake8 issue?

    @acholyn
    acholyn committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    766fa2e View commit details
    Browse the repository at this point in the history

  2. ignoring flake8

    @acholyn
    acholyn committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    de5be2a View commit details
    Browse the repository at this point in the history

  3. more flake8 exclusion

    @acholyn
    acholyn committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    5690f51 View commit details
    Browse the repository at this point in the history

  4. undoing exclusion; doesn't work

    @acholyn
    acholyn committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    8fbc1aa View commit details
    Browse the repository at this point in the history

  5. changing flake8 max line length

    @acholyn
    acholyn committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    7bcc74b View commit details
    Browse the repository at this point in the history

  6. tyring to fix frag ordering on ant page

    @acholyn
    acholyn committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    ae215ef View commit details
    Browse the repository at this point in the history

  7. pre-commit trailing whitespace

    @acholyn
    acholyn committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    3bb835a View commit details
    Browse the repository at this point in the history

  8. reincluding old pre-commit arg

    @acholyn
    acholyn committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    b1964fa View commit details
    Browse the repository at this point in the history

  9. fixing end of file

    @acholyn
    acholyn committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    7ef1968 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2023

  1. removing order buttons on ant page except unknown

    @acholyn
    acholyn committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    abd8cd8 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. adding link info

    @acholyn
    acholyn committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    8bd6611 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. enabling fragment ordering on work page

    @acholyn
    acholyn committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    3a8deef View commit details
    Browse the repository at this point in the history

  2. updating work page to use link templates

    @acholyn
    acholyn committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    f5b3d64 View commit details
    Browse the repository at this point in the history

  3. removing def/pos from list item templates

    @acholyn
    acholyn committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    7556b1c View commit details
    Browse the repository at this point in the history

  4. fixing titles not showing

    @acholyn
    acholyn committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    9886d88 View commit details
    Browse the repository at this point in the history

  5. removing unused mtbw function

    @acholyn
    acholyn committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    1e2254d View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. adding unknown work/book

    @acholyn
    acholyn committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    954f80d View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. applying review suggestions

    @acholyn
    acholyn committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    abf8ece View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. holding changes for reboot

    @acholyn
    acholyn committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    274fb60 View commit details
    Browse the repository at this point in the history

  2. fixing migration

    @acholyn
    acholyn committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    1e6e739 View commit details
    Browse the repository at this point in the history

  3. adding unknown work/book to ant/wk and creating

    @acholyn
    acholyn committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    bd453f7 View commit details
    Browse the repository at this point in the history

  4. minor fixes for migration & models

    @acholyn
    acholyn committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    ab1f5ef View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. fixes for migration, adding decorators

    @acholyn
    acholyn committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    7d30198 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. adjust get_ordered_mat to use real unknown book

    @acholyn
    acholyn committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    ae6c43b View commit details
    Browse the repository at this point in the history

  2. preventing unknown books from being reorderable

    @acholyn
    acholyn committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    1f4ebb3 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. updating unknown work/book to return item

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

  2. updating link function in migration

    @acholyn
    acholyn committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    82fab0c View commit details
    Browse the repository at this point in the history

  3. tidying up

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

  4. updating handle link function to assign to unknown

    @acholyn
    acholyn committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    0079ffc View commit details
    Browse the repository at this point in the history

  5. removing old unknown work section on ant page

    @acholyn
    acholyn committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    7921e82 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. migration tweak

    @acholyn
    acholyn committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    758e620 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. small tweaks for ordering links

    @acholyn
    acholyn committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    e880482 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. small tweaks to book list

    @acholyn
    acholyn committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    48c15c1 View commit details
    Browse the repository at this point in the history

  2. adding in reindexing work order

    @acholyn
    acholyn committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    47c0798 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2023

  1. adding reindexed work order to migration

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

  2. prevent unknown work from being ordered

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

  3. removing empty unknown work from list

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

Commits on Mar 29, 2023

  1. fixing model tests

    @acholyn
    acholyn committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    6d42403 View commit details
    Browse the repository at this point in the history

  2. updates from tests

    @acholyn
    acholyn committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    eef2b38 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. small tweak to make everything the same

    @acholyn
    acholyn committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    ca949ed View commit details
    Browse the repository at this point in the history

  2. small streamlining tweak

    @acholyn
    acholyn committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    b0b396d View commit details
    Browse the repository at this point in the history

  3. fixing view tests

    @acholyn
    acholyn committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    e733422 View commit details
    Browse the repository at this point in the history

  4. fixing view tests

    @acholyn
    acholyn committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    2e06845 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'fix/fragment-ordering' of github.com:UCL/frrant into fi… 

    …x/fragment-ordering
    @acholyn
    acholyn committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    b616b02 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2023

  1. fixing other tests

    @acholyn
    acholyn committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    fa00253 View commit details
    Browse the repository at this point in the history

  2. tweaks to book_set

    @acholyn
    acholyn committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    5d4c20a View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Apply suggestions from code review 

    for migration file

Co-authored-by: Tom Couch <t.couch@ucl.ac.uk>
    @acholyn @tcouch
    acholyn and tcouch committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    1639c6b View commit details
    Browse the repository at this point in the history

  2. Renamed func as reindexing wrt books and antiquarians

    @tcouch
    tcouch committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    36fb889 View commit details
    Browse the repository at this point in the history

  3. retrieve Book model for give_links_order_in_book

    @tcouch
    tcouch committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    2075fb0 View commit details
    Browse the repository at this point in the history

  4. typo: ditinct -> distinct

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

Commits on Apr 20, 2023

  1. Add work/book order changes to migration and remove order by book number

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

Commits on Apr 21, 2023

  1. Reindex links to work when book order changes

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

  2. Clarify ordered materials and remove redundant code

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

  3. Fix appositumlink, testimoniumlink reordering and drag and drop

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

  4. fix button alignment

    @tcouch
    tcouch committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    199796a View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2023

  1. Set link.book=unknown when book is deleted.

    @tcouch
    tcouch committed Apr 22, 2023
    Configuration menu
    Copy the full SHA
    3da5871 View commit details
    Browse the repository at this point in the history

  2. Make naming consistent and add docstring

    @tcouch
    tcouch committed Apr 22, 2023
    Configuration menu
    Copy the full SHA
    fa4f8b3 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. Put testimonia from unknown work back on top, don't include unknown w… 

    …ork in name
    @tcouch
    tcouch committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    7e45438 View commit details
    Browse the repository at this point in the history

  2. Fix broken link schema tests

    @tcouch
    tcouch committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    6ac5d45 View commit details
    Browse the repository at this point in the history

  3. Don't include unknown works in definite_work_and_book_links

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

  4. Fix broken ordered_materials test

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

  5. Reinstate order by number

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

  6. Run pre-commit on all files

    @tcouch
    tcouch committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    723a27b View commit details
    Browse the repository at this point in the history

  7. applying suggestions

    @acholyn
    acholyn committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    30c8931 View commit details
    Browse the repository at this point in the history

  8. applying suggestions

    @acholyn
    acholyn committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    394b572 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2023

  1. Merge branch 'fix/fragment-ordering' of github.com:UCL/frrant into fi… 

    …x/fragment-ordering
    @acholyn
    acholyn committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    e24084f View commit details
    Browse the repository at this point in the history

  2. pre-commit for linter

    @acholyn
    acholyn committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    5293577 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix/fragment-ordering' into fix/fragment-ordering-tc2

    @tcouch
    tcouch committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    317752b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #384 from UCL/fix/fragment-ordering-tc2 

    Fix/fragment ordering tc2
    @tcouch
    tcouch committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    b006420 View commit details
    Browse the repository at this point in the history