Build: #2 was successful Changes by Rob Kooper and Brock Angelo
Code commits
clowder
-
Rob Kooper b4a41143480b595fc1ea552a2844b8cc30e37c15
Merge pull request #432 in CATS/clowder from develop to imlczo-merging-develop-201506
* commit '2f9559605b27cd2327781ee14c915e160231ae2a':
Changing Favicon for Cats -
Indira Gutierrez Polo 2f9559605b27cd2327781ee14c915e160231ae2a m
Changing Favicon for Cats
-
Brock Angelo f3d24b95dfe6b6149beb462bf90e01102e77e6b8
resolve merge conflict
-
Rob Kooper 8c06292891042c841a8478c3730e2c2e8a15b285 m
bump version
-
Rob Kooper 9911a0d470b82d8b9c23d407beda8ab6d16cbfed m
set version to 0.9
-
Rob Kooper d904397f05c8f9a288b1ab8b8b06f6155deb35ee m
change references to medici-play to clowder
- INSTALL.md (version d904397f05c8f9a288b1ab8b8b06f6155deb35ee) (diffs)
- README.md (version d904397f05c8f9a288b1ab8b8b06f6155deb35ee) (diffs)
- app/api/Status.scala (version d904397f05c8f9a288b1ab8b8b06f6155deb35ee) (diffs)
- doc/src/markdown/manual.html (version d904397f05c8f9a288b1ab8b8b06f6155deb35ee) (diffs)
- doc/src/sphinx/setup.rst (version d904397f05c8f9a288b1ab8b8b06f6155deb35ee) (diffs)
- doc/src/sphinx/source.rst (version d904397f05c8f9a288b1ab8b8b06f6155deb35ee) (diffs)
- project/Build.scala (version d904397f05c8f9a288b1ab8b8b06f6155deb35ee) (diffs)
-
Rob Kooper c58c121f6f588619659a2ef79e05074333d46444 m
Merge branch 'develop' of ssh://opensource.ncsa.illinois.edu:7999/cats/clowder into feature/MMDB-1840-use-clowder-instead-of-test-in
-
Luigi Marini e86e37661591ef3c8b1806c685f2ec3c84831f18 m
Merge pull request #414 in MMDB/medici-play from bugfix/MMDB-1856-remove-legacy-mode-parameter to develop
* commit '00f4b47172e36f07d164073f4d49353d7889bcfb':
Updates to clean up some debugging statements and tighten up some of the assignment code, per Rob's suggestion.
Updates based on discussion in comments and in meeting. Use mode parameter if it is present, otherwise use the cookie value. For most standard operations, there will be no parameter present, and the user will not see one.
Updates to remove the unnecessary parameter, and the addition of cookie usage for tag listings. -
Rob Kooper 936cf7dec3f1a13a15e9f7dc22b5ae6e06d9fdaa m
Merge pull request #413 in MMDB/medici-play from add-custom-folder to develop
* commit '392eb38416db3efcb4684d934b5d0a613f311e75':
allow custom things to go in custom folder -
Rob Kooper 8324fa83afd324c8277dc6f9427a36b5d7886d4a m
Merge pull request #415 in MMDB/medici-play from galleria_fullscreen to develop
* commit 'd6f83a52631c83c68c4525b09688842022453d55':
removed unused code
Brighter color.
Using link for Galleria fullscreen.
Galleria fullscreen mode. -
Rob Kooper 6899799d94b644153e8c2716cf6b18b27137480d m
Merge pull request #417 in MMDB/medici-play from bugfix/MMDB-1867-section-tags-comments-pdf-broken to develop
* commit 'f6fc533420a1791ad11dd2775c769a467d8e40ce':
pass id of file, not of preview -
Rob Kooper b53f98e2323258173f8a7401a881946634321f47 m
remove funding until we have complete list
-
Rob Kooper f6fc533420a1791ad11dd2775c769a467d8e40ce m
pass id of file, not of preview
This worked before because the tested use case did not have a preview
and thus the id was the same as the preview id. -
Rob Kooper d6f83a52631c83c68c4525b09688842022453d55 m
removed unused code
-
Mario Felarca 00f4b47172e36f07d164073f4d49353d7889bcfb m
Updates to clean up some debugging statements and tighten up some of the assignment code, per Rob's suggestion.
- app/controllers/Collections.scala (version 00f4b47172e36f07d164073f4d49353d7889bcfb) (diffs)
- app/controllers/Datasets.scala (version 00f4b47172e36f07d164073f4d49353d7889bcfb) (diffs)
- app/controllers/Files.scala (version 00f4b47172e36f07d164073f4d49353d7889bcfb) (diffs)
- app/controllers/Tags.scala (version 00f4b47172e36f07d164073f4d49353d7889bcfb) (diffs)
-
Constantinos Sophocleous d675765d18d7454428e723bae6d4f22f011d2eb6 m
Brighter color.
-
Constantinos Sophocleous de9a27241ffdf23d7dcaae3046f02872b200c07a m
Using link for Galleria fullscreen.
-
Mario Felarca 5dad0e7622829bfdc62f41ccbe37687bca21415c m
Updates based on discussion in comments and in meeting. Use mode parameter if it is present, otherwise use the cookie value. For most standard operations, there will be no parameter present, and the user will not see one.
- app/controllers/Collections.scala (version 5dad0e7622829bfdc62f41ccbe37687bca21415c) (diffs)
- app/controllers/Datasets.scala (version 5dad0e7622829bfdc62f41ccbe37687bca21415c) (diffs)
- app/controllers/Files.scala (version 5dad0e7622829bfdc62f41ccbe37687bca21415c) (diffs)
- app/controllers/Tags.scala (version 5dad0e7622829bfdc62f41ccbe37687bca21415c) (diffs)
- app/views/collectionList.scala.html (version 5dad0e7622829bfdc62f41ccbe37687bca21415c) (diffs)
- app/views/datasetList.scala.html (version 5dad0e7622829bfdc62f41ccbe37687bca21415c) (diffs)
- app/views/filesList.scala.html (version 5dad0e7622829bfdc62f41ccbe37687bca21415c) (diffs)
- app/views/searchByTag.scala.html (version 5dad0e7622829bfdc62f41ccbe37687bca21415c) (diffs)
- conf/routes (version 5dad0e7622829bfdc62f41ccbe37687bca21415c) (diffs)
-
Constantinos Sophocleous 66175c3406a98f91afdd8d2b598fcacab8d1aeb7 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/MED/medici-play into galleria_fullscreen
Conflicts:
app/views/file.scala.html
public/stylesheets/main.css -
Constantinos Sophocleous 4265a42e24cdd5a8dc5caab5d2bbeb1d16adcdb5 m
Galleria fullscreen mode.
-
Mario Felarca 8f58fcb6ccadd70bead42556a7321f2edd8016c9 m
Updates to remove the unnecessary parameter, and the addition of cookie usage for tag listings.
- app/controllers/Files.scala (version 8f58fcb6ccadd70bead42556a7321f2edd8016c9) (diffs)
- app/controllers/Tags.scala (version 8f58fcb6ccadd70bead42556a7321f2edd8016c9) (diffs)
- app/views/collectionList.scala.html (version 8f58fcb6ccadd70bead42556a7321f2edd8016c9) (diffs)
- app/views/datasetList.scala.html (version 8f58fcb6ccadd70bead42556a7321f2edd8016c9) (diffs)
- app/views/filesList.scala.html (version 8f58fcb6ccadd70bead42556a7321f2edd8016c9) (diffs)
- app/views/searchByTag.scala.html (version 8f58fcb6ccadd70bead42556a7321f2edd8016c9) (diffs)
-
Rob Kooper 392eb38416db3efcb4684d934b5d0a613f311e75 m
allow custom things to go in custom folder
custom is now searched for play.plugins and custom.conf. Use this
folder to keep your local changes to the configuration files. The
custom folder is in .gitignore. -
Rob Kooper 9b991d66ebadfbbd8f58229c6ec92c81303fc9fb m
cleanup README
-
Rob Kooper 89c75274e1a95fcdf2f3ee18a4e3df49916e6406 m
contributors
-
Luigi Marini 4407233ef9b482f00fc2d1457ae08504571e81ba m
Merge pull request #307 in MMDB/medici-play from sections_thumbnails to develop
* commit 'ef849196226348396d4d7a60352fcbd21f8ab6cc':
Thumbnail ID returned properly.
Thumbnail ID returned properly.
Sections attach thumbnail route.
Files page to use sections thumbnails if available.
Permissions to update sections (e.g. thumbnails). Based on permissions of the file the section belongs to.
Sections thumbnails model, service and API. -
Luigi Marini 620f1d8167751003533025a11747b8ce44769a19 m
Merge pull request #287 in MMDB/medici-play from new-MMDB-1638-presentations-support to develop
* commit 'c9fcabcf822812388430ed315abde5491e82a4bf':
Appearance fix.
Better detection of user's access rights for file in presentations previewer using User template parameter.
Make file download of original ZIP file invisible for no-edit-rights people (i.e. non-authors) for presentations files when the merged video is ready. Non-authors should only be able to download the merged video.
RabbitMQ plugin disabled.
Change in video element id to comply with Galleria section jump code.
Presentations support. -
Mario Felarca 996aadb679c5b3ee099ff0bf64fcff8859efb96e m
Missed an item to merge.
-
Mario Felarca 8b18a4f3571d08e507a321f55958e313508f532e m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/mmdb/medici-play into bugfix/MMDB-1772-clean-up-hardcoded-links
Conflicts:
public/javascripts/dataset-create-fileuploader.js -
Mario Felarca 0312ff6014113727aeb9c3732b2646876d1d2cdb m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/mmdb/medici-play into bugfix/MMDB-1772-clean-up-hardcoded-links
Conflicts:
public/javascripts/collectionDatasetsList.js -
Luigi Marini a548d6887d3822239e9bf753cbe390ba3c10d68a m
Merge pull request #342 in MMDB/medici-play from bugfix/MMDB-1778-link-to-dataset-hard-to-see to develop
* commit 'e685d7e8b22257ccc0eeabe534726dcf41388a8c':
Update to remove references to redundant (and older) jquery libraries and widgets by the file uploader library. Re-enabling of the notify calls in the dataset creation workflow.
Reverted changes for notify. Left the code in, commented out. Ensured that the link to the new dataset will always be emphasized and clearly a link, no matter what the theme is.
For testing. -
Mario Felarca e685d7e8b22257ccc0eeabe534726dcf41388a8c m
Update to remove references to redundant (and older) jquery libraries and widgets by the file uploader library. Re-enabling of the notify calls in the dataset creation workflow.
- app/views/newDataset.scala.html (version e685d7e8b22257ccc0eeabe534726dcf41388a8c) (diffs)
- app/views/upload.scala.html (version e685d7e8b22257ccc0eeabe534726dcf41388a8c) (diffs)
- public/javascripts/dataset-create-fileuploader.js (version e685d7e8b22257ccc0eeabe534726dcf41388a8c) (diffs)
- public/javascripts/file-uploader/jquery.min.js (version e685d7e8b22257ccc0eeabe534726dcf41388a8c) (diffs)
- public/javascripts/file-uploader/vendor/jquery.ui.widget.js (version e685d7e8b22257ccc0eeabe534726dcf41388a8c) (diffs)
-
Luigi Marini 79a69c90e3adfd1f8f25f9cdce9126e8b0d477cb m
Merge pull request #368 in MMDB/medici-play from MMDB-1808-searchbytag to develop
* commit 'f6f52f5ba597d3d1835c3a9dfc6057724f205c74':
Changed status update frequency from 2 min to default 5 min.
disabled Rabbitmq and Elasticsearch Plugin
Added search by fields and stem of a word -
Smruti Padhy f6f52f5ba597d3d1835c3a9dfc6057724f205c74 m
Changed status update frequency from 2 min to default 5 min.
-
Luigi Marini f0992ffffaed114171a8c537bdef64eba0e8f74a m
Merge pull request #363 in MMDB/medici-play from feature/MMDB-1821-show-simple-alphabetical-list-of to develop
* commit 'd3408cf87aa52311f891ea0ac4990695877d2152':
create listing of tags -
Luigi Marini 1719c5b574480130f14ca176ebedbbc2f6c7984f m
Merge pull request #375 in MMDB/medici-play from bugfix/MMDB-1825-add-context-support-for-person to develop
* commit '29e71d4e7bcd183fb3fdba0cf94f972f8c772f97':
Removed a console log display used for debugging
Code changes to reflect updates to person tracking extractor
Validated metadata, display appropriate error messages
fix to failed JS loads error
Added context support for person tracking visualization -
Luigi Marini b6c911ce5b22cda474c74ddb9656e59eed4fba47 m
Merge pull request #387 in MMDB/medici-play from bugfix/MMDB-1839-test-data-deleted-after-running to develop
* commit '9907039780cf9900a27bfe93f96117a4274922fc':
use regular file instead of tempfile MMDB-1839 -
Constantinos Sophocleous ef849196226348396d4d7a60352fcbd21f8ab6cc m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/MED/medici-play into sections_thumbnails
Conflicts:
app/views/file.scala.html -
Rob Kooper d3408cf87aa52311f891ea0ac4990695877d2152 m
Merge remote-tracking branch 'origin/develop' into feature/MMDB-1821-show-simple-alphabetical-list-of
-
Smruti Padhy 711d0d06cea70881ca940404de3c498986d73b3a m
disabled Rabbitmq and Elasticsearch Plugin
-
Smruti Padhy fe7ca6517320274ad5175a010c10b37902641367 m
Merge remote-tracking branch 'origin/develop' into MMDB-1808-searchbytag
Conflicts:
app/services/ElasticsearchPlugin.scala -
Luigi Marini 93947f99294b89a05675e704ec4b17b58b7747ab m
Merge pull request #378 in MMDB/medici-play from bugfix/MMDB-1815-pagination-in-search-result to develop
* commit '641db8bbc6a949f74e6e40f200d68dc5de310fdb':
Add pagination to tag search MMDB-1815 -
Rob Kooper 8601dc785e1f07b02afe4a7c2a3e038d354c0d94 m
use clowder MMDB-1840
-
Rob Kooper e441f16dd659b28f69b59983e64df747af439941 m
Merge remote-tracking branch 'origin/develop' into feature/MMDB-1821-show-simple-alphabetical-list-of
-
Rob Kooper 9907039780cf9900a27bfe93f96117a4274922fc m
use regular file instead of tempfile MMDB-1839
TempFile will be deleted after a garbage collect. -
Luigi Marini 727133c7e1adc06e2150102a18e7c8400050b578 m
Merge pull request #364 in MMDB/medici-play from bugfix/MMDB-1794-file-upload-error-on-timeout to develop
* commit '40c37407959bb7f1a5197232f9db33ae8acb8535':
Final testing and changes complete. Addition of auth checks to both file add and file submit for new file upload workflow. Also added the changes to check for auth on add to the new dataset workflow, to attempt to catch authentication issues as early as possible.
Another interim checkin. Basic tests done. Need to refine the logic on the client side to handle multiple calls to submit. Model after existing structure in the dataset case.
Initial checking of new file and new getUser API call. Testing to follow, as well as the actual modification of the new JS file to call the new API, and integration with the actual front end. -
Luigi Marini 68aeb33330f785b50ccb50394a5f10648c9ebca5 m
Merge pull request #361 in MMDB/medici-play from galleria-appearance-fixes to develop
* commit '713e16a90d473ee7d2fe22f946797c0e22395146':
Overriding Galleria default thumbnails size to make them somehow less small.
Bugfix.
Sliding Galleria scenes table when the scenes are more than a few.
Galleria video scenes viewer change size on screen resize. -
Luigi Marini 30bd0ee1e62f85a6f91f082ab079a80cc9171c6a m
Merge pull request #353 in MMDB/medici-play from bugfix/MMDB-1796-dataset-free-text-is-not-decoded to develop
* commit '14d4163b96d25ae8a3f93be23c29a168d01b488e':
Changes to move decoding elements for free text fields of Collections and Datasets into the Utils object. Updates to call these from all appropriate locations. Addition of calls to decode dataset elements in the Collections view and the File view. -
Luigi Marini 49b68a829149e97a037caedcd089a8b3d9834fdb m
Merge pull request #332 in MMDB/medici-play from bugfix/MMDB-1775-dataset-option-shows-a-value to develop
* commit 'c2a84ce4c96e4c71eaff37317fe9c0a2e3327e55':
Cleaned up the error messages so that they make more sense. Minor layout tweak for the File view regarding the error message.
Small changes to allow first elements in the input box to be blank. -
Luigi Marini 5d6f07c3763e176d5fce70e74f01f01fb8b797da m
Merge pull request #345 in MMDB/medici-play from bugfix/MMDB-1798-ui-errros-in-collections-detail to develop
* commit 'd312e27687da789eb1a620883e51999274cd5243':
Cleanup and temporary fix, to simply allow the datasets to be correctly added and removed from the existing listing on the collection details page. -
Luigi Marini eb0dc31144118c90bd50241f6e02b93e4a2650c8 m
Merge pull request #331 in MMDB/medici-play from bugfix/MMDB-1777-description-not-required to develop
* commit 'e4807555e51dca1d30a70142e32b4fbe9143b66f':
Changes to Collections and Description to leverage the new RequiredFields utility. This will be extended to spaces and other resources. It is configurable via the application.conf file. -
Luigi Marini 393c7ccf9327b75e800885edb997205e3082f997 m
Merge pull request #369 in MMDB/medici-play from MMDB-1819-restart-search to develop
* commit 'cd59f188fcebbb3a1f7b7b836b7a687faf367869':
Added feature to connect to Elasticsearch when searched for the first time -
Luigi Marini 1566e269b4123ffaf6f77b6f151912757c7e04e7 m
Merge pull request #377 in MMDB/medici-play from bugfix/MMDB-1824-unable-to-create-a-section-and to develop
* commit '5e17645ca80311c0ed5e293c06199f327feacc8b':
remove some debug statements
replace , with %2C
Fix issue with tags/comments in sections MMDB-1824 -
Rob Kooper 33f340b3128d1ddc5a1326bbf2dedfac0fe713f2 m
Make sure _typeHint is added MMDB-1838
writeBlob would not add a typeHint. Function now is a generic that
takes the type of the model and uses that to add _typeHint.- app/services/mongodb/MongoDBFileService.scala (version 33f340b3128d1ddc5a1326bbf2dedfac0fe713f2) (diffs)
- app/services/mongodb/MongoDBPreviewService.scala (version 33f340b3128d1ddc5a1326bbf2dedfac0fe713f2) (diffs)
- app/services/mongodb/MongoDBThreeDService.scala (version 33f340b3128d1ddc5a1326bbf2dedfac0fe713f2) (diffs)
- app/services/mongodb/MongoDBThumbnailService.scala (version 33f340b3128d1ddc5a1326bbf2dedfac0fe713f2) (diffs)
- app/services/mongodb/MongoDBTileService.scala (version 33f340b3128d1ddc5a1326bbf2dedfac0fe713f2) (diffs)
- app/services/mongodb/MongoUtils.scala (version 33f340b3128d1ddc5a1326bbf2dedfac0fe713f2) (diffs)
-
Brock Angelo 24485c64e948e0cbaf6f24ee56ad17a5c8a035cf m
fixes MMDB-1837
-
Sandeep Puthanveetil Satheesan 29e71d4e7bcd183fb3fdba0cf94f972f8c772f97 m
Merge remote-tracking branch 'origin/develop' into bugfix/MMDB-1825-add-context-support-for-person
-
Sandeep Puthanveetil Satheesan 6e0bf955667f1ed5688446d376338dea33b62ed1 m
Removed a console log display used for debugging
-
Sandeep Puthanveetil Satheesan b08cb8c723d60014aa5804f0284c9c8b6b9c324c m
Code changes to reflect updates to person tracking extractor
-
Rob Kooper 5e17645ca80311c0ed5e293c06199f327feacc8b m
remove some debug statements
-
unknown <eroeder@student10.ad.ncsa.edu> a5b8cbe23c7b36c827022dc3c4a65484f8b7d250 m
Fix for failing test cases in preview spec.
-
unknown <eroeder@student10.ad.ncsa.edu> fab27b7f40caac574d9a9ee13c6ad57ed23bfcb2 m
Fix for collections and datasets class test cases failure.
-
Luigi Marini 993511796462475c80fc611b94ec27b954bf253f m
Merge pull request #352 in MMDB/medici-play from feature/BD-593-test-coverage-csv-file to develop
* commit '102534d23838488748cd5cae903ffaa8a62c7615':
Checking in testing coverage file. -
Luigi Marini 96f2f4401775af04858b93b424349388d6c4bcaf m
Merge pull request #351 in MMDB/medici-play from feature/BD-584-api-integration-test-cases-preview to develop
* commit '7d1b83fc9a92e4f118c6d64b8feb2beadec1ad5e':
Preview test cases are working properly.
More cleanup of test scripts.
Fixing additional merge conflicts to add previews test class to the testing suite.
Organizing test suite into specific folder and integration into full nested suite test solution. -
Rob Kooper 641db8bbc6a949f74e6e40f200d68dc5de310fdb m
Add pagination to tag search MMDB-1815
- app/controllers/Tags.scala (version 641db8bbc6a949f74e6e40f200d68dc5de310fdb) (diffs)
- app/services/DatasetService.scala (version 641db8bbc6a949f74e6e40f200d68dc5de310fdb) (diffs)
- app/services/FileService.scala (version 641db8bbc6a949f74e6e40f200d68dc5de310fdb) (diffs)
- app/services/cassandra/CassandraDataset.scala (version 641db8bbc6a949f74e6e40f200d68dc5de310fdb) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version 641db8bbc6a949f74e6e40f200d68dc5de310fdb) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version 641db8bbc6a949f74e6e40f200d68dc5de310fdb) (diffs)
- app/util/Parsers.scala (version 641db8bbc6a949f74e6e40f200d68dc5de310fdb) (diffs)
- app/views/searchByTag.scala.html (version 641db8bbc6a949f74e6e40f200d68dc5de310fdb) (diffs)
- conf/routes (version 641db8bbc6a949f74e6e40f200d68dc5de310fdb) (diffs)
-
Rob Kooper 3fda349a53b9a7c43fb48de614e752997a6804b6 m
replace , with %2C
-
Rob Kooper 1ec7a03f350c9cf5381a8ebab0e439ae0ceb15a9 m
Fix issue with tags/comments in sections MMDB-1824
- public/javascripts/previewers/pdf/some-library.js (version 1ec7a03f350c9cf5381a8ebab0e439ae0ceb15a9) (diffs)
- public/javascripts/previewers/sectionRubberband.js (version 1ec7a03f350c9cf5381a8ebab0e439ae0ceb15a9) (diffs)
- public/javascripts/previewers/thumbnail/thumbnail-previewer.js (version 1ec7a03f350c9cf5381a8ebab0e439ae0ceb15a9) (diffs)
-
Sandeep Puthanveetil Satheesan 87cb2d2035eacfc2c523c3eb63325320141f2863 m
Validated metadata, display appropriate error messages
-
Smruti Padhy cd59f188fcebbb3a1f7b7b836b7a687faf367869 m
Added feature to connect to Elasticsearch when searched for the first time
-
Sandeep Puthanveetil Satheesan 2488f3bdd59d9f9a0bda1eb421c9ffaa6d6e9c82 m
fix to failed JS loads error
-
Smruti Padhy 5dceccb72b4a813912b100d85198f2ec9fba250d m
Added search by fields and stem of a word
-
Sandeep Puthanveetil Satheesan 7786b52f3379b98360d01ada0235c824b145d49b m
Added context support for person tracking visualization
-
Mario Felarca 40c37407959bb7f1a5197232f9db33ae8acb8535 m
Final testing and changes complete. Addition of auth checks to both file add and file submit for new file upload workflow. Also added the changes to check for auth on add to the new dataset workflow, to attempt to catch authentication issues as early as possible.
- app/api/Users.scala (version 40c37407959bb7f1a5197232f9db33ae8acb8535) (diffs)
- public/javascripts/dataset-create-fileuploader.js (version 40c37407959bb7f1a5197232f9db33ae8acb8535) (diffs)
- public/javascripts/file-uploader/jquery.fileupload-medici-auth.js (version 40c37407959bb7f1a5197232f9db33ae8acb8535) (diffs)
-
Constantinos Sophocleous 713e16a90d473ee7d2fe22f946797c0e22395146 m
Overriding Galleria default thumbnails size to make them somehow less small.
-
Rob Kooper 5cfc1f3e9c221c542a7edd32c06bb23271d4bd31 m
create listing of tags
Shows first char at front of tags, allows to easily jump to specific
spot in alphabet.- app/controllers/Tags.scala (version 5cfc1f3e9c221c542a7edd32c06bb23271d4bd31) (diffs)
- app/views/main.scala.html (version 5cfc1f3e9c221c542a7edd32c06bb23271d4bd31) (diffs)
- app/views/tagListChar.scala.html (version 5cfc1f3e9c221c542a7edd32c06bb23271d4bd31) (diffs)
- conf/routes (version 5cfc1f3e9c221c542a7edd32c06bb23271d4bd31) (diffs)
- public/stylesheets/main.css (version 5cfc1f3e9c221c542a7edd32c06bb23271d4bd31) (diffs)
-
Constantinos Sophocleous 6aa7acb47855008b926d51d2383ff91650da2815 m
Bugfix.
-
Constantinos Sophocleous 24b6e9c00ab84f1566a1d861c704d9f87b4a2167 m
Sliding Galleria scenes table when the scenes are more than a few.
-
Mario Felarca a919d0cea92ff1efa4fcd61f70db7a46cb0b368d m
Another interim checkin. Basic tests done. Need to refine the logic on the client side to handle multiple calls to submit. Model after existing structure in the dataset case.
- app/api/Users.scala (version a919d0cea92ff1efa4fcd61f70db7a46cb0b368d) (diffs)
- app/controllers/Application.scala (version a919d0cea92ff1efa4fcd61f70db7a46cb0b368d) (diffs)
- app/views/upload.scala.html (version a919d0cea92ff1efa4fcd61f70db7a46cb0b368d) (diffs)
- conf/routes (version a919d0cea92ff1efa4fcd61f70db7a46cb0b368d) (diffs)
- public/javascripts/file-uploader/jquery.fileupload-medici-auth.js (version a919d0cea92ff1efa4fcd61f70db7a46cb0b368d) (diffs)
-
Constantinos Sophocleous 04551f2a96663ad40495d62683512cbc056e0618 m
Merge remote-tracking branch 'origin/develop' into galleria-appearance-fixes
-
Constantinos Sophocleous aeca2e01bce927b355116fa6c106b53654c3904d m
Galleria video scenes viewer change size on screen resize.
-
Mario Felarca 6106799d76d36be777e2191ad0be8ec20adaca61 m
Initial checking of new file and new getUser API call. Testing to follow, as well as the actual modification of the new JS file to call the new API, and integration with the actual front end.
-
Mario Felarca 14d4163b96d25ae8a3f93be23c29a168d01b488e m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/mmdb/medici-play into bugfix/MMDB-1796-dataset-free-text-is-not-decoded
Conflicts:
app/controllers/Files.scala -
Mario Felarca 52ea9f543962c331cbdb09b763ca2d37cdef09b0 m
Changes to move decoding elements for free text fields of Collections and Datasets into the Utils object. Updates to call these from all appropriate locations. Addition of calls to decode dataset elements in the Collections view and the File view.
- app/controllers/Collections.scala (version 52ea9f543962c331cbdb09b763ca2d37cdef09b0) (diffs)
- app/controllers/Datasets.scala (version 52ea9f543962c331cbdb09b763ca2d37cdef09b0) (diffs)
- app/controllers/Files.scala (version 52ea9f543962c331cbdb09b763ca2d37cdef09b0) (diffs)
- app/controllers/Utils.scala (version 52ea9f543962c331cbdb09b763ca2d37cdef09b0) (diffs)
-
Eugene Roeder 102534d23838488748cd5cae903ffaa8a62c7615 m
Checking in testing coverage file.
-
Eugene Roeder 7d1b83fc9a92e4f118c6d64b8feb2beadec1ad5e m
Preview test cases are working properly.
- test/data/previews/data-test-general.json (version 7d1b83fc9a92e4f118c6d64b8feb2beadec1ad5e) (diffs)
- test/data/previews/data-test-preview.json (version 7d1b83fc9a92e4f118c6d64b8feb2beadec1ad5e) (diffs)
- test/data/previews/morrowplots-preview-meta.jpg (version 7d1b83fc9a92e4f118c6d64b8feb2beadec1ad5e) (diffs)
- test/integration/APITestSuite.scala (version 7d1b83fc9a92e4f118c6d64b8feb2beadec1ad5e) (diffs)
- test/integration/app-server/AppFixture.scala (version 7d1b83fc9a92e4f118c6d64b8feb2beadec1ad5e) (diffs)
- test/integration/app-server/AppFunctionalTest.scala (version 7d1b83fc9a92e4f118c6d64b8feb2beadec1ad5e) (diffs)
- test/integration/app-server/ApplicationSpec.scala (version 7d1b83fc9a92e4f118c6d64b8feb2beadec1ad5e) (diffs)
- test/integration/app-server/ServerFixture.scala (version 7d1b83fc9a92e4f118c6d64b8feb2beadec1ad5e) (diffs)
- test/integration/dts/APIDTSExtractionsTestSuite.scala (version 7d1b83fc9a92e4f118c6d64b8feb2beadec1ad5e) (diffs)
- test/integration/dts/DTSExtractionsAPIAppSpec.scala (version 7d1b83fc9a92e4f118c6d64b8feb2beadec1ad5e) (diffs)
- test/integration/previews/PreviewsAPIAppSpec.scala (version 7d1b83fc9a92e4f118c6d64b8feb2beadec1ad5e) (diffs)
-
Mario Felarca c2a84ce4c96e4c71eaff37317fe9c0a2e3327e55 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/mmdb/medici-play into bugfix/MMDB-1775-dataset-option-shows-a-value
Conflicts:
app/views/dataset.scala.html -
Mario Felarca ba55b415115c22491fa359d737852a3cd1ec9e12 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/mmdb/medici-play into bugfix/MMDB-1772-clean-up-hardcoded-links
Conflicts:
app/controllers/Application.scala
app/views/dataset.scala.html -
Eugene Roeder 5519772be69c230b86de06c3c1889cc59b8fcf9e m
More cleanup of test scripts.
- test/data/data-search-general.json (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/data-search-user.json (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/data-test-general.json (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/data-test-user.json (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/data.json (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/data1.json (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/extractions/morrowplots-thumb.jpg (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/extractions/morrowplots.jpg (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/files/data-search-general.json (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/files/data-search-user.json (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/files/data-test-general.json (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/files/data-test-user.json (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/files/morrowplots-thumb-1.jpg (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/files/morrowplots-thumb.jpg (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/files/morrowplots.jpg (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/morrowplots-thumb-1.jpg (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/morrowplots-thumb.jpg (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/data/morrowplots.jpg (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/AppFixture.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/AppFunctionalTest.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/ApplicationSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/ExtractionFileUploadFunctionSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/IntegrationSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/ServerFixture.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/app-server/AppFixture.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/app-server/AppFunctionalTest.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/app-server/ApplicationSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/app-server/IntegrationSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/app-server/ServerFixture.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/dts/APIDTSExtractionsTestSuite.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/dts/DTSExtractionsAPIAppSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/extractions/APIExtractionsTestSuite.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/extractions/ExtractionAPIControllerFunctionalSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/extractions/ExtractionsAPIAppSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/integration/files/FilesAPIAppSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/unit/ExtractionAPIControllerSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/unit/FileSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/unit/MongoDBSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/unit/MongoFileSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/unit/TestData.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/unit/UnitSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/unit/app-server/FileSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/unit/app-server/MongoDBSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/unit/app-server/MongoFileSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/unit/app-server/TestData.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/unit/app-server/UnitSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
- test/unit/extractions/ExtractionHTMLControllerSpec.scala (version 5519772be69c230b86de06c3c1889cc59b8fcf9e) (diffs)
-
Eugene Roeder d25eb8e45e8bd672bc6f4f692c9b530efda4c7b1 m
Fixing additional merge conflicts to add previews test class to the testing suite.
- test/integration/MultiFileUpload.scala (version d25eb8e45e8bd672bc6f4f692c9b530efda4c7b1) (diffs)
- test/integration/collections/APICollectionsTestSuite.scala (version d25eb8e45e8bd672bc6f4f692c9b530efda4c7b1) (diffs)
- test/integration/collections/CollectionsAPIAppSpec.scala (version d25eb8e45e8bd672bc6f4f692c9b530efda4c7b1) (diffs)
- test/integration/utilities/MultiFileUpload.scala (version d25eb8e45e8bd672bc6f4f692c9b530efda4c7b1) (diffs)
-
Eugene Roeder 4bd0cdf36f06a2b98f23807b61c0ae8897b40919 m
Fixing merge conflicts.
-
Eugene Roeder 4d819c4ef34fec18704c2ff649e5936686e69092 m
Organizing test suite into specific folder and integration into full nested suite test solution.
- test/data/previews/morrowplots-preview.jpg (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/data/previews/morrowplots.jpg (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/DTSFunctionalSpec.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/DatasetsAPIAppSpec.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/ExtractionAPIControllerFunctionalSpec.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/ExtractionAPIControllerSpec.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/FilesAPIAppSpec.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/collections/APICollectionsTestSuite.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/collections/CollectionsAPIAppSpec.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/dts/APIDTSExtractionsTestSuite.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/dts/DTSExtractionsAPIAppSpec.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/extractions/APIExtractionsTestSuite.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/extractions/ExtractionAPIControllerFunctionalSpec.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/extractions/ExtractionsAPIAppSpec.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/previews/APIPreviewsTestSuite.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/integration/previews/PreviewsAPIAppSpec.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
- test/unit/ExtractionAPIControllerSpec.scala (version 4d819c4ef34fec18704c2ff649e5936686e69092) (diffs)
-
Constantinos Sophocleous c9fcabcf822812388430ed315abde5491e82a4bf m
Appearance fix.
-
Constantinos Sophocleous ff40b9417353b815207d08123669b911779b4d7a m
Better detection of user's access rights for file in presentations previewer using User template parameter.
-
Constantinos Sophocleous 76ae83f8d0d301b3e2cb1c0adf7db90e1b67783c m
Make file download of original ZIP file invisible for no-edit-rights people (i.e. non-authors) for presentations files when the merged video is ready. Non-authors should only be able to download the merged video.
-
Mario Felarca d312e27687da789eb1a620883e51999274cd5243 m
Cleanup and temporary fix, to simply allow the datasets to be correctly added and removed from the existing listing on the collection details page.
No pgination, no other structural changes. The update to bring the
collection details view in line with respect to contained datasets will be
tracked under JIRA task MMDB-1811. -
Mario Felarca 00ef3d0626f5c022910c6f286f32ba9c7c839712 m
Reverted changes for notify. Left the code in, commented out. Ensured that the link to the new dataset will always be emphasized and clearly a link, no matter what the theme is.
-
Mario Felarca eb5c9183debc9dde84b465a4897c772c763c54e6 m
Cleaned up the error messages so that they make more sense. Minor layout tweak for the File view regarding the error message.
-
Mario Felarca f448a266e5670930f80047d975888d7506e706bc m
Small changes to allow first elements in the input box to be blank.
-
Mario Felarca e4807555e51dca1d30a70142e32b4fbe9143b66f m
Changes to Collections and Description to leverage the new RequiredFields utility. This will be extended to spaces and other resources. It is configurable via the application.conf file.
- app/controllers/Collections.scala (version e4807555e51dca1d30a70142e32b4fbe9143b66f) (diffs)
- app/controllers/Datasets.scala (version e4807555e51dca1d30a70142e32b4fbe9143b66f) (diffs)
- app/util/RequiredFieldsConfig.scala (version e4807555e51dca1d30a70142e32b4fbe9143b66f) (diffs)
- app/views/newCollection.scala.html (version e4807555e51dca1d30a70142e32b4fbe9143b66f) (diffs)
- app/views/newDataset.scala.html (version e4807555e51dca1d30a70142e32b4fbe9143b66f) (diffs)
- conf/application.conf (version e4807555e51dca1d30a70142e32b4fbe9143b66f) (diffs)
- public/javascripts/collection-create.js (version e4807555e51dca1d30a70142e32b4fbe9143b66f) (diffs)
- public/javascripts/dataset-create-fileuploader.js (version e4807555e51dca1d30a70142e32b4fbe9143b66f) (diffs)
-
Mario Felarca e4178eebc7d9bd71f236c7dd0fecf274abf67492 m
For testing.
-
Mario Felarca f775c105779bfcd48e5d6ad4d960826615ff7601 m
First pass, found everything that was associated with href and url: definitions in ajax calls.
- app/controllers/Application.scala (version f775c105779bfcd48e5d6ad4d960826615ff7601) (diffs)
- app/views/dataset.scala.html (version f775c105779bfcd48e5d6ad4d960826615ff7601) (diffs)
- app/views/datasetsContainingFile.scala.html (version f775c105779bfcd48e5d6ad4d960826615ff7601) (diffs)
- public/javascripts/collectionDatasetsList.js (version f775c105779bfcd48e5d6ad4d960826615ff7601) (diffs)
- public/javascripts/dataset-attach-fileuploader.js (version f775c105779bfcd48e5d6ad4d960826615ff7601) (diffs)
- public/javascripts/dataset-create-fileuploader.js (version f775c105779bfcd48e5d6ad4d960826615ff7601) (diffs)
- public/javascripts/errorRedirect.js (version f775c105779bfcd48e5d6ad4d960826615ff7601) (diffs)
- public/javascripts/searchUserMetadata.js (version f775c105779bfcd48e5d6ad4d960826615ff7601) (diffs)
-
Constantinos Sophocleous ca7cfb7e6f9f01e3c358952788e8005983ea4259 m
RabbitMQ plugin disabled.