clowder

• 

  Brock Angelo 04 Sep 2015 643481a7bbc4ce0227281113177e4dda1ee90fb7

  resolve merge conflict
• 

  Sandeep Puthanveetil Satheesan 21 Aug 2015 8a92df77d1ef06f007be93ef7262b9b46f381c42 m

  Clicking on bar chart to seek video to that position.

  • public/javascripts/previewers/person-tracking/some-library.js (version 8a92df77d1ef06f007be93ef7262b9b46f381c42) (diffs)
• 

  Sandeep Puthanveetil Satheesan 21 Aug 2015 d535e618b9bdbc7f2198a98b78951be1127da96c m

  Minor UI change for fixing misalignment when a scroll bar appears.

  • public/javascripts/previewers/person-tracking/some-library.js (version d535e618b9bdbc7f2198a98b78951be1127da96c) (diffs)
• 

  Sandeep Puthanveetil Satheesan 21 Aug 2015 c5b21871d972f2bca34786199d9b37a2e3f34f72 m

  Use regex for input validation.

  • public/javascripts/previewers/person-tracking/some-library.js (version c5b21871d972f2bca34786199d9b37a2e3f34f72) (diffs)
• 

  Sandeep Puthanveetil Satheesan 21 Aug 2015 951a81b87a39855b9d3a490d773d851c62ff1af0 m

  Minor UI change for fixing misalignment when a scroll bar appears.

  • public/javascripts/previewers/person-tracking/some-library.js (version 951a81b87a39855b9d3a490d773d851c62ff1af0) (diffs)
• 

  Sandeep Puthanveetil Satheesan 20 Aug 2015 80f872946e95825f706d19b1d4579b3d83dd58dd m

  Error messages use notify method. Error messages to display response status message. Error messages edited to be more clear. Replace deprecated jQuery 'success' function with 'done'. Code cleanup.

  • public/javascripts/previewers/person-tracking/some-library.js (version 80f872946e95825f706d19b1d4579b3d83dd58dd) (diffs)
• 

  Sandeep Puthanveetil Satheesan 20 Aug 2015 3b33ef6813a4b92158d31583a1858666c5c486e8 m

  Input field validation. Minor UI changes.

  • public/javascripts/previewers/person-tracking/some-library.js (version 3b33ef6813a4b92158d31583a1858666c5c486e8) (diffs)
• 

  Sandeep Puthanveetil Satheesan 20 Aug 2015 038abd58d8da036035e7bc84ed77905013601cf8 m

  Bug fix in calculating min max label values. Set up auto adjusting of axes ranges based on person tracking data.

  • public/javascripts/previewers/person-tracking/some-library.js (version 038abd58d8da036035e7bc84ed77905013601cf8) (diffs)
• 

  Sandeep Puthanveetil Satheesan 19 Aug 2015 0683c58be35181c7f40df430f410fb8b6500cd4d m

  Add new person IDs with autocomplete feature.

  • public/javascripts/previewers/person-tracking/some-library.js (version 0683c58be35181c7f40df430f410fb8b6500cd4d) (diffs)
• 

  Sandeep Puthanveetil Satheesan 19 Aug 2015 214be2cf9edac781793681771ca3777c0453e207 m

  Add custom padding to y-axis title based on the number of digits in the max Person ID.

  • public/javascripts/previewers/person-tracking/some-library.js (version 214be2cf9edac781793681771ca3777c0453e207) (diffs)
• 

  Sandeep Puthanveetil Satheesan 19 Aug 2015 d6cc8d1c7929e8e5885e8dfb604f2c5866f7ca91 m

  Set min and max values for y-axis. Add axis labels. Sort Person IDs in legend and drop down menu.

  • public/javascripts/jquery.flot.axislabels.js (version d6cc8d1c7929e8e5885e8dfb604f2c5866f7ca91) (diffs)
  • public/javascripts/previewers/person-tracking/some-library.js (version d6cc8d1c7929e8e5885e8dfb604f2c5866f7ca91) (diffs)
• 

  Sandeep Puthanveetil Satheesan 18 Aug 2015 411a0c6b1184eb664a41a27d8d3a7912a7330918 m

  Change sorting of legend labels from alphabetical to numeric

  • public/javascripts/previewers/person-tracking/some-library.js (version 411a0c6b1184eb664a41a27d8d3a7912a7330918) (diffs)
• 

  Sandeep Puthanveetil Satheesan 18 Aug 2015 7f087f04a52886357044ead42bc3b420a875c6d0 m

  Set max height to labels list. Add scroll bar to labels list when the height exceeds the set limit.

  • public/javascripts/previewers/person-tracking/some-library.js (version 7f087f04a52886357044ead42bc3b420a875c6d0) (diffs)
• 

  Sandeep Puthanveetil Satheesan 18 Aug 2015 470afbd3cdcfbbe654ea34da74c85bc8f5ab239b m

  Sort legend labels

  • public/javascripts/previewers/person-tracking/some-library.js (version 470afbd3cdcfbbe654ea34da74c85bc8f5ab239b) (diffs)
