clowder

• 

  Todd Nicholson <tcnichol@illinois.edu> 18 Feb 2016 cee785941f6b5ccab1eddae807b9d8088d40b6b3

  Merge branch 'develop' into features/vocabularies
  # Conflicts:
  #        app/api/Collections.scala
  #        app/services/DI.scala
• 

  Indira Gutierrez Polo 18 Feb 2016 f9a7401aba1e05b305238f01d5abea7b4ddf8d36 m

  Fix error in merge.

  • app/controllers/Collections.scala (version f9a7401aba1e05b305238f01d5abea7b4ddf8d36) (diffs)
• 

  Indira Gutierrez Polo 18 Feb 2016 d92e9d94e876368719cdca3b052456ac8f4aa1d1 m

  Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-367-hierarchical-folders-in-datasets
  # Conflicts:
  #        app/api/Collections.scala
  #        app/controllers/Collections.scala
  #        app/services/CollectionService.scala
• 

  Indira Gutierrez Polo 18 Feb 2016 77cb1646aff0172e3f09612eb8bf416523897058 m

  Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-367-hierarchical-folders-in-datasets
  # Conflicts:
  #        app/views/dataset.scala.html
• 

  Luigi Marini 18 Feb 2016 71e455fd19b76dbf89df8f883efb2a45ec1d50c0 m

  Merge branch 'develop' into merge/final-merge-develop-nested-collections
  # Conflicts:
  #        app/views/collectionofdatasets.scala.html
• 

  Luigi Marini 18 Feb 2016 2221d3e9e7f6f12ae506466bf352b98685c5237c m

  Merge pull request #742 in CATS/clowder from bugfix/CATS-428-sensor-edit-form-is-broken to develop
  * commit 'db0905814d367b157e607f292e3bc2c8d5de2d1c':
    fixes CATS-428 adds the ability to get the path to a file in /public from inside a javascript file
• 

  Rob Kooper 17 Feb 2016 240f28b39e5a53e1c3332aeef545db918b059cf8 m

  force logo to be 1 textline

  • app/views/main.scala.html (version 240f28b39e5a53e1c3332aeef545db918b059cf8) (diffs)
• 

  Indira Gutierrez Polo 17 Feb 2016 34612eb4fab1234278f617b2692101c0c6989cab m

  Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-367-hierarchical-folders-in-datasets
  # Conflicts:
  #        app/services/DI.scala
  #        public/stylesheets/main.css
• 

  Luigi Marini 17 Feb 2016 810ce8bebb1e7c50fc63fc9d4f8d611f500ba805 m

  Merge pull request #749 in CATS/clowder from feature/CATS-381-remove-notes to develop
  * commit 'a2c04e9d23ebbabf4316f6db16b521890b985708':
    add notesHtml to models for MongoDB compatibility reasons
    remove tinyemc editor init
    removed notesHtml from curationObject file
    removed NotesHTML from file model
    remove Notes and related code including endpoints
• 

  Michal Ondrejcek 17 Feb 2016 a2c04e9d23ebbabf4316f6db16b521890b985708 m

  add notesHtml to models for MongoDB compatibility reasons

  • app/models/CurationObject.scala (version a2c04e9d23ebbabf4316f6db16b521890b985708) (diffs)
  • app/models/Dataset.scala (version a2c04e9d23ebbabf4316f6db16b521890b985708) (diffs)
  • app/models/File.scala (version a2c04e9d23ebbabf4316f6db16b521890b985708) (diffs)
• 

  Yan Zhao 17 Feb 2016 b8de0a3434900cb58420592f08b3a4294e962762 m

  merge

  • app/services/mongodb/MongoSalatPlugin.scala (version b8de0a3434900cb58420592f08b3a4294e962762) (diffs)
• 

  Yan Zhao 17 Feb 2016 170b07d93e7083b6c46098a955c96d4a1bc5b27f m

  merge

  • app/services/mongodb/MongoSalatPlugin.scala (version 170b07d93e7083b6c46098a955c96d4a1bc5b27f) (diffs)
• 

  Yan Zhao 17 Feb 2016 fc25ed74edd0bbe130e7f319703989021c40a1a9 m

  Merge remote-tracking branch 'origin/develop' into bugfix/CATS-391-clean-up-list-of-preference-in-staging
  # Conflicts:
  #        app/services/mongodb/MongoSalatPlugin.scala
• 

  Luigi Marini 17 Feb 2016 9059d1c71cca777e3e3bcf94a4ef9ffd14ade0b3 m

  Merge pull request #741 in CATS/clowder from feature/CATS-377-add-create-dataset-collections-spaces to develop
  * commit '7e3d7b4dcbb0f4a312c1606669d16982678c6a06':
    profile icon added
    removed col-md-12 class to remove extra indentation
    remove Create Collection and Dataset from Grid and add them to the top bar
    add Create button links to Home page
• 

  Luigi Marini 17 Feb 2016 ff531f1ec841cf593716f3bb8bfd568571ca917f m

  Merge pull request #736 in CATS/clowder from bugfix/CATS-417-add-date-to-curation-object-tile to develop
  * commit '43c0284345c9d18105c1c4dfeb8d6eb72024cda3':
    Update app/views/spaces/stagingarea.scala.html
    created
    wordwrap for status table
    btn-link for update status
    Uploaded data format; navigation
    upload
    add time &author for curation
• 

  Indira Gutierrez Polo 17 Feb 2016 7e3d7b4dcbb0f4a312c1606669d16982678c6a06 m

  Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-377-add-create-dataset-collections-spaces
  # Conflicts:
  #        app/views/home.scala.html
• 

  Rob Kooper 17 Feb 2016 5c792585188a7921dc78c5dbaf05d8e1f9565098 m

  Merge remote-tracking branch 'origin/develop' into bugfix/CATS-382-ability-to-specify-logo-and-favicon
• 

  Yan Zhao 17 Feb 2016 43c0284345c9d18105c1c4dfeb8d6eb72024cda3 m

  Update app/views/spaces/stagingarea.scala.html

  • app/views/spaces/stagingarea.scala.html (version 43c0284345c9d18105c1c4dfeb8d6eb72024cda3) (diffs)
