Commits

Comparison is available only for releases created from the same branch as this release.

This release
Showing 100 of 446 code changes
Author Commit Message Commit date
Luigi Marini Luigi Marini 5d206f174d04b849fd247df746686572edbecaa8 Merge branch 'master' into release/1.0
# Conflicts:
#        project/Build.scala
Luigi Marini Luigi Marini 8a908456f4898fddb918ee96c4fc34d3a0ce4bf8 Merge pull request #1085 in CATS/clowder from include-datasetid-in-manual-file-extractions to release/1.0
* commit '06941c95941d54d69002112ad2eebd7767ea5b68':
  include mock dataset service in tests
  Include dataset ID when manually submitting file
Luigi Marini Luigi Marini 1d3a76ddb0e512155bd83fcbf922f0691558eabf Merge pull request #1083 in CATS/clowder from CATS-691-documentation-cleanup-for-1.0-release to release/1.0
* commit 'a41b8f4671877f7f4653ffa8666f9d34b7633a38':
  missed one medici
  Replaced "medici" and "medici2" string with "clowder".
Rob Kooper Rob Kooper a41b8f4671877f7f4653ffa8666f9d34b7633a38 missed one medici
Max Burnette <mburnet88@gmail.com> Max Burnette <mburnet88@gmail.com> 06941c95941d54d69002112ad2eebd7767ea5b68 include mock dataset service in tests
Rob Kooper Rob Kooper bde5c9399ce7d3848d969554a543ee8672d7695a Don't count the bytes.
Max Burnette <mburnet88@gmail.com> Max Burnette <mburnet88@gmail.com> 9a560fc195ae8ae457a11a21e55eaa038042ecd1 Include dataset ID when manually submitting file
Luigi Marini Luigi Marini a92416cb5a2d3e27bd53cc91579050f37fa69316 Replaced "medici" and "medici2" string with "clowder".
Rob Kooper Rob Kooper fd0fbebc14b0e49f7728a13dbea19ba4d5ae4b7b ability to show exception in webpage cleanup email /api/ calls return json error
Rob Kooper Rob Kooper 25130c59847b50ac99d64cde4ed7b905aa4a7939 try catch around most elasticsearch operations
Indira Gutierrez Polo Indira Gutierrez Polo bac790e274d9e1bec3c6a977b6802b9f79c07160 Renaming url to be redirected to.
Luigi Marini Luigi Marini 7b0707bc5330f5ce1d9d64b04e0883640d945d32 Merge pull request #1064 in CATS/clowder from bugfix/CATS-690-show-space-and-role-in-collaborators to release/1.0
* commit 'ee3fba498597a4d16b148b070d70ea703b4a6fc1':
  Removing current user Id
  Adding implicit user to the file / submit for extraction page.
  Removing the parameters from the extraction page
  Showing spaces and roles for all users that are collaborators for a dataset and collection
Luigi Marini Luigi Marini 00cbd388e8e73dd100e8edf89f83268665ef637c Merge pull request #1068 in CATS/clowder from feature/CATS-685-contributing.md to release/1.0
* commit '825a9f976243cfe14c64c77e2289b54acd311a2b':
  Added improvements to CONTRIBUTING.md
  Added improvements to CONTRIBUTING.md
  Links cleanup and made a few terms consistent throughout CONTRIBUTING.md
  typos
  Beginning CONTRIBUTING.md file.
Luigi Marini Luigi Marini 825a9f976243cfe14c64c77e2289b54acd311a2b Added improvements to CONTRIBUTING.md
Luigi Marini Luigi Marini 946488ab5393daa591bde4740d17aa4470a0b9cc Added improvements to CONTRIBUTING.md
Luigi Marini Luigi Marini b4744bfa6bf1bc744d992dc0c6fdbe963d6cd4b9 Merge pull request #1063 in CATS/clowder from bugfix/release-1-indira to release/1.0
* commit '171d39c594e2bb9c3d63564bea62bcd10961b408':
  removing html from space allocation
  htmlEncode and Decode in the license form
  html decode on chosen-select
