clowder

• 

  Constantinos Sophocleous 03 Jul 2015 dc799533c262f319773535bfec904d8a111206cc

  Merge remote-tracking branch 'origin/develop' into gateone-computing-resources-access-integration
  Conflicts:
          app/api/Permissions.scala
          app/controllers/Application.scala
          app/services/DI.scala
• 

  Luigi Marini 24 Jun 2015 9847ea5b9828ce566f1d0f6414474372efcd0f16 m

  Merge pull request #462 in CATS/clowder from feature/MMDB-1823-display-bounding-boxes-layered to develop
  * commit 'b5f5dcbc2244e5b7c545544c352a931f5b001c31':
    Preview registration issue fixed.
    Preview registration
    Flickering issue with bounding boxes fixed, Code cleanup
    Color matching fixed.
    Fixed issue with JS file loads
    Bounding boxes uses corresponding colors from graph
    Added log message when any JS file loading fails.
    fixed bug  - person tracking visualization not getting displayed when other extractors run. Changed canvas height.
    Displaying video on canvas, scaled down preson tracking to fit video preview dimensions, code cleanup.
• 

  Luigi Marini 24 Jun 2015 6ca68df42c1a281693573849b8948625b2917a35 m

  Merge pull request #425 in CATS/clowder from bugfix/MMDB-1848-comment-text-corner-case to develop
  * commit '488e76779c7a4be9c12adb3f01ae53c36947b0b8':
    Update to unify decoding and handling on the controller side. This is in preparation for unification with the other comment changes, and future expansion of how to handle specific allowed tags.
    Updates to ensure that HTML entered into free text fields is safe when being displayed in the UI, while still ensuring that newlines can be retained correctly.
    Responses to pull request comments. Updating ListBuffer vars to be vals where possible. Removal of console logging on client side.
    Changes to fix all Dataset names, Collection names and descriptions, and comments. This includes editing and display dynamically after creation or on user interaction as well.
    First checkin of the pass through dataset description, which was used for testing. Some basic items for dataset name as well.
• 

  Luigi Marini 24 Jun 2015 8983f0633debc4ae79a2d31a83ae3ab6c3e1f2e7 m

  Merge pull request #457 in CATS/clowder from feature/MMDB-1846-need-to-add-a-list-and-remove-previews to develop
  * commit 'ff041d5c67a3d08618962f32bef51aece4be6fe3':
    Added previews end point to remove file and also did file cleanup work in all three test suites.
    Initial check in for Previews listing and removal end points.
• 

  Luigi Marini 24 Jun 2015 a9b38656dfc118fe60b1a2af9370b352a2f358da m

  Merge pull request #402 in CATS/clowder from release/cs492 to develop
  * commit '564c965eb2b4b3cf86f311dd5de88d405754160e': (76 commits)
    Fixed queries for user datasets and files shown on the profile page.
    Removed extra padding for menu items.
    remove wrong merge
    created help menu
    move search bar left of admin menu
    switch to models.User
    added back removed line
    fix no echo sometimes
    rearrange right side menu
    add models.User everywhere
    make sure user is saved as ClowderUser
    renamed MediciUser to ClowderUser
    use profile class
    Use instance display name instead of hardcoded name in rss feed
    use MONGOUPDATE
    limit number of updates
    Fixed typo
    fix compile errors
    Moved sendEmail to Events
    fixes to make things compile again
    ...
• 

  Luigi Marini 24 Jun 2015 564c965eb2b4b3cf86f311dd5de88d405754160e m

  Fixed queries for user datasets and files shown on the profile page.

  • app/services/mongodb/MongoDBDatasetService.scala (version 564c965eb2b4b3cf86f311dd5de88d405754160e) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version 564c965eb2b4b3cf86f311dd5de88d405754160e) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 0f68e89a17159a9833ca543f7edd55c8dca6521b m

  Flickering issue with bounding boxes fixed, Code cleanup

  • public/javascripts/VideoFrame.min.js (version 0f68e89a17159a9833ca543f7edd55c8dca6521b) (diffs)
  • public/javascripts/previewers/person-tracking/some-library.js (version 0f68e89a17159a9833ca543f7edd55c8dca6521b) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 98dadcfb21060ca977354b71c592324cf0028d70 m

  Displaying video on canvas, scaled down preson tracking to fit video preview dimensions, code cleanup.

  • public/javascripts/VideoFrame.min.js (version 98dadcfb21060ca977354b71c592324cf0028d70) (diffs)
  • public/javascripts/previewers/person-tracking/some-library.js (version 98dadcfb21060ca977354b71c592324cf0028d70) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 9495463dc938ed61afa23f22136d7c120b34dfb8 m

  Bounding boxes uses corresponding colors from graph

  • public/javascripts/previewers/person-tracking/some-library.js (version 9495463dc938ed61afa23f22136d7c120b34dfb8) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 2f1623c6546a89cf1a15db75222f7f3be4cc45c0 m

  fixed bug  - person tracking visualization not getting displayed when other extractors run. Changed canvas height.

  • public/javascripts/previewers/person-tracking/some-library.js (version 2f1623c6546a89cf1a15db75222f7f3be4cc45c0) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 be78d75a8c5c79f6a0f004b02b525eb854bbacc9 m

  Fixed issue with JS file loads

  • public/javascripts/previewers/person-tracking/some-library.js (version be78d75a8c5c79f6a0f004b02b525eb854bbacc9) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 8c39b16c62996c64aa62c73fbafad8b63f3f7c99 m

  Preview registration

  • public/javascripts/previewers/person-tracking/package.json (version 8c39b16c62996c64aa62c73fbafad8b63f3f7c99) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 94af9299d9a7f257f5e855750df86423a40b54a4 m

  Color matching fixed.

  • public/javascripts/previewers/person-tracking/some-library.js (version 94af9299d9a7f257f5e855750df86423a40b54a4) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 14f6dd9ffd20903ae659ed910cd01a8a08d283fc m

  Added log message when any JS file loading fails.

  • public/javascripts/previewers/person-tracking/some-library.js (version 14f6dd9ffd20903ae659ed910cd01a8a08d283fc) (diffs)
• 

  Sandeep Puthanveetil Satheesan 24 Jun 2015 b5f5dcbc2244e5b7c545544c352a931f5b001c31 m

  Preview registration issue fixed.

  • app/controllers/Application.scala (version b5f5dcbc2244e5b7c545544c352a931f5b001c31) (diffs)
  • public/javascripts/previewers/person-tracking/package.json (version b5f5dcbc2244e5b7c545544c352a931f5b001c31) (diffs)
  • public/javascripts/previewers/person-tracking/some-library.js (version b5f5dcbc2244e5b7c545544c352a931f5b001c31) (diffs)