• 

  Sandeep Puthanveetil Satheesan 18 Aug 2015 9317f390533979c9dd559b74e7d4fd40ab051f81 m

  Remove 'Person_' from display and data structures.

  • public/javascripts/previewers/person-tracking/some-library.js (version 9317f390533979c9dd559b74e7d4fd40ab051f81) (diffs)
• 

  Sandeep Puthanveetil Satheesan 17 Aug 2015 62224a056af21d6b3d601fe090044120b08ee191 m

  Change the x-axis of graph to display all frames at page load.

  • public/javascripts/previewers/person-tracking/some-library.js (version 62224a056af21d6b3d601fe090044120b08ee191) (diffs)
• 

  Luigi Marini 17 Aug 2015 0698a8688fd2d03e7f947543fb0e9d7f28634a83 m

  Merge pull request #506 in CATS/clowder from feature/CATS-71-person-tracks-to-be-made-editable to develop
  * commit '1e19c889d564e52c803ddba0eda9c0ba2a4c6e89':
    Code Cleanup. Edited some comments.
    Bug fixes. Debug code present.
    Bug fix in JS file.
    Removed a blank line from routes
    Bug fix
    Fixed a bug related to missing indices in sortedFrameDataArray and it's copy
    Minor change to fix compilation error.
    Changes to use updateMetadata API end point to update person-tracking metadata. Code cleanup Changes to prevent NULL values from being sent to the database.
    Added API end point for updating technical metadata
    Added functionality to seek video and graph based clicking person label.
    Improved editing/removing person tracks functionality. Fixed bugs. Some code cleanup. Added confirm / cancel buttons.
    Added coarse functionality to merge person tracks and remove them. The JS person-tracking metadata object also gets update in the client side.
    Started with making labels clickable, and displaying drop down list
• 

  Luigi Marini 17 Aug 2015 aa138530b0fdb0b8802cf74009ddad95e13fda50 m

  Merge branch 'develop' into files-datasets-metadata-groupings-dumps
  # Conflicts:
  #        conf/play.plugins
  #        conf/routes
• 

  Sandeep Puthanveetil Satheesan 12 Aug 2015 bbd7628e8a6cd21fdb24890859118c9b92907141 m

  Bug fixes. Debug code present.

  • public/javascripts/previewers/person-tracking/some-library.js (version bbd7628e8a6cd21fdb24890859118c9b92907141) (diffs)
• 

  Sandeep Puthanveetil Satheesan 12 Aug 2015 1e19c889d564e52c803ddba0eda9c0ba2a4c6e89 m

  Code Cleanup. Edited some comments.

  • public/javascripts/previewers/person-tracking/some-library.js (version 1e19c889d564e52c803ddba0eda9c0ba2a4c6e89) (diffs)
• 

  Sandeep Puthanveetil Satheesan 12 Aug 2015 718a3e012a39ca2d29d6fe00d11e029d1227ddab m

  Bug fix in JS file.

  • public/javascripts/previewers/person-tracking/some-library.js (version 718a3e012a39ca2d29d6fe00d11e029d1227ddab) (diffs)
• 

  Sandeep Puthanveetil Satheesan 12 Aug 2015 b2221a341ac23748bc710f002b0fefe67dbd4b13 m

  Removed a blank line from routes

  • conf/routes (version b2221a341ac23748bc710f002b0fefe67dbd4b13) (diffs)
• 

  Sandeep Puthanveetil Satheesan 12 Aug 2015 ab0caccc05645692b376ca9108e2899f079baffe m

  Bug fix

  • public/javascripts/previewers/person-tracking/some-library.js (version ab0caccc05645692b376ca9108e2899f079baffe) (diffs)
• 

  Sandeep Puthanveetil Satheesan 12 Aug 2015 3c29d32ab0670570debec1eeb28333745c54952b m

  Fixed a bug related to missing indices in sortedFrameDataArray and it's copy

  • public/javascripts/previewers/person-tracking/some-library.js (version 3c29d32ab0670570debec1eeb28333745c54952b) (diffs)
• 

  Sandeep Puthanveetil Satheesan 12 Aug 2015 49ec8963d98a5092db0bed5ca4fdfa2349026ce8 m

  Minor change to fix compilation error.

  • app/api/Files.scala (version 49ec8963d98a5092db0bed5ca4fdfa2349026ce8) (diffs)
• 

  Sandeep Puthanveetil Satheesan 12 Aug 2015 2dbacea888eb2fc508898b4efbf2577214355c59 m

  Changes to use updateMetadata API end point to update person-tracking metadata. Code cleanup Changes to prevent NULL values from being sent to the database.

  • public/javascripts/previewers/person-tracking/some-library.js (version 2dbacea888eb2fc508898b4efbf2577214355c59) (diffs)
• 

  Sandeep Puthanveetil Satheesan 12 Aug 2015 ba49025e7de90944603097c2954f6d20ef184093 m

  Added API end point for updating technical metadata

  • app/api/Files.scala (version ba49025e7de90944603097c2954f6d20ef184093) (diffs)
  • app/controllers/Application.scala (version ba49025e7de90944603097c2954f6d20ef184093) (diffs)
  • app/services/FileService.scala (version ba49025e7de90944603097c2954f6d20ef184093) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version ba49025e7de90944603097c2954f6d20ef184093) (diffs)
  • conf/routes (version ba49025e7de90944603097c2954f6d20ef184093) (diffs)
