Build: #3 was successful Changes by Brock Angelo
Code commits
clowder
-
Brock Angelo 1bb03fc7f230d7fc0112a801d13bb75f96779146
Merge branch 'develop' into feature/IMLCZO-96-use-a-defined-vocabulary-for-the
-
Luigi Marini 59a301926c3ab27f2a7b9014c9932fde18965432 m
Merge pull request #707 in CATS/clowder from bugfix/CATS-337-modify-ore-map-as-needed to develop
* commit '5cc18b5832dd5a724da2efb1df4c1ae46ea05b59':
Rolling back change of creator to uploaded by. -
Indira Gutierrez Polo 5cc18b5832dd5a724da2efb1df4c1ae46ea05b59 m
Rolling back change of creator to uploaded by.
-
Luigi Marini 7519a03f60d5d52bd19b01bd57581b970eb13de9 m
Merge pull request #706 in CATS/clowder from bugfix/CATS-337-modify-ore-map-as-needed to develop
* commit '971cff41e0dc12575538b648245847d9b1a9790a':
Updating ORE Map
Updating ORE Map
Some ORE Map updates. -
Indira Gutierrez Polo 971cff41e0dc12575538b648245847d9b1a9790a m
Updating ORE Map
-
Rob Kooper 4a8689a82914ade5f4544164998b3c8ddbfba75a m
Merge pull request #695 in CATS/clowder from tests-fix to develop
* commit 'bf915b9845ea76aebd5fcec5ed6ebdda1e0d566f':
make sure return is 200 -
Indira Gutierrez Polo 31215c72db0af386d1226b0c64a4bef5df907ff1 m
Updating ORE Map
-
Indira Gutierrez Polo 938fa7672c47a79a249ee7a4347cdc1fed13bf8b m
Some ORE Map updates.
- app/api/CurationObjects.scala (version 938fa7672c47a79a249ee7a4347cdc1fed13bf8b) (diffs)
- app/api/Users.scala (version 938fa7672c47a79a249ee7a4347cdc1fed13bf8b) (diffs)
- app/controllers/Application.scala (version 938fa7672c47a79a249ee7a4347cdc1fed13bf8b) (diffs)
- app/controllers/CurationObjects.scala (version 938fa7672c47a79a249ee7a4347cdc1fed13bf8b) (diffs)
-
Luigi Marini 74020a94d095867c4d0a8fde3326a888a9e2d03a m
Merge pull request #700 in CATS/clowder from bugfix/CATS-340-users-can-add-datasets-they-don-t to develop
* commit 'e1426a8fd6de5e0a95ccad08468a6d3e1439ef7c':
Added support for CurationFiles to Permission.checkOwner.
return all spaces/collections the user can write to.
return anonymous
remove leftover code.
fix api calls
check user.id not email
documentation
only owner can add to space/collection -
Luigi Marini e1426a8fd6de5e0a95ccad08468a6d3e1439ef7c m
Added support for CurationFiles to Permission.checkOwner.
-
Rob Kooper fed9e3654fbb4eb4df00588bd9615e84a2d59aa9 m
return all spaces/collections the user can write to.
-
Rob Kooper 035064e7d8fc6168a7febdfc3781b6124ba7fd61 m
return anonymous
- app/api/Collections.scala (version 035064e7d8fc6168a7febdfc3781b6124ba7fd61) (diffs)
- app/api/Permissions.scala (version 035064e7d8fc6168a7febdfc3781b6124ba7fd61) (diffs)
- app/api/Spaces.scala (version 035064e7d8fc6168a7febdfc3781b6124ba7fd61) (diffs)
- app/services/mongodb/MongoDBUserService.scala (version 035064e7d8fc6168a7febdfc3781b6124ba7fd61) (diffs)
-
Rob Kooper 4e5440b6b6e702a582f15866349b686a643a438a m
remove leftover code.
-
Rob Kooper 51a1f5e339cad51b7308f322c73c5ccd526086db m
fix api calls
- app/api/Collections.scala (version 51a1f5e339cad51b7308f322c73c5ccd526086db) (diffs)
- app/api/Spaces.scala (version 51a1f5e339cad51b7308f322c73c5ccd526086db) (diffs)
- app/services/CollectionService.scala (version 51a1f5e339cad51b7308f322c73c5ccd526086db) (diffs)
- app/services/SpaceService.scala (version 51a1f5e339cad51b7308f322c73c5ccd526086db) (diffs)
- app/services/mongodb/MongoDBCollectionService.scala (version 51a1f5e339cad51b7308f322c73c5ccd526086db) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version 51a1f5e339cad51b7308f322c73c5ccd526086db) (diffs)
-
Rob Kooper aaabd774c6fe19b59a515a35f6119340deb3a70b m
check user.id not email
twitter does not have email. -
Rob Kooper a2d54fca30454d26caca5711d0a18e74562cbd39 m
documentation
-
Rob Kooper cff6e95782aee19135dad27c8536de62edeec967 m
only owner can add to space/collection
-
Yan Zhao d857380aef7167428a77c73029268fb7db3d5abe m
update the logic of space banner & logo
-
Luigi Marini 48bfdc381b3d94956570e0e92bd261c192991d53 m
Merge pull request #691 in CATS/clowder from feature/CATS-176-move-sensors-configuration-from to develop
* commit '98cc246ff3e1783639a73306e19ae6ddfa49f5a4':
add form-control to input fields
Fixes CATS-176 -
Luigi Marini a1e072ef10d4ca8bb118bc75d94539e51740773a m
Merge pull request #687 in CATS/clowder from feature/IMLCZO-91-on-the-clowder-sensor-edit-form to develop
* commit 'fb4c8815d117c7f63ecc01ce0abcd930c25ba00e':
recenter the map when the user drags the marker
recenter map when user interacts with either of the input fields
Fixes IMLCZO-91. Consolidates the map logic into a separate file used by create and edit forms. -
Brock Angelo fb4c8815d117c7f63ecc01ce0abcd930c25ba00e m
recenter the map when the user drags the marker
-
Brock Angelo 565a851eccdcaeb2504634ade2d0c4d200f4b38c m
recenter map when user interacts with either of the input fields
-
Brock Angelo 98cc246ff3e1783639a73306e19ae6ddfa49f5a4 m
add form-control to input fields
-
Brock Angelo f5cd4379b05c10a871e02a1ddb7232a4bad7f2b5 m
fix for delete button for logged in user
-
Brock Angelo 2e3bc4aba2fb30d73fce80fb8c452ee40dfddf63 m
if the form was ever invalidated, a new attempted wouldn't have ever set this back to true.
-
Brock Angelo 69817d0dbf5796fa9ac8a557f317ad5bd0787c32 m
update error labels to red
-
Brock Angelo 38a03d9032029d3a89c263e22cbe033b407ab528 m
resolve merge conflict
-
Luigi Marini 7654c07899c25eeddd62c3de69ac9bc29b2b68d9 m
Merge pull request #690 in CATS/clowder from feature/CATS-320-consolidate-duplicate-code-for-sensor to develop
* commit 'bada9f3f9b0ea76ae27ef836c40d623195c124ac':
consolidate the stream-form into a separate handlebars file -
Luigi Marini e373b547161f7ddf7f261e9c7df2a56517f0eb80 m
Merge pull request #682 in CATS/clowder from bugfix/CATS-309-avoid-page-refresh-after-adding to develop
* commit '1ea9969c02a4c9bdb116eb9a15d7635c511bdb3e':
Fixing adding metadata on the curation page.
Adding it to files.
Modifying add metadata to not reload the page. -
Rob Kooper 4738d619569911a4c615d624f71415771181ec33 m
fix save of file
lot cleaner using Java 7 functions, now works with any input stream. -
Luigi Marini f1a0c191ba0f93f78f0c2f5575ee436231e4f03e m
Merge pull request #676 in CATS/clowder from feature/CATS-270-description-in-datasets-can-contain to develop
* commit '96632f38e2f3a7474b3de44f2fedcbe7e8820d52':
Adding mouseleave events when cancel or editing descriptions. Moving on document ready to already existing one.
encode description
space before add
width of tag in dataset
width of tag in dataset
render URLs in description of dataset -
Luigi Marini b73ff9734aefea26adddc2581e1efe117ea5c02b m
Merge pull request #681 in CATS/clowder from bugfix/CATS-247-add-title-and-spacing-between-tags to develop
* commit '8dce69f8c1d8f74eea824b61ce219925511db173':
Moving metadata to search menu. Adding title to tags pages. Adding padding between tags in weighted tags page. -
Rob Kooper bf915b9845ea76aebd5fcec5ed6ebdda1e0d566f m
make sure return is 200
Tests were failing because the post is assumed to succeed. If not 200
it will return an empty string. -
Indira Gutierrez Polo 1ea9969c02a4c9bdb116eb9a15d7635c511bdb3e m
Fixing adding metadata on the curation page.
- app/views/dataset.scala.html (version 1ea9969c02a4c9bdb116eb9a15d7635c511bdb3e) (diffs)
- app/views/file.scala.html (version 1ea9969c02a4c9bdb116eb9a15d7635c511bdb3e) (diffs)
- app/views/metadatald/addMetadata.scala.html (version 1ea9969c02a4c9bdb116eb9a15d7635c511bdb3e) (diffs)
- app/views/metadatald/viewDataset.scala.html (version 1ea9969c02a4c9bdb116eb9a15d7635c511bdb3e) (diffs)
- app/views/metadatald/viewFile.scala.html (version 1ea9969c02a4c9bdb116eb9a15d7635c511bdb3e) (diffs)
- app/views/spaces/curationObject.scala.html (version 1ea9969c02a4c9bdb116eb9a15d7635c511bdb3e) (diffs)
-
Brock Angelo aa10b317d495c293aa4b099940bdaee2d56ac7a3 m
update the create and edit forms to store the sensor type. It is setup in javascript so that we can later pull this from the sensor configuration (I have another open task for that).
- app/views/geostreams/create.scala.html (version aa10b317d495c293aa4b099940bdaee2d56ac7a3) (diffs)
- app/views/geostreams/edit.scala.html (version aa10b317d495c293aa4b099940bdaee2d56ac7a3) (diffs)
- public/javascripts/geostreams/sensorCreate.js (version aa10b317d495c293aa4b099940bdaee2d56ac7a3) (diffs)
- public/javascripts/geostreams/sensorStreamEdit.js (version aa10b317d495c293aa4b099940bdaee2d56ac7a3) (diffs)
-
Brock Angelo 6500c2940fa58d9b3ab5273580b9db75bf8e86e9 m
Fixes IMLCZO-91. Consolidates the map logic into a separate file used by create and edit forms.
- app/views/geostreams/create.scala.html (version 6500c2940fa58d9b3ab5273580b9db75bf8e86e9) (diffs)
- app/views/geostreams/edit.scala.html (version 6500c2940fa58d9b3ab5273580b9db75bf8e86e9) (diffs)
- public/javascripts/geostreams/sensorCreate.js (version 6500c2940fa58d9b3ab5273580b9db75bf8e86e9) (diffs)
- public/javascripts/geostreams/sensorEdit.js (version 6500c2940fa58d9b3ab5273580b9db75bf8e86e9) (diffs)
- public/javascripts/geostreams/sensorStreamEdit.js (version 6500c2940fa58d9b3ab5273580b9db75bf8e86e9) (diffs)
- public/javascripts/geostreams/updateMap.js (version 6500c2940fa58d9b3ab5273580b9db75bf8e86e9) (diffs)
-
Indira Gutierrez Polo 108db376fc9df6499869d4840cc6999750ec6d6d m
Adding it to files.
-
Indira Gutierrez Polo a387672dfbc5f701838f65d6b49b61c8d6b05ecb m
Modifying add metadata to not reload the page.
-
Indira Gutierrez Polo 96632f38e2f3a7474b3de44f2fedcbe7e8820d52 m
Adding mouseleave events when cancel or editing descriptions. Moving on document ready to already existing one.
-
Indira Gutierrez Polo 8dce69f8c1d8f74eea824b61ce219925511db173 m
Moving metadata to search menu. Adding title to tags pages. Adding padding between tags in weighted tags page.
- app/views/main.scala.html (version 8dce69f8c1d8f74eea824b61ce219925511db173) (diffs)
- app/views/tagList.scala.html (version 8dce69f8c1d8f74eea824b61ce219925511db173) (diffs)
- app/views/tagListChar.scala.html (version 8dce69f8c1d8f74eea824b61ce219925511db173) (diffs)
- public/stylesheets/main.css (version 8dce69f8c1d8f74eea824b61ce219925511db173) (diffs)
-
Michal Ondrejcek 298f91202338432e4ee4ad22a61b84612902d9e3 m
Merge branch 'feature/CATS-101-notify-user-if-user-is-add-removed' of https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/clowder into feature/CATS-101-notify-user-if-user-is-add-removed
-
Michal Ondrejcek bde9a3b5e06acb4b95b60d596965e75ad0cfdedf m
Add event message to user's profile.
-
Michal Ondrejcek 2491d8b5e5d2b5f14fd994b01d66e317070cd4d7 m
Add event message to user's profile.
-
Yan Zhao 892ed311e3520e53b4e15a130c993e4839c588ae m
encode description
-
Yan Zhao e2be015efd2f8b357758975d2217cd4ef3f180a1 m
space before add
-
Yan Zhao 6ea59c721e2ad5ed9c753bd502b0902d3824f6ad m
width of tag in dataset
-
Yan Zhao 2f9588e0b3de10eb4932952540d2f6483511cb69 m
width of tag in dataset
-
Yan Zhao 6ba9abeb8b4b1776e3c34377357eda0343bfe153 m
render URLs in description of dataset