Build: #5 was successful
Job: default was successful
Code commits
clowder
-
Sara Lambert 038bbb81a602507ce2350cbf27947e25b8ec834e
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/clowder into CATS-793-enable-username-password-for-geoserver
-
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.
-
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.