• 

  Sandeep Puthanveetil Satheesan 12 Aug 2015 3c9324dc9e6987dc1e0447a35ef18b328ed776f6 m

  Added functionality to seek video and graph based clicking person label.

  • public/javascripts/previewers/person-tracking/some-library.js (version 3c9324dc9e6987dc1e0447a35ef18b328ed776f6) (diffs)
• 

  Sandeep Puthanveetil Satheesan 12 Aug 2015 60421bc4f528e1d850fc9a4d122b6519e780a06e m

  Improved editing/removing person tracks functionality. Fixed bugs. Some code cleanup. Added confirm / cancel buttons.

  • public/javascripts/previewers/person-tracking/some-library.js (version 60421bc4f528e1d850fc9a4d122b6519e780a06e) (diffs)
• 

  Sandeep Puthanveetil Satheesan 12 Aug 2015 e7567ef5214230cae0bb3658299385f8aa968f3d m

  Started with making labels clickable, and displaying drop down list

  • public/javascripts/previewers/person-tracking/some-library.js (version e7567ef5214230cae0bb3658299385f8aa968f3d) (diffs)
• 

  Sandeep Puthanveetil Satheesan 12 Aug 2015 f71e912fb17a95b66fba15ea4b9f0b0e2a5dd26f m

  Added coarse functionality to merge person tracks and remove them. The JS person-tracking metadata object also gets update in the client side.

  • public/javascripts/previewers/person-tracking/some-library.js (version f71e912fb17a95b66fba15ea4b9f0b0e2a5dd26f) (diffs)
• 

  Luigi Marini 06 Aug 2015 482e39f87fcccf5b5a81716bb7d9b0241af8ae36 m

  Merge pull request #442 in CATS/clowder from MMDB-1822-Galleria-images-JSON to develop
  * commit 'c001894e1b3b4dd93b11e200fa8c0f1ea7e87977':
    Galleria images passed as JSON for better performance.
• 

  Rob Kooper 22 Jul 2015 4997e344d84bb6cb65d72d358f3716d333c2c7e8 m

  Merge remote-tracking branch 'origin/develop' into feature/CATS-76-add-crowd-as-login-mechanism
• 

  Luigi Marini 22 Jul 2015 7b124db616cb78042508bd0e21070c81d8f901be m

  Merge pull request #486 in CATS/clowder from feature/CATS-91-allow-to-use-cilogon-to-login-to to develop
  * commit 'b03c3dccbb57e128413653dcb03bc789e35a869b':
    Add cilogon
• 

  Rui Liu 22 Jul 2015 f0b431b489371a2be3cbda61674d234e2168a06b m

  Added 4 indexes in 3 collections in MongoDB to speed Clowder up.
  Observed very slow uploads (> 1 hour for 1200 files), saw lots of
  slow queries in mongod.log, added the indexes, upload time went
  down to ~3 minutes. Per Rob and Smruti, checking in the changes...

  • app/services/mongodb/MongoSalatPlugin.scala (version f0b431b489371a2be3cbda61674d234e2168a06b) (diffs)
• 

  Luigi Marini 21 Jul 2015 c473896102f97729a187b64c8b935d12824d4330 m

  Merge pull request #265 in CATS/clowder from MMDB-1756_sections_descriptions to develop
  * commit 'e5a8c3745e9228fecbf8ee783245d9932e54cb98':
    Removed display:block from section description since it was breaking the GUI. The buttons were getting hidden behind the next row.
    Bugfixes plus empty line removal.
    Renaming on fields.
    API function rename.
    Fix for sections descriptions not showing newlines.
    Permissions for sections editing (so far for descriptions).
    Sections descriptions.
• 

  Luigi Marini 21 Jul 2015 19c03a2bf69299af447916dd360b3d127b675026 m

  Merge pull request #475 in CATS/clowder from feature/CATS-59-store-extractor-metadata to develop
  * commit '402acda959e94bf517e745030137c978e259cb5b':
    Fixed api permissions for extractors info endpoints.
    Implemented API endpoints to store ExtractorInfo when new extractors come online.
    Added ExtractionInfo model.
• 

  Luigi Marini 21 Jul 2015 402acda959e94bf517e745030137c978e259cb5b m

  Fixed api permissions for extractors info endpoints.

  • app/api/Extractions.scala (version 402acda959e94bf517e745030137c978e259cb5b) (diffs)
• 

  Luigi Marini 20 Jul 2015 508173b85a037fce094e3f2b9fc2d62168fa2d40 m

  Merge pull request #478 in CATS/clowder from feature/CATS-93-upgrade-to-sbt-13.8 to develop
  * commit '6b18c2b0a42eb83e7531f8d61096b8302bed16a5':
    Upgraded to sbt 13.8
• 

  Rob Kooper 17 Jul 2015 b03c3dccbb57e128413653dcb03bc789e35a869b m

  Add cilogon

  • app/services/CILogonProvider.scala (version b03c3dccbb57e128413653dcb03bc789e35a869b) (diffs)
  • conf/play.plugins (version b03c3dccbb57e128413653dcb03bc789e35a869b) (diffs)
  • conf/securesocial.conf (version b03c3dccbb57e128413653dcb03bc789e35a869b) (diffs)
  • public/securesocial/images/providers/cilogon.png (version b03c3dccbb57e128413653dcb03bc789e35a869b) (diffs)