• 

  Yan Zhao 17 Feb 2016 8c7fcfd425cb9fe32be0265230b80e3b804e3cfe m

  created

  • app/views/datasets/listCurationObjects.scala.html (version 8c7fcfd425cb9fe32be0265230b80e3b804e3cfe) (diffs)
  • app/views/spaces/curation_summary.scala.html (version 8c7fcfd425cb9fe32be0265230b80e3b804e3cfe) (diffs)
  • app/views/spaces/submittedCurationObject.scala.html (version 8c7fcfd425cb9fe32be0265230b80e3b804e3cfe) (diffs)
• 

  Luigi Marini 17 Feb 2016 ee28b9317ad0b5d30de8c7b28b833da7be3daa69 m

  Merge pull request #693 in CATS/clowder from feature/IMLCZO-76-require-agreement-to-data-policy to develop
  * commit 'b0665c8e2df0cac8a464051a1b98e7d87241b6a8':
    restore correct form settings
    move the checkbox below the terms of use
    updating pull request so that all sensor-related fields are now located on the Sensor Admin form
    update the admin form to provide instructions on the user agreement. style the user agreement contain a little nicer.
    fix for when element is missing and move click listener into same logic
    This commit allows us to query from Geo-Dashboard for values set in the Clowder Sensors admin config
    update method documentation
    adds the User Agreement form to the Admin Customize page, and if a value exists in this form, the user sign-up page will have a checkbox that must be checked prior to creating an account.
• 

  Yan Zhao 17 Feb 2016 6dd80580b0e1e07d785da195357e3a6e9867faa3 m

  Merge remote-tracking branch 'origin/develop' into bugfix/CATS-417-add-date-to-curation-object-tile
• 

  Luigi Marini 17 Feb 2016 037ca8f11a1fb8780f35445c20683881b3b85859 m

  Merge pull request #752 in CATS/clowder from bugfix/CATS-393-weird-issue-with-permissions-warning to develop
  * commit 'a94162ecc54dd5cc9a89794fbe49bf68484e95f1':
    title changed
• 

  Luigi Marini 17 Feb 2016 ccb510a6d209e1e580f4f940d36292f3e00f426b m

  Merge pull request #751 in CATS/clowder from bugfix/SEAD-930-sha512-hash-incorrect to develop
  * commit 'bde1e70ece86e4ca2a29ad6745299104b90b9e83':
    fix to wrongly calculated sha512 for files in mongo store
• 

  Luigi Marini 17 Feb 2016 2761eb7c1e88380fcb193096e756e0691e7956c7 m

  Merge pull request #750 in CATS/clowder from bugfix/CATS-434-update-title-in-listitems-to-be to develop
  * commit 'e12d03fa902f4f7c63af5b0528a2c66dffbf0377':
    Updating list items to be h3 instead of h2
• 

  Luigi Marini 17 Feb 2016 a7ba08cd0159199b41a16bd94af31a0947883f7d m

  Merge pull request #744 in CATS/clowder from bugfix/CATS-415-when-deleting-a-file-from-datasets to develop
  * commit 'fd1a863fc30767c9ba91237d12f6f87ce2dcb7c6':
    redirect to the current page
    change the redirect call
• 

  Luigi Marini 17 Feb 2016 fa8cad7cf6f00a16f4ba720e976b828ac6173864 m

  Merge pull request #746 in CATS/clowder from bugfix/CATS-406-can-t-click-on-create-resource-links to develop
  * commit 'e9da78916ebba6f0df12d07ebc487217b495c840':
    Fix styling in home page
• 

  Luigi Marini 17 Feb 2016 c2e34a7a04737fc81a4a5138baefd3c8084548fd m

  Merge pull request #727 in CATS/clowder from bugfix/CATS-384-retracting-older-curation-objects to develop
  * commit '171b5cfd8a69d889341ce1709b8b588355eef46e':
    404 not found
    response.message
    notify when success
    notify when success
    retractCurationObject
    set curation as In Curation when it is not found in repository
• 

  Rob Kooper 17 Feb 2016 6f66c52891207db294933d6ff14e9d15e81a5a22 m

  remove >

  • app/views/logoSelect.scala.html (version 6f66c52891207db294933d6ff14e9d15e81a5a22) (diffs)
• 

  Rob Kooper 17 Feb 2016 d4edc3397eb82a9e59b4d6b3a96b4128bfc58309 m

  actual delete logos
  Forgot to remove logo from the logos collection, and to drop logos
  collection.

  • app/services/mongodb/MongoDBLogoService.scala (version d4edc3397eb82a9e59b4d6b3a96b4128bfc58309) (diffs)
  • app/services/mongodb/MongoSalatPlugin.scala (version d4edc3397eb82a9e59b4d6b3a96b4128bfc58309) (diffs)
• 

  Michal Ondrejcek 17 Feb 2016 2c21ba4fa9f6c17f67b1f4b6b66891c89a9ad897 m

  profile icon added

  • app/views/home.scala.html (version 2c21ba4fa9f6c17f67b1f4b6b66891c89a9ad897) (diffs)
• 

  Rob Kooper 17 Feb 2016 9f35db510aea122e5503c4f8e51cb3029055f780 m

  fix issue with logos disappearing
  NOTE: we can not use the gridfs.files and add our metadata, since when
  we call the save function and not save everything out (such as chunk
  size) it will be overwritten with only our data and will not be able to
  load the data from gridfs anymore.

  • app/models/Logo.scala (version 9f35db510aea122e5503c4f8e51cb3029055f780) (diffs)
  • app/services/LogoService.scala (version 9f35db510aea122e5503c4f8e51cb3029055f780) (diffs)
  • app/services/mongodb/MongoDBByteStorage.scala (version 9f35db510aea122e5503c4f8e51cb3029055f780) (diffs)
  • app/services/mongodb/MongoDBLogoService.scala (version 9f35db510aea122e5503c4f8e51cb3029055f780) (diffs)
  • app/services/mongodb/MongoUtils.scala (version 9f35db510aea122e5503c4f8e51cb3029055f780) (diffs)
• 

  Brock Angelo 17 Feb 2016 b0665c8e2df0cac8a464051a1b98e7d87241b6a8 m

  restore correct form settings

  • app/views/ss/Registration/signUp.scala.html (version b0665c8e2df0cac8a464051a1b98e7d87241b6a8) (diffs)
