clowder

• 

  Bing Zhang 28 Apr 2020 37e34f4632d58f78bb966528dabc5f2da7df0848

  merge conflicts resolved
• 

  Luigi Marini 27 Apr 2020 b41a2a1962db98c1340006c5d45f800743eb2568 m

  Fixed API call to correct endpoint when deleting tags on file page.

  • CHANGELOG.md (version b41a2a1962db98c1340006c5d45f800743eb2568) (diffs)
• 

  Luigi Marini 27 Apr 2020 becb27ea2d3c3c15d4d3a620c927b71c9fb5a44d m

  Merge branch 'develop' into bugfix/CATS-1053-tags-added-to-sections-do-not-appear-until-refresh
  # Conflicts:
  #        CHANGELOG.md
• 

  Luigi Marini 27 Apr 2020 8afaa80b31a94bf58f3d134a983f2fbc77d03eef m

  Fixed API call to correct endpoint when deleting tags on file page.

  • CHANGELOG.md (version 8afaa80b31a94bf58f3d134a983f2fbc77d03eef) (diffs)
• 

  Todd Nicholson 21 Apr 2020 1863bef4df87a5a4835d113475ed328d8e69670b m

  needed Tag import in SectionService

  • app/services/SectionService.scala (version 1863bef4df87a5a4835d113475ed328d8e69670b) (diffs)
• 

  Todd Nicholson 21 Apr 2020 d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961 m

  initial commit
  when tags are added to sections, the new tag cannot be added without the new tag name and id. to fix this, tagService addTagsHelper now also returns the tags that were added in addition to the (not_found, error_string.) So now, adding tags to sections returns a list of the new tags in the response, so that the new tag is added to the right div in sectionRubberband.js.

  • app/api/Files.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
  • app/api/Sections.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
  • app/services/DatasetService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
  • app/services/FileService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
  • app/services/SectionService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
  • app/services/TagService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
  • app/services/mongodb/MongoDBSectionService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
  • app/services/mongodb/MongoDBTagService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
  • app/views/file.scala.html (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
  • public/javascripts/previewers/sectionRubberband.js (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
• 

  Todd Nicholson 06 Apr 2020 03762b5306aa229c1ea037210accd5f44b45d1f7 m

  changing button to red

  • app/views/extractorDetails.scala.html (version 03762b5306aa229c1ea037210accd5f44b45d1f7) (diffs)
• 

  Todd Nicholson 02 Apr 2020 c7a6c28b44748b8c745c409e66b72996e4e11b10 m

  printing out info if extractor not found that was to be deleted

  • app/services/mongodb/MongoDBExtractorService.scala (version c7a6c28b44748b8c745c409e66b72996e4e11b10) (diffs)
• 

  Todd Nicholson 02 Apr 2020 983b47d4f932471569975c356accb66ea30791b3 m

  fixing the button delete not back

  • app/views/extractorDetails.scala.html (version 983b47d4f932471569975c356accb66ea30791b3) (diffs)
• 

  Todd Nicholson 02 Apr 2020 624e6e126aaeb960a3ac4bc069f5fb659ebc2a5b m

  wrong branch for this change, undoing

  • app/views/file.scala.html (version 624e6e126aaeb960a3ac4bc069f5fb659ebc2a5b) (diffs)
• 

  Todd Nicholson 02 Apr 2020 56f6e452cb46100b37801b433c7124fd1acd097a m

  reverted change fixed in other PR

  • app/views/file.scala.html (version 56f6e452cb46100b37801b433c7124fd1acd097a) (diffs)
• 

  Todd Nicholson 01 Apr 2020 9a17cf430a51af9ea19f9f5918d04455b60fcf6d m

  button changed

  • app/views/extractorDetails.scala.html (version 9a17cf430a51af9ea19f9f5918d04455b60fcf6d) (diffs)
• 

  Todd Nicholson 12 Mar 2020 67a88391b8c8848929a9909b7e8344528b5019ff m

  Merge branch 'develop' into feature/CATS-1044-allow-delete-extractor
  # Conflicts:
  #        CHANGELOG.md
• 

  Todd Nicholson 11 Mar 2020 8bfb22a4608e221a2714f49dbcd610987adbfcf4 m

  changelog

  • CHANGELOG.md (version 8bfb22a4608e221a2714f49dbcd610987adbfcf4) (diffs)
• 

  Todd Nicholson 11 Mar 2020 f2010eb4b2b13439dd5dc70cbe6719a294dcf9bc m

  extractor is deleted and redirect works

  • app/api/Extractions.scala (version f2010eb4b2b13439dd5dc70cbe6719a294dcf9bc) (diffs)
  • app/services/mongodb/MongoDBExtractorService.scala (version f2010eb4b2b13439dd5dc70cbe6719a294dcf9bc) (diffs)
  • app/views/extractorDetails.scala.html (version f2010eb4b2b13439dd5dc70cbe6719a294dcf9bc) (diffs)
  • conf/routes (version f2010eb4b2b13439dd5dc70cbe6719a294dcf9bc) (diffs)
  • public/javascripts/extractors/extractors.js (version f2010eb4b2b13439dd5dc70cbe6719a294dcf9bc) (diffs)
• 

  Todd Nicholson 11 Mar 2020 ace807b477829aa5747b1129a7219700ce729efe m

  adding to js routes delete does not currently work

  • app/api/Extractions.scala (version ace807b477829aa5747b1129a7219700ce729efe) (diffs)
  • app/controllers/Application.scala (version ace807b477829aa5747b1129a7219700ce729efe) (diffs)
  • app/services/mongodb/MongoDBExtractorService.scala (version ace807b477829aa5747b1129a7219700ce729efe) (diffs)
  • conf/routes (version ace807b477829aa5747b1129a7219700ce729efe) (diffs)
  • public/javascripts/deleteUtils.js (version ace807b477829aa5747b1129a7219700ce729efe) (diffs)
  • public/javascripts/extractors/extractors.js (version ace807b477829aa5747b1129a7219700ce729efe) (diffs)
• 

  Todd Nicholson 11 Mar 2020 0e59edf7c8b5e20d123811485deacd1fb067d4bc m

  adding ability to delete extractor

  • app/api/Extractions.scala (version 0e59edf7c8b5e20d123811485deacd1fb067d4bc) (diffs)
  • app/services/ExtractorService.scala (version 0e59edf7c8b5e20d123811485deacd1fb067d4bc) (diffs)
  • app/services/mongodb/MongoDBExtractorService.scala (version 0e59edf7c8b5e20d123811485deacd1fb067d4bc) (diffs)
  • conf/routes (version 0e59edf7c8b5e20d123811485deacd1fb067d4bc) (diffs)
• 

  Todd Nicholson 11 Mar 2020 1fe70e41cfde5853cd012f98efdb28402b33dc99 m

  button present, modal pops up, does not actually delete and redirect yet

  • app/views/extractorDetails.scala.html (version 1fe70e41cfde5853cd012f98efdb28402b33dc99) (diffs)
  • public/javascripts/deleteUtils.js (version 1fe70e41cfde5853cd012f98efdb28402b33dc99) (diffs)
  • public/javascripts/extractors/extractors.js (version 1fe70e41cfde5853cd012f98efdb28402b33dc99) (diffs)