Build: #2 was successful Changes by Constantinos Sophocleous
Code commits
clowder
-
Constantinos Sophocleous ad150030d20960b21a95d92596e91069c80f099e
Merge branch 'iframes-previewer' into cyiPortalDeployment
-
Constantinos Sophocleous 1e0b7bdba6db8dc76eba4fee64346d1795f19792 m
Removal of debug code.
-
Constantinos Sophocleous eb90c828af3c89c5bd2202cefca3f824395344e4
Merge branch 'mongo-services-fixes' into cyiPortalDeployment
-
Constantinos Sophocleous 706ecc6ccd0f8ce8723c165cf86c8c8cda13d8c3
Merge branch 'extractions-messages-fixes' into cyiPortalDeployment
-
Constantinos Sophocleous 1c7ba87e5cc2d10bcbb744961d153d4c06cf8554
Merge branch 'mongo-dataset-service-fixes' into cyiPortalDeployment
-
Constantinos Sophocleous a30451048b628aed587f0ff3f8ff6ede2f386dd3
Merge branch 'collections-service-thumbnails-fixes' into cyiPortalDeployment
-
Constantinos Sophocleous 5ab8858b57c670d84cd79abd7335318df9113513
Merge branch 'elasticsearch-collections-search-fixes' into cyiPortalDeployment
-
Constantinos Sophocleous 67469e1c84a50942e1f8333bb34c0a83e00966cc
Merge branch 'files-datasets-metadata-groupings-dumps' into cyiPortalDeployment
Conflicts:
conf/play.plugins
conf/routes -
Constantinos Sophocleous 7fe6a2a29ceaf09f73770b7166eb24157a70560a
Merge branch 'sections-click-video-navigation' into cyiPortalDeployment
Conflicts:
app/views/file.scala.html -
Constantinos Sophocleous b6e2c8a7c21110468cade85d8659f6fa624e2442
Merge remote-tracking branch 'origin/video-mp4-plus-webm-support' into cyiPortalDeployment
-
Constantinos Sophocleous 76e322c35fcf7ffe3619a03cbfdb26bdce5a8aac
Merge remote-tracking branch 'origin/MMDB-1756_sections_descriptions' into cyiPortalDeployment
-
Constantinos Sophocleous 34cde491e9338273f9ccb052973284703e607e83 m
Preview 3D annotations fix.
-
Constantinos Sophocleous f2fe4fa1e6c9db79cec25fc3e3a53371f02fb4c2 m
Bugfix.
-
Constantinos Sophocleous db1e9431afcd541f82d9b8506aaadd9a189b7def m
Fix for datasets listing before date.
-
Constantinos Sophocleous 55d057b9294c4616d1eabf7acb5716df5fa535ff m
Removal of double addition of thumbnail/removal to/from Collection.
-
Constantinos Sophocleous 7e9533c12483e9aa48921f64408094546924e13e m
Searching in Collections as well.
-
Constantinos Sophocleous 9233ac320c5c71c9229fee13c95dda3fdd1c1da6 m
Dumping functionality for metadata of files and datasets, plus groupings of files in datasets. Using final staging directories for dumps.
- app/api/Datasets.scala (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- app/api/Files.scala (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- app/controllers/Admin.scala (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- app/services/DatasetService.scala (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- app/services/DatasetsAutodumpService.scala (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- app/services/DatasetsMetadataAutodumpService.scala (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- app/services/FileDumpService.scala (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- app/services/FileMetadataAutodumpService.scala (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- app/services/FileService.scala (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- app/services/cassandra/CassandraDataset.scala (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- app/views/main.scala.html (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- app/views/viewDumpers.scala.html (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- conf/application.conf (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- conf/play.plugins (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
- conf/routes (version 9233ac320c5c71c9229fee13c95dda3fdd1c1da6) (diffs)
-
Constantinos Sophocleous d4aa3f95690d77051e9eff367fddabbeb7f82225 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/CATS/clowder into sections-click-video-navigation
-
Constantinos Sophocleous cbff83c76f94e7156eb7b43cb11d00e7d06903a4 m
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.
-
Constantinos Sophocleous 9d5c263d591aa573d2f5f6bb1c28ca84adb553a4 m
Changed cursor to hand pointer when over Galleria main image (which can now move the video time on click).
-
Constantinos Sophocleous 7294b1d428845e4e2dcd2a299b52852097a5d219 m
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.
-
Constantinos Sophocleous 8b36851d1638fae06671a7e6bd0da1c123e8e181 m
Cinemetrics sections in single file screen move to time point in video when section preview is clicked in galleria main display.
-
Constantinos Sophocleous 1b4da2f8b01a7fad61dc23555d79e1c54f21978b m
Getting the video preview content type directly on page load.
-
Constantinos Sophocleous 75d5b9f2ebaed2145461591f56ca744658fd649d m
Removal of unneeded file.
-
Constantinos Sophocleous abb8d4d2a938342b83132a2e548a933d3d3137b5 m
Bugfixes plus empty line removal.
-
Constantinos Sophocleous fb2ac96c07bb01a374022f054c270685ab6178a2 m
Renaming on fields.
-
Constantinos Sophocleous f8eac9bda0472c3db29b8b949703c775f75312d8 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/CATS/clowder into MMDB-1756_sections_descriptions
Conflicts:
conf/routes -
Constantinos Sophocleous 663810f70f2a018a7408a0a7f7d20d264c875732 m
API function rename.
-
Constantinos Sophocleous 705d0e19354e84bb818866bdce3b3a2f6d3cfbc7 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/CATS/clowder into MMDB-1756_sections_descriptions
Conflicts:
README
app/api/Sections.scala
app/models/Section.scala
app/services/SectionService.scala
app/services/mongodb/MongoDBSectionService.scala
conf/routes -
Constantinos Sophocleous 2a3ff5c12bfb458aafdc056e7d07c681b8391fa3 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/CATS/clowder into video-mp4-plus-webm-support
Conflicts:
LICENSE
README
app/controllers/Application.scala
conf/mimetypes.conf
project/plugins.sbt
public/plugins/expressInstall.swf -
Constantinos Sophocleous 7460fe963287ae82c684f3bd104de74580c5fc4f m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/MED/medici-play into MMDB-1756_sections_descriptions
Conflicts:
app/views/file.scala.html -
Constantinos Sophocleous 33ec5721261096d8bac02eca70ed84488124cea0 m
EOL conversion to Unix.
- LICENSE (version 33ec5721261096d8bac02eca70ed84488124cea0) (diffs)
- README (version 33ec5721261096d8bac02eca70ed84488124cea0) (diffs)
- project/plugins.sbt (version 33ec5721261096d8bac02eca70ed84488124cea0) (diffs)
- public/plugins/expressInstall.swf (version 33ec5721261096d8bac02eca70ed84488124cea0) (diffs)
-
Constantinos Sophocleous eb80a0783032513aaa081b764b0e2ae6e9f4bde2 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/MED/medici-play into video-mp4-plus-webm-support
Conflicts:
public/javascripts/previewers/video/video.js -
Constantinos Sophocleous 8a45c89cfa6b508d5125a88ada1d8cc40ce1a922 m
Fix for sections descriptions not showing newlines.
-
Constantinos Sophocleous 21fc0f2ca7a1e71d6c064570332d0b8861933031 m
Merge remote-tracking branch 'origin/develop' into MMDB-1756_sections_descriptions
-
Constantinos Sophocleous 4c8a3d1866da278f00758997639c9533e969d424 m
RabbitMQ plugin disabled by default.
-
Constantinos Sophocleous 4a3b62926bb8879824eec10966d94e2cd8d1b013 m
MP4+WebM video preview support for cross-browser compatibility.
- app/api/Previews.scala (version 4a3b62926bb8879824eec10966d94e2cd8d1b013) (diffs)
- app/controllers/Application.scala (version 4a3b62926bb8879824eec10966d94e2cd8d1b013) (diffs)
- conf/mimetypes.conf (version 4a3b62926bb8879824eec10966d94e2cd8d1b013) (diffs)
- conf/play.plugins (version 4a3b62926bb8879824eec10966d94e2cd8d1b013) (diffs)
- public/javascripts/previewers/video/package.json (version 4a3b62926bb8879824eec10966d94e2cd8d1b013) (diffs)
- public/javascripts/previewers/video/video.js (version 4a3b62926bb8879824eec10966d94e2cd8d1b013) (diffs)
-
Constantinos Sophocleous 4706c745f253eb8612b2e59a81c7b922c458ddd3 m
Merge remote-tracking branch 'origin/develop' into MMDB-1756_sections_descriptions
-
Constantinos Sophocleous 04029efe619a228990b3d21d892367aaa8ac98c4 m
Permissions for sections editing (so far for descriptions).
-
Constantinos Sophocleous bba94b952241aa1f6ed3723d043a25322ca83168 m
Sections descriptions.
- app/api/Sections.scala (version bba94b952241aa1f6ed3723d043a25322ca83168) (diffs)
- app/models/Section.scala (version bba94b952241aa1f6ed3723d043a25322ca83168) (diffs)
- app/services/SectionService.scala (version bba94b952241aa1f6ed3723d043a25322ca83168) (diffs)
- app/services/mongodb/MongoDBSectionService.scala (version bba94b952241aa1f6ed3723d043a25322ca83168) (diffs)
- app/views/file.scala.html (version bba94b952241aa1f6ed3723d043a25322ca83168) (diffs)
- conf/routes (version bba94b952241aa1f6ed3723d043a25322ca83168) (diffs)
- public/javascripts/sectionsListProcess.js (version bba94b952241aa1f6ed3723d043a25322ca83168) (diffs)