clowder

• 

  Todd Nicholson <tcnichol@illinois.edu> 30 Jan 2017 9e324a9f1671d1a209778a546fd639a1453725dd

  Merge remote-tracking branch 'remotes/origin/develop' into feature/CATS-715-create-collection-from-zip
  # Conflicts:
  #        app/api/Collections.scala
  #        app/controllers/Collections.scala
  #        app/controllers/Files.scala
  #        app/util/FileUtils.scala
• 

  Max Burnette <mburnet88@gmail.com> 30 Jan 2017 439b62b9f170dc61d9fcff619897af9cf722fcd5 m

  Merge branch 'develop' into overhaul-elasticsearch
  # Conflicts:
  #        app/controllers/Files.scala
• 

  Luigi Marini 27 Jan 2017 85980289852dd7bc1851435befcc74cb1f1ecc66 m

  Merge pull request #1110 in CATS/clowder from CATS-723-update-change-log-with-recent-changes to develop
  * commit '2ec037e234fcb7474bc7fbd9a09a02fe672aa403':
    Updated change log
• 

  Luigi Marini 27 Jan 2017 dd9b07649a056e94f00691f08f9bf0a8d39eae7a m

  Merge pull request #1066 in CATS/clowder from feature/BD-1167-brown-dog-docker-container to develop
  * commit 'b5c1f5006be17f7cb2db7f710ca665589a40afab':
    fix bcrpt invalid salt revision
    more cleanup
    rename the default user name and use MONGO_URI
    fix comments
    refactoring
    init commit
• 

  Luigi Marini 27 Jan 2017 aa4d228a426b87553366530659ef3478831af56d m

  Merge pull request #1081 in CATS/clowder from feature/CATS-653-cache-summary-results to develop
  * commit 'b2d0114530c09846ed0671935f902db41a0b98f2':
    Pass symbol to incrementCounts
    Code cleanup
    Fix Extraction unit test
    Fix AppConfigService trait
    Increment User count
    Increment counts as things are added/deleted
    Write counts to appConfig on init and read from there
• 

  Luigi Marini 27 Jan 2017 786b9caa1a97b8ec282afd159c16ced9a0631f44 m

  Merge pull request #1102 in CATS/clowder from bugfix/GLM-74-fix-returning-strings-on-clowder to develop
  * commit '07383807b61ac1d8b0bf2b42e967b1c956fc0780':
    Moving zooplankton data into array variable instead of strings
• 

  Sandeep Puthanveetil Satheesan 26 Jan 2017 2ec037e234fcb7474bc7fbd9a09a02fe672aa403 m

  Updated change log

  • CHANGELOG.md (version 2ec037e234fcb7474bc7fbd9a09a02fe672aa403) (diffs)
• 

  Luigi Marini 25 Jan 2017 63308fe67305eaaa15724fb8750e4b9575f3f71a m

  Merge pull request #1109 in CATS/clowder from master-to-develop to develop
  * commit 'daea9578631b0d8dded99dc51ab385deffbb1361':
    Update project/Build.scala
    Added CATS-717 to CHANGELOG.md for 1.1 release.
    User entered metadata now points to https://clowder.ncsa.illinois.edu/contexts/metadata.jsonld and adds a specific entry for the field_id as defined in the database.
    Added Jim Myers to CONTRIBUTORS.md.
    Tweaked existing entries in CHANGELOG.md and added a few more. Upgraded version to 1.1.0.
    Fixed bug in logging statement and corrected a minor typo
    make sure message is persistant
    Added changelog
    Updates how metadata creator is displayed
    Fix title in breadcrumb
    fix missing buttons
• 

  Rob Kooper 25 Jan 2017 daea9578631b0d8dded99dc51ab385deffbb1361 m

  Update project/Build.scala

  • project/Build.scala (version daea9578631b0d8dded99dc51ab385deffbb1361) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 23 Jan 2017 de5a1357e4a554666252cf5902cfbf7dcb59134f m

  Merge branch 'develop' into overhaul-elasticsearch
• 

  Rob Kooper 19 Jan 2017 321e7c7799bac1e394fce6f1e8ef11454864e601 m

  more cleanup

  • scripts/mongo-init/Dockerfile (version 321e7c7799bac1e394fce6f1e8ef11454864e601) (diffs)
• 

  Bing Zhang 19 Jan 2017 b5c1f5006be17f7cb2db7f710ca665589a40afab m

  fix bcrpt invalid salt revision

  • scripts/mongo-init/FILES.mongo-init/usr/local/bin/passwd (version b5c1f5006be17f7cb2db7f710ca665589a40afab) (diffs)
• 

  Bing Zhang 19 Jan 2017 35777355cc7721110f171b426a6ebccbadc17b78 m

  rename the default user name and use MONGO_URI

  • scripts/mongo-init/Dockerfile (version 35777355cc7721110f171b426a6ebccbadc17b78) (diffs)
  • scripts/mongo-init/FILES.mongo-init/usr/local/bin/entrypoint.sh (version 35777355cc7721110f171b426a6ebccbadc17b78) (diffs)
  • scripts/mongo-init/README (version 35777355cc7721110f171b426a6ebccbadc17b78) (diffs)