Indira Gutierrez Polo Indira Gutierrez Polo 171d39c594e2bb9c3d63564bea62bcd10961b408 removing html from space allocation
Indira Gutierrez Polo Indira Gutierrez Polo ee3fba498597a4d16b148b070d70ea703b4a6fc1 Removing current user Id
Luigi Marini Luigi Marini 089de64d493991d4d749b319914942cf67579166 Merge remote-tracking branch 'origin/feature/CATS-685-contributing.md' into feature/CATS-685-contributing.md
# Conflicts:
#        CONTRIBUTING.md
Luigi Marini Luigi Marini 9fda4cc15116f44690ddbb850cbdb629eca36ece Links cleanup and made a few terms consistent throughout CONTRIBUTING.md
Indira Gutierrez Polo Indira Gutierrez Polo 4d291f3b089e5c2d59f46d1a83bd320b950cbac1 Adding implicit user to the file / submit for extraction page.
Indira Gutierrez Polo Indira Gutierrez Polo 2ab6cf4e95a1da03fa32625e854457eaec95e037 typos
Luigi Marini Luigi Marini bf026f2db6315eb95467e61c9868980aaf3fc09b Beginning CONTRIBUTING.md file.
Yan Zhao Yan Zhao d07fb1c5105681b8c251673596992d744c63eb31 index file in folder has correct dataset name
Indira Gutierrez Polo Indira Gutierrez Polo 6220468f338ba40fe96be56742f48cb04593baa3 Removing the parameters from the extraction page
Indira Gutierrez Polo Indira Gutierrez Polo ef658e00ca57e23c8555810dbf01fafdb81929dc Showing spaces and roles for all users that are collaborators for a dataset and collection
Indira Gutierrez Polo Indira Gutierrez Polo 2e62cc7605092dbead0db35ff27c9fca7fc75f28 htmlEncode and Decode in the license form
Indira Gutierrez Polo Indira Gutierrez Polo 1bf6de6a1973729cd29307a1130ac7b2d36dd639 html decode on chosen-select
Rob Kooper Rob Kooper 762283036a41be08a509eadd96f21b80d29d71aa remove x
Rob Kooper Rob Kooper 53e523f5213561aa83595c40da5f844764dbd01c use java 1.7 parsing of data/time
Luigi Marini Luigi Marini 064fccba4c9fc5ce98dbba882e4041f00bdd550f Merge pull request #1056 in CATS/clowder from bugfix/reindex-bug-23 to release/1.0
Squashed commit of the following:

commit fc7673b29097f279e599f3c04ccc7b643a8bdc09
Author: Indira Gutierrez <indiragp@illinois.edu>
Date:   Tue Oct 25 09:27:22 2016 -0500

    Indexing collections on update name and description
    Indexing datasets on creation

commit 6165e8d18eb3c9f1319352138eea363e230655c4
Author: Yan <yanzhao3@illinois.edu>
Date:   Mon Oct 17 14:58:53 2016 -0500

    reindex when update dataset & file

commit 44b8460e9f656210a991f13900ea6db8d29e0459
Author: Yan <yanzhao3@illinois.edu>
Date:   Mon Oct 17 14:56:47 2016 -0500

    reindex when update dataset & file
Luigi Marini Luigi Marini 10c24cc1507bec0d34c35945b741d06d9fb2cc7b Merge pull request #1060 in CATS/clowder from bugfix/find-extractor-by-name to release/1.0
Squashed commit of the following:

commit d9c642a93f2e4e13c2192e87f03209ba1cca0070
Author: Luigi Marini <lmarini@illinois.edu>
Date:   Mon Oct 24 14:16:59 2016 -0500

    Renamed GET /extractors/:name parameter in routes definition

