Code commits
clowder
-
Jim Myers 149e0abbdfe968bb974359a0dc6413c989b2da26
Merge branch 'develop' into feature/editable-metadata
Conflicts:
CHANGELOG.md
app/controllers/CurationObjects.scala
app/services/mongodb/MongoSalatPlugin.scala
app/views/metadatald/search.scala.html
conf/routes
public/stylesheets/main.css
public/stylesheets/themes/sead.min.css -
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