• 

  Bing Zhang 19 Jan 2017 01d12007be281d035cb6af1d6374a5904771815f m

  fix comments

  • docker.sh (version 01d12007be281d035cb6af1d6374a5904771815f) (diffs)
  • scripts/mongo-init/Dockerfile (version 01d12007be281d035cb6af1d6374a5904771815f) (diffs)
  • scripts/mongo-init/FILES.mongo-init/usr/local/bin/entrypoint.sh (version 01d12007be281d035cb6af1d6374a5904771815f) (diffs)
  • scripts/mongo-init/FILES.mongo-init/usr/local/bin/passwd (version 01d12007be281d035cb6af1d6374a5904771815f) (diffs)
  • scripts/mongo-init/docker.sh (version 01d12007be281d035cb6af1d6374a5904771815f) (diffs)
  • scripts/mongo-init/docker/Dockerfile (version 01d12007be281d035cb6af1d6374a5904771815f) (diffs)
  • scripts/mongo-init/entrypoint.sh (version 01d12007be281d035cb6af1d6374a5904771815f) (diffs)
  • scripts/mongo-init/passwd (version 01d12007be281d035cb6af1d6374a5904771815f) (diffs)
• 

  Bing Zhang 19 Jan 2017 2eb4f1daa8a070a9e2c205cf056c6781eee1229e m

  refactoring

  • scripts/mongo-init/README (version 2eb4f1daa8a070a9e2c205cf056c6781eee1229e) (diffs)
  • scripts/mongo-init/docker.sh (version 2eb4f1daa8a070a9e2c205cf056c6781eee1229e) (diffs)
  • scripts/mongo-init/entrypoint.sh (version 2eb4f1daa8a070a9e2c205cf056c6781eee1229e) (diffs)
• 

  Bing Zhang 19 Jan 2017 fd7fff9a8dc21c0665979c6957dd2cf5179cf9e1 m

  init commit

  • scripts/mongo-init/README (version fd7fff9a8dc21c0665979c6957dd2cf5179cf9e1) (diffs)
  • scripts/mongo-init/docker.sh (version fd7fff9a8dc21c0665979c6957dd2cf5179cf9e1) (diffs)
  • scripts/mongo-init/docker/Dockerfile (version fd7fff9a8dc21c0665979c6957dd2cf5179cf9e1) (diffs)
  • scripts/mongo-init/entrypoint.sh (version fd7fff9a8dc21c0665979c6957dd2cf5179cf9e1) (diffs)
  • scripts/mongo-init/passwd (version fd7fff9a8dc21c0665979c6957dd2cf5179cf9e1) (diffs)
• 

  Luigi Marini 18 Jan 2017 808242d8bee8d384fdd53c176e065aa71fac720d m

  Merge pull request #1101 in CATS/clowder from changelog to release/1.0.1
  * commit '4d05685a85af40c9796f86d933b16287cf5f81fd':
    Added CATS-717 to CHANGELOG.md for 1.1 release.
    Added Jim Myers to CONTRIBUTORS.md.
    Tweaked existing entries in CHANGELOG.md and added a few more. Upgraded version to 1.1.0.
    Added changelog
• 

  Luigi Marini 18 Jan 2017 4d05685a85af40c9796f86d933b16287cf5f81fd m

  Added CATS-717 to CHANGELOG.md for 1.1 release.

  • CHANGELOG.md (version 4d05685a85af40c9796f86d933b16287cf5f81fd) (diffs)
• 

  Luigi Marini 18 Jan 2017 8cdcf4296d48d2e6b862d08116cc86282889a1e4 m

  User entered metadata now points to https://clowder.ncsa.illinois.edu/contexts/metadata.jsonld and adds a specific entry for the field_id as defined in the database.

  • app/views/metadatald/addMetadata.scala.html (version 8cdcf4296d48d2e6b862d08116cc86282889a1e4) (diffs)
• 

  Luigi Marini 18 Jan 2017 b5f39159f3f9f413b20d60ee0a52e39a2583c3c0 m

  Added Jim Myers to CONTRIBUTORS.md.

  • CONTRIBUTORS.md (version b5f39159f3f9f413b20d60ee0a52e39a2583c3c0) (diffs)
• 

  Luigi Marini 18 Jan 2017 fe994c7bf62045803c0c31918eab2d58e59ebd2b m

  Tweaked existing entries in CHANGELOG.md and added a few more. Upgraded version to 1.1.0.

  • CHANGELOG.md (version fe994c7bf62045803c0c31918eab2d58e59ebd2b) (diffs)
  • project/Build.scala (version fe994c7bf62045803c0c31918eab2d58e59ebd2b) (diffs)
• 

  Sandeep Puthanveetil Satheesan 13 Jan 2017 a61a6db4dd31bd7841c47c5d2d1e3244b4d3ef3c m

  Fixed bug in logging statement and corrected a minor typo

  • app/util/FileUtils.scala (version a61a6db4dd31bd7841c47c5d2d1e3244b4d3ef3c) (diffs)
• 

  Rob Kooper 12 Jan 2017 262c22be1b411c7e1b5bc9ddcd9ca66b98710e21 m

  make sure message is persistant

  • app/services/RabbitmqPlugin.scala (version 262c22be1b411c7e1b5bc9ddcd9ca66b98710e21) (diffs)