• 

  Rob Kooper 17 Jul 2015 5edb2c319e7eaa82bcaa03090fed9c754e71c485 m

  Merge remote-tracking branch 'origin/develop' into feature/CATS-76-add-crowd-as-login-mechanism
• 

  Inna Zharnitsky 17 Jul 2015 5601755d022f9edf7202e5ed4240072e54d09bd8 m

  Changed url for file downloadAsFormat, so it is easy to distinguish from other file urls.

  • conf/routes (version 5601755d022f9edf7202e5ed4240072e54d09bd8) (diffs)
• 

  Luigi Marini 16 Jul 2015 b0423a7e35d80b4ac4d15bc027f9a6a6338face4 m

  Merge branch 'develop' into feature/CATS-59-store-extractor-metadata
  # Conflicts:
  #        conf/routes
• 

  Inna Zharnitsky 15 Jul 2015 1448559c97fa8f596e81aee42b95020090f4dda1 m

  Merge branch 'develop' into feature/downloadAs-PolyglotPlugin-CATS-68
  Conflicts:
          conf/routes
• 

  Inna Zharnitsky 15 Jul 2015 93d916b2cb68f95f4fbdbd6c69439a492e004b27 m

  To get input type for Polyglot, use file name instead of content type. Fixes issue CATS-100.

  • app/controllers/Files.scala (version 93d916b2cb68f95f4fbdbd6c69439a492e004b27) (diffs)
• 

  Eugene Roeder 14 Jul 2015 e7d473281a5a91e9f67d84b8f1c42d7e5e30fb1c m

  Worked through merge conflicts.
• 

  Luigi Marini 13 Jul 2015 6b18c2b0a42eb83e7531f8d61096b8302bed16a5 m

  Upgraded to sbt 13.8

  • sbt-launch-lib.bash (version 6b18c2b0a42eb83e7531f8d61096b8302bed16a5) (diffs)
  • sbt-launch.jar (version 6b18c2b0a42eb83e7531f8d61096b8302bed16a5) (diffs)
  • sbt32.bat (version 6b18c2b0a42eb83e7531f8d61096b8302bed16a5) (diffs)
  • sbt64.bat (version 6b18c2b0a42eb83e7531f8d61096b8302bed16a5) (diffs)
• 

  Luigi Marini 10 Jul 2015 edb2723ad2fcb75bc6b19244fb53837196b753cb m

  Merge pull request #443 in CATS/clowder from iframes-previewer to develop
  * commit '1e0b7bdba6db8dc76eba4fee64346d1795f19792':
    Removal of debug code.
    Added link to open resource in new window.
    HTTP-to-HTTPS redirect message shown only to users with Edit permissions to File.
    Appearance fixes.
    Iframes previewer using JSON.
    Commenting.
    Display note when iframe URL is changed for attempt at mixed-content avoidance.
    Iframes previewer appearance fixes.
    Error display for being unable to load iframe.
    Iframes preview support.
• 

  Luigi Marini 10 Jul 2015 3b6c9b5fc3e893169804bfa0195acc18ed91205e m

  Merge pull request #448 in CATS/clowder from elasticsearch-collections-search-fixes to develop
  * commit '7e9533c12483e9aa48921f64408094546924e13e':
    Searching in Collections as well.
• 

  Luigi Marini 10 Jul 2015 feb4cef878430d40e370683b23ab0ef9b0ddc89f m

  Merge pull request #452 in CATS/clowder from mongo-services-fixes to develop
  * commit '34cde491e9338273f9ccb052973284703e607e83':
    Preview 3D annotations fix.
• 

  Luigi Marini 10 Jul 2015 0f103709d57899171bcdb86f81259a64358dab6d m

  Merge pull request #449 in CATS/clowder from collections-service-thumbnails-fixes to develop
  * commit '55d057b9294c4616d1eabf7acb5716df5fa535ff':
    Removal of double addition of thumbnail/removal to/from Collection.
• 

  Luigi Marini 10 Jul 2015 e5a8c3745e9228fecbf8ee783245d9932e54cb98 m

  Removed display:block from section description since it was breaking the GUI. The buttons were getting hidden behind the next row.

  • public/stylesheets/main.css (version e5a8c3745e9228fecbf8ee783245d9932e54cb98) (diffs)
• 

  Rob Kooper 09 Jul 2015 7d45f1599d3d239cecdc2063ea7d77683f65fe76 m

  fixes for missing emails

  • app/controllers/Profile.scala (version 7d45f1599d3d239cecdc2063ea7d77683f65fe76) (diffs)
  • app/models/Event.scala (version 7d45f1599d3d239cecdc2063ea7d77683f65fe76) (diffs)
• 

  Rob Kooper 09 Jul 2015 4d412a813277416d586642c25852367dfcd0d3a2 m

  don't show userpass info on profile page

  • app/views/profile.scala.html (version 4d412a813277416d586642c25852367dfcd0d3a2) (diffs)
