Build: #25 was successful Manual run by Sandeep Puthanveetil Satheesan
Code commits
clowder
-
Sandeep Puthanveetil Satheesan 9ba983818cd5d42407123ed7aae10550b3b32658
Merged develop branch.
-
Luigi Marini 0fb46c2800bac43cf2e1ec30b0963577991b1bed m
Added entry to changelog.
-
Luigi Marini a032d869f28b8b2a9837817922dfc08e9f9426a7 m
Merge branch 'develop' into bugfix/CATS-887-spaces-are-listed-if-not-logged-in-and-permissions-is-private
-
Indira Gutierrez Polo 1c3bd8767d6e30e794e7b3eaa0e0cdfc380e26d7 m
Adding Orcid Id's to zenodo.json file
-
Indira Gutierrez Polo 248111d332a08c3894ce9bb5b44e0bfab74eb149 m
In a private Clowder instance, a superadmin can now see datasets in a space that he/she is not part of.
-
Rob Kooper d9b0a618c565cbab16d0da571c2ded366d07834f m
check global permissions
if permissions is not private we should not list all datasets. -
Rob Kooper 784d3fc44466978f2eb7c37e0ae8faeaef98c422 m
login fixes
- user can accept ToS even if account is not activted
- only send email first login when using external provider
- don't show notify error for selections if not authorized (accepting ToS).
- cleanup CHANGELOG.md- CHANGELOG.md (version 784d3fc44466978f2eb7c37e0ae8faeaef98c422) (diffs)
- app/api/ApiController.scala (version 784d3fc44466978f2eb7c37e0ae8faeaef98c422) (diffs)
- app/controllers/SecuredController.scala (version 784d3fc44466978f2eb7c37e0ae8faeaef98c422) (diffs)
- app/services/SecureSocialEventListener.scala (version 784d3fc44466978f2eb7c37e0ae8faeaef98c422) (diffs)
- app/views/main.scala.html (version 784d3fc44466978f2eb7c37e0ae8faeaef98c422) (diffs)
-
Luigi Marini 13d282e129f7dc15e93fdcc6c9a690e536e42845 m
Added extra comment line.
-
Luigi Marini d4adb763310433e1bc6c045673a84335de3423f4 m
Removed extra comment line.
-
Luigi Marini d948ffc34f6559b1c229f41da6e53c314eb3fed9 m
Merge pull request #1246 in CATS/clowder from hotfix/add-comment-to-ldap to release/1.4
* commit '938da0fe8acfe1a670300ebefb99d5b3c00d0847':
add comment in ldap -
Sara Lambert 530fd0defef2e88ad7592e1ff70b67d4fe406774 m
Filter extractors listed in 'submit X for extraction' to only list the appropriate extractors.
- CHANGELOG.md (version 530fd0defef2e88ad7592e1ff70b67d4fe406774) (diffs)
- CONTRIBUTORS.md (version 530fd0defef2e88ad7592e1ff70b67d4fe406774) (diffs)
- app/controllers/Extractors.scala (version 530fd0defef2e88ad7592e1ff70b67d4fe406774) (diffs)
- app/models/Extraction.scala (version 530fd0defef2e88ad7592e1ff70b67d4fe406774) (diffs)
-
Yan Zhao 938da0fe8acfe1a670300ebefb99d5b3c00d0847 m
add comment in ldap
-
Luigi Marini 91311a27f28c8d92aaa2ff3dcc0e6a49362cd5e7 m
Updated CHANGELOG.md.
-
Luigi Marini a2c2ee599ff4273659fe14714f4db225d1fb1901 m
Updated CHANGELOG.md.
-
Luigi Marini d9521d3d200a7af379c9ca25b51669c999112654 m
Merge branch 'develop' into release/1.4
# Conflicts:
# CHANGELOG.md -
Luigi Marini 812ae0eef3e8a9a81402cfe1ca6ed0cd11ef3f4e m
Merge pull request #1228 in CATS/clowder from bugfix/CATS-842-metadata-widget-links to develop
* commit '33f593915e68c9d6dbdc9b9bc903d72f4d5e3806':
Updating typo's adding "-" + counter.toString() to all ids
Using popups with ContextURL instead of a link. -
Luigi Marini 2d1a5850fdbadd8760050c8d3d28082415910c20 m
Merge pull request #1244 in CATS/clowder from feature/CATS-861-html-previewer to develop
* commit 'a61e3d173184548cc681d4e6e8a6a795844109c8':
Added HTML previewer. Deprecated x3dom previewer. [CATS-861] -
Indira Gutierrez Polo 25948fdd0608ddd4d65057f5987d630dfa924a9b m
Merge branch 'release/1.4' of https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/clowder into feature/CATS-882-update-gravatar-to-https
# Conflicts:
# CHANGELOG.md -
Jim Myers 82178b8b5f0a611afbbe351b85ec48ea884433d5 m
changelog update
-
Indira Gutierrez Polo a8b62abe52306006b1e01eaf2187cbcb47c93e7a m
Serving gravatar picture over https instead of http
-
Luigi Marini a61e3d173184548cc681d4e6e8a6a795844109c8 m
Added HTML previewer. Deprecated x3dom previewer. [CATS-861]
- CHANGELOG.md (version a61e3d173184548cc681d4e6e8a6a795844109c8) (diffs)
- public/javascripts/previewers/html/html-iframe.js (version a61e3d173184548cc681d4e6e8a6a795844109c8) (diffs)
- public/javascripts/previewers/html/package.json (version a61e3d173184548cc681d4e6e8a6a795844109c8) (diffs)
- public/javascripts/previewers/x3dom/package.json (version a61e3d173184548cc681d4e6e8a6a795844109c8) (diffs)
-
Luigi Marini e8fdae553fc70c61f4242c4413ff7301fc65657e m
Cleanup README.md and added CLA information to CONTRIBUTING.md.
-
Jim Myers 67f57ab0abea151a263309c5eb83a55d09ed466d m
typo
-
Luigi Marini f01866c37a47090be3db97f87f0f2084d2ed1959 m
Added Zenodo configuration file.
-
Indira Gutierrez Polo b26116d4447f456e8a0e9912ba8a0746c61ce8b6 m
Fixing changelog
-
Jim Myers c7786a771005a67a8573c963241fcad067ce0e69 m
CATS-880 - space admins allowed to edit/delete md defs
-
Indira Gutierrez Polo 33f593915e68c9d6dbdc9b9bc903d72f4d5e3806 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/clowder into bugfix/CATS-842-metadata-widget-links
# Conflicts:
# CHANGELOG.md -
Indira Gutierrez Polo fe89996fb2ca71f91b4fd738a09941d8ca13f6ca m
Updating typo's adding "-" + counter.toString() to all ids
-
Rob Kooper a7d9a56edfe0a101263d4327d86905cf984a68e5 m
fix release script
-
Rob Kooper 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff m
Updated the docker-compose: - documentation can be found at https://opensource.ncsa.illinois.edu/confluence/display/CATS/Running+Clowder+using+Docker - added new conf options clowder.rabbitmq.clowderurl used to set url to clowder, in this case a http://clowder:9000 when sending messages over rabbitmq - added a default values for docker-compose like running in the custom.conf, this assumes machines named clowder, mongo, rabbitmq, and elasticsearch - changed the build process, should leverage more of the cache file of docker build - changed the build process to use alpine linux, resulting in a smaller image - use clowder-data for data and clowder-custom for customizations - split docker.sh into release.sh and docker.sh. docker.sh will build docker containers, release.sh will do the actual push to docker hub. - Added healthcheck to dockerfile. Healtcheck will see if /api/status retuns ok, if not the container will be considered unhealthy (can be seen using docker ps). This will also make sure rabbitmq is connected (CATS-874) -Ffix so it can be deployed in kubernetes with docker stack deploy
- .dockerignore (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- CHANGELOG.md (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- Dockerfile (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- app/services/RabbitmqPlugin.scala (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- conf/application.conf (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- docker-compose.yml (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- docker.sh (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- docker/Dockerfile (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- docker/clowder.sh (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- docker/custom.conf (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- docker/entrypoint.sh (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- docker/healthcheck.sh (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- docker/play.plugins (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- release.sh (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
- sbt (version 01a852db1086cfd8f17aa5c1bb21ff4bbd67c4ff) (diffs)
-
Luigi Marini c048bd95a1a6fb96954c837f48bff39f2567e7bf m
Updated version to 1.4.0.
-
Luigi Marini a1dede474be978a678eaeb56aaaf8b69992acb73 m
Merge pull request #1231 in CATS/clowder from bugfix/CATS-860-advanced-search-show-more-results-throws-error to develop
* commit 'b003f340e0aef245bebf4f7a8552c25fa3e18853':
Fixed bugs with 'show more' button on advanced search page. Added ability to paginate. -
Max Burnette <mburnet2@illinois.com> b003f340e0aef245bebf4f7a8552c25fa3e18853 m
Fixed bugs with 'show more' button on advanced search page. Added ability to paginate.
Hide 'show more' link if number of results is zero or if we get less than the full set of responses.- CHANGELOG.md (version b003f340e0aef245bebf4f7a8552c25fa3e18853) (diffs)
- app/api/Search.scala (version b003f340e0aef245bebf4f7a8552c25fa3e18853) (diffs)
- app/services/ElasticsearchPlugin.scala (version b003f340e0aef245bebf4f7a8552c25fa3e18853) (diffs)
- app/views/metadatald/search.scala.html (version b003f340e0aef245bebf4f7a8552c25fa3e18853) (diffs)
- conf/routes (version b003f340e0aef245bebf4f7a8552c25fa3e18853) (diffs)
-
Chen Wang 733f3e56012b1291f0fefb84e333859ce7b01c3a m
examples of interacting with Clowder files and dataset endpoints using jupyter notebook
add my name to contributor md
add entry
add entry in the changelog
replace the clowder URL from the socialmediamacroscope site to clowder demo site- CHANGELOG.md (version 733f3e56012b1291f0fefb84e333859ce7b01c3a) (diffs)
- CONTRIBUTORS.md (version 733f3e56012b1291f0fefb84e333859ce7b01c3a) (diffs)
- scripts/jupyter-notebook/collections.ipynb (version 733f3e56012b1291f0fefb84e333859ce7b01c3a) (diffs)
- scripts/jupyter-notebook/dataset_files.ipynb (version 733f3e56012b1291f0fefb84e333859ce7b01c3a) (diffs)
- scripts/jupyter-notebook/spaces.ipynb (version 733f3e56012b1291f0fefb84e333859ce7b01c3a) (diffs)
-
Luigi Marini 34583400aa208d4c5c9a5dc5b50701a2ef340f49 m
Merge pull request #1182 in CATS/clowder from feature-publication-page-updates to develop
* commit '1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc':
Improve the display of published data: - using masonry, allowing filtering (including test vs production). - Using filtrify for client-side filtering since the sead c3pr search endpoint doesn't yet filter (or page). - Add publications for space page -
Jim Myers 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc m
Improve the display of published data: - using masonry, allowing filtering (including test vs production). - Using filtrify for client-side filtering since the sead c3pr search endpoint doesn't yet filter (or page). - Add publications for space page
Just using a client-side custom query to start. Refactored main
publications page to be callable as a tab on the spaces page and updated
styling to make publications closer to datasets
Rearrange getPublications code to serve the overall pubs page and the per space pages
Affiliated Spaces: Added item to edit space page to allow listing of other spaces (e.g.
sead 1 spaces) from which pubs should be shown. Also moved pub query to
a util class and removed separate copies in space and curation
controllers. Doing server-side filter to space and affiliates so pub
listing for a space only shows relevant entries, which can then be
filtered further by filtrify.- app/api/Metadata.scala (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- app/controllers/Application.scala (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- app/controllers/CurationObjects.scala (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- app/controllers/SecuredController.scala (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- app/controllers/Spaces.scala (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- app/models/Space.scala (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- app/util/Publications.scala (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- app/views/curations/publishedData.scala.html (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- app/views/curations/publishedGrid.scala.html (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- app/views/main.scala.html (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- app/views/spaces/newEditTemplate.scala.html (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- app/views/spaces/space.scala.html (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- conf/routes (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- public/fonts/filtrify/filtrify-webfont.eot (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- public/fonts/filtrify/filtrify-webfont.svg (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- public/fonts/filtrify/filtrify-webfont.ttf (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- public/fonts/filtrify/filtrify-webfont.woff (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- public/javascripts/filtrify.js (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- public/javascripts/repositories.js (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- public/stylesheets/filtrify.css (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- public/stylesheets/main.css (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
- public/stylesheets/themes/sead.min.css (version 1d17cc0ced83d20b92e2b2d3b5c1e31230a94ffc) (diffs)
-
Luigi Marini aae28985354ba139fc6d49172c1a052c2cd5dbb1 m
Fixed merge conflict
-
Rob Kooper 2bc1daf507ee7c6a6d25dc93d9589a4b4b928871 m
Send email when user signs up/logins first time using social providers.
-
Luigi Marini ad01d5505e65d356cf618c8b9aebb698ddc4f5a4 m
Merge pull request #1234 in CATS/clowder from CATS-864-when-creating-a-new-instance-initialadmin-shows-as-not-active to develop
* commit '1090bef559df2ffe6782a63589c206ad51e13e20':
Setting Status for users on signup -
Luigi Marini 848b5524f6a85c6d0067b92a496cedf7efa810ee m
Merge pull request #1230 in CATS/clowder from Update-README-file-for-the-windows-clowder-setting to develop
* commit '033335caafe8386737af7cd5c94d9fcd96417297':
Updated README: Jnotify library required on Windows. -
Yong Wook Kim 033335caafe8386737af7cd5c94d9fcd96417297 m
Updated README: Jnotify library required on Windows.
-
Luigi Marini 20ed7a4dbe3eff888ff606fc612317cdfab9c0c0 m
Merge pull request #1207 in CATS/clowder from feature/SEAD-1173-manage-original-filename-as-uploaded to develop
* commit '77e8728e38a9b8802c93791b2c3076584879a978':
Track name as uploaded. -
Jim Myers 77e8728e38a9b8802c93791b2c3076584879a978 m
Track name as uploaded.
Changes to keep the original filename as a separate item from the
current filename for files. Added to search as a 'created_as' string
field. Default is "" and it is populated upon any call to rename(). The
display shows the new field only if it has a non zero length value.
DB update to populate originalname from FRBR "Upload Path" metadata
provided by SEAD migrator/uploader.- CHANGELOG.md (version 77e8728e38a9b8802c93791b2c3076584879a978) (diffs)
- app/models/ElasticSearchObject.scala (version 77e8728e38a9b8802c93791b2c3076584879a978) (diffs)
- app/models/File.scala (version 77e8728e38a9b8802c93791b2c3076584879a978) (diffs)
- app/services/ElasticsearchPlugin.scala (version 77e8728e38a9b8802c93791b2c3076584879a978) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version 77e8728e38a9b8802c93791b2c3076584879a978) (diffs)
- app/services/mongodb/MongoSalatPlugin.scala (version 77e8728e38a9b8802c93791b2c3076584879a978) (diffs)
- app/util/FileUtils.scala (version 77e8728e38a9b8802c93791b2c3076584879a978) (diffs)
- app/util/SearchUtils.scala (version 77e8728e38a9b8802c93791b2c3076584879a978) (diffs)
- app/views/file.scala.html (version 77e8728e38a9b8802c93791b2c3076584879a978) (diffs)
-
Bing Zhang 82a13fd42ef1e074c17280e8694f1524afbcb65e m
Fixed geospatial layers checkbox turn on/off and opacity by using the file id for the div instead of the file name.
-
Indira Gutierrez Polo 1090bef559df2ffe6782a63589c206ad51e13e20 m
Setting Status for users on signup
-
Bing Zhang a6384074b0714cd930246a5c557f398f5390ebed m
Check rabbitmq, mongo, clowder are ready before creating default users.
- CHANGELOG.md (version a6384074b0714cd930246a5c557f398f5390ebed) (diffs)
- scripts/mongo-init/Dockerfile (version a6384074b0714cd930246a5c557f398f5390ebed) (diffs)
- scripts/mongo-init/FILES.mongo-init/usr/local/bin/entrypoint.sh (version a6384074b0714cd930246a5c557f398f5390ebed) (diffs)
- scripts/mongo-init/README (version a6384074b0714cd930246a5c557f398f5390ebed) (diffs)
-
Indira Gutierrez Polo 4e56997fbbbebe9f2f9eee3d0b6d92876175f153 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/clowder into bugfix/CATS-842-metadata-widget-links
# Conflicts:
# CHANGELOG.md -
Indira Gutierrez Polo 6d6c4c29d49cc4dc187c5a9b93b03d62c8bd5394 m
Using popups with ContextURL instead of a link.