• 

  Indira Gutierrez Polo 12 Jan 2017 07383807b61ac1d8b0bf2b42e967b1c956fc0780 m

  Moving zooplankton data into array variable instead of strings

  • app/api/Geostreams.scala (version 07383807b61ac1d8b0bf2b42e967b1c956fc0780) (diffs)
• 

  Rob Kooper 09 Jan 2017 537d2073b1773da204f16b5f946534b2377a14bd m

  Added changelog

  • CHANGELOG.md (version 537d2073b1773da204f16b5f946534b2377a14bd) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 06 Jan 2017 d346ee6dfa9fa55a6b0dc82ea908f99becf3e97a m

  Updates how metadata creator is displayed

  • app/models/Metadata.scala (version d346ee6dfa9fa55a6b0dc82ea908f99becf3e97a) (diffs)
  • app/views/metadatald/view.scala.html (version d346ee6dfa9fa55a6b0dc82ea908f99becf3e97a) (diffs)
• 

  Rob Kooper 05 Jan 2017 91a6660f0eb3f666cd96b337e1529486874b8ee3 m

  Fix title in breadcrumb

  • app/views/spaces/listSpaces.scala.html (version 91a6660f0eb3f666cd96b337e1529486874b8ee3) (diffs)
• 

  Rob Kooper 05 Jan 2017 c061e7350f30860353932870b9879db14f2ae99b m

  fix missing buttons

  • app/views/datasetList.scala.html (version c061e7350f30860353932870b9879db14f2ae99b) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 09 Dec 2016 86588ef3208b566a43709902e8e2b11d6e867eea m

  Remove contains operator; index descriptions properly

  • app/services/ElasticsearchPlugin.scala (version 86588ef3208b566a43709902e8e2b11d6e867eea) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 09 Dec 2016 93144fe15150828890b034d9682e94c5cf243e62 m

  Improve metadata reindexing

  • app/services/ElasticsearchPlugin.scala (version 93144fe15150828890b034d9682e94c5cf243e62) (diffs)
  • app/util/SearchUtils.scala (version 93144fe15150828890b034d9682e94c5cf243e62) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 08 Dec 2016 b2d0114530c09846ed0671935f902db41a0b98f2 m

  Merge branch 'develop' into feature/CATS-653-cache-summary-results
  # Conflicts:
  #        app/controllers/Files.scala
  #        app/services/ElasticsearchPlugin.scala
  
  Resolved merge conflict.
• 

  Max Burnette <mburnet88@gmail.com> 08 Dec 2016 7e752a929bfbae4425d2db647b03c0708d471a7a m

  Merge branch 'develop' into overhaul-elasticsearch
  Resolve merge conflicts.
• 

  Max Burnette <mburnet88@gmail.com> 02 Dec 2016 7c405082e5a744955abae227fdc9e30d33e7d017 m

  Pass symbol to incrementCounts

  • app/Global.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
  • app/api/Collections.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
  • app/api/Datasets.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
  • app/api/Extractions.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
  • app/api/Files.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
  • app/api/Spaces.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
  • app/controllers/Application.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
  • app/controllers/Collections.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
  • app/controllers/Files.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
  • app/controllers/Users.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
  • app/models/DBCounts.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
  • app/services/AppConfigurationService.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
  • app/services/mongodb/MongoDBAppConfigurationService.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
  • app/util/FileUtils.scala (version 7c405082e5a744955abae227fdc9e30d33e7d017) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 02 Dec 2016 2912713064041d89f2867c026c0e61633c2cc5d6 m

  Code cleanup

  • app/Global.scala (version 2912713064041d89f2867c026c0e61633c2cc5d6) (diffs)
  • app/controllers/Application.scala (version 2912713064041d89f2867c026c0e61633c2cc5d6) (diffs)
  • app/services/mongodb/MongoDBAppConfigurationService.scala (version 2912713064041d89f2867c026c0e61633c2cc5d6) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 01 Dec 2016 e5b6b3047bb99da98661852fc2a1fb770c18214d m

  Fix Extraction unit test

  • test/unit/extractions/ExtractionHTMLControllerSpec.scala (version e5b6b3047bb99da98661852fc2a1fb770c18214d) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 01 Dec 2016 93a6f6b3ac0e24b1b163ae8b3f97266a566d6b52 m

  Fix AppConfigService trait

  • app/services/AppConfigurationService.scala (version 93a6f6b3ac0e24b1b163ae8b3f97266a566d6b52) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 01 Dec 2016 fab9af029c83d4abc859e7354a3140ebd31b704d m

  Increment User count

  • app/controllers/Users.scala (version fab9af029c83d4abc859e7354a3140ebd31b704d) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 01 Dec 2016 5c21ed9e9ac4c9f82f3ba42f45046d76cc3e54ab m

  Increment counts as things are added/deleted

  • app/Global.scala (version 5c21ed9e9ac4c9f82f3ba42f45046d76cc3e54ab) (diffs)
  • app/api/Collections.scala (version 5c21ed9e9ac4c9f82f3ba42f45046d76cc3e54ab) (diffs)
  • app/api/Datasets.scala (version 5c21ed9e9ac4c9f82f3ba42f45046d76cc3e54ab) (diffs)
  • app/api/Extractions.scala (version 5c21ed9e9ac4c9f82f3ba42f45046d76cc3e54ab) (diffs)
  • app/api/Files.scala (version 5c21ed9e9ac4c9f82f3ba42f45046d76cc3e54ab) (diffs)
  • app/api/Spaces.scala (version 5c21ed9e9ac4c9f82f3ba42f45046d76cc3e54ab) (diffs)
  • app/controllers/Application.scala (version 5c21ed9e9ac4c9f82f3ba42f45046d76cc3e54ab) (diffs)
  • app/controllers/Collections.scala (version 5c21ed9e9ac4c9f82f3ba42f45046d76cc3e54ab) (diffs)
  • app/controllers/Files.scala (version 5c21ed9e9ac4c9f82f3ba42f45046d76cc3e54ab) (diffs)
  • app/services/AppConfigurationService.scala (version 5c21ed9e9ac4c9f82f3ba42f45046d76cc3e54ab) (diffs)
  • app/services/mongodb/MongoDBAppConfigurationService.scala (version 5c21ed9e9ac4c9f82f3ba42f45046d76cc3e54ab) (diffs)
  • app/util/FileUtils.scala (version 5c21ed9e9ac4c9f82f3ba42f45046d76cc3e54ab) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 29 Nov 2016 40c59e080d82a5f770aa97ba96bd3508b34db610 m

  Write counts to appConfig on init and read from there

  • app/Global.scala (version 40c59e080d82a5f770aa97ba96bd3508b34db610) (diffs)
  • app/controllers/Application.scala (version 40c59e080d82a5f770aa97ba96bd3508b34db610) (diffs)
  • app/services/AppConfigurationService.scala (version 40c59e080d82a5f770aa97ba96bd3508b34db610) (diffs)
  • app/services/mongodb/MongoDBAppConfigurationService.scala (version 40c59e080d82a5f770aa97ba96bd3508b34db610) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 15 Nov 2016 5d7c95830b45aea91dc231fe5f47f5a514613503 m

  Merge branch 'develop' into overhaul-elasticsearch
  # Conflicts:
  #        app/services/mongodb/MongoDBFileService.scala
  
  - ported dataset folder indexing from Yan