• 

  Indira Gutierrez Polo 17 Feb 2016 675c1950f7cfe78213d07b862a8804580e0dbf72 m

  Fixing issue with back button and #'s.

  • app/views/dataset.scala.html (version 675c1950f7cfe78213d07b862a8804580e0dbf72) (diffs)
  • conf/routes (version 675c1950f7cfe78213d07b862a8804580e0dbf72) (diffs)
• 

  Michal Ondrejcek 16 Feb 2016 76e4182b66c857147d7bf05429dc4a9bb84f1c61 m

  remove tinyemc editor init

  • app/views/dataset.scala.html (version 76e4182b66c857147d7bf05429dc4a9bb84f1c61) (diffs)
  • app/views/file.scala.html (version 76e4182b66c857147d7bf05429dc4a9bb84f1c61) (diffs)
  • app/views/notesform.scala.html (version 76e4182b66c857147d7bf05429dc4a9bb84f1c61) (diffs)
• 

  Michal Ondrejcek 16 Feb 2016 a94162ecc54dd5cc9a89794fbe49bf68484e95f1 m

  title changed

  • app/views/file.scala.html (version a94162ecc54dd5cc9a89794fbe49bf68484e95f1) (diffs)
  • app/views/files/listitem.scala.html (version a94162ecc54dd5cc9a89794fbe49bf68484e95f1) (diffs)
• 

  Indira Gutierrez Polo 16 Feb 2016 8e152df092423e8b5fe3c203957e8ff6e9a1bc30 m

  1. More updates to display name. 2. Adding documentation to api/folders and controllers/folders 3. Deleting folders when deleting a dataset. 4. Removing placeholder from folders/listitem for second column 5. Removed id for metadata-count 6. Renaming to FolderDAO in MongoDBFolderService

  • app/api/Datasets.scala (version 8e152df092423e8b5fe3c203957e8ff6e9a1bc30) (diffs)
  • app/api/Folders.scala (version 8e152df092423e8b5fe3c203957e8ff6e9a1bc30) (diffs)
  • app/controllers/Folders.scala (version 8e152df092423e8b5fe3c203957e8ff6e9a1bc30) (diffs)
  • app/services/FolderService.scala (version 8e152df092423e8b5fe3c203957e8ff6e9a1bc30) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version 8e152df092423e8b5fe3c203957e8ff6e9a1bc30) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version 8e152df092423e8b5fe3c203957e8ff6e9a1bc30) (diffs)
  • app/services/mongodb/MongoDBFolderService.scala (version 8e152df092423e8b5fe3c203957e8ff6e9a1bc30) (diffs)
  • app/views/dataset.scala.html (version 8e152df092423e8b5fe3c203957e8ff6e9a1bc30) (diffs)
  • app/views/folders/listitem.scala.html (version 8e152df092423e8b5fe3c203957e8ff6e9a1bc30) (diffs)
• 

  Rob Kooper 16 Feb 2016 bde1e70ece86e4ca2a29ad6745299104b90b9e83 m

  fix to wrongly calculated sha512 for files in mongo store
  This only affect the files that are stored in mongo. This code includes
  a fix, as well as a wrapper for the code that runs the updates. To run
  updates you can use the following code: updateMongo("KEY",
  actualFunction). This will make sure that the update is only executed
  once iff the MONGOUPDATE flag is set. It will print out the amount of
  time an update took.
  
  Also updated logger to add a timestamp for easier debugging.

  • app/services/mongodb/MongoSalatPlugin.scala (version bde1e70ece86e4ca2a29ad6745299104b90b9e83) (diffs)
  • app/services/mongodb/MongoUtils.scala (version bde1e70ece86e4ca2a29ad6745299104b90b9e83) (diffs)
  • conf/logger.xml (version bde1e70ece86e4ca2a29ad6745299104b90b9e83) (diffs)
• 

  Michal Ondrejcek 16 Feb 2016 27f72a9e129565bc5f50a3a40a90059daaa57ae6 m

  removed notesHtml from curationObject file

  • app/controllers/CurationObjects.scala (version 27f72a9e129565bc5f50a3a40a90059daaa57ae6) (diffs)
  • app/models/CurationObject.scala (version 27f72a9e129565bc5f50a3a40a90059daaa57ae6) (diffs)
• 

  Indira Gutierrez Polo 16 Feb 2016 e12d03fa902f4f7c63af5b0528a2c66dffbf0377 m

  Updating list items to be h3 instead of h2

  • app/views/collections/listitem.scala.html (version e12d03fa902f4f7c63af5b0528a2c66dffbf0377) (diffs)
  • app/views/datasets/listitem.scala.html (version e12d03fa902f4f7c63af5b0528a2c66dffbf0377) (diffs)
  • app/views/files/listitem.scala.html (version e12d03fa902f4f7c63af5b0528a2c66dffbf0377) (diffs)
  • app/views/spaces/listItem.scala.html (version e12d03fa902f4f7c63af5b0528a2c66dffbf0377) (diffs)
• 

  Michal Ondrejcek 16 Feb 2016 c2bad0148ff6209f5bec3556c6ca764ea6d9ad31 m

  removed NotesHTML from file model

  • app/models/File.scala (version c2bad0148ff6209f5bec3556c6ca764ea6d9ad31) (diffs)
• 

  Michal Ondrejcek 16 Feb 2016 915877f2e79f33e1051bd03941d0f2ac9e198c52 m

  removed col-md-12 class to remove extra indentation

  • app/views/spaces/space.scala.html (version 915877f2e79f33e1051bd03941d0f2ac9e198c52) (diffs)
• 

  Michal Ondrejcek 16 Feb 2016 c9467102ec378273444deeacfb33433a1f169050 m

  conflict - develop is right :-)
• 

  Indira Gutierrez Polo 16 Feb 2016 082cc738ced2daadab8e8644ac2b71c74ea2d398 m

  Removing js associated with the metadata counter. (Delete)

  • app/views/metadatald/view.scala.html (version 082cc738ced2daadab8e8644ac2b71c74ea2d398) (diffs)
