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

4813 allow duplicate files #6924

Merged
merged 83 commits into from
Aug 3, 2020
Merged

4813 allow duplicate files #6924

merged 83 commits into from
Aug 3, 2020

Commits on May 12, 2020

  1. #4813 allow duplicate files to be uploaded

    @sekmiller
    sekmiller committed May 12, 2020
    Configuration menu
    Copy the full SHA
    f311312 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed May 12, 2020
    Configuration menu
    Copy the full SHA
    cfe629d View commit details
    Browse the repository at this point in the history

Commits on May 13, 2020

  1. #4813 Allow replacement with the same file

    @sekmiller
    sekmiller committed May 13, 2020
    Configuration menu
    Copy the full SHA
    abcaa3b View commit details
    Browse the repository at this point in the history

Commits on May 15, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed May 15, 2020
    Configuration menu
    Copy the full SHA
    ce34432 View commit details
    Browse the repository at this point in the history

  2. #4813 update comments

    @sekmiller
    sekmiller committed May 15, 2020
    Configuration menu
    Copy the full SHA
    4743b23 View commit details
    Browse the repository at this point in the history

  3. #4813 update test and bundle

    @sekmiller
    sekmiller committed May 15, 2020
    Configuration menu
    Copy the full SHA
    ca7ba78 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2020

  1. #4813 fix failing test

    @sekmiller
    sekmiller committed May 18, 2020
    Configuration menu
    Copy the full SHA
    17869df View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed May 20, 2020
    Configuration menu
    Copy the full SHA
    34ce725 View commit details
    Browse the repository at this point in the history

  2. #4813 fix filemetadata testing

    @sekmiller
    sekmiller committed May 20, 2020
    Configuration menu
    Copy the full SHA
    9b4152c View commit details
    Browse the repository at this point in the history

  3. Create 4813-allow-duplicate-files.md

    @djbrooke
    djbrooke committed May 20, 2020
    Configuration menu
    Copy the full SHA
    801d4bb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed May 20, 2020
    Configuration menu
    Copy the full SHA
    d1139a9 View commit details
    Browse the repository at this point in the history

  5. #4813 remove extraneous logging

    @sekmiller
    sekmiller committed May 20, 2020
    Configuration menu
    Copy the full SHA
    aa02d34 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2020

  1. #4813 fix display of file names in popup

    @sekmiller
    sekmiller committed May 29, 2020
    Configuration menu
    Copy the full SHA
    0cea0da View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed May 29, 2020
    Configuration menu
    Copy the full SHA
    2997792 View commit details
    Browse the repository at this point in the history

  3. #4813 Do not allow replace with same file

    @sekmiller
    sekmiller committed May 29, 2020
    Configuration menu
    Copy the full SHA
    121620c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed May 29, 2020
    Configuration menu
    Copy the full SHA
    5012eb6 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2020

  1. #4813 modify inline error message for dupes

    @sekmiller
    sekmiller committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    b24b3c2 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2020

  1. #4813 add more detail to duplicate messages

    @sekmiller
    sekmiller committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    1182c54 View commit details
    Browse the repository at this point in the history

  2. #4813 grammar

    @sekmiller
    sekmiller committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    6fb7c93 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    86294eb View commit details
    Browse the repository at this point in the history

  2. #4813 update button label

    @sekmiller
    sekmiller committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    21a2a7f View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    f82ca33 View commit details
    Browse the repository at this point in the history

  2. #4813 add note about duplicate file path/name

    @sekmiller
    sekmiller authored Jun 9, 2020
    Configuration menu
    Copy the full SHA
    a323db5 View commit details
    Browse the repository at this point in the history

  3. #4813 add doc for duplicate file content/name

    @sekmiller
    sekmiller authored Jun 9, 2020
    Configuration menu
    Copy the full SHA
    178b6a4 View commit details
    Browse the repository at this point in the history

  4. #4813 add link to user guide to popup

    @sekmiller
    sekmiller committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    640325c View commit details
    Browse the repository at this point in the history

  5. #4813 reword inline warning message

    @sekmiller
    sekmiller committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    eec2854 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    0273d86 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2020

  1. #4813 add warning if replacement file is dup of existing file

    @sekmiller
    sekmiller committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    fae5dc1 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2020

  1. #4813 show replace with dup message on upload component

    @sekmiller
    sekmiller committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    d36c046 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2020

  1. updating rules, need to check with @sekmiller

    @djbrooke
    djbrooke committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    847fd62 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    6eddfc3 View commit details
    Browse the repository at this point in the history

  3. update release notes for dupe file handling

    @djbrooke
    djbrooke committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    954b3b7 View commit details
    Browse the repository at this point in the history

  4. update duplicate file explanation as it pertains to replace

    @djbrooke
    djbrooke committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    0328487 View commit details
    Browse the repository at this point in the history

  5. typo, thanks @jggautier

    @djbrooke
    djbrooke committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    0e90ce8 View commit details
    Browse the repository at this point in the history

  6. #4813 update replace rules

    @sekmiller
    sekmiller authored Jun 23, 2020
    Configuration menu
    Copy the full SHA
    911cd0e View commit details
    Browse the repository at this point in the history

  7. #4813 update bundle to reflect new section in User Guide

    @sekmiller
    sekmiller committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    c8f358f View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    d8dcb17 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    a8629f4 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    2d79816 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    70820ba View commit details
    Browse the repository at this point in the history

  2. adding a

    @djbrooke
    djbrooke committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    dcf2d73 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    1b68d11 View commit details
    Browse the repository at this point in the history

  2. #4813 update formatting of inline message

    @sekmiller
    sekmiller committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    f1f18a0 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    e9f24cf View commit details
    Browse the repository at this point in the history

  2. #4813 add render logic to inline warning

    @sekmiller
    sekmiller committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    dfe9af5 View commit details
    Browse the repository at this point in the history

  3. #4813 get update button to display after upload

    @sekmiller
    sekmiller committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    6af0f3e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    117b321 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2020

  1. #4813 update popup messages

    @sekmiller
    sekmiller committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    77ad2e3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    dab96ab View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2020

  1. #4813 add warnings when dup content added in same upload session

    @sekmiller
    sekmiller committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    6e7c3b9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    ea85d9f View commit details
    Browse the repository at this point in the history

  3. Cleaned up upload/edit file table layout to fix padding and margin is… 

    …sues [ref 4813]
    @mheppler
    mheppler committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    1ebd566 View commit details
    Browse the repository at this point in the history

  4. #4813 change replace with dup to error. no popup.

    @sekmiller
    sekmiller committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    f64d4c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. Correct guides typo, fix guides link, ui clean up for duplidate files… 

    … [ref 4813]
    @mheppler
    mheppler committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    40701b9 View commit details
    Browse the repository at this point in the history

  2. #4813 fix file replace dupe messaging

    @sekmiller
    sekmiller committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    9fe91e1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    6eb7b52 View commit details
    Browse the repository at this point in the history

  4. #4813 remove unused code

    @sekmiller
    sekmiller committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    c69ef84 View commit details
    Browse the repository at this point in the history

  5. #4813 fix button refresh on file delete

    @sekmiller
    sekmiller committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    9350502 View commit details
    Browse the repository at this point in the history

  6. #4813 fix failing test

    @sekmiller
    sekmiller committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    54011d7 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    d0f5adc View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2020

  1. #4813 clean up some message code

    @sekmiller
    sekmiller committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    36a0d76 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    e9d58aa View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    77edbb6 View commit details
    Browse the repository at this point in the history

  2. #4813 fix popup header

    @sekmiller
    sekmiller committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    14d24f5 View commit details
    Browse the repository at this point in the history

  3. #4813 include new files in dupe name search

    @sekmiller
    sekmiller committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    60f2750 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    8a3ed9b View commit details
    Browse the repository at this point in the history

  5. #4813 fix replace with multiple matching files

    @sekmiller
    sekmiller committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    21f98be View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 21, 2020
    Configuration menu
    Copy the full SHA
    0e531ee View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    7126aaa View commit details
    Browse the repository at this point in the history

  2. #4813 add note about multiples to inline message

    @sekmiller
    sekmiller committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    5522e5d View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2020

  1. #4813 update messaging

    @sekmiller
    sekmiller committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    2d60309 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    f87c9d9 View commit details
    Browse the repository at this point in the history

  3. #4813 more message updates

    @sekmiller
    sekmiller committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    0f41e9d View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2020

  1. Merge branch 'develop' into 4813-allow-duplicate-files 

    # Conflicts:
#	src/main/webapp/editFilesFragment.xhtml
    @sekmiller
    sekmiller committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    8169a1b View commit details
    Browse the repository at this point in the history

  2. #4813 redo update buttons

    @sekmiller
    sekmiller committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    cef57dc View commit details
    Browse the repository at this point in the history

  3. #4813 remove file names from delete success msg

    @sekmiller
    sekmiller committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    031b253 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    a4be5eb View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2020

  1. #4813 code cleanup

    @sekmiller
    sekmiller committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    46badd3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into 4813-allow-duplicate-files

    @sekmiller
    sekmiller committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    90edc9e View commit details
    Browse the repository at this point in the history

  3. #4813 clarify file name/path editing rules

    @sekmiller
    sekmiller authored Jul 30, 2020
    Configuration menu
    Copy the full SHA
    0e99e15 View commit details
    Browse the repository at this point in the history

  4. #4813 removing out of date comments

    @sekmiller
    sekmiller committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    d0bfd3d View commit details
    Browse the repository at this point in the history

  5. #4813 remove marked as dup from file metadata

    @sekmiller
    sekmiller committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    82f9825 View commit details
    Browse the repository at this point in the history

  6. #4813 separate retrieval of files for Deletion

    @sekmiller
    sekmiller committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    57ab613 View commit details
    Browse the repository at this point in the history