commit 1b25a82d15c939030322296e13f694b64bd4f412
Author: Luigi Marini <lmarini@illinois.edu>
Date:   Mon Oct 24 11:22:06 2016 -0500

    Find extractor info by extractor's name instead of extractor's internal id
Todd Nicholson <tcnichol@illinois.edu> Todd Nicholson <tcnichol@illinois.edu> 492dfcc61984f1c4c082855dc797f9e016bb9c52 changed icon from tent to hard drive for spaces
Rob Kooper Rob Kooper 0415f4cd970d818877cc4f4ec99431cd740f806d make sure the code is backwards compatible.
Rob Kooper Rob Kooper d4d8fbb2db65539c7e1364a9582054007cc68b98 make sure to parse timezone in timestamp
Rob Kooper Rob Kooper a337dcdaebff48f59deda2fe103a3c265ceddb43 Merge pull request #1052 in CATS/clowder from bugfix/CATS-679-update-text-at-multiple-places to release/1.0
* commit 'cc17d7f5f68a6a0f5c8e90fac6483c3ded6ccfa8':
  Show appropriate message when a folder is empty or after deleting the last file / folder from a folder
  1. Updated text Users in home page 2. Added texts Users and user to messages for i18n
  Fixed typo in collection page
Rob Kooper Rob Kooper 3f31be906dc1dc5862fb6fb9cecf32519fd94338 Merge pull request #1047 in CATS/clowder from bugfix/access-space-homepage to release/1.0
* commit '448174c0bf60a886a56cb9d5b3627671174b52ac':
  remove access count
  remove to
  fix test
  fix test
  remove it entirely
  remove it entirely
  fix test
  homepage access spaces number
Sandeep Puthanveetil Satheesan Sandeep Puthanveetil Satheesan cc17d7f5f68a6a0f5c8e90fac6483c3ded6ccfa8 Show appropriate message when a folder is empty or after deleting the last file / folder from a folder
Yan Zhao Yan Zhao 448174c0bf60a886a56cb9d5b3627671174b52ac remove access count
Sandeep Puthanveetil Satheesan Sandeep Puthanveetil Satheesan 61e9de100dbf1f262a81bfc253326187195a65bf 1. Updated text Users in home page 2. Added texts Users and user to messages for i18n
Sandeep Puthanveetil Satheesan Sandeep Puthanveetil Satheesan bac185a1ff242eeb7a1025d1ea7bb6c5f1bdfe70 Fixed typo in collection page
Luigi Marini Luigi Marini 76d0578c13dad73accda3842ab835236ef0a4ec6 Merge pull request #1035 in CATS/clowder from bugfix/viewProfile-user-not-exist to release/1.0
* commit '19907d91d928bc79d60a2f514110ad0cc87e2757':
  view and not just BadRequest message
  changed message displayed
Yan Zhao Yan Zhao 0e0908e87f78552fde86806d33370df2dbf895ad remove to
Yan Zhao Yan Zhao b65a72faa13423fca3d70d02325416265108b83d fix test
Yan Zhao Yan Zhao 967584e11e3c37de5938cc259513e0f4ba253f83 fix test
Yan Zhao Yan Zhao 5f8f95a7f476e3b7fe2513ca8b0fbfe6c57279f7 remove it entirely
Yan Zhao Yan Zhao a0371b069790dedd7a96f91ea120893f98c4b1bf remove it entirely
Yan Zhao Yan Zhao aec1da20217f12e39f725ddd82f92a39f6203e4b fix test
Yan Zhao Yan Zhao 5a9b23a3708bf11f963709de50ce86e569e0bdaf homepage access spaces number
Luigi Marini Luigi Marini 86a310e53f62eac0ba2a0e3a3e24c14a58bd2b67 Merge pull request #1045 in CATS/clowder from bugfix/file-tag-button to release/1.0
* commit 'e27208951f7f08a8f19c68d5c419e29b405ee7bd':
  diaable tag button