• 

  Luigi Marini 24 Jun 2015 5458ad89c369a2efd20c8f514775e9520ae52881 m

  Removed extra padding for menu items.

  • public/stylesheets/main.css (version 5458ad89c369a2efd20c8f514775e9520ae52881) (diffs)
• 

  Luigi Marini 24 Jun 2015 b5016fea1aa615970d510484295747c86a262498 m

  Merge pull request #444 in CATS/clowder from sections-click-video-navigation to develop
  * commit 'd4aa3f95690d77051e9eff367fddabbeb7f82225':
    Disabled Galleria info area in dataset page as it displayed no real info not viewable elsewhere and messed up the clicking of the main image. Toggleable sections click video navigation.
    Changed cursor to hand pointer when over Galleria main image (which can now move the video time on click).
    Removed autojump of Galleria slideshow when video proceeds. This was done because: -Now the user can select a point in the video to jump to by clicking on the image displayed in the Galleria main display, after it is displayed there. -When the video moves, the displayed image in Galleria main display changes (autojump). -If scenes change fast, then when the user clicks on a Galleria thumbnail to display it on the main screen, the displayed image is changed by the video automatically before the user has time to view his selected image and click on it to move on that point in the video.
    Cinemetrics sections in single file screen move to time point in video when section preview is clicked in galleria main display.
• 

  Luigi Marini 24 Jun 2015 3e7e1cf0e115b8a8fb7295cc364a70200c0395bb m

  Merge pull request #292 in CATS/clowder from video-mp4-plus-webm-support to develop
  * commit '1b4da2f8b01a7fad61dc23555d79e1c54f21978b':
    Getting the video preview content type directly on page load.
    Removal of unneeded file.
    EOL conversion to Unix.
    RabbitMQ plugin disabled by default.
    MP4+WebM video preview support for cross-browser compatibility.
