Build: #4 was successful Changes by Rob Kooper
Code commits
clowder
-
Rob Kooper 7283fc44f0ffc347b938f63258947964e94697c6
Merge remote-tracking branch 'origin/develop' into feature/SEAD-1055-sorting-by-date-and-title-for-datasets
-
Rob Kooper 22da993796acf30c1a25fec013efd05c9a4df92d
undo casbah
-
Indira Gutierrez Polo 6377ac40efbcaf3526572f41f15d8507b96c73b7 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into updates-changelog
# Conflicts:
# CHANGELOG.md -
Indira Gutierrez Polo d1513bae010885472abeb860bb31c01a61a9ded0 m
Updates to the changelog
-
Luigi Marini a6396b8f00b27f07c164424f5067fe38a50acd66 m
Merge pull request #1124 in CATS/clowder from bugfix/CATS-752-deleted-space-in-spaceslist to develop
* commit '0ed7a151bf41f1137476a3e9b21bac74586fbdd9':
fixed - datasets not in collections will be fixed
fixed problem where sub collections spaces not updated
better logging
Datasets and collections that are in a space are removed from the space before the space is deleted. This way the deleted space id will not be in the spaces. -
Luigi Marini 7a46d2f7937df18b74654b50bc0cf581deb9d90c m
Merge pull request #1129 in CATS/clowder from feature/SEAD-1149-show-how-many-pages-and-let-users to develop
* commit 'e27426e9ff647a702506928384afc29d8ef393e4':
Make sure page number select box has the correct padding around it.
Places javascript in an included file.
Modifications to display a variable number of items per page.
Changing items displayed on a page. -
Luigi Marini e27426e9ff647a702506928384afc29d8ef393e4 m
Make sure page number select box has the correct padding around it.
-
Rob Kooper 8b71ad0affa5d671c37b82b327cfd63975583ddf m
return last_average
last_average is only returned if semi binning is enabled, and semi binning could only be spring or summer. Right now if sem is not spring or summer, no data is filtered, but the last_average should be returned.
This should be fixed since it looks like we always want last_average, and so it should not depend on the fact that we set semi to something else than spring/summer.
when fixed this should return last_average: https://seagrant-dev.ncsa.illinois.edu/clowder/api/geostreams/datapoints/trends?sensor_id=950&semi=all -
Eugene Roeder 158059d61fd17940ec6ff9cd106d50fe1ab10d8b m
Places javascript in an included file.
- app/views/collectionList.scala.html (version 158059d61fd17940ec6ff9cd106d50fe1ab10d8b) (diffs)
- app/views/datasetList.scala.html (version 158059d61fd17940ec6ff9cd106d50fe1ab10d8b) (diffs)
- app/views/spaces/listSpaces.scala.html (version 158059d61fd17940ec6ff9cd106d50fe1ab10d8b) (diffs)
- public/javascripts/displayPanels.js (version 158059d61fd17940ec6ff9cd106d50fe1ab10d8b) (diffs)
-
Luigi Marini d87f24cb1360f528c203cdc85dffd44d6f7b8c55 m
Merge pull request #1131 in CATS/clowder from geostreams-error-binning-hour to develop
* commit '5ab1e80f492ae54653dd731a2caf0e1fd16d5640':
Adding try catch on binning by hour and minute. -
Max Burnette <mburnet88@gmail.com> 7112203952f0ad75cc2cbdc28018ad10a57e2e76 m
Squashed commit of the following:
commit afd596048b19da415b850d4c0d1f3c186a1b6fb3
Author: Max Burnette <mburnet88@gmail.com>
Date: Wed Apr 5 13:30:54 2017 -0500
Fix sub folder name creation
commit a27788dbfeef84b1e599e70d39d9737ecc192435
Author: Max Burnette <mburnet88@gmail.com>
Date: Wed Apr 5 13:24:48 2017 -0500
Migrate new folder logic to Iterator
commit db902ec6980bf61665a816c23abab7dfb0323176
Author: Max Burnette <mburnet88@gmail.com>
Date: Wed Apr 5 12:46:52 2017 -0500
Properly handle nested folders as well
commit bbba56647a2bb5ed9b7cfcb7cf9b9731ed349717
Author: Max Burnette <mburnet88@gmail.com>
Date: Wed Apr 5 11:30:47 2017 -0500
Don't create dataset download folders if unnecessary -
Indira Gutierrez Polo 5ab1e80f492ae54653dd731a2caf0e1fd16d5640 m
Adding try catch on binning by hour and minute.
-
Rob Kooper e84e4544f69aa7d341a3b48f58082bf57eedda1c m
Squashed commit of the following:
commit 41297fbb27c6f70578b3217c82526c9edcc67887
Author: Rob Kooper <kooper@illinois.edu>
Date: Mon May 1 16:52:33 2017 -0500
binning was hard coded to semi, no an argument 'binning'
commit 511fbc3261f565a335f5bf03f6711c7e9bd74160
Author: Rob Kooper <kooper@illinois.edu>
Date: Mon May 1 16:12:36 2017 -0500
need to pass all parameters explicitly
commit 2d636f98bfd411d97066654036c54bbc6bb20756
Author: Rob Kooper <kooper@illinois.edu>
Date: Mon May 1 16:06:59 2017 -0500
lustrum == 5 years
commit b978b237e539eee39104d462fb7de2aff07c2444
Author: Rob Kooper <kooper@illinois.edu>
Date: Mon May 1 16:06:19 2017 -0500
add window parameters to trend -
Todd Nicholson <tcnichol@illinois.edu> e875b38b2931aab3d04f128c87ca9c204c0475fb m
Squashed commit of the following:
commit 5117575dcc8ee39bb5166007ceb0f2e64a6f5557
Author: todd_n <todd.nicholson@gmail.com>
Date: Tue Apr 25 17:41:05 2017 -0500
new change - where we check to see if there is another file pointing to the same bytes, if so, we delete previews and thumbnails there (and not before.) If the original is deleted, the copy will still have a thumbnail and previews, and if the last one, they will be deleted along with the file bytes.
commit 5023fc954e8bedac0d7031da8df02ddd0d9d80bf
Author: todd_n <todd.nicholson@gmail.com>
Date: Mon Apr 24 19:10:23 2017 -0500
bytes no longer replicated for file previews or thumbnails.
commit ffb6923b298079889fb3ec1c87a33884ac0ca682
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Apr 19 23:55:06 2017 -0500
Squashed commit of the following:
commit 9e8f24977a9f7b570942170e1c53d3a860de68ce
Author: todd_n <todd.nicholson@gmail.com>
Date: Tue Apr 18 18:44:03 2017 -0500
reverted changes in play.plugins
commit f8c083ac6ff4aefa63279de0beacf002d15e67d1
Author: todd_n <todd.nicholson@gmail.com>
Date: Tue Apr 18 18:42:35 2017 -0500
this the changelog if fixed now.
commit 70d9ff5554ee7fd69e346e4712b74457059467d4
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Apr 5 13:57:55 2017 -0500
dataset thumbnail now set using set method - not by copying
commit 6c731c3bf705a1942f3558dc2926c3e9dc95409c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Apr 5 13:55:09 2017 -0500
dataset thumbnail now set using set method - not by copying
commit 7cc6eb866478d6a93c63b6f31fae70c29ee34992
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Apr 4 00:18:51 2017 -0500
added changelog
commit 847c435d8e0af5b84a3e534835c876b4165dfa74
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Apr 3 22:20:56 2017 -0500
this should fix the thumbnail problems - still need to test more
commit e41f77faff6cb380823f0562f49f05d63cffda69
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Apr 3 18:42:31 2017 -0500
the None error should be fixed now, the thumbnail error is still there
commit 0abc5e2bb7f73d22007fb5fc5c47de96f9284a72
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Apr 3 17:37:46 2017 -0500
Fixing error logging, removed unused lines
commit c5fe8b649f25ba99abfc3ffe3d66de88a660ebc4
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Apr 3 14:20:43 2017 -0500
added changelog entry
commit 8742b55fc818c8b54552932e0b79b5a6ed421ed5
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Mar 15 16:20:13 2017 -0500
added note to change log
commit bb3c17aca138f8284fd966cbf7bd204e69a1818b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Feb 28 14:30:25 2017 -0600
reverted changes that should not have been committed
commit 98656358d996459e0bf3df9fb94f8ad5f59c2447
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 20:35:18 2017 -0600
should work now
commit db1d6a76bc0a0eb85a9e8d6611e3da59f56028a0
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 20:03:02 2017 -0600
dataset thumbnail now copied.
commit 8d1fb27ed85d5601f6683e8bb13305d7966c7976
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 17:35:17 2017 -0600
thumbnail on original is fine, just won't show for dataset in the copy
commit fae500d8b68a93cde3ab0e32609f3fc4c2e54b02
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 17:12:11 2017 -0600
dataset metadata copied if from extractor, fixed error
commit ce8359b463e9e76a754733d9aff54413450f61e9
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 15:40:59 2017 -0600
dataset metadata copied if from extractor
commit 01ef24da9647be649ac213f54a40646cd373577c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 15:36:43 2017 -0600
TODO added. that line causes the original preview to disappear
commit a27efe5d1d2d1a715effac61d1451d4735594dfd
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 15:25:48 2017 -0600
TODO added. that line causes the original preview to disappear
commit 032292d0f20379ee3ef1c43be04137ec300991bd
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 15:12:01 2017 -0600
file metadata now copied correctly. dataset preview breaks for original dataset and does not appear for copied dataset
commit 6b98f6a319291511faa4465d2b989b0a72e6f8b4
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 14:48:37 2017 -0600
metadata does not currently work
commit 08087d9f6cb80cb1f1c87db82be2715dbe5dd42d
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 14:27:23 2017 -0600
image previews now appear to be copied correctly for files only
commit dea85fd71b568e4cc702a2e6f50dde4f9941651e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 14:21:38 2017 -0600
cpy
commit db1ec1c090411686c5c109cb5c48acd7eb125323
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 13:34:59 2017 -0600
new methods copy file metadata and previews, rather than re-running extractors
commit a34b5486bf03d985fde280153d8c5e76283d3d3f
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 13:14:49 2017 -0600
new methods copy file metadata and previews, rather than re-running extractors
commit 5fa56f76a6cededc0b20c19ac9c45af3da8750a4
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Feb 26 22:28:42 2017 -0600
new methods for copying file metadata and previews (currently stubs)
commit 1607ec1e1ce1f8d186bf729ef7179f197a06cb69
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Feb 26 21:35:07 2017 -0600
new methods for copying file metadata and previews (currently stubs)
commit 0ee7eb1b834b3d00218765e1045515ddab3513cc
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Feb 11 20:18:35 2017 -0600
this should fix the problem of extractors not running when a dataset is copied. right now, I am not sure if metadata added by users or comments will be preserved or whether that is intended behavior.
commit 9e8f24977a9f7b570942170e1c53d3a860de68ce
Author: todd_n <todd.nicholson@gmail.com>
Date: Tue Apr 18 18:44:03 2017 -0500
reverted changes in play.plugins
commit f8c083ac6ff4aefa63279de0beacf002d15e67d1
Author: todd_n <todd.nicholson@gmail.com>
Date: Tue Apr 18 18:42:35 2017 -0500
this the changelog if fixed now.
commit 70d9ff5554ee7fd69e346e4712b74457059467d4
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Apr 5 13:57:55 2017 -0500
dataset thumbnail now set using set method - not by copying
commit 6c731c3bf705a1942f3558dc2926c3e9dc95409c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Apr 5 13:55:09 2017 -0500
dataset thumbnail now set using set method - not by copying
commit 7cc6eb866478d6a93c63b6f31fae70c29ee34992
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Apr 4 00:18:51 2017 -0500
added changelog
commit 847c435d8e0af5b84a3e534835c876b4165dfa74
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Apr 3 22:20:56 2017 -0500
this should fix the thumbnail problems - still need to test more
commit e41f77faff6cb380823f0562f49f05d63cffda69
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Apr 3 18:42:31 2017 -0500
the None error should be fixed now, the thumbnail error is still there
commit 0abc5e2bb7f73d22007fb5fc5c47de96f9284a72
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Apr 3 17:37:46 2017 -0500
Fixing error logging, removed unused lines
commit c5fe8b649f25ba99abfc3ffe3d66de88a660ebc4
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Apr 3 14:20:43 2017 -0500
added changelog entry
commit 8742b55fc818c8b54552932e0b79b5a6ed421ed5
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Mar 15 16:20:13 2017 -0500
added note to change log
commit bb3c17aca138f8284fd966cbf7bd204e69a1818b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Feb 28 14:30:25 2017 -0600
reverted changes that should not have been committed
commit 98656358d996459e0bf3df9fb94f8ad5f59c2447
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 20:35:18 2017 -0600
should work now
commit db1d6a76bc0a0eb85a9e8d6611e3da59f56028a0
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 20:03:02 2017 -0600
dataset thumbnail now copied.
commit 8d1fb27ed85d5601f6683e8bb13305d7966c7976
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 17:35:17 2017 -0600
thumbnail on original is fine, just won't show for dataset in the copy
commit fae500d8b68a93cde3ab0e32609f3fc4c2e54b02
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 17:12:11 2017 -0600
dataset metadata copied if from extractor, fixed error
commit ce8359b463e9e76a754733d9aff54413450f61e9
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 15:40:59 2017 -0600
dataset metadata copied if from extractor
commit 01ef24da9647be649ac213f54a40646cd373577c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 15:36:43 2017 -0600
TODO added. that line causes the original preview to disappear
commit a27efe5d1d2d1a715effac61d1451d4735594dfd
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 15:25:48 2017 -0600
TODO added. that line causes the original preview to disappear
commit 032292d0f20379ee3ef1c43be04137ec300991bd
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 15:12:01 2017 -0600
file metadata now copied correctly. dataset preview breaks for original dataset and does not appear for copied dataset
commit 6b98f6a319291511faa4465d2b989b0a72e6f8b4
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 14:48:37 2017 -0600
metadata does not currently work
commit 08087d9f6cb80cb1f1c87db82be2715dbe5dd42d
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 14:27:23 2017 -0600
image previews now appear to be copied correctly for files only
commit dea85fd71b568e4cc702a2e6f50dde4f9941651e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 14:21:38 2017 -0600
cpy
commit db1ec1c090411686c5c109cb5c48acd7eb125323
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 13:34:59 2017 -0600
new methods copy file metadata and previews, rather than re-running extractors
commit a34b5486bf03d985fde280153d8c5e76283d3d3f
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Feb 27 13:14:49 2017 -0600
new methods copy file metadata and previews, rather than re-running extractors
commit 5fa56f76a6cededc0b20c19ac9c45af3da8750a4
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Feb 26 22:28:42 2017 -0600
new methods for copying file metadata and previews (currently stubs)
commit 1607ec1e1ce1f8d186bf729ef7179f197a06cb69
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Feb 26 21:35:07 2017 -0600
new methods for copying file metadata and previews (currently stubs)
commit 0ee7eb1b834b3d00218765e1045515ddab3513cc
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Feb 11 20:18:35 2017 -0600
this should fix the problem of extractors not running when a dataset is copied. right now, I am not sure if metadata added by users or comments will be preserved or whether that is intended behavior.- CHANGELOG.md (version e875b38b2931aab3d04f128c87ca9c204c0475fb) (diffs)
- app/api/Datasets.scala (version e875b38b2931aab3d04f128c87ca9c204c0475fb) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version e875b38b2931aab3d04f128c87ca9c204c0475fb) (diffs)
- app/util/FileUtils.scala (version e875b38b2931aab3d04f128c87ca9c204c0475fb) (diffs)
- conf/mimetypes.conf (version e875b38b2931aab3d04f128c87ca9c204c0475fb) (diffs)
-
Eugene Roeder f6f75f74ff49e9fd4c4e7574d1b60d6cc509bc6e m
Modifications to display a variable number of items per page.
-
Eugene Roeder 282865765b0b2bcd1bc8e8513be7edb7d3ffb7e8 m
Changing items displayed on a page.
- app/views/collectionList.scala.html (version 282865765b0b2bcd1bc8e8513be7edb7d3ffb7e8) (diffs)
- app/views/datasetList.scala.html (version 282865765b0b2bcd1bc8e8513be7edb7d3ffb7e8) (diffs)
- app/views/spaces/listSpaces.scala.html (version 282865765b0b2bcd1bc8e8513be7edb7d3ffb7e8) (diffs)
- public/stylesheets/main.css (version 282865765b0b2bcd1bc8e8513be7edb7d3ffb7e8) (diffs)
-
Rob Kooper a39b1b5554930b54ee2396958a70537abf71f6bf m
getParent() returns null if file is invalid
-
Todd Nicholson <tcnichol@illinois.edu> b4354e0e791917a8174771a85affd15b949132fd m
Squashed commit of the following:
commit 224aae21e023996c69ddeaad69dfa603e7e17356
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Apr 5 13:25:37 2017 -0500
changelog - entry added under unreleased
commit a12738b5ce40f3ef16173912484605917cfba0af
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Apr 4 12:36:09 2017 -0500
errors fixed with wrong arguments in method after merge
commit bc140b86a0edfd99836370432d6ad3c89ab58b33
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Apr 4 12:11:41 2017 -0500
fixing issues after merge
commit dbe73131ec9b147b0acd4a1f4687fa0b9b3f2802
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Apr 4 11:47:11 2017 -0500
fixing spaces and name of booleans
commit b39fb9da764b9eaf6142b30502013f1e30705db9
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Apr 4 11:26:38 2017 -0500
change default to false
commit 8742b55fc818c8b54552932e0b79b5a6ed421ed5
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Mar 15 16:20:13 2017 -0500
added note to change log
commit c5b9c82326db0e01721af73dad9d668f43fb02c6
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Jan 30 15:29:31 2017 -0600
default showOnlyShared = false
commit 1615c8725b45af585c9d90bcec008a0b426af1aa
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Nov 20 16:24:51 2016 -0600
use showOnlyShared boolean in explore. needs to be tested
commit 46d6755be949edf1e88e8dd4c351df89c94ecf2c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Nov 20 16:21:35 2016 -0600
need to fix filteredquery in datasets still
commit 2f1aec41919bb9b92ac08de2aaa95d8abcd56c18
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Nov 20 16:14:55 2016 -0600
new boolean used in datasets, need to change list filteredquery in MongoDBDatasetService and change views
commit a1e940df88e883d8faee9284e8bc37d48fa577fe
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Nov 20 15:49:22 2016 -0600
collections done except filteredQuery
view still needs to be changed
commit 918a9a8a529965e1c3fe171452716b22b6be19de
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Nov 20 15:36:18 2016 -0600
new boolean for collections, need to modify services
commit 0a9de7d721659f21057eb63fa67eda5356e0adee
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Nov 20 15:21:10 2016 -0600
Merge branch 'develop' into explore-only-shared
# Conflicts:
# app/services/mongodb/MongoDBDatasetService.scala
Added new boolean for Collections.
commit 49b4357267a964f7fdb793271aff847024209c20
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 24 11:34:19 2016 -0500
only show shared collections and spaces under explore enabled
commit 4ee65c286ebe06dc87715de495ed09eeac8192e3
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 24 11:20:53 2016 -0500
only show shared datasets under explore- CHANGELOG.md (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- app/api/Collections.scala (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- app/api/Datasets.scala (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- app/api/Spaces.scala (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- app/controllers/Collections.scala (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- app/controllers/Datasets.scala (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- app/controllers/Spaces.scala (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- app/services/CollectionService.scala (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- app/services/DatasetService.scala (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- app/services/SpaceService.scala (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- app/services/mongodb/MongoDBCollectionService.scala (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- app/views/main.scala.html (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- conf/application.conf (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
- conf/routes (version b4354e0e791917a8174771a85affd15b949132fd) (diffs)
-
Max Burnette <mburnet88@gmail.com> 1fac691ac00c630dacf0b8c49ba02201ebff8455 m
Squashed commit of the following:
commit 2713a49e1f215c550f6e0217ce19ace9136c35f3
Author: Max Burnette <mburnet88@gmail.com>
Date: Mon Apr 3 15:10:38 2017 -0500
Print mentioned user's ID instead of commenter's name
commit 4a3a89d173a9888fd4513182b08d898c48421bda
Author: Max Burnette <mburnet88@gmail.com>
Date: Mon Apr 3 14:06:20 2017 -0500
Syntax cleanup, changelog fix
commit 3183f931cc08f802cbc5fb6823186d97c1fd6359
Author: Max Burnette <mburnet88@gmail.com>
Date: Mon Mar 27 10:24:35 2017 -0500
Add users route to Application
commit d8ce1220aefdabadbc059271fbbe5de22ff29c18
Author: Max Burnette <mburnet88@gmail.com>
Date: Mon Mar 27 10:24:21 2017 -0500
Add permission filter to file/dataset comments
commit a3b1e031e237a08e06ae58c931c7c7d7908da657
Author: Max Burnette <mburnet88@gmail.com>
Date: Fri Mar 17 13:18:53 2017 -0500
Update CHANGELING
commit 2801c5ffbbb17de0fa834d979b31a090a676ad7b
Author: Max Burnette <mburnet88@gmail.com>
Date: Wed Mar 15 14:48:47 2017 -0500
Use IdentityProvider for display
commit 878275f80bb970885628e9e416b9b02cc5a57199
Author: Max Burnette <mburnet88@gmail.com>
Date: Wed Mar 15 14:07:20 2017 -0500
Correctly display dataset & commenter names + links
commit 3d7e735096651f440bda891c3587b46e7ce2b930
Author: Max Burnette <mburnet88@gmail.com>
Date: Tue Mar 14 13:39:19 2017 -0500
Create event on mentioned user's feed.
commit f600fd6c6369ffa5fcebecac73cfb04026998f48
Author: Max Burnette <mburnet88@gmail.com>
Date: Fri Feb 24 11:13:24 2017 -0600
Correctly send link in all cases
commit 964d8b7879f7a1300f73e93e54fd32e2990caf72
Author: Max Burnette <mburnet88@gmail.com>
Date: Fri Feb 24 11:07:46 2017 -0600
Add actual email sending logic
commit 098f86cd34b390d69e319667108661aa6fd4e625
Author: Max Burnette <mburnet88@gmail.com>
Date: Fri Feb 24 09:53:54 2017 -0600
Generate correct email contents
commit 676db535d404981e6c450035c52b202574bbe1c7
Author: Max Burnette <mburnet88@gmail.com>
Date: Fri Feb 24 08:41:58 2017 -0600
Get mentions after successful comment POST
commit fa71b12f66387b9a537f5d578d69a35bf9a50af9
Author: Max Burnette <mburnet88@gmail.com>
Date: Thu Feb 23 15:49:40 2017 -0600
Use mention.js to query users dynamically
commit 0f813551d6fc28be6a0e6404dd4554f699cccb20
Author: Max Burnette <mburnet88@gmail.com>
Date: Wed Feb 22 14:42:25 2017 -0600
Basic logic to recognize @ character- CHANGELOG.md (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- app/api/Comments.scala (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- app/api/Datasets.scala (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- app/api/Files.scala (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- app/api/Users.scala (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- app/controllers/Application.scala (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- app/controllers/Datasets.scala (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- app/controllers/Users.scala (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- app/models/Dataset.scala (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- app/views/commentform.scala.html (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- app/views/dataset.scala.html (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- app/views/file.scala.html (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- app/views/newsFeedCardEmail.scala.html (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- app/views/newsfeedCard.scala.html (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- conf/routes (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- public/javascripts/comment-edit.js (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- public/javascripts/mention/jquery.elastic.js (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- public/javascripts/mention/jquery.mentionsInput.css (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
- public/javascripts/mention/jquery.mentionsInput.js (version 1fac691ac00c630dacf0b8c49ba02201ebff8455) (diffs)
-
Todd Nicholson <tcnichol@illinois.edu> 8bdd889914a07f3e61894c378b4e73f072af04e4 m
Squashed commit of the following:
commit 0490d724ba70cb59a5bb7be5c732ec85e5739575
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Apr 3 15:37:53 2017 -0500
fixed changelog
commit 06bb489d8469962c289c1252fc45104c3fd7a287
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Apr 3 15:27:51 2017 -0500
fixed changelog
commit 86c90b328aa51779f00b98ddc859853211091455
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Mar 20 15:44:01 2017 -0500
bagit value now read from conf file for collections and datasets. default is true.
commit 362f60b18b04f3f745043e25a883043f46aa644e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Mar 20 15:36:59 2017 -0500
Merge branch 'feature/CATS-571-download-collection' of https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/clowder into feature/CATS-571-download-collection
bagit values now read from conf file
commit f47f1ea0a27f7c633ea7cdbf21613e0cdfa7a1e6
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Mar 15 16:25:35 2017 -0500
Merge branch 'feature/CATS-571-download-collection' of https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/clowder into feature/CATS-571-download-collection
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Added change log entry.
commit a41e42f4a3ae3afb1cebed5bb57a73f1b1ebf46c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Mar 15 16:23:52 2017 -0500
Merge branch 'feature/CATS-571-download-collection' of https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/clowder into feature/CATS-571-download-collection
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Added change log entry.
commit 8742b55fc818c8b54552932e0b79b5a6ed421ed5
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Mar 15 16:20:13 2017 -0500
added note to change log
commit 6452272c281037bfa4b6e03517f944e787dfbe66
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Mar 15 13:18:15 2017 -0500
Squashed commit of the following:
commit e2dc2f59e6466c5cd8f7f78ee0701522e805d51c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Mar 13 15:47:39 2017 -0500
bagit default to true
commit dab3a85d72e116b4db9caf93a1105e00fd0422bc
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Feb 23 12:21:34 2017 -0600
Squashed commit of the following:
commit 555dcda7b822f424410f32be36bea858e0f1769e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Nov 14 13:11:02 2016 -0600
author email fixed
commit 8831607eaec43e494e1707f786d0f37aea877154
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Nov 12 19:55:50 2016 -0600
split list of child/parent ids with commas. author is now the email of author for collections
commit 3abcda9813457f8f0918964795826abf76af22f8
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Nov 12 18:36:37 2016 -0600
use matched dataset rather that currentDataset.get
commit d2f14b267efa6a17c8b99eda72472a2f9651991b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Nov 12 15:07:26 2016 -0600
may be too many cases here. might need to clean up
commit 02ddc173577f7af4932a49974ed52bb5f0783203
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Nov 11 22:29:20 2016 -0600
using Option[Dataset] for currentDataset works now for empty colllection
commit 95f4fa80021fc87d3b1edc8e6780d15f0c576333
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Nov 11 15:56:16 2016 -0600
made a string separated by commas rather than list for spaces, collection ids
commit 01167813ca0bebf3922527f8240638c9d4a326bb
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 24 13:44:03 2016 -0500
added description. removed created by me
commit 890bcbc9316c5a90e174eb14457dd287a0f21bb3
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 24 13:33:51 2016 -0500
fixed error for human readable bytes
commit 6a5319dfdf2ba337d303059e6416ce62a0394c0b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Oct 18 16:50:43 2016 -0500
removed unused code that was commented out
commit 5a53644be3c2e007412cb83739eb829768c8e285
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Oct 18 16:49:08 2016 -0500
fixed case - bagit was not generated if a root collection had no subcollections.
commit e562bdf34787df6e9bdb15da06f91c6f37991772
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:43:24 2016 -0500
all new iterators added. need to test adding them to method
commit 6c67df739808b0ce5c20a8c219412632a493adde
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:23:41 2016 -0500
CollectionIterator added
commit c8bd44d882c57f8cdc4376b094b34599c64d564a
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:12:30 2016 -0500
DatasetsInCollectionIterator added
commit a22951023a06530c15ed76053acf07e0ca8abf51
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:06:12 2016 -0500
added datasetinterator class
commit 87fc1a177cebb840b699385353c145e8d80d952d
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 15:06:06 2016 -0500
iterators in their own classes for FileIterator, DatasetIterator, and CollectionIterator
commit 6ddd1281b4c0d02bf6beb2539cfe5309583be484
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Oct 7 13:01:59 2016 -0500
should fix download bug of not downloading all files
commit 5cd0a5fbeaef98cd6289e45fa3f1701f3de62290
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 29 14:19:14 2016 -0500
fixed a typo
commit d38ad24c9eacc99ab2610d7d478a38d977603a9e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 26 13:14:32 2016 -0500
disabled rabbitmq in play.plugins
commit 2727371e595495e1a3de223f7d98715735f61b68
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 20:30:08 2016 -0500
download collection now works. need to test with permissions
commit 73e286fe5ed067ff39957aa64eeb981fe5208ac3
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 18:54:46 2016 -0500
download collection now works. need to test with permissions
commit 525f980754186b3b57d92bd7d376a524fa603b81
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 18:42:48 2016 -0500
bagit files now in correct folder
commit c397c9dd177623f4581058fccc991d5ee2aac60c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 17:18:49 2016 -0500
some cleanup needed and GUI needs to be implemented, but download collection now works with or without bagit
commit 7bb8cfe6e4bfa926ba253e5cb0a14850eca1c8a8
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 16:15:50 2016 -0500
need to fix folder where bagit stuff goes, and bytes is not computed correctly.
commit 5f615872a31fe4bc2405b0de195f67377a399b99
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 15:11:14 2016 -0500
RootCollection works, except bagit information
commit 86a808d9fe3e9c580834fdab30a88d853d68d263
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 22:56:36 2016 -0500
should work now!
commit 90c61328cc20b354707abe0cd2b1d24447394b25
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 22:12:09 2016 -0500
should work, needs testing
commit 6fbdbf9d5191fd82fd2a05201e43d142bb8ebd55
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 21:26:13 2016 -0500
collectionIterator should work now, testing needed on collection with enough depth
commit 6901230dc2abd67bbb6afef4250c60a01e059372
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:27:55 2016 -0500
subcols now gotten
commit 90bea0255d4d36e7f1556495a7d75949d9cc5fd9
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:21:35 2016 -0500
getting subcollection
commit e10a02d9deea83742f0c9c63a17162da9bbff0ff
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:17:29 2016 -0500
getting subcollection
commit 579c4efeff8fc629885c5879e93bc19064f4b390
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:09:05 2016 -0500
getting subcollection
commit aecfc5fdab580cf0303b9cc9434ae9a526069834
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:06:34 2016 -0500
getting subcollection
commit 1837cb12b4c5bb972461b8fa1f99542a53e3b4a3
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 15:34:02 2016 -0500
datasets now contain all files
commit 8d1db696fae9b6abd7a936d53e388b2d04ffcd5f
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 14:36:07 2016 -0500
using Option[DatasetIterator] in DatasetsInCollectionIterator in case the collection contains no datasets. Similar method will be created for SubCollections.
commit 973096399f4769d8f38a2caedfc1da4ba42c5c04
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 23:53:36 2016 -0500
adding CollectionIterator - for non root collections. it does all but the bag it, and it calls itself as long as there is another collection
commit f82492bc9567254896c20c04adf2c70c5edf5bca
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 23:31:45 2016 -0500
adding RootCollectionIterator - different from SubCollectionIterator (not written yet) since it handles the bagit stuff
commit ca7465c18695d92a26ccd1bc84bed5985929218c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 19:47:24 2016 -0500
Dataset Iterator now works with files. HasNext needed to check whether the current file iterator had next, rather than checking that in the case for FileIterator
commit 8a24fa599d62bebcf0674af6b758cb26e717738b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 16:03:45 2016 -0500
FileIterator works. Need to figure why it does not work with datasetIterator
commit f8956b6d2b7b8f11d330d85fc121715df2eba12e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Sep 14 16:23:03 2016 -0500
dataset info now works
commit 80a1377c8cf9252fe827e00736e4e1529393cf7b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Sep 13 18:11:59 2016 -0500
added code for getting files for a dataset
commit d98e5f436501f99aba7769ec06a448fb2b0fadbb
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Sep 13 15:40:03 2016 -0500
collection will now download with datasets within collection. need to add files to datasets.
commit a9278acac17fe1b043967fa466b13e3cff700523
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 23:51:42 2016 -0500
doesn't work, cannot open zip
commit 00b5e2f9737b501ae8b534c8f6d88dcb79464831
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 21:56:36 2016 -0500
using iterator method to produce streams
commit 6d91488cbdddff125f877c3861b2de76a5797087
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 19:31:56 2016 -0500
basic case statements for input streams for collection
commit f919998fb3b7b2c7207faa201c666f6e05463976
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 19:04:46 2016 -0500
input streams for FileIterator fixed, now adds to md5 map
commit be7785f03e66178b7905b3084eac98f2e2bf526d
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 18:59:36 2016 -0500
added class FileIterator
commit ddc04123e71bfbdcc5b028edcf787e05ca4ed1c1
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 18:53:28 2016 -0500
added new iterator. using iterators for file, dataset, and collection download.
commit 189952df43b73b2949ec8f757a6d29db881133bc
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 15:48:01 2016 -0500
added new iterator. using iterators for file, dataset, and collection download.
commit 884d3fc959473a9161808b0510be3c5318822ad7
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 15:42:39 2016 -0500
does not work. this should download only the datasets in the collection.
commit 1f6e23e220d31e01ff8a0c75cdb1cb559dd7804f
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 14:42:44 2016 -0500
will compile at least
commit c9a8228d4e2cf9a0417cb781ab882b3c93a44f7c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 14:26:18 2016 -0500
removed enumeratorFromCollection - need to start again. using recursive calls to method from here on out
commit 9bae1490635ce82b3ee99e8f1ae85f7fe03d4738
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 12:51:38 2016 -0500
need to test combining enumerators for datasets
commit 8eb51a175f4b5eb8dad4c9d5d33773f53cae8765
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 18:21:44 2016 -0500
more additions - still incomplete
commit c1ebe42b725cb8242d9ea00b513aaed4c70db3e8
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 17:43:03 2016 -0500
added method for metadata and info for collection
commit 345bef22e06fb75fdf16638060112322678b7e50
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 17:01:11 2016 -0500
added method for collection outputstream
commit a0560160c4f4f5591571e6d116dec0ce30402cfe
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 16:10:53 2016 -0500
added methods for getting output streams for files
commit c4d391a2e3b193d4a585a688ab30902bf3c72a73
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 15:23:11 2016 -0500
new strategy for getting streams - for a dataset or collection a getStream method will take level, file_type as parameters and return the correct stream.
commit 78bfd99a6b793d01c919f3769df2df5b3251a369
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Sep 4 18:14:32 2016 -0500
basic structure for processing streams in place. need method to generate inputStreams
commit 6e2c357b75e8bda223f4e75ae5a91343d57a139e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 1 20:28:37 2016 -0500
need to figure out how to get inputstream from the enumerator
commit 61bc9e87390f1ae15a21c65399b92cffb8fb25d1
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 1 15:55:27 2016 -0500
started work. new route and method begun.
commit 5de4b085be69b358c1bbf49b2a998a0415859911
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 1 15:32:31 2016 -0500
started work. new route and method begun.
commit 555dcda7b822f424410f32be36bea858e0f1769e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Nov 14 13:11:02 2016 -0600
author email fixed
commit 8831607eaec43e494e1707f786d0f37aea877154
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Nov 12 19:55:50 2016 -0600
split list of child/parent ids with commas. author is now the email of author for collections
commit 3abcda9813457f8f0918964795826abf76af22f8
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Nov 12 18:36:37 2016 -0600
use matched dataset rather that currentDataset.get
commit d2f14b267efa6a17c8b99eda72472a2f9651991b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Nov 12 15:07:26 2016 -0600
may be too many cases here. might need to clean up
commit 02ddc173577f7af4932a49974ed52bb5f0783203
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Nov 11 22:29:20 2016 -0600
using Option[Dataset] for currentDataset works now for empty colllection
commit 95f4fa80021fc87d3b1edc8e6780d15f0c576333
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Nov 11 15:56:16 2016 -0600
made a string separated by commas rather than list for spaces, collection ids
commit 01167813ca0bebf3922527f8240638c9d4a326bb
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 24 13:44:03 2016 -0500
added description. removed created by me
commit 890bcbc9316c5a90e174eb14457dd287a0f21bb3
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 24 13:33:51 2016 -0500
fixed error for human readable bytes
commit 6a5319dfdf2ba337d303059e6416ce62a0394c0b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Oct 18 16:50:43 2016 -0500
removed unused code that was commented out
commit 5a53644be3c2e007412cb83739eb829768c8e285
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Oct 18 16:49:08 2016 -0500
fixed case - bagit was not generated if a root collection had no subcollections.
commit e562bdf34787df6e9bdb15da06f91c6f37991772
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:43:24 2016 -0500
all new iterators added. need to test adding them to method
commit 6c67df739808b0ce5c20a8c219412632a493adde
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:23:41 2016 -0500
CollectionIterator added
commit c8bd44d882c57f8cdc4376b094b34599c64d564a
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:12:30 2016 -0500
DatasetsInCollectionIterator added
commit a22951023a06530c15ed76053acf07e0ca8abf51
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:06:12 2016 -0500
added datasetinterator class
commit 87fc1a177cebb840b699385353c145e8d80d952d
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 15:06:06 2016 -0500
iterators in their own classes for FileIterator, DatasetIterator, and CollectionIterator
commit 6ddd1281b4c0d02bf6beb2539cfe5309583be484
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Oct 7 13:01:59 2016 -0500
should fix download bug of not downloading all files
commit 5cd0a5fbeaef98cd6289e45fa3f1701f3de62290
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 29 14:19:14 2016 -0500
fixed a typo
commit d38ad24c9eacc99ab2610d7d478a38d977603a9e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 26 13:14:32 2016 -0500
disabled rabbitmq in play.plugins
commit 2727371e595495e1a3de223f7d98715735f61b68
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 20:30:08 2016 -0500
download collection now works. need to test with permissions
commit 73e286fe5ed067ff39957aa64eeb981fe5208ac3
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 18:54:46 2016 -0500
download collection now works. need to test with permissions
commit 525f980754186b3b57d92bd7d376a524fa603b81
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 18:42:48 2016 -0500
bagit files now in correct folder
commit c397c9dd177623f4581058fccc991d5ee2aac60c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 17:18:49 2016 -0500
some cleanup needed and GUI needs to be implemented, but download collection now works with or without bagit
commit 7bb8cfe6e4bfa926ba253e5cb0a14850eca1c8a8
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 16:15:50 2016 -0500
need to fix folder where bagit stuff goes, and bytes is not computed correctly.
commit 5f615872a31fe4bc2405b0de195f67377a399b99
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 15:11:14 2016 -0500
RootCollection works, except bagit information
commit 86a808d9fe3e9c580834fdab30a88d853d68d263
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 22:56:36 2016 -0500
should work now!
commit 90c61328cc20b354707abe0cd2b1d24447394b25
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 22:12:09 2016 -0500
should work, needs testing
commit 6fbdbf9d5191fd82fd2a05201e43d142bb8ebd55
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 21:26:13 2016 -0500
collectionIterator should work now, testing needed on collection with enough depth
commit 6901230dc2abd67bbb6afef4250c60a01e059372
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:27:55 2016 -0500
subcols now gotten
commit 90bea0255d4d36e7f1556495a7d75949d9cc5fd9
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:21:35 2016 -0500
getting subcollection
commit e10a02d9deea83742f0c9c63a17162da9bbff0ff
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:17:29 2016 -0500
getting subcollection
commit 579c4efeff8fc629885c5879e93bc19064f4b390
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:09:05 2016 -0500
getting subcollection
commit aecfc5fdab580cf0303b9cc9434ae9a526069834
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:06:34 2016 -0500
getting subcollection
commit 1837cb12b4c5bb972461b8fa1f99542a53e3b4a3
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 15:34:02 2016 -0500
datasets now contain all files
commit 8d1db696fae9b6abd7a936d53e388b2d04ffcd5f
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 14:36:07 2016 -0500
using Option[DatasetIterator] in DatasetsInCollectionIterator in case the collection contains no datasets. Similar method will be created for SubCollections.
commit 973096399f4769d8f38a2caedfc1da4ba42c5c04
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 23:53:36 2016 -0500
adding CollectionIterator - for non root collections. it does all but the bag it, and it calls itself as long as there is another collection
commit f82492bc9567254896c20c04adf2c70c5edf5bca
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 23:31:45 2016 -0500
adding RootCollectionIterator - different from SubCollectionIterator (not written yet) since it handles the bagit stuff
commit ca7465c18695d92a26ccd1bc84bed5985929218c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 19:47:24 2016 -0500
Dataset Iterator now works with files. HasNext needed to check whether the current file iterator had next, rather than checking that in the case for FileIterator
commit 8a24fa599d62bebcf0674af6b758cb26e717738b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 16:03:45 2016 -0500
FileIterator works. Need to figure why it does not work with datasetIterator
commit f8956b6d2b7b8f11d330d85fc121715df2eba12e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Sep 14 16:23:03 2016 -0500
dataset info now works
commit 80a1377c8cf9252fe827e00736e4e1529393cf7b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Sep 13 18:11:59 2016 -0500
added code for getting files for a dataset
commit d98e5f436501f99aba7769ec06a448fb2b0fadbb
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Sep 13 15:40:03 2016 -0500
collection will now download with datasets within collection. need to add files to datasets.
commit a9278acac17fe1b043967fa466b13e3cff700523
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 23:51:42 2016 -0500
doesn't work, cannot open zip
commit 00b5e2f9737b501ae8b534c8f6d88dcb79464831
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 21:56:36 2016 -0500
using iterator method to produce streams
commit 6d91488cbdddff125f877c3861b2de76a5797087
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 19:31:56 2016 -0500
basic case statements for input streams for collection
commit f919998fb3b7b2c7207faa201c666f6e05463976
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 19:04:46 2016 -0500
input streams for FileIterator fixed, now adds to md5 map
commit be7785f03e66178b7905b3084eac98f2e2bf526d
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 18:59:36 2016 -0500
added class FileIterator
commit ddc04123e71bfbdcc5b028edcf787e05ca4ed1c1
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 18:53:28 2016 -0500
added new iterator. using iterators for file, dataset, and collection download.
commit 189952df43b73b2949ec8f757a6d29db881133bc
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 15:48:01 2016 -0500
added new iterator. using iterators for file, dataset, and collection download.
commit 884d3fc959473a9161808b0510be3c5318822ad7
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 15:42:39 2016 -0500
does not work. this should download only the datasets in the collection.
commit 1f6e23e220d31e01ff8a0c75cdb1cb559dd7804f
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 14:42:44 2016 -0500
will compile at least
commit c9a8228d4e2cf9a0417cb781ab882b3c93a44f7c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 14:26:18 2016 -0500
removed enumeratorFromCollection - need to start again. using recursive calls to method from here on out
commit 9bae1490635ce82b3ee99e8f1ae85f7fe03d4738
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 12:51:38 2016 -0500
need to test combining enumerators for datasets
commit 8eb51a175f4b5eb8dad4c9d5d33773f53cae8765
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 18:21:44 2016 -0500
more additions - still incomplete
commit c1ebe42b725cb8242d9ea00b513aaed4c70db3e8
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 17:43:03 2016 -0500
added method for metadata and info for collection
commit 345bef22e06fb75fdf16638060112322678b7e50
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 17:01:11 2016 -0500
added method for collection outputstream
commit a0560160c4f4f5591571e6d116dec0ce30402cfe
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 16:10:53 2016 -0500
added methods for getting output streams for files
commit c4d391a2e3b193d4a585a688ab30902bf3c72a73
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 15:23:11 2016 -0500
new strategy for getting streams - for a dataset or collection a getStream method will take level, file_type as parameters and return the correct stream.
commit 78bfd99a6b793d01c919f3769df2df5b3251a369
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Sep 4 18:14:32 2016 -0500
basic structure for processing streams in place. need method to generate inputStreams
commit 6e2c357b75e8bda223f4e75ae5a91343d57a139e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 1 20:28:37 2016 -0500
need to figure out how to get inputstream from the enumerator
commit 61bc9e87390f1ae15a21c65399b92cffb8fb25d1
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 1 15:55:27 2016 -0500
started work. new route and method begun.
commit 5de4b085be69b358c1bbf49b2a998a0415859911
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 1 15:32:31 2016 -0500
started work. new route and method begun.
commit e2dc2f59e6466c5cd8f7f78ee0701522e805d51c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Mar 13 15:47:39 2017 -0500
bagit default to true
commit dab3a85d72e116b4db9caf93a1105e00fd0422bc
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Feb 23 12:21:34 2017 -0600
Squashed commit of the following:
commit 555dcda7b822f424410f32be36bea858e0f1769e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Nov 14 13:11:02 2016 -0600
author email fixed
commit 8831607eaec43e494e1707f786d0f37aea877154
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Nov 12 19:55:50 2016 -0600
split list of child/parent ids with commas. author is now the email of author for collections
commit 3abcda9813457f8f0918964795826abf76af22f8
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Nov 12 18:36:37 2016 -0600
use matched dataset rather that currentDataset.get
commit d2f14b267efa6a17c8b99eda72472a2f9651991b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Nov 12 15:07:26 2016 -0600
may be too many cases here. might need to clean up
commit 02ddc173577f7af4932a49974ed52bb5f0783203
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Nov 11 22:29:20 2016 -0600
using Option[Dataset] for currentDataset works now for empty colllection
commit 95f4fa80021fc87d3b1edc8e6780d15f0c576333
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Nov 11 15:56:16 2016 -0600
made a string separated by commas rather than list for spaces, collection ids
commit 01167813ca0bebf3922527f8240638c9d4a326bb
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 24 13:44:03 2016 -0500
added description. removed created by me
commit 890bcbc9316c5a90e174eb14457dd287a0f21bb3
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 24 13:33:51 2016 -0500
fixed error for human readable bytes
commit 6a5319dfdf2ba337d303059e6416ce62a0394c0b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Oct 18 16:50:43 2016 -0500
removed unused code that was commented out
commit 5a53644be3c2e007412cb83739eb829768c8e285
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Oct 18 16:49:08 2016 -0500
fixed case - bagit was not generated if a root collection had no subcollections.
commit e562bdf34787df6e9bdb15da06f91c6f37991772
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:43:24 2016 -0500
all new iterators added. need to test adding them to method
commit 6c67df739808b0ce5c20a8c219412632a493adde
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:23:41 2016 -0500
CollectionIterator added
commit c8bd44d882c57f8cdc4376b094b34599c64d564a
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:12:30 2016 -0500
DatasetsInCollectionIterator added
commit a22951023a06530c15ed76053acf07e0ca8abf51
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:06:12 2016 -0500
added datasetinterator class
commit 87fc1a177cebb840b699385353c145e8d80d952d
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 15:06:06 2016 -0500
iterators in their own classes for FileIterator, DatasetIterator, and CollectionIterator
commit 6ddd1281b4c0d02bf6beb2539cfe5309583be484
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Oct 7 13:01:59 2016 -0500
should fix download bug of not downloading all files
commit 5cd0a5fbeaef98cd6289e45fa3f1701f3de62290
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 29 14:19:14 2016 -0500
fixed a typo
commit d38ad24c9eacc99ab2610d7d478a38d977603a9e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 26 13:14:32 2016 -0500
disabled rabbitmq in play.plugins
commit 2727371e595495e1a3de223f7d98715735f61b68
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 20:30:08 2016 -0500
download collection now works. need to test with permissions
commit 73e286fe5ed067ff39957aa64eeb981fe5208ac3
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 18:54:46 2016 -0500
download collection now works. need to test with permissions
commit 525f980754186b3b57d92bd7d376a524fa603b81
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 18:42:48 2016 -0500
bagit files now in correct folder
commit c397c9dd177623f4581058fccc991d5ee2aac60c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 17:18:49 2016 -0500
some cleanup needed and GUI needs to be implemented, but download collection now works with or without bagit
commit 7bb8cfe6e4bfa926ba253e5cb0a14850eca1c8a8
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 16:15:50 2016 -0500
need to fix folder where bagit stuff goes, and bytes is not computed correctly.
commit 5f615872a31fe4bc2405b0de195f67377a399b99
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 15:11:14 2016 -0500
RootCollection works, except bagit information
commit 86a808d9fe3e9c580834fdab30a88d853d68d263
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 22:56:36 2016 -0500
should work now!
commit 90c61328cc20b354707abe0cd2b1d24447394b25
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 22:12:09 2016 -0500
should work, needs testing
commit 6fbdbf9d5191fd82fd2a05201e43d142bb8ebd55
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 21:26:13 2016 -0500
collectionIterator should work now, testing needed on collection with enough depth
commit 6901230dc2abd67bbb6afef4250c60a01e059372
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:27:55 2016 -0500
subcols now gotten
commit 90bea0255d4d36e7f1556495a7d75949d9cc5fd9
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:21:35 2016 -0500
getting subcollection
commit e10a02d9deea83742f0c9c63a17162da9bbff0ff
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:17:29 2016 -0500
getting subcollection
commit 579c4efeff8fc629885c5879e93bc19064f4b390
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:09:05 2016 -0500
getting subcollection
commit aecfc5fdab580cf0303b9cc9434ae9a526069834
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:06:34 2016 -0500
getting subcollection
commit 1837cb12b4c5bb972461b8fa1f99542a53e3b4a3
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 15:34:02 2016 -0500
datasets now contain all files
commit 8d1db696fae9b6abd7a936d53e388b2d04ffcd5f
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 14:36:07 2016 -0500
using Option[DatasetIterator] in DatasetsInCollectionIterator in case the collection contains no datasets. Similar method will be created for SubCollections.
commit 973096399f4769d8f38a2caedfc1da4ba42c5c04
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 23:53:36 2016 -0500
adding CollectionIterator - for non root collections. it does all but the bag it, and it calls itself as long as there is another collection
commit f82492bc9567254896c20c04adf2c70c5edf5bca
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 23:31:45 2016 -0500
adding RootCollectionIterator - different from SubCollectionIterator (not written yet) since it handles the bagit stuff
commit ca7465c18695d92a26ccd1bc84bed5985929218c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 19:47:24 2016 -0500
Dataset Iterator now works with files. HasNext needed to check whether the current file iterator had next, rather than checking that in the case for FileIterator
commit 8a24fa599d62bebcf0674af6b758cb26e717738b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 16:03:45 2016 -0500
FileIterator works. Need to figure why it does not work with datasetIterator
commit f8956b6d2b7b8f11d330d85fc121715df2eba12e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Sep 14 16:23:03 2016 -0500
dataset info now works
commit 80a1377c8cf9252fe827e00736e4e1529393cf7b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Sep 13 18:11:59 2016 -0500
added code for getting files for a dataset
commit d98e5f436501f99aba7769ec06a448fb2b0fadbb
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Sep 13 15:40:03 2016 -0500
collection will now download with datasets within collection. need to add files to datasets.
commit a9278acac17fe1b043967fa466b13e3cff700523
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 23:51:42 2016 -0500
doesn't work, cannot open zip
commit 00b5e2f9737b501ae8b534c8f6d88dcb79464831
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 21:56:36 2016 -0500
using iterator method to produce streams
commit 6d91488cbdddff125f877c3861b2de76a5797087
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 19:31:56 2016 -0500
basic case statements for input streams for collection
commit f919998fb3b7b2c7207faa201c666f6e05463976
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 19:04:46 2016 -0500
input streams for FileIterator fixed, now adds to md5 map
commit be7785f03e66178b7905b3084eac98f2e2bf526d
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 18:59:36 2016 -0500
added class FileIterator
commit ddc04123e71bfbdcc5b028edcf787e05ca4ed1c1
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 18:53:28 2016 -0500
added new iterator. using iterators for file, dataset, and collection download.
commit 189952df43b73b2949ec8f757a6d29db881133bc
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 15:48:01 2016 -0500
added new iterator. using iterators for file, dataset, and collection download.
commit 884d3fc959473a9161808b0510be3c5318822ad7
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 15:42:39 2016 -0500
does not work. this should download only the datasets in the collection.
commit 1f6e23e220d31e01ff8a0c75cdb1cb559dd7804f
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 14:42:44 2016 -0500
will compile at least
commit c9a8228d4e2cf9a0417cb781ab882b3c93a44f7c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 14:26:18 2016 -0500
removed enumeratorFromCollection - need to start again. using recursive calls to method from here on out
commit 9bae1490635ce82b3ee99e8f1ae85f7fe03d4738
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 12:51:38 2016 -0500
need to test combining enumerators for datasets
commit 8eb51a175f4b5eb8dad4c9d5d33773f53cae8765
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 18:21:44 2016 -0500
more additions - still incomplete
commit c1ebe42b725cb8242d9ea00b513aaed4c70db3e8
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 17:43:03 2016 -0500
added method for metadata and info for collection
commit 345bef22e06fb75fdf16638060112322678b7e50
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 17:01:11 2016 -0500
added method for collection outputstream
commit a0560160c4f4f5591571e6d116dec0ce30402cfe
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 16:10:53 2016 -0500
added methods for getting output streams for files
commit c4d391a2e3b193d4a585a688ab30902bf3c72a73
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 15:23:11 2016 -0500
new strategy for getting streams - for a dataset or collection a getStream method will take level, file_type as parameters and return the correct stream.
commit 78bfd99a6b793d01c919f3769df2df5b3251a369
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Sep 4 18:14:32 2016 -0500
basic structure for processing streams in place. need method to generate inputStreams
commit 6e2c357b75e8bda223f4e75ae5a91343d57a139e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 1 20:28:37 2016 -0500
need to figure out how to get inputstream from the enumerator
commit 61bc9e87390f1ae15a21c65399b92cffb8fb25d1
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 1 15:55:27 2016 -0500
started work. new route and method begun.
commit 5de4b085be69b358c1bbf49b2a998a0415859911
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 1 15:32:31 2016 -0500
started work. new route and method begun.
commit 555dcda7b822f424410f32be36bea858e0f1769e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Nov 14 13:11:02 2016 -0600
author email fixed
commit 8831607eaec43e494e1707f786d0f37aea877154
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Nov 12 19:55:50 2016 -0600
split list of child/parent ids with commas. author is now the email of author for collections
commit 3abcda9813457f8f0918964795826abf76af22f8
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Nov 12 18:36:37 2016 -0600
use matched dataset rather that currentDataset.get
commit d2f14b267efa6a17c8b99eda72472a2f9651991b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Nov 12 15:07:26 2016 -0600
may be too many cases here. might need to clean up
commit 02ddc173577f7af4932a49974ed52bb5f0783203
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Nov 11 22:29:20 2016 -0600
using Option[Dataset] for currentDataset works now for empty colllection
commit 95f4fa80021fc87d3b1edc8e6780d15f0c576333
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Nov 11 15:56:16 2016 -0600
made a string separated by commas rather than list for spaces, collection ids
commit 01167813ca0bebf3922527f8240638c9d4a326bb
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 24 13:44:03 2016 -0500
added description. removed created by me
commit 890bcbc9316c5a90e174eb14457dd287a0f21bb3
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 24 13:33:51 2016 -0500
fixed error for human readable bytes
commit 6a5319dfdf2ba337d303059e6416ce62a0394c0b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Oct 18 16:50:43 2016 -0500
removed unused code that was commented out
commit 5a53644be3c2e007412cb83739eb829768c8e285
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Oct 18 16:49:08 2016 -0500
fixed case - bagit was not generated if a root collection had no subcollections.
commit e562bdf34787df6e9bdb15da06f91c6f37991772
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:43:24 2016 -0500
all new iterators added. need to test adding them to method
commit 6c67df739808b0ce5c20a8c219412632a493adde
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:23:41 2016 -0500
CollectionIterator added
commit c8bd44d882c57f8cdc4376b094b34599c64d564a
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:12:30 2016 -0500
DatasetsInCollectionIterator added
commit a22951023a06530c15ed76053acf07e0ca8abf51
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 16:06:12 2016 -0500
added datasetinterator class
commit 87fc1a177cebb840b699385353c145e8d80d952d
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Oct 17 15:06:06 2016 -0500
iterators in their own classes for FileIterator, DatasetIterator, and CollectionIterator
commit 6ddd1281b4c0d02bf6beb2539cfe5309583be484
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Oct 7 13:01:59 2016 -0500
should fix download bug of not downloading all files
commit 5cd0a5fbeaef98cd6289e45fa3f1701f3de62290
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 29 14:19:14 2016 -0500
fixed a typo
commit d38ad24c9eacc99ab2610d7d478a38d977603a9e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 26 13:14:32 2016 -0500
disabled rabbitmq in play.plugins
commit 2727371e595495e1a3de223f7d98715735f61b68
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 20:30:08 2016 -0500
download collection now works. need to test with permissions
commit 73e286fe5ed067ff39957aa64eeb981fe5208ac3
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 18:54:46 2016 -0500
download collection now works. need to test with permissions
commit 525f980754186b3b57d92bd7d376a524fa603b81
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 18:42:48 2016 -0500
bagit files now in correct folder
commit c397c9dd177623f4581058fccc991d5ee2aac60c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 17:18:49 2016 -0500
some cleanup needed and GUI needs to be implemented, but download collection now works with or without bagit
commit 7bb8cfe6e4bfa926ba253e5cb0a14850eca1c8a8
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 16:15:50 2016 -0500
need to fix folder where bagit stuff goes, and bytes is not computed correctly.
commit 5f615872a31fe4bc2405b0de195f67377a399b99
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sat Sep 17 15:11:14 2016 -0500
RootCollection works, except bagit information
commit 86a808d9fe3e9c580834fdab30a88d853d68d263
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 22:56:36 2016 -0500
should work now!
commit 90c61328cc20b354707abe0cd2b1d24447394b25
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 22:12:09 2016 -0500
should work, needs testing
commit 6fbdbf9d5191fd82fd2a05201e43d142bb8ebd55
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 21:26:13 2016 -0500
collectionIterator should work now, testing needed on collection with enough depth
commit 6901230dc2abd67bbb6afef4250c60a01e059372
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:27:55 2016 -0500
subcols now gotten
commit 90bea0255d4d36e7f1556495a7d75949d9cc5fd9
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:21:35 2016 -0500
getting subcollection
commit e10a02d9deea83742f0c9c63a17162da9bbff0ff
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:17:29 2016 -0500
getting subcollection
commit 579c4efeff8fc629885c5879e93bc19064f4b390
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:09:05 2016 -0500
getting subcollection
commit aecfc5fdab580cf0303b9cc9434ae9a526069834
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 16:06:34 2016 -0500
getting subcollection
commit 1837cb12b4c5bb972461b8fa1f99542a53e3b4a3
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 15:34:02 2016 -0500
datasets now contain all files
commit 8d1db696fae9b6abd7a936d53e388b2d04ffcd5f
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Fri Sep 16 14:36:07 2016 -0500
using Option[DatasetIterator] in DatasetsInCollectionIterator in case the collection contains no datasets. Similar method will be created for SubCollections.
commit 973096399f4769d8f38a2caedfc1da4ba42c5c04
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 23:53:36 2016 -0500
adding CollectionIterator - for non root collections. it does all but the bag it, and it calls itself as long as there is another collection
commit f82492bc9567254896c20c04adf2c70c5edf5bca
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 23:31:45 2016 -0500
adding RootCollectionIterator - different from SubCollectionIterator (not written yet) since it handles the bagit stuff
commit ca7465c18695d92a26ccd1bc84bed5985929218c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 19:47:24 2016 -0500
Dataset Iterator now works with files. HasNext needed to check whether the current file iterator had next, rather than checking that in the case for FileIterator
commit 8a24fa599d62bebcf0674af6b758cb26e717738b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 15 16:03:45 2016 -0500
FileIterator works. Need to figure why it does not work with datasetIterator
commit f8956b6d2b7b8f11d330d85fc121715df2eba12e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Wed Sep 14 16:23:03 2016 -0500
dataset info now works
commit 80a1377c8cf9252fe827e00736e4e1529393cf7b
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Sep 13 18:11:59 2016 -0500
added code for getting files for a dataset
commit d98e5f436501f99aba7769ec06a448fb2b0fadbb
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Tue Sep 13 15:40:03 2016 -0500
collection will now download with datasets within collection. need to add files to datasets.
commit a9278acac17fe1b043967fa466b13e3cff700523
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 23:51:42 2016 -0500
doesn't work, cannot open zip
commit 00b5e2f9737b501ae8b534c8f6d88dcb79464831
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 21:56:36 2016 -0500
using iterator method to produce streams
commit 6d91488cbdddff125f877c3861b2de76a5797087
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 19:31:56 2016 -0500
basic case statements for input streams for collection
commit f919998fb3b7b2c7207faa201c666f6e05463976
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 19:04:46 2016 -0500
input streams for FileIterator fixed, now adds to md5 map
commit be7785f03e66178b7905b3084eac98f2e2bf526d
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 18:59:36 2016 -0500
added class FileIterator
commit ddc04123e71bfbdcc5b028edcf787e05ca4ed1c1
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 18:53:28 2016 -0500
added new iterator. using iterators for file, dataset, and collection download.
commit 189952df43b73b2949ec8f757a6d29db881133bc
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 12 15:48:01 2016 -0500
added new iterator. using iterators for file, dataset, and collection download.
commit 884d3fc959473a9161808b0510be3c5318822ad7
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 15:42:39 2016 -0500
does not work. this should download only the datasets in the collection.
commit 1f6e23e220d31e01ff8a0c75cdb1cb559dd7804f
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 14:42:44 2016 -0500
will compile at least
commit c9a8228d4e2cf9a0417cb781ab882b3c93a44f7c
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 14:26:18 2016 -0500
removed enumeratorFromCollection - need to start again. using recursive calls to method from here on out
commit 9bae1490635ce82b3ee99e8f1ae85f7fe03d4738
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 8 12:51:38 2016 -0500
need to test combining enumerators for datasets
commit 8eb51a175f4b5eb8dad4c9d5d33773f53cae8765
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 18:21:44 2016 -0500
more additions - still incomplete
commit c1ebe42b725cb8242d9ea00b513aaed4c70db3e8
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 17:43:03 2016 -0500
added method for metadata and info for collection
commit 345bef22e06fb75fdf16638060112322678b7e50
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 17:01:11 2016 -0500
added method for collection outputstream
commit a0560160c4f4f5591571e6d116dec0ce30402cfe
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 16:10:53 2016 -0500
added methods for getting output streams for files
commit c4d391a2e3b193d4a585a688ab30902bf3c72a73
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Mon Sep 5 15:23:11 2016 -0500
new strategy for getting streams - for a dataset or collection a getStream method will take level, file_type as parameters and return the correct stream.
commit 78bfd99a6b793d01c919f3769df2df5b3251a369
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Sun Sep 4 18:14:32 2016 -0500
basic structure for processing streams in place. need method to generate inputStreams
commit 6e2c357b75e8bda223f4e75ae5a91343d57a139e
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 1 20:28:37 2016 -0500
need to figure out how to get inputstream from the enumerator
commit 61bc9e87390f1ae15a21c65399b92cffb8fb25d1
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 1 15:55:27 2016 -0500
started work. new route and method begun.
commit 5de4b085be69b358c1bbf49b2a998a0415859911
Author: Todd Nicholson <tcnichol@illinois.edu>
Date: Thu Sep 1 15:32:31 2016 -0500
started work. new route and method begun.- CHANGELOG.md (version 8bdd889914a07f3e61894c378b4e73f072af04e4) (diffs)
- app/Iterators/BagItIterator.scala (version 8bdd889914a07f3e61894c378b4e73f072af04e4) (diffs)
- app/Iterators/CollectionIterator.scala (version 8bdd889914a07f3e61894c378b4e73f072af04e4) (diffs)
- app/Iterators/DatasetIterator.scala (version 8bdd889914a07f3e61894c378b4e73f072af04e4) (diffs)
- app/Iterators/DatasetsInCollectionIterator.scala (version 8bdd889914a07f3e61894c378b4e73f072af04e4) (diffs)
- app/Iterators/FileIterator.scala (version 8bdd889914a07f3e61894c378b4e73f072af04e4) (diffs)
- app/Iterators/RootCollectionIterator.scala (version 8bdd889914a07f3e61894c378b4e73f072af04e4) (diffs)
- app/api/Collections.scala (version 8bdd889914a07f3e61894c378b4e73f072af04e4) (diffs)
- app/api/Datasets.scala (version 8bdd889914a07f3e61894c378b4e73f072af04e4) (diffs)
- app/controllers/Application.scala (version 8bdd889914a07f3e61894c378b4e73f072af04e4) (diffs)
- app/views/collectionofdatasets.scala.html (version 8bdd889914a07f3e61894c378b4e73f072af04e4) (diffs)
- conf/application.conf (version 8bdd889914a07f3e61894c378b4e73f072af04e4) (diffs)
- conf/routes (version 8bdd889914a07f3e61894c378b4e73f072af04e4) (diffs)
-
Eugene Roeder db1225b92e2ec508a83bc2c6da6f824313edcd7c m
Squashed commit of the following:
commit fa68c15565cbfca24179d18eae3303ae4b36a057
Author: Gene Roeder <eroeder@illinois.edu>
Date: Mon Apr 3 12:42:20 2017 -0500
Added view dataset permission as an additional and clause.
commit 45e122aa6bbd1e29a603b06665ce8ba62dc7b4f4
Author: Gene Roeder <eroeder@illinois.edu>
Date: Mon Mar 20 15:02:19 2017 -0500
Had permissions that needed swapped from previous commit.
commit 912655560eeb2e38d67ebd1b422845ae2cfc782c
Author: Gene Roeder <eroeder@illinois.edu>
Date: Mon Mar 13 14:52:00 2017 -0500
Changes to add the copy dataset feature for non space owners. -
Todd Nicholson <tcnichol@illinois.edu> 0ed7a151bf41f1137476a3e9b21bac74586fbdd9 m
fixed - datasets not in collections will be fixed
-
Todd Nicholson <tcnichol@illinois.edu> af256434b4d2e16d8eb8ee5580f4ff068e393300 m
fixed problem where sub collections spaces not updated
-
Todd Nicholson <tcnichol@illinois.edu> 575154d2a849ef893ed428e507b2d5ec07f366d2 m
better logging
-
Todd Nicholson <tcnichol@illinois.edu> 74db56daba4daad7cfdea946d1b799a1a75d9285 m
Datasets and collections that are in a space are removed from the space before the space is deleted. This way the deleted space id will not be in the spaces.
-
Luigi Marini 85b364996462349c461049a964325fa7aac83fe8 m
Set version to 1.x.
-
Luigi Marini 042ae2cda80cb9956aafec26d61a6dd785c9ec37 m
Merge branch 'master' into develop
-
Luigi Marini 4dfe0981cadd3252965c1f05b14a172e4b94d9b1 m
Increased version to 1.2.0. Clowder now requires Java 8.
-
Luigi Marini b098afc5a28117a27d4167cbaeeb65db98a0311b m
Merge remote-tracking branch 'origin/develop' into develop
-
Max Burnette <mburnet88@gmail.com> e16ccda8be589cdc3035af49b67a9ac0906485d4 m
Remove conflict string
-
Max Burnette <mburnet88@gmail.com> fc9f6786589398c252c82f39d5f41148f60ed9dc m
Merge branch 'develop' into bugfix/SEAD-1108-email-event-setting-3
# Conflicts:
# CHANGELOG.md -
Max Burnette <mburnet88@gmail.com> 1763d603ed5d7231c1a20e5180a9240b49f09b89 m
Add Changelog entry
-
Luigi Marini 8a47cacdb4133c56d8c1f6a8f10a5bea93275856 m
Merge remote-tracking branch 'origin/develop' into develop
-
Luigi Marini bcdb1fd95c151822e7e5c4e9ce5920ed04b6edd3 m
Squashed commit of the following:
commit d947d8da6ea09f70e33f1d690c9f23e64acb87ff
Author: Luigi Marini <lmarini@illinois.edu>
Date: Tue Mar 14 17:21:31 2017 -0500
Added docker hub repository ids change to CHANGELOG.md
commit 5ef6a42db140a850d981b047415cdebcc9d5e6ea
Author: Luigi Marini <lmarini@illinois.edu>
Date: Mon Feb 20 16:50:00 2017 -0600
Fixed docker hub ids for extractors now that they have been moved from ncsa/* to clowder/*. -
Luigi Marini d0242a309f70d9a1921023ea87710cd124e34d52 m
Merge remote-tracking branch 'origin/develop' into develop
-
Rob Kooper 900c5976afd72f8462719434c3b8cc9eaeca6fb0 m
changed path from /tmp/clowder to /home/clowder/data CATS-748 cleanup changelog use full id for filename when using diskbytestorage
-
Jim Myers bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc m
Squashed commit of the following:
commit bf7416c6a57bfe5f60876f9b17eadd9483da0012
Author: Jim Myers <myersjd@umich.edu>
Date: Thu Mar 2 11:10:59 2017 -0500
word-wrapping and summarize for list views
commit 1dbdb54609dd4093275ceb19825a8b2b26cb8486
Author: Jim Myers <myersjd@umich.edu>
Date: Thu Mar 2 11:00:06 2017 -0500
left justify needed when text wraps to stay in bounds, e.g. right column
buttons in list view
commit 74108b72ed3611b7443379cbfaa315f8c5af8e1b
Author: Jim Myers <myersjd@umich.edu>
Date: Thu Mar 2 10:56:10 2017 -0500
fix button labels going out of bounds , e.g. when list view for
Collections in space and you shrink the display width to ~1000px
commit 15bd91883641f1e2c47d2d6f342302d1a687bd98
Author: Jim Myers <myersjd@umich.edu>
Date: Thu Mar 2 10:27:40 2017 -0500
separate styles for full abstract and abstract summaries, apply to all
relevant tile views
commit 62826a684ff05b86e4999987a276ab5d1336a030
Author: Jim Myers <myersjd@umich.edu>
Date: Wed Mar 1 16:44:03 2017 -0500
applying summarization to other tiled displays, using <br> consistently
(since that is what js is picking up even if a / is written...
commit 5334fd30daa673f59e23570cba13380258b93ffd
Author: Jim Myers <myersjd@umich.edu>
Date: Wed Mar 1 16:02:08 2017 -0500
apply scrolling and wrapping to collection descriptions
commit f3af96b218602db4dc841d49c24636c5859d86ce
Author: Jim Myers <myersjd@umich.edu>
Date: Wed Mar 1 15:58:33 2017 -0500
apply new summarization to colection tiles.
commit e937db942f888fca2c06cf1e323186805141ac89
Author: Jim Myers <myersjd@umich.edu>
Date: Wed Mar 1 15:58:10 2017 -0500
dynamic summarization to a default of 8 lines
Conflicts:
public/stylesheets/themes/sead.min.css
commit ec8261c689874ed2e7aed388942b501d3c527d8f
Author: Jim Myers <myersjd@umich.edu>
Date: Wed Mar 1 15:57:08 2017 -0500
fix for descriptions going beyond the tile boundaries in single
column/small displays
Conflicts:
public/stylesheets/main.css
commit 6807308b791183a9fb1db67c18d95245a6a85d44
Author: Jim Myers <myersjd@umich.edu>
Date: Tue Feb 28 15:39:43 2017 -0500
handle \n in description in this view
commit 6280fb4716d9dad49ffb089cc900b04f5c0c4f60
Author: Jim Myers <myersjd@umich.edu>
Date: Fri Feb 3 10:36:15 2017 -0500
remove use of panel css class after edits
commit ba71af64f41f324ffab62ae1b0b379f6a01b7a76
Author: Jim Myers <myersjd@umich.edu>
Date: Thu Feb 2 15:04:57 2017 -0500
changelog entry
commit e1d07c05a7a1cbfb7b9fe3b044b7eba35ce67e65
Author: Jim Myers <myersjd@umich.edu>
Date: Thu Feb 2 14:48:44 2017 -0500
avoiding use of panel, which is theme dependent.
commit f93271097b9725f9829fc014e23263dbef7b5658
Author: Jim Myers <myersjd@umich.edu>
Date: Fri Jan 27 14:30:17 2017 -0500
adding 'abstract' styling for additional tile displays of datasets and
curationobjects and removing ellipsize on multiline fields that can have
special chars (since it can break special chars apart and doesn't
shorten tall descriptions that have few chars but many lines. (Could
replace with a smarter version that just detects css overflow and adds
... or other indicator rather than showing scroll bars.)
commit 06da957c12e2a605d3be8a5ac357448329975290
Author: Jim Myers <myersjd@umich.edu>
Date: Fri Jan 27 12:50:22 2017 -0500
manage how descriptions display in lists
commit 4f1c3bd276f88c32e6fc5367a02dbd19f24128ae
Author: Jim Myers <myersjd@umich.edu>
Date: Fri Jan 27 12:46:43 2017 -0500
fix for cross-browser display issues related to multiple lines, long
lines, vertical position for short descriptions...
commit b3c4335eb0285196fd3c593d3c83f5ea2a2a8f64
Author: Jim Myers <myersjd@umich.edu>
Date: Wed Jan 4 15:18:28 2017 -0500
remove abstract panel border
commit 415086ae2d1b9b76c6fbe4960a0b43282dacf5a1
Author: Jim Myers <myersjd@umich.edu>
Date: Wed Jan 4 15:09:00 2017 -0500
adjusting abstract view to be longer (250px) and without a border
commit 657bfeb53835a70aac050028577b5fed0d119054
Author: Jim Myers <myersjd@umich.edu>
Date: Wed Jan 4 14:59:10 2017 -0500
make creators appear below single line abstract...
commit a436acd49498a3ead7e37c4d465c9c1aa8ce9628
Author: Jim Myers <myersjd@umich.edu>
Date: Tue Jan 3 17:35:27 2017 -0500
yet another typo
commit cfc48807018aa34af2debb0cc38745ec5488d413
Author: Jim Myers <myersjd@umich.edu>
Date: Tue Jan 3 17:22:19 2017 -0500
more typos
commit f7d6d5e57bb2156fa68aeaceb4759e5dcce6d828
Author: Jim Myers <myersjd@umich.edu>
Date: Tue Jan 3 17:14:58 2017 -0500
@html of description...
commit a8387df22b47f9810023a6a9dc9d98443ead742f
Author: Jim Myers <myersjd@umich.edu>
Date: Tue Jan 3 17:04:59 2017 -0500
autoscroll for abstract in curation as in a dataset
commit 4d527e9cf15805b578567bced48bca3ddf4f7814
Author: Jim Myers <myersjd@umich.edu>
Date: Tue Jan 3 17:04:21 2017 -0500
wrap description/abstracts
commit e42cf8e15e5e618e3b6d3e3c4001770f64f44491
Author: Jim Myers <myersjd@umich.edu>
Date: Tue Jan 3 15:21:11 2017 -0500
handle long descriptions and descriptions with long words
commit dec715bd26bb071139feb248b188d09dba47511e
Author: Jim Myers <myersjd@umich.edu>
Date: Tue Jan 3 15:20:31 2017 -0500
making bottom padding consistent for files/datasets/collections in
search results page (and for title bars of files/datasets/collection
pages)
commit d79c57de6a11b521ec867138042a71f1ab17e396
Author: Jim Myers <myersjd@umich.edu>
Date: Tue Jan 3 15:17:38 2017 -0500
standardize display of descriptions with new lines (as <br/>)
drop height-dependent margins which can move results into/above category
labels
commit 0cc40cc66b68b9c36649062d0739ba3e618d191d
Author: Jim Myers <myersjd@umich.edu>
Date: Fri Dec 23 17:50:37 2016 -0500
Handling abstracts that are:
Long,
Multiline
with html special characters
from 1.5 migrations that have additional encoded chars such as ' for
'
Changes to display in dataset, new curation object, curation summary
panels, submitted CO, and staging area displays- CHANGELOG.md (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/controllers/CurationObjects.scala (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/collectionList.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/collectionofdatasets.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/collections/listchildcollection.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/collections/listitem.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/collections/tile.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/curations/newCuration.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/curations/publishedData.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/curations/tile.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/dataset.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/datasetList.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/datasets/listitem.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/datasets/tile.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/searchResults.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/spaces/collectionsTable.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/spaces/curationSummary.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/spaces/datasetsGrid.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/spaces/listItem.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/spaces/listSpaces.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/spaces/space.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/spaces/stagingarea.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/spaces/submittedCurationObject.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- app/views/spaces/tile.scala.html (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- public/javascripts/descriptionSummary.js (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- public/stylesheets/main.css (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
- public/stylesheets/themes/sead.min.css (version bbaad2cc0dc7f2a3fbdcd9bc4613fe6efe0cdddc) (diffs)
-
Jim Myers 84ebff6576f03c253e44dfa4e67a7990ac1738a3 m
Bugfix - next and prev buttons were broken in the main Dataset/Collection lists because sorting is only done within a space and the prev/next buttons should have used the non-sort functions
-
Rob Kooper cd8988192c7384d13c74f5f24f8b81c312ce966e m
disable sorting by default, can be enabled in custom.conf using sortInMemory = true miscalanous bug fixes.
- app/controllers/Collections.scala (version cd8988192c7384d13c74f5f24f8b81c312ce966e) (diffs)
- app/controllers/Datasets.scala (version cd8988192c7384d13c74f5f24f8b81c312ce966e) (diffs)
- app/views/collectionList.scala.html (version cd8988192c7384d13c74f5f24f8b81c312ce966e) (diffs)
- app/views/dataset.scala.html (version cd8988192c7384d13c74f5f24f8b81c312ce966e) (diffs)
- app/views/datasetList.scala.html (version cd8988192c7384d13c74f5f24f8b81c312ce966e) (diffs)
- app/views/datasets/filesAndFolders.scala.html (version cd8988192c7384d13c74f5f24f8b81c312ce966e) (diffs)
- app/views/spaces/collectionsGrid.scala.html (version cd8988192c7384d13c74f5f24f8b81c312ce966e) (diffs)
- app/views/spaces/datasetsGrid.scala.html (version cd8988192c7384d13c74f5f24f8b81c312ce966e) (diffs)
- conf/application.conf (version cd8988192c7384d13c74f5f24f8b81c312ce966e) (diffs)
- conf/routes (version cd8988192c7384d13c74f5f24f8b81c312ce966e) (diffs)
-
Rob Kooper 6df02aaf19cdf6e54fe3e9ce2bdcee1eb310190c m
Merge branch 'feature/sortable' of ssh://opensource.ncsa.illinois.edu:7999/~jimmyers/clowder into features/sortable
-
Jim Myers f6dc374230204f9afdae190f2ef191b8034a6289 m
improving indents...
-
Jim Myers 7bd6952558565fd5e8332b27b0302575eeaf2b05 m
Merge branch 'develop' into feature/sortable
Conflicts:
app/controllers/Datasets.scala
app/views/dataset.scala.html
public/stylesheets/main.css -
Luigi Marini 5df706df4dd082eb989b008d2f09a9c2fdc5ad0c m
Merge pull request #1114 in CATS/clowder from ~JIMMYERS/clowder:bugfix/SEAD-1071-resolve-confusion-around-duplicate to develop
* commit '61b89331c23bf7299b2050a56e8178f539962b86': (28 commits)
trigger use of creator select list option based on availability of stagingarea plugin. Without plugin, entry is simple text.
import needed for Messages
Owner now in Messages
revert conflicting change
merge error
merge fix
replacing import statement dropped in merges
changelog entry
Reset should trigger required field messages as needed.
improving layout
dynamically update error messages for required fields
Make the switch from "Add a description" to "Description:" as a label work when value goes form 0 length to a string and back, and handle the label coming from Messages
reset now resets values to the originals on the Dataset rather than setting things to blank/empty values...
Add labels for description/abstract except in tiles. Switched to use Messages so labels can be configged by projects.
Creator label in dataset goes from "Add creator(s)" when empty to "Creator(s): " when a value(s) exists
replacing "Author" label for creators (coming from c3pr)
another 'Author' to 'Owner'
'Author' to 'Owner' in labels for COs in the staging area
GUI Updates:
update Abstract label
... -
Jim Myers 61b89331c23bf7299b2050a56e8178f539962b86 m
trigger use of creator select list option based on availability of stagingarea plugin. Without plugin, entry is simple text.
- app/api/Metadata.scala (version 61b89331c23bf7299b2050a56e8178f539962b86) (diffs)
- app/controllers/Datasets.scala (version 61b89331c23bf7299b2050a56e8178f539962b86) (diffs)
- app/views/dataset.scala.html (version 61b89331c23bf7299b2050a56e8178f539962b86) (diffs)
- public/javascripts/creators.js (version 61b89331c23bf7299b2050a56e8178f539962b86) (diffs)
-
Max Burnette <mburnet88@gmail.com> 0b4c471b42e8e74355006df5b962929d1536c0cb m
Return list properly when event_type_prefix not found
-
Rob Kooper 27c0071b7326f9fc606066f463cb2a2831694624 m
Merge branch 'feature/sortable' of ssh://opensource.ncsa.illinois.edu:7999/~jimmyers/clowder into features/sortable
-
Jim Myers 866b49dcb4cb89977b6bd31be05ea610d71ad8e3 m
Merge branch 'develop' into feature/sortable
-
Jim Myers df29c0f3aa9cea744482b418fe699cb648e51829 m
import needed for Messages
-
Max Burnette <mburnet88@gmail.com> a3bedc7d84aa7b8ce3ec206f55c599624616a22b m
Change debug log to warning
-
Max Burnette <mburnet88@gmail.com> d99cebe86c485f41b2e46d190e3b48e476462766 m
Add default cases for unhandled event types
-
Max Burnette <mburnet88@gmail.com> 274583c197188defed176b70a3b6f4635fdcdf50 m
Migrate logic from newsfeedCard to newsFeedCardEmail
-
Jim Myers ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c m
Owner now in Messages
- app/api/Comments.scala (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- app/api/Spaces.scala (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- app/views/collectionofdatasets.scala.html (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- app/views/collections/listchildcollection.scala.html (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- app/views/curations/listitem.scala.html (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- app/views/dataset.scala.html (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- app/views/datasets/addFiles.scala.html (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- app/views/datasets/listCurationObjects.scala.html (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- app/views/datasets/listitem.scala.html (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- app/views/spaces/curationSummary.scala.html (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- app/views/spaces/editUsers.scala.html (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- app/views/spaces/stagingarea.scala.html (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- app/views/spaces/submittedCurationObject.scala.html (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- app/views/toolManager.scala.html (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
- conf/messages (version ac1f7c3bedff6b4ccedfabbfdd97cd406ed8637c) (diffs)
-
Luigi Marini 114f31ff3883dc16f7fa5ae9dc26156a9a37a633 m
Merge remote-tracking branch 'origin/develop' into develop
-
Jim Myers 4fc7bfc1490cd1220586e33d5cf1e5b6aa3e741c m
Merge branch 'develop' into bugfix/SEAD-1071-resolve-confusion-around-duplicate
-
Jim Myers e0df25189f67cd6f901bd5d2b8ac7ac21d0b8bdd m
Merge pull request #10 in ~JIMMYERS/clowder from CATS/clowder:develop to develop
* commit '019744cb6e4b76db67610419b1f42d36cda255e0':
fix compile error
docker now only pushes to clowder -
Jim Myers db3767138dc9bd429a07d9af63e0e92264008b6f m
revert conflicting change
-
Jim Myers ab529aa0276c193098ffb2af191c00d26c445e14 m
merge error
-
Jim Myers d57beb0fae5f32dbaab43ea6bb8876f74f67091f m
minimal update so that the lists of datasets and collections in a space (which are sorted) will show the public datasets when the user is not logged in /doesn't have access. Presumably this changes as sort moves to DB.
- app/controllers/Collections.scala (version d57beb0fae5f32dbaab43ea6bb8876f74f67091f) (diffs)
- app/controllers/Datasets.scala (version d57beb0fae5f32dbaab43ea6bb8876f74f67091f) (diffs)
- app/services/CollectionService.scala (version d57beb0fae5f32dbaab43ea6bb8876f74f67091f) (diffs)
- app/services/mongodb/MongoDBCollectionService.scala (version d57beb0fae5f32dbaab43ea6bb8876f74f67091f) (diffs)
- app/views/spaces/datasetsGrid.scala.html (version d57beb0fae5f32dbaab43ea6bb8876f74f67091f) (diffs)
- conf/routes (version d57beb0fae5f32dbaab43ea6bb8876f74f67091f) (diffs)
-
Jim Myers ecdd303d183ca29ad5d5886363fbb72b1682ee5b m
post-merge fixes for compile errors...
- app/controllers/Collections.scala (version ecdd303d183ca29ad5d5886363fbb72b1682ee5b) (diffs)
- app/controllers/Datasets.scala (version ecdd303d183ca29ad5d5886363fbb72b1682ee5b) (diffs)
- app/views/spaces/collectionsGrid.scala.html (version ecdd303d183ca29ad5d5886363fbb72b1682ee5b) (diffs)
- app/views/spaces/datasetsGrid.scala.html (version ecdd303d183ca29ad5d5886363fbb72b1682ee5b) (diffs)
-
Jim Myers 5de3139a843f1f670c197805207aac93f9c45bc1 m
Merge branch 'develop' into feature/sortable
Conflicts:
app/controllers/Collections.scala
app/controllers/Datasets.scala
app/views/collectionList.scala.html
app/views/datasetList.scala.html
app/views/spaces/collectionsGrid.scala.html
app/views/spaces/datasetsGrid.scala.html
conf/routes -
Jim Myers 4a36e51ca1f0dc348cd2de9d186a1d47246e881f m
merge fix
-
Jim Myers 7ce81778c5db1f85c39a0290bca28237ee39cb0a m
Merge branch 'develop' into bugfix/SEAD-1071-resolve-confusion-around-duplicate
Conflicts:
app/controllers/CurationObjects.scala
app/views/curations/newCuration.scala.html
app/views/spaces/submittedCurationObject.scala.html -
Jim Myers 473bb347b4adbfeb700addbfc60fd56b1240a13c m
replacing import statement dropped in merges
-
Jim Myers 31441563b9a9e1faa022c4cabfc82771920d2e77 m
changelog entry
-
Jim Myers 2cb4f01cb85aee80f41e1a3b0ccc9b651e053a36 m
Merge branch 'develop' into bugfix/SEAD-1071-resolve-confusion-around-duplicate
Conflicts:
app/api/Metadata.scala
app/services/mongodb/MongoDBDatasetService.scala
public/javascripts/people.js -
Jim Myers 496d0a82e66ee9fbe2b93fdcc6a0b82a8871ced8 m
Reset should trigger required field messages as needed.
-
Jim Myers 28708ecb9e6e45660572fa38d194b0e46cc2ffec m
improving layout
-
Jim Myers 6490e37df9b6d18ca3fc748c496e055ab0d9ba02 m
dynamically update error messages for required fields
-
Jim Myers fbea97daaaa17928de4f9bb20e525411ffeaca0b m
Make the switch from "Add a description" to "Description:" as a label work when value goes form 0 length to a string and back, and handle the label coming from Messages
-
Jim Myers 994b2e49f3f207bc685481d810efbbd6aa47777d m
reset now resets values to the originals on the Dataset rather than setting things to blank/empty values...
-
Luigi Marini 2454a019f122c426bc400a3b8452a78988cb1dcc m
Merge branch 'master' into develop
# Conflicts:
# project/Build.scala -
Jim Myers f2578ae18033f1ca07fba2312777713450aea6e8 m
Add labels for description/abstract except in tiles. Switched to use Messages so labels can be configged by projects.
- app/views/curations/newCuration.scala.html (version f2578ae18033f1ca07fba2312777713450aea6e8) (diffs)
- app/views/dataset.scala.html (version f2578ae18033f1ca07fba2312777713450aea6e8) (diffs)
- app/views/spaces/curationSummary.scala.html (version f2578ae18033f1ca07fba2312777713450aea6e8) (diffs)
- app/views/spaces/submittedCurationObject.scala.html (version f2578ae18033f1ca07fba2312777713450aea6e8) (diffs)
- conf/messages (version f2578ae18033f1ca07fba2312777713450aea6e8) (diffs)
-
Jim Myers 2373700079906b13787d2125997b5c542d3215f5 m
Creator label in dataset goes from "Add creator(s)" when empty to "Creator(s): " when a value(s) exists
-
Jim Myers 722fe2e4a04e7491d24390ff310462bd75d7a8f9 m
Merge branch 'develop' into bugfix/SEAD-1071-resolve-confusion-around-duplicate
-
Jim Myers bad4358696415d6bd192970295c82a9d639a80d1 m
replacing "Author" label for creators (coming from c3pr)
-
Jim Myers d3fdf630a72ded1853afef9db7134c8fa28299b2 m
right justify sort in file/folder view, matching other views
-
Jim Myers 35f36e4ec84efc7b424783b492b0aea30ea91ec3 m
another 'Author' to 'Owner'
-
Jim Myers 3e0b7ea02375b75759a8e8d91ebb0ede72ac25c5 m
'Author' to 'Owner' in labels for COs in the staging area
-
Jim Myers 0624b965fae384ae4b5fa92b98c97009e43e06db m
GUI Updates:
move creators above description.
Use a disappearing "Add creators" label when no creators have been added
Fix so "Add description" reappears when description is empty
Autofocus on creators or description when starting to edit.
Improve spacing and wrapping with commas in summary.- app/views/curations/newCuration.scala.html (version 0624b965fae384ae4b5fa92b98c97009e43e06db) (diffs)
- app/views/dataset.scala.html (version 0624b965fae384ae4b5fa92b98c97009e43e06db) (diffs)
- app/views/spaces/curationSummary.scala.html (version 0624b965fae384ae4b5fa92b98c97009e43e06db) (diffs)
- public/javascripts/creators.js (version 0624b965fae384ae4b5fa92b98c97009e43e06db) (diffs)
- public/stylesheets/main.css (version 0624b965fae384ae4b5fa92b98c97009e43e06db) (diffs)
-
Jim Myers 63bcc7a8cfcf15a8625bccf5a975f224e1117926 m
update Abstract label
-
Jim Myers 4d4efd68e4e9e4b65e14302a4672b82589eeabdc m
update to identify "Creator" as an ordered list per the JSON-LD spec
-
Jim Myers f58dbaf0c5a2637aa5dec7db02f74e59d0710a17 m
missing people.js script
-
Jim Myers 59cf1e702a764012c48c554a1d1fb684366c64bb m
another creator to owner label change
-
Jim Myers e1acfc4170447b4ead9f2cc4b80c93baf7ac0689 m
further updates to naming/organization of info in the various publication workflow steps
- app/views/spaces/curationObject.scala.html (version e1acfc4170447b4ead9f2cc4b80c93baf7ac0689) (diffs)
- app/views/spaces/curationSummary.scala.html (version e1acfc4170447b4ead9f2cc4b80c93baf7ac0689) (diffs)
- app/views/spaces/matchmakerResult.scala.html (version e1acfc4170447b4ead9f2cc4b80c93baf7ac0689) (diffs)
- app/views/spaces/submittedCurationObject.scala.html (version e1acfc4170447b4ead9f2cc4b80c93baf7ac0689) (diffs)
-
Jim Myers c28fc5ab10a0398059fcf672c7f9a718bbc93dc8 m
error check if people.uri is not set
-
Jim Myers e34a9708c3860d4a4de6d7436d95d9237305ba49 m
set a min-width for sort box so choice isn't truncated...
-
Jim Myers d036b2c4114d69b4403c1444651d54553718a590 m
Tightening spacing in select2 sort lists
-
Jim Myers 169e7bee5508786cc4ba208cdbb0be6c427e2b8f m
typo in creator delete from curation object
-
Jim Myers 0c8d57e61d3f8042932901b89feef05e6cbe3f74 m
Merge remote-tracking branch 'origin/develop' into bugfix/SEAD-1071-resolve-confusion-around-duplicate
-
Jim Myers 0d976238f7f78a5a316dc59ec50800fa8b986c8f m
Updates to support adding an ordered list of creators for datasets and creation objects.
The Dataset and CO models for creators are the same and the display and
edit capabilities are ~consistent across the various pages.
Note that this update fixes an unreported issue - creator names added to
a Curation Object that contain a comma (e.g. "Bob, Jr.") were split into
multiple creators once saved- app/api/Metadata.scala (version 0d976238f7f78a5a316dc59ec50800fa8b986c8f) (diffs)
- app/controllers/Application.scala (version 0d976238f7f78a5a316dc59ec50800fa8b986c8f) (diffs)
- app/controllers/CurationObjects.scala (version 0d976238f7f78a5a316dc59ec50800fa8b986c8f) (diffs)
- app/controllers/Datasets.scala (version 0d976238f7f78a5a316dc59ec50800fa8b986c8f) (diffs)
- app/views/curations/newCuration.scala.html (version 0d976238f7f78a5a316dc59ec50800fa8b986c8f) (diffs)
- app/views/dataset.scala.html (version 0d976238f7f78a5a316dc59ec50800fa8b986c8f) (diffs)
- app/views/spaces/curationSummary.scala.html (version 0d976238f7f78a5a316dc59ec50800fa8b986c8f) (diffs)
- conf/routes (version 0d976238f7f78a5a316dc59ec50800fa8b986c8f) (diffs)
- public/javascripts/creators.js (version 0d976238f7f78a5a316dc59ec50800fa8b986c8f) (diffs)
- public/javascripts/curation-create.js (version 0d976238f7f78a5a316dc59ec50800fa8b986c8f) (diffs)
- public/javascripts/people.js (version 0d976238f7f78a5a316dc59ec50800fa8b986c8f) (diffs)
- public/stylesheets/main.css (version 0d976238f7f78a5a316dc59ec50800fa8b986c8f) (diffs)
-
Jim Myers 60e318c82fdab2e1783ff4e12a6b95dd63a66264 m
Merge remote-tracking branch 'origin/feature/SEAD-1126-show-creator-contact-ids-as-name-url-email' into bugfix/SEAD-1071-resolve-confusion-around-duplicate
-
Jim Myers c2410c5f92305085e15c439b0c1700f76b15c88b m
initial changes to address SEAD-1071
including moving Creator to a list managed as part of the dataset model
and basic add/delete/reorder capability for the creator list in the api
and gui.
Also updated labels for Owner, removed abtract adn keywords from default
metadata, etc.- app/api/Datasets.scala (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- app/controllers/Application.scala (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- app/models/Dataset.scala (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- app/models/MetadataDefinition.scala (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- app/services/DatasetService.scala (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- app/views/collectionofdatasets.scala.html (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- app/views/collections/listchildcollection.scala.html (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- app/views/curations/listitem.scala.html (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- app/views/dataset.scala.html (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- app/views/datasets/addFiles.scala.html (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- app/views/datasets/listitem.scala.html (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- app/views/toolManager.scala.html (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- conf/routes (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
- public/stylesheets/main.css (version c2410c5f92305085e15c439b0c1700f76b15c88b) (diffs)
-
Jim Myers 8abefd5df1dfb9160ffb17dd8f51588efcc2f66f m
removing filter type-in in sort by lists
- app/views/collectionList.scala.html (version 8abefd5df1dfb9160ffb17dd8f51588efcc2f66f) (diffs)
- app/views/collectionofdatasets.scala.html (version 8abefd5df1dfb9160ffb17dd8f51588efcc2f66f) (diffs)
- app/views/datasetList.scala.html (version 8abefd5df1dfb9160ffb17dd8f51588efcc2f66f) (diffs)
- app/views/datasets/filesAndFolders.scala.html (version 8abefd5df1dfb9160ffb17dd8f51588efcc2f66f) (diffs)
-
Jim Myers 3e245e5a13843e15b6fe289b19f7e6c1144dde01 m
Shortening labels for sort by for dates...
- app/views/collectionList.scala.html (version 3e245e5a13843e15b6fe289b19f7e6c1144dde01) (diffs)
- app/views/collectionofdatasets.scala.html (version 3e245e5a13843e15b6fe289b19f7e6c1144dde01) (diffs)
- app/views/datasetList.scala.html (version 3e245e5a13843e15b6fe289b19f7e6c1144dde01) (diffs)
- app/views/datasets/filesAndFolders.scala.html (version 3e245e5a13843e15b6fe289b19f7e6c1144dde01) (diffs)
-
Jim Myers e87077dffbc843f1f61df42667bfa91e952f8169 m
fixed places where the existence of a sort-order cookie was assumed
- app/views/collectionList.scala.html (version e87077dffbc843f1f61df42667bfa91e952f8169) (diffs)
- app/views/collectionofdatasets.scala.html (version e87077dffbc843f1f61df42667bfa91e952f8169) (diffs)
- app/views/datasetList.scala.html (version e87077dffbc843f1f61df42667bfa91e952f8169) (diffs)
- app/views/datasets/filesAndFolders.scala.html (version e87077dffbc843f1f61df42667bfa91e952f8169) (diffs)
-
Jim Myers d49caf3273d9fece64e5666067b6c5ef5d13319b m
sorting of datasets in a space
also made date/newest first the default if there's no sort-order cookie
and updated all sort functions to take a sort String rather than an
Option- app/controllers/Application.scala (version d49caf3273d9fece64e5666067b6c5ef5d13319b) (diffs)
- app/controllers/Collections.scala (version d49caf3273d9fece64e5666067b6c5ef5d13319b) (diffs)
- app/controllers/Datasets.scala (version d49caf3273d9fece64e5666067b6c5ef5d13319b) (diffs)
- app/util/SortingUtils.scala (version d49caf3273d9fece64e5666067b6c5ef5d13319b) (diffs)
- app/views/datasetList.scala.html (version d49caf3273d9fece64e5666067b6c5ef5d13319b) (diffs)
- app/views/spaces/datasetsGrid.scala.html (version d49caf3273d9fece64e5666067b6c5ef5d13319b) (diffs)
- conf/routes (version d49caf3273d9fece64e5666067b6c5ef5d13319b) (diffs)
-
Jim Myers 106c43f1566c6bf4862e48a6efbe06b58d088fe7 m
moving sorting functions to a util class
-
Jim Myers 547f55a7773dfdcda2b630562eef8f9ff775adfe m
sort ordering for child collections and datasets in a collection....
- app/controllers/Collections.scala (version 547f55a7773dfdcda2b630562eef8f9ff775adfe) (diffs)
- app/views/collectionList.scala.html (version 547f55a7773dfdcda2b630562eef8f9ff775adfe) (diffs)
- app/views/collectionofdatasets.scala.html (version 547f55a7773dfdcda2b630562eef8f9ff775adfe) (diffs)
- public/stylesheets/main.css (version 547f55a7773dfdcda2b630562eef8f9ff775adfe) (diffs)
-
Jim Myers 2d9fc9681785bcd3ac2396a65f77e9497ad84dec m
shift the collection sort box to the right to stay with grid/list buttons
-
Jim Myers ad550eb0a092477c96d31c72c4557e4b896cfaf9 m
to use cookie rather than passed parameter for sort order for sorting of files and folders in dataset
- app/controllers/Datasets.scala (version ad550eb0a092477c96d31c72c4557e4b896cfaf9) (diffs)
- app/controllers/Folders.scala (version ad550eb0a092477c96d31c72c4557e4b896cfaf9) (diffs)
- app/views/dataset.scala.html (version ad550eb0a092477c96d31c72c4557e4b896cfaf9) (diffs)
- app/views/datasets/filesAndFolders.scala.html (version ad550eb0a092477c96d31c72c4557e4b896cfaf9) (diffs)
- app/views/folders/listitem.scala.html (version ad550eb0a092477c96d31c72c4557e4b896cfaf9) (diffs)
- conf/routes (version ad550eb0a092477c96d31c72c4557e4b896cfaf9) (diffs)