• 

  Max Burnette <mburnet88@gmail.com> 31 Oct 2016 8b2c09143b40eb334a6ee03715871866d1960336 m

  Merge branch 'develop' into overhaul-elasticsearch
  # Conflicts:
  #        app/services/mongodb/MongoDBMetadataService.scala
• 

  Max Burnette <mburnet88@gmail.com> 31 Oct 2016 aa65c9a714e205c8466162507599b1506678f806 m

  Merge branch 'develop' into overhaul-elasticsearch
  # Conflicts:
  #        app/services/mongodb/MongoDBMetadataService.scala
• 

  Max Burnette <mburnet88@gmail.com> 29 Sep 2016 04c306e7da48c520eeb922d2b70948ad61528544 m

  Several typo fixes + code improvements

  • app/api/Metadata.scala (version 04c306e7da48c520eeb922d2b70948ad61528544) (diffs)
  • app/api/Search.scala (version 04c306e7da48c520eeb922d2b70948ad61528544) (diffs)
  • app/util/SearchUtils.scala (version 04c306e7da48c520eeb922d2b70948ad61528544) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 16 Sep 2016 b81931176941be29adef7c9517a081e6359862b1 m

  Slight code cleanup

  • app/api/Search.scala (version b81931176941be29adef7c9517a081e6359862b1) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 16 Sep 2016 8d9b050bda26e72ca98bb16bf119479aa7f6d7a7 m

  Don't index collection datasets for now
  this can be done once the dataset listing methods can return an
  iterator instead of a list - otherwise collections with many datasets
  will cause memory errors when converting to elastic search object

  • app/api/Admin.scala (version 8d9b050bda26e72ca98bb16bf119479aa7f6d7a7) (diffs)
  • app/util/SearchUtils.scala (version 8d9b050bda26e72ca98bb16bf119479aa7f6d7a7) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 16 Sep 2016 28efebdfdf82e6c1c9ee5d2a250b9e3a05fc4dba m

  Fix order of recursion check on reindex

  • app/services/ElasticsearchPlugin.scala (version 28efebdfdf82e6c1c9ee5d2a250b9e3a05fc4dba) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 16 Sep 2016 6bec1acc20c85ab0e6e1be61892bcef0962eee41 m

  Use ES for section tags on weighted tag list

  • app/controllers/Tags.scala (version 6bec1acc20c85ab0e6e1be61892bcef0962eee41) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 14 Sep 2016 f6597bba328e68ca439fce8569e347aa0c7c0ade m

  Add CommentService specifier

  • app/util/SearchUtils.scala (version f6597bba328e68ca439fce8569e347aa0c7c0ade) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 14 Sep 2016 dcd3bdf60381cb96e9d275dd7f5166c5681ab0d2 m

  Correctly index section tags

  • app/services/ElasticsearchPlugin.scala (version dcd3bdf60381cb96e9d275dd7f5166c5681ab0d2) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version dcd3bdf60381cb96e9d275dd7f5166c5681ab0d2) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version dcd3bdf60381cb96e9d275dd7f5166c5681ab0d2) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version dcd3bdf60381cb96e9d275dd7f5166c5681ab0d2) (diffs)
  • app/util/SearchUtils.scala (version dcd3bdf60381cb96e9d275dd7f5166c5681ab0d2) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 07 Sep 2016 676063ccc71837889b37022771e4b6b2ce1d4a70 m

  Merge branch 'develop' into overhaul-elasticsearch
  # Conflicts:
  #        app/api/Metadata.scala