Rob Kooper Rob Kooper d5328fef7f64cdd0c7921b2ecb8932269fb29c43 file is not part of a dataset see https://clowder-dev.ncsa.illinois.edu/clowder/files/55e46a97e4b08612a9c0dd94
Todd Nicholson <tcnichol@illinois.edu> Todd Nicholson <tcnichol@illinois.edu> 19907d91d928bc79d60a2f514110ad0cc87e2757 view and not just BadRequest message
Luigi Marini Luigi Marini 97bc5929def36589225748211e20dc46741c7389 Merge pull request #1042 in CATS/clowder from bugfix/select-enter-institution to release/1.0
* commit 'd446e1a2c9be0839ea85bdd06f9cd0a6d6eea9a8':
  fixed to say enter or select, not just select
Luigi Marini Luigi Marini 50841cc3f588e478d5f821e2d0d9cb85e3f54b63 Merge pull request #1038 in CATS/clowder from avatarURL-becomes-radio-box to release/1.0
* commit 'dd0a26ffb56afcdbb8a0c988bca0b41133120b73':
  query
  Fix class of Avatar URL box
  Make gravatar/custom URL in edit profile more clear
Luigi Marini Luigi Marini 66c3bd475a148a500959c39c1a1b0ad6dd691bb1 Merge pull request #1040 in CATS/clowder from bugfix/CATS-675-check-if-external-link-is-empty to release/1.0
* commit '2912eca4ba723c3268c8e3a7cdef2a99b851ca51':
  check for an empty input value
Luigi Marini Luigi Marini 1ee4b520f1a5b81e9d01e4130ac69a700fb7d4d7 Merge pull request #1044 in CATS/clowder from better-extractors-fix to release/1.0
* commit '4f5a498851eca966f6e16bf55aed5ca7c72e80e4':
  create unique list at lower level fixes extractors space as well.
Luigi Marini Luigi Marini fe8cb5a1a0321e40fe3f412cedf7e5b298e09b46 Merge pull request #1043 in CATS/clowder from bugfix/CATS-676-make-tabs-in-home-page-sticky to release/1.0
* commit '14dcc457a25636939f99a89d4d0ab9ef25f60d6a':
  1. Added JQuery sticky tabs plugin 2. Added a line of code to make tabs sticky
Luigi Marini Luigi Marini 6aba1e3078d4b7b3aeda563d02bba5a1f000deed Merge pull request #1041 in CATS/clowder from bugfix/Create-space-with-script-tags to release/1.0
* commit '95a9b018a2420db72d5f399e5542fcfdb14c9cd8':
  replace in the delete message
Yan Zhao Yan Zhao e27208951f7f08a8f19c68d5c419e29b405ee7bd diaable tag button
Rob Kooper Rob Kooper 4f5a498851eca966f6e16bf55aed5ca7c72e80e4 create unique list at lower level fixes extractors space as well.
Todd Nicholson <tcnichol@illinois.edu> Todd Nicholson <tcnichol@illinois.edu> d446e1a2c9be0839ea85bdd06f9cd0a6d6eea9a8 fixed to say enter or select, not just select
Sandeep Puthanveetil Satheesan Sandeep Puthanveetil Satheesan 14dcc457a25636939f99a89d4d0ab9ef25f60d6a 1. Added JQuery sticky tabs plugin 2. Added a line of code to make tabs sticky
Yan Zhao Yan Zhao 95a9b018a2420db72d5f399e5542fcfdb14c9cd8 replace in the delete message
Max Burnette <mburnet88@gmail.com> Max Burnette <mburnet88@gmail.com> dd0a26ffb56afcdbb8a0c988bca0b41133120b73 query
Rob Kooper Rob Kooper cc6ac4c45fa18e55ee45336c9701b3f8d681b9d8 Merge pull request #1039 in CATS/clowder from bugfix/release-1-indira to release/1.0
* commit 'a5f81177da7d351c25cda4453f74c59a69793eec':
  Removing var within if block
  Adding Publishing Project Name to publication request to C3PR