• 

  Rob Kooper 09 Jul 2015 da4476bd9c5aae0030bd0c987f0c74510aed8b52 m

  show links to profile pages

  • app/views/profile.scala.html (version da4476bd9c5aae0030bd0c987f0c74510aed8b52) (diffs)
• 

  Rob Kooper 09 Jul 2015 a255f7df252f8ab36a5fedcdd274b3ab8baae3eb m

  changed return format

  • app/services/CrowdProvider.scala (version a255f7df252f8ab36a5fedcdd274b3ab8baae3eb) (diffs)
• 

  Rob Kooper 09 Jul 2015 d16157c30f77c32e411c9e7fa36df6a0e27cd9a4 m

  no email specified (twitter)

  • app/controllers/Profile.scala (version d16157c30f77c32e411c9e7fa36df6a0e27cd9a4) (diffs)
• 

  Rob Kooper 09 Jul 2015 aaadbfc9d7424390ea46c11096f47831a7d71340 m

  normalize path

  • app/views/ss/provider.scala.html (version aaadbfc9d7424390ea46c11096f47831a7d71340) (diffs)
  • public/images/providers/crowd.png (version aaadbfc9d7424390ea46c11096f47831a7d71340) (diffs)
  • public/securesocial/images/providers/crowd.png (version aaadbfc9d7424390ea46c11096f47831a7d71340) (diffs)
• 

  Luigi Marini 07 Jul 2015 8f7e7ed9085f6c12729982eec818a8b6b425cfbd m

  Implemented API endpoints to store ExtractorInfo when new extractors come online.

  • app/api/Extractions.scala (version 8f7e7ed9085f6c12729982eec818a8b6b425cfbd) (diffs)
  • app/models/Extraction.scala (version 8f7e7ed9085f6c12729982eec818a8b6b425cfbd) (diffs)
  • app/services/ExtractorService.scala (version 8f7e7ed9085f6c12729982eec818a8b6b425cfbd) (diffs)
  • app/services/mongodb/MongoDBExtractorService.scala (version 8f7e7ed9085f6c12729982eec818a8b6b425cfbd) (diffs)
  • conf/routes (version 8f7e7ed9085f6c12729982eec818a8b6b425cfbd) (diffs)
• 

  Luigi Marini 06 Jul 2015 fc54da0fc57ed3a6d5805142221cd835469d0924 m

  Added ExtractionInfo model.

  • app/models/Extraction.scala (version fc54da0fc57ed3a6d5805142221cd835469d0924) (diffs)
• 

  Rob Kooper 04 Jul 2015 2fdbddee7e1c27256afc3a69b0097f5a7bd18161 m

  fix compile error
  Can not have a package securesocial inside services since it collides
  with the securesocial package

  • app/services/CrowdProvider.scala (version 2fdbddee7e1c27256afc3a69b0097f5a7bd18161) (diffs)
  • app/services/securesocial/CrowdProvider.scala (version 2fdbddee7e1c27256afc3a69b0097f5a7bd18161) (diffs)
  • app/views/ss/provider.scala.html (version 2fdbddee7e1c27256afc3a69b0097f5a7bd18161) (diffs)
  • conf/play.plugins (version 2fdbddee7e1c27256afc3a69b0097f5a7bd18161) (diffs)
• 

  Rob Kooper 04 Jul 2015 d771e021f3e01538af619575998f9cda8b6dab26 m

  ability to use crowd CATS-76

  • app/services/securesocial/CrowdProvider.scala (version d771e021f3e01538af619575998f9cda8b6dab26) (diffs)
  • app/views/ss/provider.scala.html (version d771e021f3e01538af619575998f9cda8b6dab26) (diffs)
  • conf/play.plugins (version d771e021f3e01538af619575998f9cda8b6dab26) (diffs)
  • conf/securesocial.conf (version d771e021f3e01538af619575998f9cda8b6dab26) (diffs)
  • public/images/providers/crowd.png (version d771e021f3e01538af619575998f9cda8b6dab26) (diffs)
  • scripts/crowd/clowder.php (version d771e021f3e01538af619575998f9cda8b6dab26) (diffs)
• 

  Constantinos Sophocleous 03 Jul 2015 e54cf35fe927106f7cd06d83b1a1a3d8e4151deb m

  Merge remote-tracking branch 'origin/develop' into files-datasets-metadata-groupings-dumps
  Conflicts:
          app/services/cassandra/CassandraDataset.scala
          app/services/mongodb/MongoDBDatasetService.scala
          app/views/main.scala.html
• 

  Constantinos Sophocleous 02 Jul 2015 c001894e1b3b4dd93b11e200fa8c0f1ea7e87977 m

  Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/CATS/clowder into MMDB-1822-Galleria-images-JSON
  Conflicts:
          app/views/file.scala.html
• 

  Inna Zharnitsky 30 Jun 2015 8ae91f95f2a632f5f3ed600c52bd6f043640f016 m

  Set the vhost variable before using in a call. CATS-74.

  • app/services/RabbitmqPlugin.scala (version 8ae91f95f2a632f5f3ed600c52bd6f043640f016) (diffs)