• 

  Max Burnette <mburnet88@gmail.com> 02 Sep 2016 6ae6f00c520a738bef8c8adf0bf7fd5b674ba1fe m

  Handle user metadata and duplicates better in autocomplete

  • app/api/Metadata.scala (version 6ae6f00c520a738bef8c8adf0bf7fd5b674ba1fe) (diffs)
  • app/controllers/Files.scala (version 6ae6f00c520a738bef8c8adf0bf7fd5b674ba1fe) (diffs)
  • app/util/SearchUtils.scala (version 6ae6f00c520a738bef8c8adf0bf7fd5b674ba1fe) (diffs)
  • app/views/metadatald/search.scala.html (version 6ae6f00c520a738bef8c8adf0bf7fd5b674ba1fe) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 02 Sep 2016 6383f1a65e9c08f5755fac4aee6d833edcf22018 m

  Use match_phrase on Advanced Search to avoid OR casting

  • app/services/ElasticsearchPlugin.scala (version 6383f1a65e9c08f5755fac4aee6d833edcf22018) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 02 Sep 2016 b3b58dd967891e6070e62fa8d1b98e7859c79088 m

  Fix routes, improve error message

  • app/api/Metadata.scala (version b3b58dd967891e6070e62fa8d1b98e7859c79088) (diffs)
  • app/controllers/Search.scala (version b3b58dd967891e6070e62fa8d1b98e7859c79088) (diffs)
  • conf/routes (version b3b58dd967891e6070e62fa8d1b98e7859c79088) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 26 Aug 2016 0f62e3b1267cc00d91f53c1691a278df5a9276a1 m

  Finish overhaul for ES 2

  • app/api/Metadata.scala (version 0f62e3b1267cc00d91f53c1691a278df5a9276a1) (diffs)
  • app/models/ElasticSearchObject.scala (version 0f62e3b1267cc00d91f53c1691a278df5a9276a1) (diffs)
  • app/services/ElasticsearchPlugin.scala (version 0f62e3b1267cc00d91f53c1691a278df5a9276a1) (diffs)
  • app/util/SearchUtils.scala (version 0f62e3b1267cc00d91f53c1691a278df5a9276a1) (diffs)
  • app/views/metadatald/search.scala.html (version 0f62e3b1267cc00d91f53c1691a278df5a9276a1) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 26 Aug 2016 89297faee38139f871506146a1dde79c7c6051cf m

  Change array creation for ES2

  • app/services/ElasticsearchPlugin.scala (version 89297faee38139f871506146a1dde79c7c6051cf) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 26 Aug 2016 d09ab0776a218132c01ac3305ae319b44ad81aa5 m

  Properly generate dot-notation fields for Elasticsearch 2

  • app/api/Metadata.scala (version d09ab0776a218132c01ac3305ae319b44ad81aa5) (diffs)
  • app/services/ElasticsearchPlugin.scala (version d09ab0776a218132c01ac3305ae319b44ad81aa5) (diffs)
  • app/views/metadatald/search.scala.html (version d09ab0776a218132c01ac3305ae319b44ad81aa5) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 25 Aug 2016 7b4cfd0bf382ce014bc51b626ebcd5405fee4b57 m

  Merge branch 'develop' into overhaul-elasticsearch
  # Conflicts:
  #        app/services/ElasticsearchPlugin.scala
  #        app/services/mongodb/MongoDBMetadataService.scala
  #        app/views/metadatald/search.scala.html