Indira Gutierrez Polo Indira Gutierrez Polo a5f81177da7d351c25cda4453f74c59a69793eec Removing var within if block
Michal Ondrejcek Michal Ondrejcek 2912eca4ba723c3268c8e3a7cdef2a99b851ca51 check for an empty input value
Max Burnette <mburnet88@gmail.com> Max Burnette <mburnet88@gmail.com> 368ddaa05c247ec70eec71afe0bb740ff0e40ce6 Merge branch 'release/1.0' into avatarURL-becomes-radio-box
# Conflicts:
#        app/views/editProfile.scala.html
Max Burnette <mburnet88@gmail.com> Max Burnette <mburnet88@gmail.com> 56ac4b95c27fcf398af108aeaaee6494162f5f43 Fix class of Avatar URL box
Luigi Marini Luigi Marini 9075125ecb5a2a678e38bd742154cbe66b48d10f Merge pull request #1037 in CATS/clowder from bugfix/typo-colletion.title to release/1.0
* commit 'c692e244c40b634353c3a7cb1e0082e5b78bd817':
  fixed type on collection.title
Max Burnette <mburnet88@gmail.com> Max Burnette <mburnet88@gmail.com> 2a74fdf11de0db635c34ef21adcc3a5e49020e4f Make gravatar/custom URL in edit profile more clear
Todd Nicholson <tcnichol@illinois.edu> Todd Nicholson <tcnichol@illinois.edu> c692e244c40b634353c3a7cb1e0082e5b78bd817 fixed type on collection.title
Luigi Marini Luigi Marini b7d5a20d4f4c6f107ca8acd32126768fa6c137d2 Merge pull request #1034 in CATS/clowder from audio-previewer to release/1.0
* commit 'a202ca5448d791816058ac98b9256fa6f37f7c7d':
  audio previewer
Luigi Marini Luigi Marini f60c19bb2e5a13caf7ead6b18ee9cd9b3d8dbb96 Merge pull request #1033 in CATS/clowder from subset-extractors to release/1.0
* commit '8304efc83123d768dcb920663b9e2a1125f44ae5':
  use toSet to have only unique names
Rob Kooper Rob Kooper f2a1d68f823da742c4520d42a4fce03b30769395 add orcidid help text
Todd Nicholson <tcnichol@illinois.edu> Todd Nicholson <tcnichol@illinois.edu> ea19fe23d204ab46fa167fe812077408f38f76c6 changed message displayed
Rob Kooper Rob Kooper a202ca5448d791816058ac98b9256fa6f37f7c7d audio previewer
Rob Kooper Rob Kooper 8304efc83123d768dcb920663b9e2a1125f44ae5 use toSet to have only unique names
Indira Gutierrez Polo Indira Gutierrez Polo 8c2bfc3b629b16cfd09a0a16611c5fba2f6c2f37 Adding Publishing Project Name to publication request to C3PR
Max Burnette <mburnet88@gmail.com> Max Burnette <mburnet88@gmail.com> 9bd82c10faba1941bb457fd283269cd460cdc1af Clear box on successful email send
Luigi Marini Luigi Marini bd0e1cbca2b8bb049d26699215f6f6b22797f170 Merge pull request #1020 in CATS/clowder from less-info-logger to release/1.0
* commit 'e429293ce2f9efed80f6d6ff3ecfc282fef8b31c':
  Typo
  Changed lots of debug to info/error messages (mostly debug)
Luigi Marini Luigi Marini db66f1bfe710cfdb3a1610e7646b2706f2601675 Merge pull request #1025 in CATS/clowder from move-superadmin-down to release/1.0
* commit '39091610565cae3d1760cd68efc58f1dddddb7b4':
  Move the superadmin bar to bottom