• 

  Inna Zharnitsky 30 Jun 2015 c1fab4cd5a873db2a0e9a44872fc98f06717dbe8 m

  Reverting commit. Should be in a different branch.

  • app/services/RabbitmqPlugin.scala (version c1fab4cd5a873db2a0e9a44872fc98f06717dbe8) (diffs)
• 

  Inna Zharnitsky 30 Jun 2015 e0ee01023948e5370ad5f99d90d887012e3f0b81 m

  Sets vhost variable before making the call to RabbitMQ rest endpoint. BD-685.

  • app/services/RabbitmqPlugin.scala (version e0ee01023948e5370ad5f99d90d887012e3f0b81) (diffs)
• 

  Inna Zharnitsky 26 Jun 2015 3102be79b09ea11be1997e2e36502812aba839a7 m

  PolyglotPlugin should be commented out.

  • conf/play.plugins (version 3102be79b09ea11be1997e2e36502812aba839a7) (diffs)
• 

  Inna Zharnitsky 26 Jun 2015 eb9b5732225c2d16e33da57658aa136d92facee4 m

  Code cleanup. Added comments, removed printouts.

  • app/controllers/Files.scala (version eb9b5732225c2d16e33da57658aa136d92facee4) (diffs)
  • app/services/PolyglotPlugin.scala (version eb9b5732225c2d16e33da57658aa136d92facee4) (diffs)
• 

  Inna Zharnitsky 26 Jun 2015 e13529f7c4990a4b7efadf302feba50013697e6c m

  Merge remote-tracking branch 'origin/develop' into develop
  Conflicts:
          app/controllers/Files.scala
          app/views/file.scala.html
• 

  Luigi Marini 24 Jun 2015 9847ea5b9828ce566f1d0f6414474372efcd0f16 m

  Merge pull request #462 in CATS/clowder from feature/MMDB-1823-display-bounding-boxes-layered to develop
  * commit 'b5f5dcbc2244e5b7c545544c352a931f5b001c31':
    Preview registration issue fixed.
    Preview registration
    Flickering issue with bounding boxes fixed, Code cleanup
    Color matching fixed.
    Fixed issue with JS file loads
    Bounding boxes uses corresponding colors from graph
    Added log message when any JS file loading fails.
    fixed bug  - person tracking visualization not getting displayed when other extractors run. Changed canvas height.
    Displaying video on canvas, scaled down preson tracking to fit video preview dimensions, code cleanup.
• 

  Luigi Marini 24 Jun 2015 6ca68df42c1a281693573849b8948625b2917a35 m

  Merge pull request #425 in CATS/clowder from bugfix/MMDB-1848-comment-text-corner-case to develop
  * commit '488e76779c7a4be9c12adb3f01ae53c36947b0b8':
    Update to unify decoding and handling on the controller side. This is in preparation for unification with the other comment changes, and future expansion of how to handle specific allowed tags.
    Updates to ensure that HTML entered into free text fields is safe when being displayed in the UI, while still ensuring that newlines can be retained correctly.
    Responses to pull request comments. Updating ListBuffer vars to be vals where possible. Removal of console logging on client side.
    Changes to fix all Dataset names, Collection names and descriptions, and comments. This includes editing and display dynamically after creation or on user interaction as well.
    First checkin of the pass through dataset description, which was used for testing. Some basic items for dataset name as well.
• 

  Luigi Marini 24 Jun 2015 8983f0633debc4ae79a2d31a83ae3ab6c3e1f2e7 m

  Merge pull request #457 in CATS/clowder from feature/MMDB-1846-need-to-add-a-list-and-remove-previews to develop
  * commit 'ff041d5c67a3d08618962f32bef51aece4be6fe3':
    Added previews end point to remove file and also did file cleanup work in all three test suites.
    Initial check in for Previews listing and removal end points.
• 

  Luigi Marini 24 Jun 2015 a9b38656dfc118fe60b1a2af9370b352a2f358da m

  Merge pull request #402 in CATS/clowder from release/cs492 to develop
  * commit '564c965eb2b4b3cf86f311dd5de88d405754160e': (76 commits)
    Fixed queries for user datasets and files shown on the profile page.
    Removed extra padding for menu items.
    remove wrong merge
    created help menu
    move search bar left of admin menu
    switch to models.User
    added back removed line
    fix no echo sometimes
    rearrange right side menu
    add models.User everywhere
    make sure user is saved as ClowderUser
    renamed MediciUser to ClowderUser
    use profile class
    Use instance display name instead of hardcoded name in rss feed
    use MONGOUPDATE
    limit number of updates
    Fixed typo
    fix compile errors
    Moved sendEmail to Events
    fixes to make things compile again
    ...