• 

  Indira Gutierrez Polo 16 Feb 2016 6e2c027a6e8ca957d33d85455dbc0ecd7f506973 m

  Merge pull request #740 in CATS/clowder from bugfix/CATS-401-on-dataset-page-use-to-track-history to feature/CATS-367-hierarchical-folders-in-datasets
  * commit 'fa2aeb190eae45606b6297dd693f9ed5a0adb92d':
    remove accidental extra lines
    missing &folderId=
    missing &folderId=
    Add events related to folders. Associate them with the dataset
    Updating hash value to be folderId=uuid&page=num.
    Using # to get contents for the folder or dataset.
• 

  Indira Gutierrez Polo 16 Feb 2016 7b9e1d61c25f5d33a8bdcb7b2fb843975f250725 m

  Removing js associated with the metadata counter.

  • app/views/metadatald/addMetadata.scala.html (version 7b9e1d61c25f5d33a8bdcb7b2fb843975f250725) (diffs)
• 

  Michal Ondrejcek 16 Feb 2016 52b5666adbe213f20edebc49474db9ceab10ca14 m

  remove Notes and related code including endpoints

  • app/api/Datasets.scala (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • app/api/Files.scala (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • app/api/Permissions.scala (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • app/models/Dataset.scala (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • app/services/DatasetService.scala (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • app/services/FileService.scala (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • app/views/dataset.scala.html (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • app/views/file.scala.html (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • conf/routes (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/langs/readme.md (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/license.txt (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/advlist/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/anchor/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/autolink/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/autoresize/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/autosave/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/bbcode/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/charmap/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/code/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/contextmenu/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/directionality/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-cool.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-cry.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-embarassed.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-frown.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-innocent.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-kiss.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-laughing.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-money-mouth.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-sealed.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-smile.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-surprised.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-tongue-out.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-undecided.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-wink.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/img/smiley-yell.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/emoticons/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/example/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/example_dependency/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/fullpage/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/fullscreen/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/hr/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/image/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/importcss/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/insertdatetime/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/layer/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/legacyoutput/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/link/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/lists/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/media/moxieplayer.swf (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/media/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/nonbreaking/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/noneditable/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/pagebreak/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/paste/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/preview/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/print/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/save/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/searchreplace/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/spellchecker/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/tabfocus/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/table/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/template/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/textcolor/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/visualblocks/css/visualblocks.css (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/visualblocks/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/visualchars/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/plugins/wordcount/plugin.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/content.inline.min.css (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/content.min.css (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/fonts/readme.md (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/fonts/tinymce-small.eot (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/fonts/tinymce-small.svg (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/fonts/tinymce-small.ttf (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/fonts/tinymce-small.woff (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/fonts/tinymce.eot (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/fonts/tinymce.svg (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/fonts/tinymce.ttf (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/fonts/tinymce.woff (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/img/anchor.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/img/loader.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/img/object.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/img/trans.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/img/wline.gif (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/skin.ie7.min.css (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/skins/lightgray/skin.min.css (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/themes/modern/theme.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • public/javascripts/tinymce/tinymce.min.js (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
  • test/testing-coverage.csv (version 52b5666adbe213f20edebc49474db9ceab10ca14) (diffs)
• 

  Yan Zhao 16 Feb 2016 d7ff7d1387ffd84346c4d7c8eca64cf9aa7feacb m

  Update app/views/spaces/matchmakerResult.scala.html

  • app/views/spaces/matchmakerResult.scala.html (version d7ff7d1387ffd84346c4d7c8eca64cf9aa7feacb) (diffs)
• 

  Yan Zhao 16 Feb 2016 7e7e93bbf48cac213989d6024cc377b4fe3121a1 m

  Update app/services/mongodb/MongoSalatPlugin.scala

  • app/services/mongodb/MongoSalatPlugin.scala (version 7e7e93bbf48cac213989d6024cc377b4fe3121a1) (diffs)
• 

  Yan Zhao 16 Feb 2016 fd1a863fc30767c9ba91237d12f6f87ce2dcb7c6 m

  redirect to the current page

  • app/controllers/Collections.scala (version fd1a863fc30767c9ba91237d12f6f87ce2dcb7c6) (diffs)
  • app/controllers/Datasets.scala (version fd1a863fc30767c9ba91237d12f6f87ce2dcb7c6) (diffs)
  • app/views/collectionList.scala.html (version fd1a863fc30767c9ba91237d12f6f87ce2dcb7c6) (diffs)
  • app/views/datasetList.scala.html (version fd1a863fc30767c9ba91237d12f6f87ce2dcb7c6) (diffs)
• 

  Brock Angelo 16 Feb 2016 7552aaac4679320b15885ca8a16102758ad0e067 m

  Merge branch 'develop' into feature/IMLCZO-76-require-agreement-to-data-policy
  # Conflicts:
  #        app/api/Admin.scala
  #        app/controllers/Admin.scala
  #        app/services/AppConfigurationService.scala
  #        app/views/admin.scala.html
• 

  Yan Zhao 16 Feb 2016 e943f4933eebbbcb98668be3211614c345aa753c m

  checkbox for purpose

  • app/views/spaces/matchmakerResult.scala.html (version e943f4933eebbbcb98668be3211614c345aa753c) (diffs)
• 

  Michal Ondrejcek 15 Feb 2016 892c47fd2eb0cffdd34d91f6f62560c3d617a148 m

  remove Create Collection and Dataset from Grid and add them to the top bar

  • app/views/collectionofdatasets.scala.html (version 892c47fd2eb0cffdd34d91f6f62560c3d617a148) (diffs)
  • app/views/home.scala.html (version 892c47fd2eb0cffdd34d91f6f62560c3d617a148) (diffs)
  • app/views/spaces/collectionsBySpace.scala.html (version 892c47fd2eb0cffdd34d91f6f62560c3d617a148) (diffs)
  • app/views/spaces/collectionsGrid.scala.html (version 892c47fd2eb0cffdd34d91f6f62560c3d617a148) (diffs)
  • app/views/spaces/datasetsBySpace.scala.html (version 892c47fd2eb0cffdd34d91f6f62560c3d617a148) (diffs)
  • app/views/spaces/datasetsGrid.scala.html (version 892c47fd2eb0cffdd34d91f6f62560c3d617a148) (diffs)
  • app/views/spaces/space.scala.html (version 892c47fd2eb0cffdd34d91f6f62560c3d617a148) (diffs)
• 

  Indira Gutierrez Polo 15 Feb 2016 fa2aeb190eae45606b6297dd693f9ed5a0adb92d m

  remove accidental extra lines

  • app/views/dataset.scala.html (version fa2aeb190eae45606b6297dd693f9ed5a0adb92d) (diffs)
  • app/views/folders/listitem.scala.html (version fa2aeb190eae45606b6297dd693f9ed5a0adb92d) (diffs)
• 

  Indira Gutierrez Polo 15 Feb 2016 637a265a75adbbbf6319d230b52324f8a190c565 m

  Merge branch 'bugfix/CATS-401-on-dataset-page-use-to-track-history' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/CATS-400-follow-folders-functionality
  # Conflicts:
  #        app/views/dataset.scala.html
• 

  Indira Gutierrez Polo 15 Feb 2016 be641390e85d720e12998ba52d233fc106a48118 m

  missing &folderId=

  • app/views/file.scala.html (version be641390e85d720e12998ba52d233fc106a48118) (diffs)
• 

  Indira Gutierrez Polo 15 Feb 2016 c572b6d8473550aae5268d5ddcab25b87e50ac97 m

  missing &folderId=

  • app/views/file.scala.html (version c572b6d8473550aae5268d5ddcab25b87e50ac97) (diffs)
• 

  Indira Gutierrez Polo 15 Feb 2016 d7f54f7ee803a39ed1c30c39f5de05b96bda419c m

  Add events related to folders. Associate them with the dataset

  • app/api/Folders.scala (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • app/controllers/Datasets.scala (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • app/controllers/Folders.scala (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • app/models/ResourceRef.scala (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • app/views/dataset.scala.html (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • app/views/datasets/addFiles.scala.html (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • app/views/datasets/filesAndFolders.scala.html (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • app/views/file.scala.html (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • app/views/files/grid.scala.html (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • app/views/files/listitem.scala.html (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • app/views/filesList.scala.html (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • app/views/folders/listitem.scala.html (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • app/views/newsfeedCard.scala.html (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • app/views/users/followingFiles.scala.html (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • conf/routes (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
  • public/javascripts/fileListProcess.js (version d7f54f7ee803a39ed1c30c39f5de05b96bda419c) (diffs)
• 

  Indira Gutierrez Polo 15 Feb 2016 d0af6310fbe8ac7c252f15f374083acd66e49ee2 m

  Clean up name when creating the folder

  • app/views/dataset.scala.html (version d0af6310fbe8ac7c252f15f374083acd66e49ee2) (diffs)
• 

  Indira Gutierrez Polo 15 Feb 2016 fccdf241ffce57bb39072d90e103867d5e07f606 m

  Updating hash value to be folderId=uuid&page=num.

  • app/views/dataset.scala.html (version fccdf241ffce57bb39072d90e103867d5e07f606) (diffs)
  • app/views/datasets/addFiles.scala.html (version fccdf241ffce57bb39072d90e103867d5e07f606) (diffs)
  • app/views/folders/listitem.scala.html (version fccdf241ffce57bb39072d90e103867d5e07f606) (diffs)
• 

  Indira Gutierrez Polo 15 Feb 2016 404fee28fb426fb07a9eb19b9724db24e2144759 m

  Removing follow button from folder. Fixing permissions for files within folders.

  • app/api/Permissions.scala (version 404fee28fb426fb07a9eb19b9724db24e2144759) (diffs)
  • app/views/folders/listitem.scala.html (version 404fee28fb426fb07a9eb19b9724db24e2144759) (diffs)
• 

  Rob Kooper 13 Feb 2016 079979cffae60025c18d7bc441b5f90f29d5a1b2 m

  Ability to upload a logo
  This is used with favicon and logo for the site. The code allows to
  specify if the logo should not show text. The code is written as a
  module that should be easy to add to other places, such as spaces.

  • app/api/Admin.scala (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/api/Logos.scala (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/controllers/Admin.scala (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/controllers/Application.scala (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/models/Logo.scala (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/services/DI.scala (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/services/LogoService.scala (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/services/mongodb/MongoDBLogoService.scala (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/services/mongodb/MongoSalatPlugin.scala (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/services/mongodb/MongoUtils.scala (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/views/admin.scala.html (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/views/admin/customize.scala.html (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/views/logoSelect.scala.html (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/views/main.scala.html (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • app/views/themes.scala.html (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • conf/routes (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • public/javascripts/maxlength.min.js (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
  • public/stylesheets/main.css (version 079979cffae60025c18d7bc441b5f90f29d5a1b2) (diffs)
• 

  Indira Gutierrez Polo 12 Feb 2016 e9da78916ebba6f0df12d07ebc487217b495c840 m

  Fix styling in home page

  • app/views/home.scala.html (version e9da78916ebba6f0df12d07ebc487217b495c840) (diffs)
• 

  Yan Zhao 12 Feb 2016 171b5cfd8a69d889341ce1709b8b588355eef46e m

  404 not found

  • app/api/CurationObjects.scala (version 171b5cfd8a69d889341ce1709b8b588355eef46e) (diffs)
  • public/javascripts/curationProcess.js (version 171b5cfd8a69d889341ce1709b8b588355eef46e) (diffs)
• 

  Yan Zhao 12 Feb 2016 63022749cbccfae4719d7ed623b63c74b70cff09 m

  wordwrap for status table

  • app/views/spaces/submittedCurationObject.scala.html (version 63022749cbccfae4719d7ed623b63c74b70cff09) (diffs)
  • public/stylesheets/main.css (version 63022749cbccfae4719d7ed623b63c74b70cff09) (diffs)
• 

  Yan Zhao 12 Feb 2016 babe955587cbb010002444ada6f819b5a0e6cb1e m

  purpose checkbox

  • app/controllers/CurationObjects.scala (version babe955587cbb010002444ada6f819b5a0e6cb1e) (diffs)
  • app/controllers/Registration.scala (version babe955587cbb010002444ada6f819b5a0e6cb1e) (diffs)
  • app/models/User.scala (version babe955587cbb010002444ada6f819b5a0e6cb1e) (diffs)
  • app/services/mongodb/MongoSalatPlugin.scala (version babe955587cbb010002444ada6f819b5a0e6cb1e) (diffs)
  • app/views/spaces/matchmakerResult.scala.html (version babe955587cbb010002444ada6f819b5a0e6cb1e) (diffs)
• 

  Yan Zhao 12 Feb 2016 343898fe71c86c62a4455aaf054ca210efa8ad31 m

  response.message

  • public/javascripts/curationProcess.js (version 343898fe71c86c62a4455aaf054ca210efa8ad31) (diffs)
• 

  Yan Zhao 12 Feb 2016 13ae72e6b7b90c59faf6a72b82b51d52daaa1253 m

  notify when success

  • public/javascripts/curationProcess.js (version 13ae72e6b7b90c59faf6a72b82b51d52daaa1253) (diffs)
• 

  Yan Zhao 12 Feb 2016 25066001b1741603ca5cddc8649a672ccfa0165e m

  change the redirect call

  • app/views/collectionList.scala.html (version 25066001b1741603ca5cddc8649a672ccfa0165e) (diffs)
  • app/views/datasetList.scala.html (version 25066001b1741603ca5cddc8649a672ccfa0165e) (diffs)
• 

  Yan Zhao 12 Feb 2016 23d8f8efd0294a2419047af760186de75adfffc7 m

  notify when success

  • app/api/CurationObjects.scala (version 23d8f8efd0294a2419047af760186de75adfffc7) (diffs)
• 

  Todd Nicholson <tcnichol@illinois.edu> 11 Feb 2016 d96f644fae21607dc0e0dd1163f456a358a269b0 m

  you can only add root collections to spaces now

  • app/views/spaces/spaceAllocation.scala.html (version d96f644fae21607dc0e0dd1163f456a358a269b0) (diffs)
• 

  Brock Angelo 11 Feb 2016 db0905814d367b157e607f292e3bc2c8d5de2d1c m

  fixes CATS-428 adds the ability to get the path to a file in /public from inside a javascript file

  • app/controllers/Application.scala (version db0905814d367b157e607f292e3bc2c8d5de2d1c) (diffs)
  • app/views/geostreams/edit.scala.html (version db0905814d367b157e607f292e3bc2c8d5de2d1c) (diffs)
  • public/javascripts/geostreams/sensorCreate.js (version db0905814d367b157e607f292e3bc2c8d5de2d1c) (diffs)
  • public/javascripts/geostreams/sensorStreamEdit.js (version db0905814d367b157e607f292e3bc2c8d5de2d1c) (diffs)
• 

  Todd Nicholson <tcnichol@illinois.edu> 11 Feb 2016 d7ec774523db0000b22d1d623efb640d52eaa6fd m

  you can only add root collections to spaces now

  • app/views/spaces/spaceAllocation.scala.html (version d7ec774523db0000b22d1d623efb640d52eaa6fd) (diffs)
• 

  Todd Nicholson <tcnichol@illinois.edu> 11 Feb 2016 b8c63909484bd4e30d89daac0e5ce58ebce3fc87 m

  fixed based on feedback on pull request.

  • app/controllers/Collections.scala (version b8c63909484bd4e30d89daac0e5ce58ebce3fc87) (diffs)
  • app/services/mongodb/MongoDBSpaceService.scala (version b8c63909484bd4e30d89daac0e5ce58ebce3fc87) (diffs)
  • app/views/spaces/spaceAllocation.scala.html (version b8c63909484bd4e30d89daac0e5ce58ebce3fc87) (diffs)
• 

  Luigi Marini 11 Feb 2016 f7fa854fddb7eb42309e0793f15569acad8f3e3c m

  Merge pull request #728 in CATS/clowder from bugfix/CATS-388-when-accepting-a-user-request-for to develop
  * commit 'e742704ff6c4f52f7dc952f1f4ce98eeca161c52':
    typo
    remove log
    roll back editUser
    remove user from candidate list
    remove log; fix role bug; .remove();
    update tab number when accept/decline authorization request for space
    update tab number when accept/decline authorization request for space
• 

  Luigi Marini 11 Feb 2016 5a281682493bec6b05dcdbfa1f32deb1cf55d301 m

  Merge pull request #737 in CATS/clowder from bugfix/CATS-363-metadata-can-t-be-edited to develop
  * commit 'a97eaed3963474f090c842f13802eed2885df403':
    glyphicon-send
    PUT, save button, edit logic
    prevent the definition with existing uri being added/ edited
    remove empty lines
    edit metadata definition
• 

  Luigi Marini 11 Feb 2016 9cc7ec34ffb6f4e075d9b9b4e74a48566190c2f4 m

  Merge pull request #684 in CATS/clowder from feature/CATS-312-make-files-upload-api-accept-multiple to develop
  * commit '0eb54219d9722c5869eca1af2b208f74f6ae962d':
    uploadIntermediate now calls new upload code as well
    Added Max to CONTRIBUTORS.md
    Created uploadFile private method
    Make uploadFiles private
    Removed unnecessary value
    Cleaned up index checks and Logger msgs
    Simplified imports, removed redundancies
    Modify upload to accept multiple files
    Modify uploadToDataset to accept many files, md
    Removed duplicated API annotation
    Fixed bracketing bug w/ index flag
    Code fixes, replaced uploadToDataset content
    Split upload code into utility function
    Renamed to uploadToDatasetMulti
    First draft of /api/uploadToDatasetMax
• 

  Luigi Marini 11 Feb 2016 dc5dbdb7f6f11dff532513092354f000a2d8484b m

  Merge pull request #731 in CATS/clowder from bugfix/CATS-397-roles-don-t-change to develop
  * commit '91b4c950577743f9b56226328c2fc836439d9977':
    Moved update code to changeUserRoleInSpace
    Fixed filter on Mongo find() so that users aren't erroneously updated
    Replaced changeUserRoleInSpace with single Mongo operation
    Replaced DAO matching with UserDAO
    Deleting a role also deletes that role from users
    Rewrote to only fetch relevant users
    Remove commented-out mongo code.
    Revert to changeUserRoleInSpace
    Set multi to true to allow multiple roles to update for a user
    no longer writes bad object to wrong place
    Simplified code using DAO.update()
    Begin implementing MongoDB update version
    Moved code to MongoDBUserService
    First cut, in Admin.updateRole
• 

  Luigi Marini 11 Feb 2016 8e72f9843e1d739660018514a0e63c38290dd7f2 m

  Merge pull request #732 in CATS/clowder from feature/CATS-226-add-google-analytics to develop
  * commit '940862e55275bf3cbcf3848cfd08927476b1cb8b':
    fix documentation
    set title to name of dataset/collection
    ability to set google analytics
• 

  Yan Zhao 10 Feb 2016 f51c53b8f771c0f7b1d2e9700d556e4788f2165d m

  Merge remote-tracking branch 'origin/develop' into bugfix/CATS-384-retracting-older-curation-objects
• 

  Yan Zhao 10 Feb 2016 1b072c8b4f93ba8cc696e8cd724eeee2ef1cb64a m

  retractCurationObject

  • app/api/CurationObjects.scala (version 1b072c8b4f93ba8cc696e8cd724eeee2ef1cb64a) (diffs)
  • public/javascripts/curationProcess.js (version 1b072c8b4f93ba8cc696e8cd724eeee2ef1cb64a) (diffs)
• 

  Yan Zhao 10 Feb 2016 99c1684be48867da3feafbd257bcaee63dfa6681 m

  btn-link for update status

  • app/views/spaces/submittedCurationObject.scala.html (version 99c1684be48867da3feafbd257bcaee63dfa6681) (diffs)
• 

  Yan Zhao 10 Feb 2016 fd0c104dedef8e0197fdc053d1e18869b4e76368 m

  Uploaded data format; navigation

  • app/views/spaces/submittedCurationObject.scala.html (version fd0c104dedef8e0197fdc053d1e18869b4e76368) (diffs)
• 

  Todd Nicholson <tcnichol@illinois.edu> 10 Feb 2016 418e034722c3cfa23a402a18cdc26edf7f59f991 m

  fixed based on feedback on pull request

  • app/api/Collections.scala (version 418e034722c3cfa23a402a18cdc26edf7f59f991) (diffs)
  • app/controllers/Collections.scala (version 418e034722c3cfa23a402a18cdc26edf7f59f991) (diffs)
  • app/views/collectionofdatasets.scala.html (version 418e034722c3cfa23a402a18cdc26edf7f59f991) (diffs)
• 

  Yan Zhao 10 Feb 2016 a97eaed3963474f090c842f13802eed2885df403 m

  glyphicon-send

  • public/javascripts/metadata/manageDefinitions.js (version a97eaed3963474f090c842f13802eed2885df403) (diffs)
• 

  Yan Zhao 10 Feb 2016 e742704ff6c4f52f7dc952f1f4ce98eeca161c52 m

  typo

  • public/javascripts/spaceModify.js (version e742704ff6c4f52f7dc952f1f4ce98eeca161c52) (diffs)
• 

  Yan Zhao 10 Feb 2016 0c4dc91ea3968f47e4d989730db8f36b4dd7dd75 m

  purpose:testing-only by default

  • app/controllers/Registration.scala (version 0c4dc91ea3968f47e4d989730db8f36b4dd7dd75) (diffs)
  • app/models/User.scala (version 0c4dc91ea3968f47e4d989730db8f36b4dd7dd75) (diffs)
  • app/services/mongodb/MongoSalatPlugin.scala (version 0c4dc91ea3968f47e4d989730db8f36b4dd7dd75) (diffs)
• 

  Michal Ondrejcek 10 Feb 2016 4fe88e282aff3a8a8f351bc6d54ff9d0795f778e m

  add Create button links to Home page

  • app/views/home.scala.html (version 4fe88e282aff3a8a8f351bc6d54ff9d0795f778e) (diffs)
• 

  Yan Zhao 10 Feb 2016 c801f747a048da93f9b95fcaf745e8dbbdc92763 m

  PUT, save button, edit logic

  • app/api/Metadata.scala (version c801f747a048da93f9b95fcaf745e8dbbdc92763) (diffs)
  • app/views/manageMetadataDefinitions.scala.html (version c801f747a048da93f9b95fcaf745e8dbbdc92763) (diffs)
  • conf/routes (version c801f747a048da93f9b95fcaf745e8dbbdc92763) (diffs)
  • public/javascripts/metadata/manageDefinitions.js (version c801f747a048da93f9b95fcaf745e8dbbdc92763) (diffs)
• 

  Yan Zhao 10 Feb 2016 4bdcf9a09cc2374c54a67915a8d58e40397b66a5 m

  upload

  • app/views/datasets/listCurationObjects.scala.html (version 4bdcf9a09cc2374c54a67915a8d58e40397b66a5) (diffs)
  • app/views/spaces/submittedCurationObject.scala.html (version 4bdcf9a09cc2374c54a67915a8d58e40397b66a5) (diffs)
• 

  Indira Gutierrez Polo 09 Feb 2016 4d792403bea0af5bc959af4325b7c33a37fe3fb7 m

  Using # to get contents for the folder or dataset.

  • app/controllers/Datasets.scala (version 4d792403bea0af5bc959af4325b7c33a37fe3fb7) (diffs)
  • app/models/ResourceRef.scala (version 4d792403bea0af5bc959af4325b7c33a37fe3fb7) (diffs)
  • app/views/dataset.scala.html (version 4d792403bea0af5bc959af4325b7c33a37fe3fb7) (diffs)
  • app/views/datasets/addFiles.scala.html (version 4d792403bea0af5bc959af4325b7c33a37fe3fb7) (diffs)
  • app/views/datasets/filesAndFolders.scala.html (version 4d792403bea0af5bc959af4325b7c33a37fe3fb7) (diffs)
  • app/views/file.scala.html (version 4d792403bea0af5bc959af4325b7c33a37fe3fb7) (diffs)
  • app/views/files/grid.scala.html (version 4d792403bea0af5bc959af4325b7c33a37fe3fb7) (diffs)
  • app/views/files/listitem.scala.html (version 4d792403bea0af5bc959af4325b7c33a37fe3fb7) (diffs)
  • app/views/filesList.scala.html (version 4d792403bea0af5bc959af4325b7c33a37fe3fb7) (diffs)
  • app/views/folders/listitem.scala.html (version 4d792403bea0af5bc959af4325b7c33a37fe3fb7) (diffs)
  • app/views/users/followingFiles.scala.html (version 4d792403bea0af5bc959af4325b7c33a37fe3fb7) (diffs)
  • conf/routes (version 4d792403bea0af5bc959af4325b7c33a37fe3fb7) (diffs)
  • public/javascripts/fileListProcess.js (version 4d792403bea0af5bc959af4325b7c33a37fe3fb7) (diffs)
• 

  Brock Angelo 09 Feb 2016 39c5bb06fb1912a9fbfb752b5507105c2c866726 m

  move the checkbox below the terms of use

  • app/views/ss/Registration/signUp.scala.html (version 39c5bb06fb1912a9fbfb752b5507105c2c866726) (diffs)
• 

  Brock Angelo 09 Feb 2016 a56bb0f04ee9d31ee9f8db8d3729a7e5352263e2 m

  resolve merge conflict
• 

  Yan Zhao 08 Feb 2016 434b7adb104b509a5f78ac0a43ec4f794df84668 m

  prevent the definition with existing uri being added/ edited

  • app/api/Metadata.scala (version 434b7adb104b509a5f78ac0a43ec4f794df84668) (diffs)
  • app/services/MetadataService.scala (version 434b7adb104b509a5f78ac0a43ec4f794df84668) (diffs)
  • app/services/mongodb/MongoDBMetadataService.scala (version 434b7adb104b509a5f78ac0a43ec4f794df84668) (diffs)
  • public/javascripts/metadata/manageDefinitions.js (version 434b7adb104b509a5f78ac0a43ec4f794df84668) (diffs)
• 

  Todd Nicholson <tcnichol@illinois.edu> 08 Feb 2016 af4658554133b1f54d37e3aa2a8d8dbbec942e26 m

  fixed removing child collection or parent collection ids if the collection did not exist.
  adding a collection to space now shows proper collectionsCount

  • app/api/Collections.scala (version af4658554133b1f54d37e3aa2a8d8dbbec942e26) (diffs)
  • app/api/Spaces.scala (version af4658554133b1f54d37e3aa2a8d8dbbec942e26) (diffs)
  • app/controllers/Collections.scala (version af4658554133b1f54d37e3aa2a8d8dbbec942e26) (diffs)
  • app/services/CollectionService.scala (version af4658554133b1f54d37e3aa2a8d8dbbec942e26) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version af4658554133b1f54d37e3aa2a8d8dbbec942e26) (diffs)
  • app/services/mongodb/MongoDBSpaceService.scala (version af4658554133b1f54d37e3aa2a8d8dbbec942e26) (diffs)
  • app/views/collectionofdatasets.scala.html (version af4658554133b1f54d37e3aa2a8d8dbbec942e26) (diffs)
• 

  Todd Nicholson <tcnichol@illinois.edu> 05 Feb 2016 0d5cde4b5f56758dcc96d631a8d1bb8b4f471b3d m

  Merge branch 'develop' into merge/final-merge-develop-nested-collections
  # Conflicts:
  #        app/controllers/Collections.scala
  #        app/views/collectionofdatasets.scala.html
  
  Fixed problems with removing child or parent collections when the id is present but no collection exists. New method added to CollectionService for handling these cases. In the future it might help to do this in just removeSubCollection.
  
  Could someone please check the listchildcollection.scala.html? I updated it to be like listitem.collection.
• 

  Todd Nicholson <tcnichol@illinois.edu> 05 Feb 2016 4903ccfa32dfb8cdb466d93df18430d06b902c6a m

  fixed based on comments on pull request

  • CONTRIBUTORS.md (version 4903ccfa32dfb8cdb466d93df18430d06b902c6a) (diffs)
  • app/views/spaces/spaceAllocation_forParentCollection.scala.html (version 4903ccfa32dfb8cdb466d93df18430d06b902c6a) (diffs)
  • conf/application.conf (version 4903ccfa32dfb8cdb466d93df18430d06b902c6a) (diffs)
  • public/javascripts/collection-create.js (version 4903ccfa32dfb8cdb466d93df18430d06b902c6a) (diffs)
• 

  Indira Gutierrez Polo 05 Feb 2016 2afb136f5c6f11b88b4963e183f78b5a74e8b3dd m

  Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-367-hierarchical-folders-in-datasets
  # Conflicts:
  #        app/services/mongodb/MongoSalatPlugin.scala
• 

  Indira Gutierrez Polo 05 Feb 2016 fd79b8a2045edfa6649df38c9f7ff068a9b9ccb0 m

  Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-367-hierarchical-folders-in-datasets
  # Conflicts:
  #        app/views/dataset.scala.html
• 

  Yan Zhao 04 Feb 2016 addaa12b61c979e405240ea0b538857401d4f1a6 m

  remove empty lines

  • app/api/Metadata.scala (version addaa12b61c979e405240ea0b538857401d4f1a6) (diffs)
  • app/services/mongodb/MongoDBMetadataService.scala (version addaa12b61c979e405240ea0b538857401d4f1a6) (diffs)
  • app/views/manageMetadataDefinitions.scala.html (version addaa12b61c979e405240ea0b538857401d4f1a6) (diffs)
• 

  Yan Zhao 04 Feb 2016 bece6ef86a3f1bf46905b62522661f2a2299b63f m

  edit metadata definition

  • app/api/Metadata.scala (version bece6ef86a3f1bf46905b62522661f2a2299b63f) (diffs)
  • app/controllers/Application.scala (version bece6ef86a3f1bf46905b62522661f2a2299b63f) (diffs)
  • app/services/MetadataService.scala (version bece6ef86a3f1bf46905b62522661f2a2299b63f) (diffs)
  • app/services/mongodb/MongoDBMetadataService.scala (version bece6ef86a3f1bf46905b62522661f2a2299b63f) (diffs)
  • app/views/manageMetadataDefinitions.scala.html (version bece6ef86a3f1bf46905b62522661f2a2299b63f) (diffs)
  • conf/routes (version bece6ef86a3f1bf46905b62522661f2a2299b63f) (diffs)
  • public/javascripts/metadata/manageDefinitions.js (version bece6ef86a3f1bf46905b62522661f2a2299b63f) (diffs)