• 

  Mario Felarca 24 Jun 2015 488e76779c7a4be9c12adb3f01ae53c36947b0b8 m

  Update to unify decoding and handling on the controller side. This is in preparation for unification with the other comment changes, and future expansion of how to handle specific allowed tags.

  • app/controllers/Collections.scala (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • app/controllers/Datasets.scala (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • app/controllers/Tags.scala (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • app/controllers/Utils.scala (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • app/views/datasets/collections.scala.html (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • app/views/datasets/editInfo.scala.html (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • public/javascripts/collection-create.js (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • public/javascripts/collectionDatasetsList.js (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • public/javascripts/dataset-create-fileuploader.js (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
  • public/javascripts/datasets/collections.js (version 488e76779c7a4be9c12adb3f01ae53c36947b0b8) (diffs)
• 

  Eugene Roeder 17 Jun 2015 ff041d5c67a3d08618962f32bef51aece4be6fe3 m

  Reworked merge conflicts with routes table.
• 

  Eugene Roeder 17 Jun 2015 566cbd1d3f85e35a7ea616a17c06a25284f0ffff m

  Added previews end point to remove file and also did file cleanup work in all three test suites.

  • app/api/Previews.scala (version 566cbd1d3f85e35a7ea616a17c06a25284f0ffff) (diffs)
  • conf/routes (version 566cbd1d3f85e35a7ea616a17c06a25284f0ffff) (diffs)
  • test/integration/collections/CollectionsAPIAppSpec.scala (version 566cbd1d3f85e35a7ea616a17c06a25284f0ffff) (diffs)
  • test/integration/extractions/ExtractionsAPIAppSpec.scala (version 566cbd1d3f85e35a7ea616a17c06a25284f0ffff) (diffs)
  • test/integration/previews/PreviewsAPIAppSpec.scala (version 566cbd1d3f85e35a7ea616a17c06a25284f0ffff) (diffs)
• 

  Constantinos Sophocleous 15 Jun 2015 d4aa3f95690d77051e9eff367fddabbeb7f82225 m

  Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/CATS/clowder into sections-click-video-navigation
• 

  Constantinos Sophocleous 15 Jun 2015 cbff83c76f94e7156eb7b43cb11d00e7d06903a4 m

  Disabled Galleria info area in dataset page as it displayed no real info not viewable elsewhere and messed up the clicking of the main image. Toggleable sections click video navigation.

  • app/views/file.scala.html (version cbff83c76f94e7156eb7b43cb11d00e7d06903a4) (diffs)
  • conf/application.conf (version cbff83c76f94e7156eb7b43cb11d00e7d06903a4) (diffs)
• 

  Mario Felarca 13 Jun 2015 b116bbad03b541e2915ff63c37cd121e0b7f66be m

  Updates to ensure that HTML entered into free text fields is safe when being displayed in the UI, while still ensuring that newlines can be retained correctly.

  • app/controllers/Collections.scala (version b116bbad03b541e2915ff63c37cd121e0b7f66be) (diffs)
  • app/controllers/Datasets.scala (version b116bbad03b541e2915ff63c37cd121e0b7f66be) (diffs)
  • app/controllers/Tags.scala (version b116bbad03b541e2915ff63c37cd121e0b7f66be) (diffs)
  • app/views/datasets/editInfo.scala.html (version b116bbad03b541e2915ff63c37cd121e0b7f66be) (diffs)
  • public/javascripts/collectionDatasetsList.js (version b116bbad03b541e2915ff63c37cd121e0b7f66be) (diffs)
  • public/javascripts/datasets/collections.js (version b116bbad03b541e2915ff63c37cd121e0b7f66be) (diffs)
• 

  Mario Felarca 12 Jun 2015 4409f4f388f0f2831456255225cffe2abf292ff2 m

  Responses to pull request comments. Updating ListBuffer vars to be vals where possible. Removal of console logging on client side.

  • app/controllers/Collections.scala (version 4409f4f388f0f2831456255225cffe2abf292ff2) (diffs)
  • app/controllers/Datasets.scala (version 4409f4f388f0f2831456255225cffe2abf292ff2) (diffs)
  • app/controllers/Files.scala (version 4409f4f388f0f2831456255225cffe2abf292ff2) (diffs)
  • app/views/datasets/editInfo.scala.html (version 4409f4f388f0f2831456255225cffe2abf292ff2) (diffs)
• 

  Constantinos Sophocleous 12 Jun 2015 9d5c263d591aa573d2f5f6bb1c28ca84adb553a4 m

  Changed cursor to hand pointer when over Galleria main image (which can now move the video time on click).

  • public/javascripts/galleria-classic/galleria.classic.css (version 9d5c263d591aa573d2f5f6bb1c28ca84adb553a4) (diffs)
• 

  Constantinos Sophocleous 12 Jun 2015 7294b1d428845e4e2dcd2a299b52852097a5d219 m

  Removed autojump of Galleria slideshow when video proceeds. This was done because: -Now the user can select a point in the video to jump to by clicking on the image displayed in the Galleria main display, after it is displayed there. -When the video moves, the displayed image in Galleria main display changes (autojump). -If scenes change fast, then when the user clicks on a Galleria thumbnail to display it on the main screen, the displayed image is changed by the video automatically before the user has time to view his selected image and click on it to move on that point in the video.

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

  Constantinos Sophocleous 12 Jun 2015 8b36851d1638fae06671a7e6bd0da1c123e8e181 m

  Cinemetrics sections in single file screen move to time point in video when section preview is clicked in galleria main display.

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

  Constantinos Sophocleous 12 Jun 2015 1b4da2f8b01a7fad61dc23555d79e1c54f21978b m

  Getting the video preview content type directly on page load.

  • app/views/file.scala.html (version 1b4da2f8b01a7fad61dc23555d79e1c54f21978b) (diffs)
  • public/javascripts/previewers/video/video.js (version 1b4da2f8b01a7fad61dc23555d79e1c54f21978b) (diffs)
• 

  Constantinos Sophocleous 12 Jun 2015 75d5b9f2ebaed2145461591f56ca744658fd649d m

  Removal of unneeded file.

  • README (version 75d5b9f2ebaed2145461591f56ca744658fd649d) (diffs)
• 

  Rob Kooper 09 Jun 2015 985858e27dfc1c6b37365dec9a68c9e5dbdf0cc5 m

  Merge remote-tracking branch 'origin/develop' into release/cs492
• 

  Constantinos Sophocleous 04 Jun 2015 2a3ff5c12bfb458aafdc056e7d07c681b8391fa3 m

  Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/CATS/clowder into video-mp4-plus-webm-support
  Conflicts:
          LICENSE
          README
          app/controllers/Application.scala
          conf/mimetypes.conf
          project/plugins.sbt
          public/plugins/expressInstall.swf
• 

  Luigi Marini 03 Jun 2015 043944ea8c064307ce24a411b82f4b2d5ebfee9c m

  Merge pull request #410 in CATS/clowder from move-search-bar to release/cs492
  * commit 'ce16af1b5740d553718153490a06ea5e030561ec':
    created help menu
    move search bar left of admin menu
• 

  Mario Felarca 03 Jun 2015 431e2b73c07e4811423d0f5f976d6213ab4cfc76 m

  Changes to fix all Dataset names, Collection names and descriptions, and comments. This includes editing and display dynamically after creation or on user interaction as well.

  • app/controllers/Collections.scala (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • app/controllers/Datasets.scala (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • app/controllers/Files.scala (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • app/controllers/Tags.scala (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • app/views/collectionList.scala.html (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • app/views/collectionofdatasets.scala.html (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • app/views/comment.scala.html (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • app/views/commentform.scala.html (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • app/views/datasets/collections.scala.html (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • app/views/datasetsContainingFile.scala.html (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • app/views/searchByTag.scala.html (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • app/views/searchResults.scala.html (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • public/javascripts/collection-create.js (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • public/javascripts/collectionDatasetsList.js (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • public/javascripts/comment-edit.js (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
  • public/javascripts/dataset-create-fileuploader.js (version 431e2b73c07e4811423d0f5f976d6213ab4cfc76) (diffs)
• 

  Eugene Roeder 02 Jun 2015 c60f90e320fa894a037e0bcbf5333de7037ab36e m

  Initial check in for Previews listing and removal end points.

  • app/api/Permissions.scala (version c60f90e320fa894a037e0bcbf5333de7037ab36e) (diffs)
  • app/api/Previews.scala (version c60f90e320fa894a037e0bcbf5333de7037ab36e) (diffs)
  • app/services/PreviewService.scala (version c60f90e320fa894a037e0bcbf5333de7037ab36e) (diffs)
  • app/services/mongodb/MongoDBPreviewService.scala (version c60f90e320fa894a037e0bcbf5333de7037ab36e) (diffs)
  • conf/routes (version c60f90e320fa894a037e0bcbf5333de7037ab36e) (diffs)
• 

  Mario Felarca 02 Jun 2015 80b795475717b0a194ef9dc62a8b09ddefe49a57 m

  First checkin of the pass through dataset description, which was used for testing. Some basic items for dataset name as well.

  • app/controllers/Datasets.scala (version 80b795475717b0a194ef9dc62a8b09ddefe49a57) (diffs)
  • app/views/collectionList.scala.html (version 80b795475717b0a194ef9dc62a8b09ddefe49a57) (diffs)
  • app/views/collectionofdatasets.scala.html (version 80b795475717b0a194ef9dc62a8b09ddefe49a57) (diffs)
  • app/views/comment.scala.html (version 80b795475717b0a194ef9dc62a8b09ddefe49a57) (diffs)
  • app/views/commentform.scala.html (version 80b795475717b0a194ef9dc62a8b09ddefe49a57) (diffs)
  • app/views/dataset.scala.html (version 80b795475717b0a194ef9dc62a8b09ddefe49a57) (diffs)
  • app/views/datasetList.scala.html (version 80b795475717b0a194ef9dc62a8b09ddefe49a57) (diffs)
  • app/views/datasets/editInfo.scala.html (version 80b795475717b0a194ef9dc62a8b09ddefe49a57) (diffs)
  • app/views/datasets/home.scala.html (version 80b795475717b0a194ef9dc62a8b09ddefe49a57) (diffs)
  • app/views/searchByTag.scala.html (version 80b795475717b0a194ef9dc62a8b09ddefe49a57) (diffs)
  • app/views/searchResults.scala.html (version 80b795475717b0a194ef9dc62a8b09ddefe49a57) (diffs)
  • public/javascripts/dataset-create-fileuploader.js (version 80b795475717b0a194ef9dc62a8b09ddefe49a57) (diffs)
• 

  Rob Kooper 02 Jun 2015 65222f831bc37500df8b817e0586291bdddf1ea6 m

  remove wrong merge

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

  Rob Kooper 01 Jun 2015 52cca022bddf1dacf0d57a97c9ade5d98e9cca72 m

  Merge branch 'develop' of ssh://opensource.ncsa.illinois.edu:7999/mmdb/medici-play into release/cs492
• 

  Rob Kooper 18 May 2015 ce16af1b5740d553718153490a06ea5e030561ec m

  created help menu

  • app/views/main.scala.html (version ce16af1b5740d553718153490a06ea5e030561ec) (diffs)
  • public/stylesheets/main.css (version ce16af1b5740d553718153490a06ea5e030561ec) (diffs)
• 

  Rob Kooper 18 May 2015 8f792f21cfc552b74b644a2d0ffccc7826490873 m

  move search bar left of admin menu

  • app/views/main.scala.html (version 8f792f21cfc552b74b644a2d0ffccc7826490873) (diffs)
• 

  Rob Kooper 18 May 2015 2cc042365209f3452da2e11cf7bda5df806727a7 m

  switch to models.User

  • test/integration/app-server/ApplicationSpec.scala (version 2cc042365209f3452da2e11cf7bda5df806727a7) (diffs)
• 

  Luigi Marini 15 May 2015 23571b8875b1c275eb4d24a7af4aee6e6ff28aff m

  Merge pull request #408 in MMDB/medici-play from models-user-on-views to release/cs492
  * commit 'bfabbc75634e50b6be7f7f54d4cddfb13740c803':
    fix no echo sometimes
    rearrange right side menu
    add models.User everywhere
• 

  Rob Kooper 14 May 2015 96d0586455a01765aba9e94da8a781cebcab7c0e m

  added back removed line

  • conf/routes (version 96d0586455a01765aba9e94da8a781cebcab7c0e) (diffs)
• 

  Rob Kooper 14 May 2015 fec6cfff4ed269217fa25c8456a3b1b118169702 m

  Merge remote-tracking branch 'origin/develop' into release/cs492
• 

  Rob Kooper 14 May 2015 bfabbc75634e50b6be7f7f54d4cddfb13740c803 m

  fix no echo sometimes
  make sure to do a stty echo after sbt to make sure echo is always
  enabled.

  • sbt (version bfabbc75634e50b6be7f7f54d4cddfb13740c803) (diffs)
• 

  Rob Kooper 14 May 2015 e3b2c3553661c0f1d96724889811bb492b36c01e m

  rearrange right side menu

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

  Rob Kooper 14 May 2015 3f34618aa7beccadd98a937c3fc27dc38f96d440 m

  add models.User everywhere

  • app/views/addExistingFiles.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/addNewFiles.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/addToExistingDataset.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/admin.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/adminIndex.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/carousel.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/collectionList.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/comment.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/commentform.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/datasetList.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/datasets/collections.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/datasets/deleteButton.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/datasets/editInfo.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/datasets/editLicense.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/datasets/tags.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/datasetsContainingFile.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/editProfile.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/emailEvents.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/extract.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/fileGeneralMetadataSearch.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/fileMetadataSearch.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/files/grid.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/filesList.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/fileusermetadata.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/generalMetadataSearch.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/index.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/licenseform.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/listAdmins.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/listAllExtractions.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/metadata.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/metadataSearch.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/multimediaSearchResults.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/multimediaSearchResultsCombined.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/multimediasearch.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/newAdmin.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/newCollection.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/newDataset.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/newsFeedCardEmail.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/newsfeedCard.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/noPermissions.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/notAuthorized.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/notesform.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/searchByTag.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/searchResults.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/tagCloud.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/tagList.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/tagListChar.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/upload.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
  • app/views/uploadExtract.scala.html (version 3f34618aa7beccadd98a937c3fc27dc38f96d440) (diffs)
• 

  Rob Kooper 14 May 2015 658a0f6711f909e28d83ae3cd3f58329499a8463 m

  make sure user is saved as ClowderUser

  • app/services/mongodb/MongoDBUserService.scala (version 658a0f6711f909e28d83ae3cd3f58329499a8463) (diffs)
• 

  Rob Kooper 13 May 2015 e2050a6a85aad1c315aec4aa689538ef00e068c0 m

  renamed MediciUser to ClowderUser
  case class not used anywhere, except to create anonymous object
  anonymous object now always has id=0000000000000

  • app/api/ApiController.scala (version e2050a6a85aad1c315aec4aa689538ef00e068c0) (diffs)
  • app/controllers/Profile.scala (version e2050a6a85aad1c315aec4aa689538ef00e068c0) (diffs)
  • app/models/User.scala (version e2050a6a85aad1c315aec4aa689538ef00e068c0) (diffs)
  • app/services/mongodb/MongoSalatPlugin.scala (version e2050a6a85aad1c315aec4aa689538ef00e068c0) (diffs)
• 

  Rob Kooper 13 May 2015 1a5061183154bd41d488ba69e6087ba3557b362b m

  use profile class
  move most of the profile information to separate class

  • app/api/Users.scala (version 1a5061183154bd41d488ba69e6087ba3557b362b) (diffs)
  • app/controllers/Profile.scala (version 1a5061183154bd41d488ba69e6087ba3557b362b) (diffs)
  • app/models/User.scala (version 1a5061183154bd41d488ba69e6087ba3557b362b) (diffs)
  • app/services/UserService.scala (version 1a5061183154bd41d488ba69e6087ba3557b362b) (diffs)
  • app/services/mongodb/MongoDBUserService.scala (version 1a5061183154bd41d488ba69e6087ba3557b362b) (diffs)
  • app/views/editProfile.scala.html (version 1a5061183154bd41d488ba69e6087ba3557b362b) (diffs)
  • app/views/profile.scala.html (version 1a5061183154bd41d488ba69e6087ba3557b362b) (diffs)
  • conf/routes (version 1a5061183154bd41d488ba69e6087ba3557b362b) (diffs)
• 

  Rob Kooper 13 May 2015 e39435715054e3bfead29f86bc117b22a855da7f m

  Merge remote-tracking branch 'origin/develop' into release/cs492
• 

  Luigi Marini 13 May 2015 cd881beebc8e15303a74f807cec5975cfd7aa5dd m

  Use instance display name instead of hardcoded name in rss feed

  • app/controllers/RSS.scala (version cd881beebc8e15303a74f807cec5975cfd7aa5dd) (diffs)
• 

  Rob Kooper 13 May 2015 6d4f9ef013a681314fbee34f9610c92258a2f3f7 m

  use MONGOUPDATE

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

  Rob Kooper 13 May 2015 d5f2a7e91a19b83a1179f9548f7c3b04d432ccc9 m

  limit number of updates

  • app/controllers/Application.scala (version d5f2a7e91a19b83a1179f9548f7c3b04d432ccc9) (diffs)
  • app/models/Event.scala (version d5f2a7e91a19b83a1179f9548f7c3b04d432ccc9) (diffs)
  • app/services/EventService.scala (version d5f2a7e91a19b83a1179f9548f7c3b04d432ccc9) (diffs)
  • app/services/mongodb/MongoDBEventService.scala (version d5f2a7e91a19b83a1179f9548f7c3b04d432ccc9) (diffs)
• 

  Luigi Marini 13 May 2015 fb680c96cb992582ec9bc021878118f9999733d9 m

  Fixed typo

  • app/util/Formatters.scala (version fb680c96cb992582ec9bc021878118f9999733d9) (diffs)
• 

  Rob Kooper 09 May 2015 61f0e4f13c80edbb937d626e3dd4de121f266703 m

  fix compile errors

  • app/controllers/Application.scala (version 61f0e4f13c80edbb937d626e3dd4de121f266703) (diffs)
  • test/integration/app-server/ApplicationSpec.scala (version 61f0e4f13c80edbb937d626e3dd4de121f266703) (diffs)
• 

  Rob Kooper 09 May 2015 7f192657cbc37fdd86bceb03782b0ce74d67e927 m

  Merge remote-tracking branch 'origin/develop' into release/cs492
• 

  Rob Kooper 08 May 2015 89a2eaa21e0c4e263d2386a59487c0ee19754730 m

  Merge pull request #383 in MMDB/medici-play from feature/recommendations to release/cs492
  * commit 'b157028dbe15cc906753e314c2a12b85f0c58e26':
    Changed recommendation layout for file/dataset/collection pages.
    Created modular javascript code for follow button and recommendation. Changed recommendation layout for profile page.
    Bug fixes.
    Load model name in recommendations list and filter out excluded IDs
    Fixed typo.
    Generate and display top 10 recommendations
    Added front-end code for profile pages.
    Bug fix: clear old recommendation list when fetching new list.
    Recommendation backend query and API
    Added front-end code for querying and displaying recommendations.
• 

  Constantinos Sophocleous 07 May 2015 33ec5721261096d8bac02eca70ed84488124cea0 m

  EOL conversion to Unix.

  • LICENSE (version 33ec5721261096d8bac02eca70ed84488124cea0) (diffs)
  • README (version 33ec5721261096d8bac02eca70ed84488124cea0) (diffs)
  • project/plugins.sbt (version 33ec5721261096d8bac02eca70ed84488124cea0) (diffs)
  • public/plugins/expressInstall.swf (version 33ec5721261096d8bac02eca70ed84488124cea0) (diffs)
• 

  Yibo Guo <nil.yibo@gmail.com> 06 May 2015 b157028dbe15cc906753e314c2a12b85f0c58e26 m

  Merge remote-tracking branch 'origin/release/cs492' into feature/recommendations
  # Conflicts:
  #        app/api/Users.scala
  #        app/controllers/Application.scala
  #        app/controllers/Profile.scala
  #        app/views/profile.scala.html
• 

  Varun Kethineedi <varunsaik@Varuns-MacBook-Pro-2.local> 06 May 2015 3be0739ec8e5859227bb927dd098fb2b417f1ab1 m

  Moved sendEmail to Events

  • app/models/Event.scala (version 3be0739ec8e5859227bb927dd098fb2b417f1ab1) (diffs)
  • app/models/JobsScheduler.scala (version 3be0739ec8e5859227bb927dd098fb2b417f1ab1) (diffs)
• 

  Rob Kooper 06 May 2015 caebc543cb3312518a7b51aa06ee292c46d39fcd m

  fixes to make things compile again

  • app/api/Users.scala (version caebc543cb3312518a7b51aa06ee292c46d39fcd) (diffs)
  • conf/routes (version caebc543cb3312518a7b51aa06ee292c46d39fcd) (diffs)
• 

  Rob Kooper 06 May 2015 176968127a1ead8c8ddc1b50dd31c94db25e6ec4 m

  Merge remote-tracking branch 'origin/develop' into release/cs492
• 

  Rob Kooper 06 May 2015 2378a7002d40fe00b193f3dda934e0348c63ed5f m

  Merge remote-tracking branch 'origin/release/cs492' into feature/rss
• 

  Rob Kooper 06 May 2015 1c9bedbbb26894a69e77ae5a3948a5f9e1816a0d m

  Add comment about MMDB-1842 Cleanup formatting

  • app/models/JobsScheduler.scala (version 1c9bedbbb26894a69e77ae5a3948a5f9e1816a0d) (diffs)
• 

  Varun Kethineedi <varunsaik@Varuns-MacBook-Pro-2.local> 06 May 2015 e8cfdb88591a0e90472699bc194cd3819acda114 m

  fixed issues
• 

  Rob Kooper 06 May 2015 d5f8040ed0e3b756d49a93bd68c90fc261c247f9 m

  make sure avatar url has only 1 ?

  • app/models/User.scala (version d5f8040ed0e3b756d49a93bd68c90fc261c247f9) (diffs)
• 

  Yibo Guo <nil.yibo@gmail.com> 05 May 2015 4cbb7e191fcd11e21f0527c052ae12fb272ed449 m

  Merge remote-tracking branch 'origin/release/cs492' into feature/recommendations
  # Conflicts:
  #        app/api/Collections.scala
  #        app/api/Datasets.scala
  #        app/api/Files.scala
  #        app/api/Users.scala
  #        app/controllers/Profile.scala
  #        app/views/collectionofdatasets.scala.html
  #        app/views/file.scala.html
  #        app/views/profile.scala.html
• 

  Yibo Guo <nil.yibo@gmail.com> 04 May 2015 c6440d7a74f803c48b9b3fb1db8b106b19143682 m

  Changed recommendation layout for file/dataset/collection pages.

  • app/views/collectionofdatasets.scala.html (version c6440d7a74f803c48b9b3fb1db8b106b19143682) (diffs)
  • app/views/datasets/follow.scala.html (version c6440d7a74f803c48b9b3fb1db8b106b19143682) (diffs)
  • app/views/file.scala.html (version c6440d7a74f803c48b9b3fb1db8b106b19143682) (diffs)
• 

  Yibo Guo <nil.yibo@gmail.com> 04 May 2015 ffa78450d840e48d027fb5b78006a2aa3598e21c m

  Created modular javascript code for follow button and recommendation. Changed recommendation layout for profile page.

  • app/views/profile.scala.html (version ffa78450d840e48d027fb5b78006a2aa3598e21c) (diffs)
  • public/javascripts/recommendation.js (version ffa78450d840e48d027fb5b78006a2aa3598e21c) (diffs)
• 

  Yibo Guo <nil.yibo@gmail.com> 04 May 2015 b83eff5815b850e9c7e93f2507233a6c844fe91a m

  Bug fixes.

  • app/api/Collections.scala (version b83eff5815b850e9c7e93f2507233a6c844fe91a) (diffs)
  • app/api/Datasets.scala (version b83eff5815b850e9c7e93f2507233a6c844fe91a) (diffs)
  • app/api/Files.scala (version b83eff5815b850e9c7e93f2507233a6c844fe91a) (diffs)
  • app/api/Users.scala (version b83eff5815b850e9c7e93f2507233a6c844fe91a) (diffs)
  • app/views/file.scala.html (version b83eff5815b850e9c7e93f2507233a6c844fe91a) (diffs)
• 

  Nishant Nayudu <nishant.nayudu@gmail.com> 04 May 2015 e86c6880279ab50e0ba9c47cbdf15301ba4addf4 m

  Fixed being able to unfollow other users entities bug

  • app/views/profile.scala.html (version e86c6880279ab50e0ba9c47cbdf15301ba4addf4) (diffs)
• 

  Nishant Nayudu <nishant.nayudu@gmail.com> 04 May 2015 a8df0333fdfc8bd144b0ba32871e4faae6fa580d m

  Fixing mis-matched Divs

  • app/views/profile.scala.html (version a8df0333fdfc8bd144b0ba32871e4faae6fa580d) (diffs)
• 

  Will Hennessy 04 May 2015 ae355fd3176e8315b58ae020daa47c48036bda1c m

  Merge
• 

  Will Hennessy 04 May 2015 aa42812669909f439d7a5ab6a58cafd613c597fa m

  Load model name in recommendations list and filter out excluded IDs

  • app/api/Collections.scala (version aa42812669909f439d7a5ab6a58cafd613c597fa) (diffs)
  • app/api/Datasets.scala (version aa42812669909f439d7a5ab6a58cafd613c597fa) (diffs)
  • app/api/Files.scala (version aa42812669909f439d7a5ab6a58cafd613c597fa) (diffs)
  • app/api/Users.scala (version aa42812669909f439d7a5ab6a58cafd613c597fa) (diffs)
  • app/services/UserService.scala (version aa42812669909f439d7a5ab6a58cafd613c597fa) (diffs)
  • app/services/mongodb/MongoDBUserService.scala (version aa42812669909f439d7a5ab6a58cafd613c597fa) (diffs)
  • app/views/collectionofdatasets.scala.html (version aa42812669909f439d7a5ab6a58cafd613c597fa) (diffs)
  • app/views/datasets/follow.scala.html (version aa42812669909f439d7a5ab6a58cafd613c597fa) (diffs)
  • app/views/file.scala.html (version aa42812669909f439d7a5ab6a58cafd613c597fa) (diffs)
• 

  Yibo Guo <nil.yibo@gmail.com> 04 May 2015 1f114e4cdf7d7f8b7ce280ee98b32255ae8b6365 m

  Fixed typo.

  • app/views/profile.scala.html (version 1f114e4cdf7d7f8b7ce280ee98b32255ae8b6365) (diffs)
• 

  Xiaocheng Yuan <yxcmax@gmail.com> 04 May 2015 cfff764ef5de8c56109e442712ab24c97edfe072 m

  Merge branch 'release/cs492' of https://opensource.ncsa.illinois.edu/stash/scm/mmdb/medici-play into feature/rss
  Conflicts:
          app/controllers/Profile.scala
• 

  Nishant Nayudu <nishant.nayudu@gmail.com> 04 May 2015 1c41d9d0a3b4f1f084a1edbb7ce8e104428a8cc8 m

  Merging viewProfileUUID, User.Scala
• 

  Varun Kethineedi <varunsaik@Varuns-MacBook-Pro-2.local> 04 May 2015 232dab49c090f04bf50747b96604122656f831a8 m

  Fixed Merge Conflict
• 

  Nishant Nayudu <nishant.nayudu@gmail.com> 04 May 2015 f38491fbda1c5e66983f6cae205f22acfaf9ce47 m

  Profile Page with Follower Management

  • app/controllers/Profile.scala (version f38491fbda1c5e66983f6cae205f22acfaf9ce47) (diffs)
  • app/models/User.scala (version f38491fbda1c5e66983f6cae205f22acfaf9ce47) (diffs)
  • app/services/CollectionService.scala (version f38491fbda1c5e66983f6cae205f22acfaf9ce47) (diffs)
  • app/services/FileService.scala (version f38491fbda1c5e66983f6cae205f22acfaf9ce47) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version f38491fbda1c5e66983f6cae205f22acfaf9ce47) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version f38491fbda1c5e66983f6cae205f22acfaf9ce47) (diffs)
  • app/views/profile.scala.html (version f38491fbda1c5e66983f6cae205f22acfaf9ce47) (diffs)
  • public/javascripts/follow-button.js (version f38491fbda1c5e66983f6cae205f22acfaf9ce47) (diffs)
  • public/stylesheets/main.css (version f38491fbda1c5e66983f6cae205f22acfaf9ce47) (diffs)
• 

  Xiaocheng Yuan 28 Apr 2015 2e67699aa32608d1b3256a9c58af3c763d1ffca8 m

  RSS feed

  • app/controllers/RSS.scala (version 2e67699aa32608d1b3256a9c58af3c763d1ffca8) (diffs)
  • app/services/EventService.scala (version 2e67699aa32608d1b3256a9c58af3c763d1ffca8) (diffs)
  • app/services/mongodb/MongoDBEventService.scala (version 2e67699aa32608d1b3256a9c58af3c763d1ffca8) (diffs)
  • app/views/newsFeedCardEmail.scala.html (version 2e67699aa32608d1b3256a9c58af3c763d1ffca8) (diffs)
  • conf/routes (version 2e67699aa32608d1b3256a9c58af3c763d1ffca8) (diffs)
• 

  Varun Kethineedi <varunsaik@wirelessprvnat-172-17-99-231.near.illinois.edu> 27 Apr 2015 34ddf10408eb60a166b3f900d33ffa3d9727bbc4 m

  Fixed Formatting

  • app/controllers/Profile.scala (version 34ddf10408eb60a166b3f900d33ffa3d9727bbc4) (diffs)
  • app/models/JobsScheduler.scala (version 34ddf10408eb60a166b3f900d33ffa3d9727bbc4) (diffs)
  • app/services/EventService.scala (version 34ddf10408eb60a166b3f900d33ffa3d9727bbc4) (diffs)
  • app/services/mongodb/MongoDBEventService.scala (version 34ddf10408eb60a166b3f900d33ffa3d9727bbc4) (diffs)
  • app/services/mongodb/MongoDBSchedulerService.scala (version 34ddf10408eb60a166b3f900d33ffa3d9727bbc4) (diffs)
• 

  Varun Kethineedi <varunsaik@wirelessprvnat-172-17-99-231.near.illinois.edu> 27 Apr 2015 91b4b0c5b6c0674c7742c05fccdd44776f373728 m

  Fixed Indentation issues

  • app/api/Datasets.scala (version 91b4b0c5b6c0674c7742c05fccdd44776f373728) (diffs)
  • app/api/Events.scala (version 91b4b0c5b6c0674c7742c05fccdd44776f373728) (diffs)
  • app/api/Files.scala (version 91b4b0c5b6c0674c7742c05fccdd44776f373728) (diffs)
  • app/controllers/Profile.scala (version 91b4b0c5b6c0674c7742c05fccdd44776f373728) (diffs)
  • app/models/Event.scala (version 91b4b0c5b6c0674c7742c05fccdd44776f373728) (diffs)
• 

  Yibo Guo <nil.yibo@gmail.com> 26 Apr 2015 7265acb33d267c4045ef8cd958ab8f2885fa28e2 m

  Merge branch 'feature/recommendation-front-end' into feature/recommendations
• 

  Varun Kethineedi <varunsaik@wirelessprvnat-172-17-99-231.near.illinois.edu> 26 Apr 2015 87c68fa5189e6924449e1107a88e00f968f606e0 m

  Added Email Notifications and General Jobs Queue

  • app/Global.scala (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
  • app/controllers/Profile.scala (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
  • app/models/JobsScheduler.scala (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
  • app/models/TimerJob.scala (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
  • app/models/User.scala (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
  • app/services/DI.scala (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
  • app/services/EventService.scala (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
  • app/services/SchedulerService.scala (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
  • app/services/mongodb/MongoDBEventService.scala (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
  • app/services/mongodb/MongoDBSchedulerService.scala (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
  • app/views/editProfile.scala.html (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
  • app/views/emailEvents.scala.html (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
  • app/views/newsFeedCardEmail.scala.html (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
  • conf/application.conf (version 87c68fa5189e6924449e1107a88e00f968f606e0) (diffs)
• 

  Will Hennessy 26 Apr 2015 43d2eb5be3eec5a2febd5329bb1876eec8e57881 m

  Generate and display top 10 recommendations

  • app/api/Collections.scala (version 43d2eb5be3eec5a2febd5329bb1876eec8e57881) (diffs)
  • app/api/Datasets.scala (version 43d2eb5be3eec5a2febd5329bb1876eec8e57881) (diffs)
  • app/api/Files.scala (version 43d2eb5be3eec5a2febd5329bb1876eec8e57881) (diffs)
  • app/api/Users.scala (version 43d2eb5be3eec5a2febd5329bb1876eec8e57881) (diffs)
  • app/controllers/Application.scala (version 43d2eb5be3eec5a2febd5329bb1876eec8e57881) (diffs)
  • app/models/TypedID.scala (version 43d2eb5be3eec5a2febd5329bb1876eec8e57881) (diffs)
  • app/services/UserService.scala (version 43d2eb5be3eec5a2febd5329bb1876eec8e57881) (diffs)
  • app/services/mongodb/MongoDBUserService.scala (version 43d2eb5be3eec5a2febd5329bb1876eec8e57881) (diffs)
  • app/views/collectionofdatasets.scala.html (version 43d2eb5be3eec5a2febd5329bb1876eec8e57881) (diffs)
  • app/views/datasets/follow.scala.html (version 43d2eb5be3eec5a2febd5329bb1876eec8e57881) (diffs)
  • app/views/file.scala.html (version 43d2eb5be3eec5a2febd5329bb1876eec8e57881) (diffs)
  • conf/application.conf (version 43d2eb5be3eec5a2febd5329bb1876eec8e57881) (diffs)
  • conf/routes (version 43d2eb5be3eec5a2febd5329bb1876eec8e57881) (diffs)
• 

  Yibo Guo <nil.yibo@gmail.com> 26 Apr 2015 c906c14f93aef9eb6240939018d1675949d5f979 m

  Added front-end code for profile pages.

  • app/api/Users.scala (version c906c14f93aef9eb6240939018d1675949d5f979) (diffs)
  • app/views/profile.scala.html (version c906c14f93aef9eb6240939018d1675949d5f979) (diffs)
• 

  Yibo Guo <nil.yibo@gmail.com> 26 Apr 2015 dd546b61524aec5adc2b0a5295c20436c8aadd09 m

  Bug fix: clear old recommendation list when fetching new list.

  • app/views/collectionofdatasets.scala.html (version dd546b61524aec5adc2b0a5295c20436c8aadd09) (diffs)
  • app/views/datasets/follow.scala.html (version dd546b61524aec5adc2b0a5295c20436c8aadd09) (diffs)
  • app/views/file.scala.html (version dd546b61524aec5adc2b0a5295c20436c8aadd09) (diffs)
• 

  Will Hennessy 26 Apr 2015 3caecc8597eda89c6c6de0b7afae6d21a113ffc5 m

  Merged frontend and backend
• 

  Will Hennessy 26 Apr 2015 b6f87d2655b49ceb110194676871038c15fd3bf0 m

  Recommendation backend query and API

  • app/api/Users.scala (version b6f87d2655b49ceb110194676871038c15fd3bf0) (diffs)
  • app/controllers/Application.scala (version b6f87d2655b49ceb110194676871038c15fd3bf0) (diffs)
  • app/services/UserService.scala (version b6f87d2655b49ceb110194676871038c15fd3bf0) (diffs)
  • app/services/mongodb/MongoDBUserService.scala (version b6f87d2655b49ceb110194676871038c15fd3bf0) (diffs)
  • conf/routes (version b6f87d2655b49ceb110194676871038c15fd3bf0) (diffs)
• 

  Yibo Guo <nil.yibo@gmail.com> 26 Apr 2015 14e582157d03fc8930e09b16c68478aa3b26f4d4 m

  Added front-end code for querying and displaying recommendations.

  • app/api/Collections.scala (version 14e582157d03fc8930e09b16c68478aa3b26f4d4) (diffs)
  • app/api/Datasets.scala (version 14e582157d03fc8930e09b16c68478aa3b26f4d4) (diffs)
  • app/api/Files.scala (version 14e582157d03fc8930e09b16c68478aa3b26f4d4) (diffs)
  • app/controllers/Application.scala (version 14e582157d03fc8930e09b16c68478aa3b26f4d4) (diffs)
  • app/controllers/Profile.scala (version 14e582157d03fc8930e09b16c68478aa3b26f4d4) (diffs)
  • app/models/MiniEntity.scala (version 14e582157d03fc8930e09b16c68478aa3b26f4d4) (diffs)
  • app/views/collectionofdatasets.scala.html (version 14e582157d03fc8930e09b16c68478aa3b26f4d4) (diffs)
  • app/views/datasets/follow.scala.html (version 14e582157d03fc8930e09b16c68478aa3b26f4d4) (diffs)
  • app/views/file.scala.html (version 14e582157d03fc8930e09b16c68478aa3b26f4d4) (diffs)
  • conf/routes (version 14e582157d03fc8930e09b16c68478aa3b26f4d4) (diffs)
• 

  Varun Kethineedi <varunsaik@wirelessprvnat-172-17-99-231.near.illinois.edu> 25 Apr 2015 4d6d798d7c0a3072e5247e309690e00b8c40dfc3 m

  Merged Complete
• 

  Yibo Guo <nil.yibo@gmail.com> 25 Apr 2015 59d82ce451fe3c7f6de42fe38ad6f8b3f1779593 m

  Changed followedEntities to a list of typed id. I.e. combine the list of different followed entities to one single list with type.

  • app/models/User.scala (version 59d82ce451fe3c7f6de42fe38ad6f8b3f1779593) (diffs)
  • app/services/mongodb/MongoDBUserService.scala (version 59d82ce451fe3c7f6de42fe38ad6f8b3f1779593) (diffs)
  • app/services/mongodb/TypedIdDAO.scala (version 59d82ce451fe3c7f6de42fe38ad6f8b3f1779593) (diffs)
  • app/views/profile.scala.html (version 59d82ce451fe3c7f6de42fe38ad6f8b3f1779593) (diffs)
• 

  Yibo Guo <nil.yibo@gmail.com> 23 Apr 2015 8eac0f88413bf5edf5c1dd63522179e38daf0961 m

  Merge remote-tracking branch 'origin/release/cs492' into feature/following-model
  # Conflicts:
  #        app/api/Users.scala
  #        app/controllers/Datasets.scala
  #        app/controllers/Files.scala
  #        app/controllers/Profile.scala
  #        app/models/User.scala
  #        app/services/mongodb/MongoDBUserService.scala
  #        app/views/dataset.scala.html
  #        app/views/file.scala.html
  #        conf/routes
• 

  Yibo Guo <nil.yibo@gmail.com> 23 Apr 2015 f91bdfc2457e1d29acbb182abf01373eada23a7b m

  Created a sub-document to store followed entities.

  • app/models/User.scala (version f91bdfc2457e1d29acbb182abf01373eada23a7b) (diffs)
  • app/services/mongodb/MongoDBUserService.scala (version f91bdfc2457e1d29acbb182abf01373eada23a7b) (diffs)
  • app/views/profile.scala.html (version f91bdfc2457e1d29acbb182abf01373eada23a7b) (diffs)
• 

  Varun Kethineedi <varunsaik@wirelessprvnat-172-17-4-95.near.illinois.edu> 22 Apr 2015 4e46bc1a98591416145bc496d6a474bee131923d m

  Merge branch 'feature-events' of https://opensource.ncsa.illinois.edu/stash/scm/mmdb/medici-play into feature-events
• 

  Varun Kethineedi <varunsaik@wirelessprvnat-172-17-4-95.near.illinois.edu> 22 Apr 2015 43b4a3cb77cb5e4e75a1712ef77e69cb67f19c9f m

  fixed pull request stuff

  • app/api/Collections.scala (version 43b4a3cb77cb5e4e75a1712ef77e69cb67f19c9f) (diffs)
  • app/api/Comments.scala (version 43b4a3cb77cb5e4e75a1712ef77e69cb67f19c9f) (diffs)
  • app/api/Datasets.scala (version 43b4a3cb77cb5e4e75a1712ef77e69cb67f19c9f) (diffs)
  • app/api/Files.scala (version 43b4a3cb77cb5e4e75a1712ef77e69cb67f19c9f) (diffs)
  • app/controllers/Collections.scala (version 43b4a3cb77cb5e4e75a1712ef77e69cb67f19c9f) (diffs)
  • app/controllers/Files.scala (version 43b4a3cb77cb5e4e75a1712ef77e69cb67f19c9f) (diffs)
  • app/models/MiniUser.scala (version 43b4a3cb77cb5e4e75a1712ef77e69cb67f19c9f) (diffs)
  • app/models/User.scala (version 43b4a3cb77cb5e4e75a1712ef77e69cb67f19c9f) (diffs)
  • app/services/EventService.scala (version 43b4a3cb77cb5e4e75a1712ef77e69cb67f19c9f) (diffs)
• 

  Xiaocheng Yuan 22 Apr 2015 64b64202a6f9af62a73e0dd6cd1ff6dd7bf99fac m

  Fix newsfeed card size; extract function to convert timestamp into human readable string

  • app/util/Formatters.scala (version 64b64202a6f9af62a73e0dd6cd1ff6dd7bf99fac) (diffs)
  • app/views/index.scala.html (version 64b64202a6f9af62a73e0dd6cd1ff6dd7bf99fac) (diffs)
• 

  Rob Kooper 22 Apr 2015 9c4a094b15e1930851d0fab84f4faa29423923aa m

  Merge remote-tracking branch 'origin/release/cs492' into MMDB-1739-user-object-extend-identity
• 

  Constantinos Sophocleous 22 Apr 2015 eb80a0783032513aaa081b764b0e2ae6e9f4bde2 m

  Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/MED/medici-play into video-mp4-plus-webm-support
  Conflicts:
          public/javascripts/previewers/video/video.js