• 

  Luigi Marini 24 Jun 2015 564c965eb2b4b3cf86f311dd5de88d405754160e m

  Fixed queries for user datasets and files shown on the profile page.

  • app/services/mongodb/MongoDBDatasetService.scala (version 564c965eb2b4b3cf86f311dd5de88d405754160e) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version 564c965eb2b4b3cf86f311dd5de88d405754160e) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 8c39b16c62996c64aa62c73fbafad8b63f3f7c99 m

  Preview registration

  • public/javascripts/previewers/person-tracking/package.json (version 8c39b16c62996c64aa62c73fbafad8b63f3f7c99) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 14f6dd9ffd20903ae659ed910cd01a8a08d283fc m

  Added log message when any JS file loading fails.

  • public/javascripts/previewers/person-tracking/some-library.js (version 14f6dd9ffd20903ae659ed910cd01a8a08d283fc) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 9495463dc938ed61afa23f22136d7c120b34dfb8 m

  Bounding boxes uses corresponding colors from graph

  • public/javascripts/previewers/person-tracking/some-library.js (version 9495463dc938ed61afa23f22136d7c120b34dfb8) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 be78d75a8c5c79f6a0f004b02b525eb854bbacc9 m

  Fixed issue with JS file loads

  • public/javascripts/previewers/person-tracking/some-library.js (version be78d75a8c5c79f6a0f004b02b525eb854bbacc9) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 2f1623c6546a89cf1a15db75222f7f3be4cc45c0 m

  fixed bug  - person tracking visualization not getting displayed when other extractors run. Changed canvas height.

  • public/javascripts/previewers/person-tracking/some-library.js (version 2f1623c6546a89cf1a15db75222f7f3be4cc45c0) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 94af9299d9a7f257f5e855750df86423a40b54a4 m

  Color matching fixed.

  • public/javascripts/previewers/person-tracking/some-library.js (version 94af9299d9a7f257f5e855750df86423a40b54a4) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 b5f5dcbc2244e5b7c545544c352a931f5b001c31 m

  Preview registration issue fixed.

  • app/controllers/Application.scala (version b5f5dcbc2244e5b7c545544c352a931f5b001c31) (diffs)
  • public/javascripts/previewers/person-tracking/package.json (version b5f5dcbc2244e5b7c545544c352a931f5b001c31) (diffs)
  • public/javascripts/previewers/person-tracking/some-library.js (version b5f5dcbc2244e5b7c545544c352a931f5b001c31) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 0f68e89a17159a9833ca543f7edd55c8dca6521b m

  Flickering issue with bounding boxes fixed, Code cleanup

  • public/javascripts/VideoFrame.min.js (version 0f68e89a17159a9833ca543f7edd55c8dca6521b) (diffs)
  • public/javascripts/previewers/person-tracking/some-library.js (version 0f68e89a17159a9833ca543f7edd55c8dca6521b) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 98dadcfb21060ca977354b71c592324cf0028d70 m

  Displaying video on canvas, scaled down preson tracking to fit video preview dimensions, code cleanup.

  • public/javascripts/VideoFrame.min.js (version 98dadcfb21060ca977354b71c592324cf0028d70) (diffs)
  • public/javascripts/previewers/person-tracking/some-library.js (version 98dadcfb21060ca977354b71c592324cf0028d70) (diffs)
• 

  Luigi Marini 24 Jun 2015 5458ad89c369a2efd20c8f514775e9520ae52881 m

  Removed extra padding for menu items.

  • public/stylesheets/main.css (version 5458ad89c369a2efd20c8f514775e9520ae52881) (diffs)
• 

  Luigi Marini 24 Jun 2015 b5016fea1aa615970d510484295747c86a262498 m

  Merge pull request #444 in CATS/clowder from sections-click-video-navigation to develop
  * commit 'd4aa3f95690d77051e9eff367fddabbeb7f82225':
    Disabled Galleria info area in dataset page as it displayed no real info not viewable elsewhere and messed up the clicking of the main image. Toggleable sections click video navigation.
    Changed cursor to hand pointer when over Galleria main image (which can now move the video time on click).
    Removed autojump of Galleria slideshow when video proceeds. This was done because: -Now the user can select a point in the video to jump to by clicking on the image displayed in the Galleria main display, after it is displayed there. -When the video moves, the displayed image in Galleria main display changes (autojump). -If scenes change fast, then when the user clicks on a Galleria thumbnail to display it on the main screen, the displayed image is changed by the video automatically before the user has time to view his selected image and click on it to move on that point in the video.
    Cinemetrics sections in single file screen move to time point in video when section preview is clicked in galleria main display.
• 

  Luigi Marini 24 Jun 2015 3e7e1cf0e115b8a8fb7295cc364a70200c0395bb m

  Merge pull request #292 in CATS/clowder from video-mp4-plus-webm-support to develop
  * commit '1b4da2f8b01a7fad61dc23555d79e1c54f21978b':
    Getting the video preview content type directly on page load.
    Removal of unneeded file.
    EOL conversion to Unix.
    RabbitMQ plugin disabled by default.
    MP4+WebM video preview support for cross-browser compatibility.