Luigi Marini Luigi Marini 6d8f59745b806645e1bbb4752fba9d85fc5e6d15 Merge pull request #1019 in CATS/clowder from remove-unused-compute-home-page to release/1.0
* commit 'ff6d13ccb4a06a7c6956e47ad913e17923d9738a':
  fix broken test
  remove unused variable from index page
  only compute users/spaces/datasets if used.
Luigi Marini Luigi Marini 3191fd085581cfe77b07a96130342ee5ceb48f3f Merge pull request #1018 in CATS/clowder from feature/CATS-661-formatting-of-numbers to release/1.0
* commit '8148d2a6abbee427f084dd6f70ed2621c646993f':
  Format numbers so they are easier to read
Rob Kooper Rob Kooper 39091610565cae3d1760cd68efc58f1dddddb7b4 Move the superadmin bar to bottom
Rob Kooper Rob Kooper ff6d13ccb4a06a7c6956e47ad913e17923d9738a fix broken test
Rob Kooper Rob Kooper c251a7f31f872e3a3beee1508122a5bd79d6b367 remove unused variable from index page
Indira Gutierrez Polo Indira Gutierrez Polo e429293ce2f9efed80f6d6ff3ecfc282fef8b31c Typo
Rob Kooper Rob Kooper 4e22a692a7a9d03c0a1ec51d943483b338459d13 Changed lots of debug to info/error messages (mostly debug)
Rob Kooper Rob Kooper a00bf2d0e1834c0a6545bb43a4dcec0945797ac0 Merge pull request #1015 in CATS/clowder from bugfix/requestReceiver.email.get.toString to release/1.0
* commit 'a297c7c4f3565cb69427062c7ec4aad90855c6ff':
  sendEmail with recipient: User
  None.get
Rob Kooper Rob Kooper 724d2f08f05e496f5cae67561c2f0ee147848f52 only compute users/spaces/datasets if used.
Yan Zhao Yan Zhao a297c7c4f3565cb69427062c7ec4aad90855c6ff sendEmail with recipient: User
Rob Kooper Rob Kooper 8148d2a6abbee427f084dd6f70ed2621c646993f Format numbers so they are easier to read
Moved bytecount formatter to formatters package
Max Burnette <mburnet88@gmail.com> Max Burnette <mburnet88@gmail.com> 1bd16c2536effbcdae567111ffb23a285bda237e Make anonymous key user a serveradmin
so file path is returned
Rob Kooper Rob Kooper 8cdae0826dd28d9d9bc2b34b2a11ca8eb27186b9 Allow to disable events
Yan Zhao Yan Zhao aae4b6dd2c10e5784b16b570110ffc7db432c798 None.get
Max Burnette <mburnet88@gmail.com> Max Burnette <mburnet88@gmail.com> a57a8ffda88ae5ec5a9e5d75e040497795e05888 Fix postgres label
Rob Kooper Rob Kooper 19fa8866a71151fa226ef28d98f630a7a5e7bcb0 Merge pull request #1012 in CATS/clowder from include-full-path-in-files-api-get to release/1.0
* commit '28243eec2f1edc4afa6804d9951abfcf7e78df75':
  Squashed commit of the following:
Luigi Marini Luigi Marini d733cd5904f24671f7065337e96eb7c509fc85d2 Merge pull request #1009 in CATS/clowder from bugfix/CATS-658-store-context-for-extractors to release/1.0
* commit 'bb3c225a55003d0da7014266d97f9356831a02b8':
  store the contexts
Luigi Marini Luigi Marini 453eafb023c0a9021d35ff48aac9b2db9db8eec3 Merge pull request #1000 in CATS/clowder from bugfix/SEAD-1057-metadata-pop-ups-randomly-stay to release/1.0
* commit '33255b1069d72933c576975233fe4b912c3076ff':
  remove console logs
  removed agent context and link the profile
  no link for an Anonymous User
  remove additional hover in popover
  mousenter, mouseleave event handlers, new id for the user/agent
  mousenter, mouseleave event handlers, new id for the metadata elements
  merge
  update and popover loop