• 

  Max Burnette <mburnet88@gmail.com> 25 Aug 2016 6b6281b998123396e7cd3cbfbf0f332f49c78367 m

  Remove Advanced Search from search page

  • app/views/metadatald/search.scala.html (version 6b6281b998123396e7cd3cbfbf0f332f49c78367) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 25 Aug 2016 7389b797e7734a7e11f4fe0ca9d665068340daad m

  Remove unnecessary function + comments

  • app/services/ElasticsearchPlugin.scala (version 7389b797e7734a7e11f4fe0ca9d665068340daad) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 25 Aug 2016 a94065dff9b7fd0fcd406d9e9bad52d153be80ec m

  Fix closing bracket

  • app/models/Dataset.scala (version a94065dff9b7fd0fcd406d9e9bad52d153be80ec) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 25 Aug 2016 f806fd8df1b85194081c5445f67f6b3b5792292e m

  Revert useless file touches

  • app/models/Dataset.scala (version f806fd8df1b85194081c5445f67f6b3b5792292e) (diffs)
  • app/services/MetadataService.scala (version f806fd8df1b85194081c5445f67f6b3b5792292e) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 25 Aug 2016 5f44e1080c7ca94e3c949fcd8f303eb99a755821 m

  Remove unnecessary methods from MetadataService

  • app/services/MetadataService.scala (version 5f44e1080c7ca94e3c949fcd8f303eb99a755821) (diffs)
  • app/services/mongodb/MongoDBMetadataService.scala (version 5f44e1080c7ca94e3c949fcd8f303eb99a755821) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 25 Aug 2016 067d91931c75d346587538262b6682cdb8da79ae m

  Properly nest NOT queries in the AND/OR

  • app/api/Search.scala (version 067d91931c75d346587538262b6682cdb8da79ae) (diffs)
  • app/controllers/Application.scala (version 067d91931c75d346587538262b6682cdb8da79ae) (diffs)
  • app/services/ElasticsearchPlugin.scala (version 067d91931c75d346587538262b6682cdb8da79ae) (diffs)
  • app/views/metadatald/search.scala.html (version 067d91931c75d346587538262b6682cdb8da79ae) (diffs)
  • conf/routes (version 067d91931c75d346587538262b6682cdb8da79ae) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 25 Aug 2016 572d99d38c1b5db4420459dfd9f28fc30bd13978 m

  Clean up reindexing procedure

  • app/api/Admin.scala (version 572d99d38c1b5db4420459dfd9f28fc30bd13978) (diffs)
  • app/controllers/Tags.scala (version 572d99d38c1b5db4420459dfd9f28fc30bd13978) (diffs)
  • app/services/ElasticsearchPlugin.scala (version 572d99d38c1b5db4420459dfd9f28fc30bd13978) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 25 Aug 2016 97476f10c808015d8fd5e3773efc17b350632b51 m

  Manually define ES mappings & implement on tag lists

  • app/api/Admin.scala (version 97476f10c808015d8fd5e3773efc17b350632b51) (diffs)
  • app/controllers/Files.scala (version 97476f10c808015d8fd5e3773efc17b350632b51) (diffs)
  • app/controllers/Tags.scala (version 97476f10c808015d8fd5e3773efc17b350632b51) (diffs)
  • app/services/ElasticsearchPlugin.scala (version 97476f10c808015d8fd5e3773efc17b350632b51) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 24 Aug 2016 c54d90eef29c60c4ef6a3dc1cae2a22d35f83f36 m

  Move elastic search utils to Plugin

  • app/api/Metadata.scala (version c54d90eef29c60c4ef6a3dc1cae2a22d35f83f36) (diffs)
  • app/controllers/Search.scala (version c54d90eef29c60c4ef6a3dc1cae2a22d35f83f36) (diffs)
  • app/models/ElasticSearchObject.scala (version c54d90eef29c60c4ef6a3dc1cae2a22d35f83f36) (diffs)
  • app/services/ElasticsearchPlugin.scala (version c54d90eef29c60c4ef6a3dc1cae2a22d35f83f36) (diffs)
  • app/services/mongodb/MongoDBMetadataService.scala (version c54d90eef29c60c4ef6a3dc1cae2a22d35f83f36) (diffs)
  • app/util/SearchUtils.scala (version c54d90eef29c60c4ef6a3dc1cae2a22d35f83f36) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 24 Aug 2016 a6d9088cdd6749a901041ad90a9bd6a9873267ce m

  Move search logic into ES plugin

  • app/api/Metadata.scala (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • app/api/Search.scala (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • app/controllers/Application.scala (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • app/controllers/Files.scala (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • app/controllers/Search.scala (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • app/models/Comment.scala (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • app/models/ElasticSearchObject.scala (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • app/models/Tag.scala (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • app/services/ElasticsearchPlugin.scala (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • app/services/MetadataService.scala (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • app/services/mongodb/MongoDBMetadataService.scala (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • app/util/SearchUtils.scala (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • app/views/metadatald/search.scala.html (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • conf/application.conf (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
  • conf/routes (version a6d9088cdd6749a901041ad90a9bd6a9873267ce) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 19 Aug 2016 7d7cce70be09013f63d6f3bb235b682a0daa8b42 m

  Remove redundant search() method

  • app/controllers/Search.scala (version 7d7cce70be09013f63d6f3bb235b682a0daa8b42) (diffs)
  • app/services/ElasticsearchPlugin.scala (version 7d7cce70be09013f63d6f3bb235b682a0daa8b42) (diffs)
  • app/services/mongodb/MongoDBMetadataService.scala (version 7d7cce70be09013f63d6f3bb235b682a0daa8b42) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 19 Aug 2016 522d9832cc38cb6de7d71c21fa9720ec3cc8eeb5 m

  Improve SearchObj, remove extra index method

  • app/api/Datasets.scala (version 522d9832cc38cb6de7d71c21fa9720ec3cc8eeb5) (diffs)
  • app/models/ElasticSearchObject.scala (version 522d9832cc38cb6de7d71c21fa9720ec3cc8eeb5) (diffs)
  • app/services/ElasticsearchPlugin.scala (version 522d9832cc38cb6de7d71c21fa9720ec3cc8eeb5) (diffs)
  • app/util/SearchUtils.scala (version 522d9832cc38cb6de7d71c21fa9720ec3cc8eeb5) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 19 Aug 2016 b830a8fbc3a860ee4bea456b77f40d704abcbc42 m

  Make default ES index for easier calling

  • app/api/Metadata.scala (version b830a8fbc3a860ee4bea456b77f40d704abcbc42) (diffs)
  • app/api/Search.scala (version b830a8fbc3a860ee4bea456b77f40d704abcbc42) (diffs)
  • app/controllers/Search.scala (version b830a8fbc3a860ee4bea456b77f40d704abcbc42) (diffs)
  • app/services/ElasticsearchPlugin.scala (version b830a8fbc3a860ee4bea456b77f40d704abcbc42) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 19 Aug 2016 46eed9a2b0ddb43abd2c71ed190731c2127cd92d m

  Simplify args needed for indexing

  • app/api/Files.scala (version 46eed9a2b0ddb43abd2c71ed190731c2127cd92d) (diffs)
  • app/controllers/Collections.scala (version 46eed9a2b0ddb43abd2c71ed190731c2127cd92d) (diffs)
  • app/controllers/Files.scala (version 46eed9a2b0ddb43abd2c71ed190731c2127cd92d) (diffs)
  • app/models/ElasticSearchObject.scala (version 46eed9a2b0ddb43abd2c71ed190731c2127cd92d) (diffs)
  • app/services/ElasticsearchPlugin.scala (version 46eed9a2b0ddb43abd2c71ed190731c2127cd92d) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version 46eed9a2b0ddb43abd2c71ed190731c2127cd92d) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version 46eed9a2b0ddb43abd2c71ed190731c2127cd92d) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version 46eed9a2b0ddb43abd2c71ed190731c2127cd92d) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 19 Aug 2016 6b5b29b5b7084fa36e0041d5b39a92d70ee96cd3 m

  Rename ElasticSearch to Elasticsearch

  • app/api/Files.scala (version 6b5b29b5b7084fa36e0041d5b39a92d70ee96cd3) (diffs)
  • app/controllers/Collections.scala (version 6b5b29b5b7084fa36e0041d5b39a92d70ee96cd3) (diffs)
  • app/controllers/Files.scala (version 6b5b29b5b7084fa36e0041d5b39a92d70ee96cd3) (diffs)
  • app/models/ElasticSearchObject.scala (version 6b5b29b5b7084fa36e0041d5b39a92d70ee96cd3) (diffs)
  • app/models/Tag.scala (version 6b5b29b5b7084fa36e0041d5b39a92d70ee96cd3) (diffs)
  • app/services/ElasticsearchPlugin.scala (version 6b5b29b5b7084fa36e0041d5b39a92d70ee96cd3) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version 6b5b29b5b7084fa36e0041d5b39a92d70ee96cd3) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version 6b5b29b5b7084fa36e0041d5b39a92d70ee96cd3) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version 6b5b29b5b7084fa36e0041d5b39a92d70ee96cd3) (diffs)
  • app/util/SearchUtils.scala (version 6b5b29b5b7084fa36e0041d5b39a92d70ee96cd3) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 19 Aug 2016 050b051a1dd21065b2d836226a520ce74983ba9f m

  Created SearchUtils file
  - conversion to ElasticSearchObject logic handled there
  - substantial code cleanup as a result
  - remove of unneeded logs, comments, imports

  • app/api/Files.scala (version 050b051a1dd21065b2d836226a520ce74983ba9f) (diffs)
  • app/controllers/Collections.scala (version 050b051a1dd21065b2d836226a520ce74983ba9f) (diffs)
  • app/controllers/Files.scala (version 050b051a1dd21065b2d836226a520ce74983ba9f) (diffs)
  • app/models/Collection.scala (version 050b051a1dd21065b2d836226a520ce74983ba9f) (diffs)
  • app/models/Dataset.scala (version 050b051a1dd21065b2d836226a520ce74983ba9f) (diffs)
  • app/models/File.scala (version 050b051a1dd21065b2d836226a520ce74983ba9f) (diffs)
  • app/models/TempFile.scala (version 050b051a1dd21065b2d836226a520ce74983ba9f) (diffs)
  • app/services/ElasticsearchPlugin.scala (version 050b051a1dd21065b2d836226a520ce74983ba9f) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version 050b051a1dd21065b2d836226a520ce74983ba9f) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version 050b051a1dd21065b2d836226a520ce74983ba9f) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version 050b051a1dd21065b2d836226a520ce74983ba9f) (diffs)
  • app/util/SearchUtils.scala (version 050b051a1dd21065b2d836226a520ce74983ba9f) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 17 Aug 2016 d750052db30632bdb1956b1437a4fe1ec26c0f6b m

  Implement ElasticSearchObject

  • app/api/Files.scala (version d750052db30632bdb1956b1437a4fe1ec26c0f6b) (diffs)
  • app/controllers/Collections.scala (version d750052db30632bdb1956b1437a4fe1ec26c0f6b) (diffs)
  • app/controllers/Files.scala (version d750052db30632bdb1956b1437a4fe1ec26c0f6b) (diffs)
  • app/models/Collection.scala (version d750052db30632bdb1956b1437a4fe1ec26c0f6b) (diffs)
  • app/models/Dataset.scala (version d750052db30632bdb1956b1437a4fe1ec26c0f6b) (diffs)
  • app/models/ElasticSearchObject.scala (version d750052db30632bdb1956b1437a4fe1ec26c0f6b) (diffs)
  • app/models/File.scala (version d750052db30632bdb1956b1437a4fe1ec26c0f6b) (diffs)
  • app/models/Tag.scala (version d750052db30632bdb1956b1437a4fe1ec26c0f6b) (diffs)
  • app/models/TempFile.scala (version d750052db30632bdb1956b1437a4fe1ec26c0f6b) (diffs)
  • app/services/ElasticsearchPlugin.scala (version d750052db30632bdb1956b1437a4fe1ec26c0f6b) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version d750052db30632bdb1956b1437a4fe1ec26c0f6b) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version d750052db30632bdb1956b1437a4fe1ec26c0f6b) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version d750052db30632bdb1956b1437a4fe1ec26c0f6b) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 15 Aug 2016 8928377f4201babf2fa8b818a304d689ed2641c2 m

  working on ElasticSearchObject

  • app/api/Datasets.scala (version 8928377f4201babf2fa8b818a304d689ed2641c2) (diffs)
  • app/models/Dataset.scala (version 8928377f4201babf2fa8b818a304d689ed2641c2) (diffs)
  • app/models/ElasticSearchObject.scala (version 8928377f4201babf2fa8b818a304d689ed2641c2) (diffs)
  • app/models/Tag.scala (version 8928377f4201babf2fa8b818a304d689ed2641c2) (diffs)
  • app/services/ElasticsearchPlugin.scala (version 8928377f4201babf2fa8b818a304d689ed2641c2) (diffs)
  • app/services/mongodb/MongoDBMetadataService.scala (version 8928377f4201babf2fa8b818a304d689ed2641c2) (diffs)
  • app/views/metadatald/search.scala.html (version 8928377f4201babf2fa8b818a304d689ed2641c2) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 03 Aug 2016 8cf2c8e87c113e2351dd5e3ac3ba8d0429566e35 m

  initial (rough) working multi search

  • app/api/Metadata.scala (version 8cf2c8e87c113e2351dd5e3ac3ba8d0429566e35) (diffs)
  • app/controllers/Application.scala (version 8cf2c8e87c113e2351dd5e3ac3ba8d0429566e35) (diffs)
  • app/services/ElasticsearchPlugin.scala (version 8cf2c8e87c113e2351dd5e3ac3ba8d0429566e35) (diffs)
  • app/services/MetadataService.scala (version 8cf2c8e87c113e2351dd5e3ac3ba8d0429566e35) (diffs)
  • app/services/mongodb/MongoDBMetadataService.scala (version 8cf2c8e87c113e2351dd5e3ac3ba8d0429566e35) (diffs)
  • app/views/metadatald/search.scala.html (version 8cf2c8e87c113e2351dd5e3ac3ba8d0429566e35) (diffs)
  • conf/routes (version 8cf2c8e87c113e2351dd5e3ac3ba8d0429566e35) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 28 Jul 2016 9e8826c1095c5e09f1aabccba76a21a4822409c2 m

  Autoupdate advanced search box

  • app/views/metadatald/search.scala.html (version 9e8826c1095c5e09f1aabccba76a21a4822409c2) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 27 Jul 2016 ae8195c82a3a4fc95eead595ac0b46dc2f2c2b04 m

  Merge branch 'develop' into max-multisearch-sandbox
  # Conflicts:
  #        app/api/Metadata.scala
• 

  Max Burnette <mburnet88@gmail.com> 01 Jul 2016 601ba1aba87b233d06767c8580adda517807ad02 m

  Fix "submit" on add md row

  • app/views/metadatald/search.scala.html (version 601ba1aba87b233d06767c8580adda517807ad02) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 01 Jul 2016 10334e59f13d64ac5dc6b1e189fc049856c23dbe m

  Allow for multiple clauses in MD search

  • app/views/metadatald/search.scala.html (version 10334e59f13d64ac5dc6b1e189fc049856c23dbe) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 30 Jun 2016 d20b56e9dd34a6b300b32417b5344f94ebc95f8f m

  Implement autocomplete from ES and make search work

  • app/api/Metadata.scala (version d20b56e9dd34a6b300b32417b5344f94ebc95f8f) (diffs)
  • app/services/ElasticsearchPlugin.scala (version d20b56e9dd34a6b300b32417b5344f94ebc95f8f) (diffs)
  • app/services/MetadataService.scala (version d20b56e9dd34a6b300b32417b5344f94ebc95f8f) (diffs)
  • app/services/mongodb/MongoDBMetadataService.scala (version d20b56e9dd34a6b300b32417b5344f94ebc95f8f) (diffs)
  • app/views/metadatald/search.scala.html (version d20b56e9dd34a6b300b32417b5344f94ebc95f8f) (diffs)
  • conf/routes (version d20b56e9dd34a6b300b32417b5344f94ebc95f8f) (diffs)
• 

  Max Burnette <mburnet88@gmail.com> 20 Jun 2016 37d538cd83a6273bd3b6677c5c2c653074896034 m

  Add initial logic to fetch autocomplete data from search box

  • app/api/Metadata.scala (version 37d538cd83a6273bd3b6677c5c2c653074896034) (diffs)
  • app/controllers/Application.scala (version 37d538cd83a6273bd3b6677c5c2c653074896034) (diffs)
  • app/services/MetadataService.scala (version 37d538cd83a6273bd3b6677c5c2c653074896034) (diffs)
  • app/services/mongodb/MongoDBMetadataService.scala (version 37d538cd83a6273bd3b6677c5c2c653074896034) (diffs)
  • app/views/metadatald/search.scala.html (version 37d538cd83a6273bd3b6677c5c2c653074896034) (diffs)
  • conf/routes (version 37d538cd83a6273bd3b6677c5c2c653074896034) (diffs)