• 

  Mario Felarca 24 Jun 2015 488e76779c7a4be9c12adb3f01ae53c36947b0b8 m

  Update to unify decoding and handling on the controller side. This is in preparation for unification with the other comment changes, and future expansion of how to handle specific allowed tags.

  • app/controllers/Collections.scala (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • app/controllers/Datasets.scala (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • app/controllers/Tags.scala (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • app/controllers/Utils.scala (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • app/views/datasets/collections.scala.html (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • app/views/datasets/editInfo.scala.html (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • public/javascripts/collection-create.js (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • public/javascripts/collectionDatasetsList.js (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • public/javascripts/dataset-create-fileuploader.js (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • public/javascripts/datasets/collections.js (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
• 

  Constantinos Sophocleous 24 Jun 2015 1e0b7bdba6db8dc76eba4fee64346d1795f19792 m

  Removal of debug code.

  • public/javascripts/previewers/iframe/some-library.js (version 1e0b7bdba6db8dc76eba4fee64346d1795f19792) (diffs)
• 

  Inna Zharnitsky 22 Jun 2015 08feed8c2d333ce49b2200a3d7a8b02c4ace3b1c m

  Added downloadAs drop-down list to the file view page.
  All the Polyglot-related code is in the PolyglotPlugin.
  
  Related to JIRA tasks: CATS-68 MMDB-1713 MMDB-1849 MMDB-1872

  • app/controllers/Files.scala (version 08feed8c2d333ce49b2200a3d7a8b02c4ace3b1c) (diffs)
  • app/services/PolyglotPlugin.scala (version 08feed8c2d333ce49b2200a3d7a8b02c4ace3b1c) (diffs)
  • app/views/file.scala.html (version 08feed8c2d333ce49b2200a3d7a8b02c4ace3b1c) (diffs)
  • conf/application.conf (version 08feed8c2d333ce49b2200a3d7a8b02c4ace3b1c) (diffs)
  • conf/play.plugins (version 08feed8c2d333ce49b2200a3d7a8b02c4ace3b1c) (diffs)
  • conf/routes (version 08feed8c2d333ce49b2200a3d7a8b02c4ace3b1c) (diffs)
• 

  Eugene Roeder 17 Jun 2015 077162857a21e65d925e2127cff139bf2ef370dc m

  Added a thumbnail file removal to the Extractions test suite.

  • test/integration/extractions/ExtractionsAPIAppSpec.scala (version 077162857a21e65d925e2127cff139bf2ef370dc) (diffs)
• 

  Eugene Roeder 17 Jun 2015 6865873aed7b19b57d452b1c94a71118b1f9b4bb m

  Merge branch 'develop' into feature/MMDB-1845-there-is-no-list-route-to-view
• 

  Eugene Roeder 17 Jun 2015 ff041d5c67a3d08618962f32bef51aece4be6fe3 m

  Reworked merge conflicts with routes table.
• 

  Eugene Roeder 17 Jun 2015 566cbd1d3f85e35a7ea616a17c06a25284f0ffff m

  Added previews end point to remove file and also did file cleanup work in all three test suites.

  • app/api/Previews.scala (version 566cbd1d3f85e35a7ea616a17c06a25284f0ffff) (diffs)
  • conf/routes (version 566cbd1d3f85e35a7ea616a17c06a25284f0ffff) (diffs)
  • test/integration/collections/CollectionsAPIAppSpec.scala (version 566cbd1d3f85e35a7ea616a17c06a25284f0ffff) (diffs)
  • test/integration/extractions/ExtractionsAPIAppSpec.scala (version 566cbd1d3f85e35a7ea616a17c06a25284f0ffff) (diffs)
  • test/integration/previews/PreviewsAPIAppSpec.scala (version 566cbd1d3f85e35a7ea616a17c06a25284f0ffff) (diffs)
• 

  Luigi Marini 17 Jun 2015 c71c40a9af2bf835dbbb69a70d48e6be440560a3 m

  Added json formatter for Scala Symbols. Was throwing a compile error.

  • app/models/ResourceRef.scala (version c71c40a9af2bf835dbbb69a70d48e6be440560a3) (diffs)
• 

  Constantinos Sophocleous 17 Jun 2015 eeb0bd5083eadc01f17cf73756621e02d270c786 m

  Added link to open resource in new window.

  • public/javascripts/previewers/iframe/some-library.js (version eeb0bd5083eadc01f17cf73756621e02d270c786) (diffs)
• 

  Constantinos Sophocleous 17 Jun 2015 5505e97f04161d660a26745aab373ac1df0369f1 m

  HTTP-to-HTTPS redirect message shown only to users with Edit permissions to File.

  • app/views/file.scala.html (version 5505e97f04161d660a26745aab373ac1df0369f1) (diffs)
  • conf/play.plugins (version 5505e97f04161d660a26745aab373ac1df0369f1) (diffs)
  • public/javascripts/previewers/iframe/some-library.js (version 5505e97f04161d660a26745aab373ac1df0369f1) (diffs)
• 

  Eugene Roeder 16 Jun 2015 15803c564ad69fa3dcb45a0a48fe0f2edc403d2d m

  Fixed routes table merge conflict
• 

  Rob Kooper 16 Jun 2015 68fda60103ae1254e1912978106e64f24e409c3c m

  Add ResourceRef
  Use this class to specify what type of UUID something is.

  • app/models/ResourceRef.scala (version 68fda60103ae1254e1912978106e64f24e409c3c) (diffs)
• 

  Constantinos Sophocleous 16 Jun 2015 1538ecb77b3c8327705c98bbc2da9fdabe5b98f7 m

  Appearance fixes.

  • public/javascripts/previewers/iframe/some-library.js (version 1538ecb77b3c8327705c98bbc2da9fdabe5b98f7) (diffs)
  • public/stylesheets/main.css (version 1538ecb77b3c8327705c98bbc2da9fdabe5b98f7) (diffs)