clowder

• 

  Indira Gutierrez Polo 11 Aug 2015 b811b7d166d629f9b732d6d7fd18ba334187f4ab

  Modify Create Dataset Page -Moving the create dataset button above. -Merging both create dataset functionality -> Add new files not working. - Redirect to the dataset after creating the dataset. - Change Existing files to a jquery-chosen. It allows you to search for files instead of just showing the list

  • app/controllers/Datasets.scala (version b811b7d166d629f9b732d6d7fd18ba334187f4ab) (diffs)
  • app/views/addExistingFiles.scala.html (version b811b7d166d629f9b732d6d7fd18ba334187f4ab) (diffs)
  • app/views/addNewFiles.scala.html (version b811b7d166d629f9b732d6d7fd18ba334187f4ab) (diffs)
  • app/views/addToExistingDataset.scala.html (version b811b7d166d629f9b732d6d7fd18ba334187f4ab) (diffs)
  • app/views/newDataset.scala.html (version b811b7d166d629f9b732d6d7fd18ba334187f4ab) (diffs)
  • public/javascripts/dataset-create-fileuploader.js (version b811b7d166d629f9b732d6d7fd18ba334187f4ab) (diffs)
• 

  Luigi Marini 11 Aug 2015 d63933d8fdb19218813f08b14c207c7eae353508

  Merge pull request #502 in CATS/clowder from feature/CATS-118-create-migration-to-spaces to feature/spaces
  * commit '46d6681c5ba6392248dd71fa01e40b5f372a32de':
    convert to spaces
• 

  Luigi Marini 11 Aug 2015 2321cab6fde33d6a5a5f9f569b19c503cadfb5a3

  Merge pull request #487 in CATS/clowder from feature/CATS-104-add-edit-functionality-for-title to feature/spaces
  * commit '989730d0f8ef613e87e606994bf7aeb7a0d12084':
    Comment updates: - Adding btn-primary class to buttons. - Adding class inline instead of style - Added Permission to display the edit buttons - Changed description input to a textarea - Added form-control to the input/text areas.
    Adding css class btn and btn-sm to buttons.
    Changing HTTP method from POST to PUT
    Updating news feed for showing when a use updates a collection
    Edit Description  in Collections
    Edit Title in Collections
• 

  Indira Gutierrez Polo 11 Aug 2015 989730d0f8ef613e87e606994bf7aeb7a0d12084

  Merge branch 'feature/spaces' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-104-add-edit-functionality-for-title
  # Conflicts:
  #        app/views/datasets/home.scala.html
  #        app/views/spaces/spaceLink.scala.html
  #        public/stylesheets/main.css
• 

  Luigi Marini 11 Aug 2015 7293373f490e4cbc2cd84ee67af879cb971c8a88

  Merge pull request #500 in CATS/clowder from feature/CATS-86-invite-user-who-don-t-have-an-account to feature/spaces
  * commit 'd2a904722fda8b5bdbf239cdfbf4b9a1ce379628':
    Comment updates: - Renaming the route for consistency. - typo in invite.scala.html - added comment near specific part for registration that was updated.
    Updates from Comments in pull request: - Add documentation for controllers.Registration - Changed roleId to be a String instead of a Role in the SpaceInvite - Minor refactoring
    When the email entered is associated with a user in the space, send  an email (inviteNotificationEmail) Send email when a person is added to a space (CATS-85). (api/Spaces changes)
    Fixing Issue with UUID for securesocial invites. Saving and looking up invites as string.
    * CATS86: At a very preliminary stage... * Creating email to be sent to admins when people are invited to a space. * Creating email to be sent to new members when people are invited to a space. * -Added methods in the SpaceService to save the token with space, and role invitation information, create, read, and delete methods     -Added new method to handle registration, haven't added it to routes yet. * - Changed the method where the signup page posted to. Is a copy of the securesocial post method with an update. It checks if there is an invitation with the token, and if there is, adds the person to the space with the designated role. Otherwise is the same as before.
• 

  Indira Gutierrez Polo 11 Aug 2015 d2a904722fda8b5bdbf239cdfbf4b9a1ce379628

  Merge branch 'feature/spaces' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-86-invite-user-who-don-t-have-an-account
  # Conflicts:
  #        app/controllers/Spaces.scala
  #        app/controllers/Users.scala
  #        app/services/SpaceService.scala
  #        app/services/mongodb/MongoDBSpaceService.scala
  #        app/views/spaces/usersBySpace.scala.html
  #        conf/routes
• 

  Luigi Marini 11 Aug 2015 608f1cbb954457f419b095730f95ba3111bbd898

  Merge pull request #488 in CATS/clowder from feature/CATS-105-update-edit-functionality-for-title to feature/spaces
  * commit '1380d800eb0d72a53fe11403fde511366020aad8':
    Comment updates: - Adding btn-primary class to buttons.
    Comment updates: - Checking EditDataset Permission to show the edit buttons. - Sync the style/classes for all the edit buttons - Duplicating import for encodeDecode.js to avoid "Uncaught ReferenceError: htmlEncode is not defined" error.
    Added css class inline for display:inline.
    Renaming variable.
    Changing btn class meant to add btn-sm instead of btn-xs
    Adding css classes btn and btn-xs to the save buttons. Making the save button for the description be in the next line.
    Moving edit name, description, and license to an edit icon next to each one.
• 

  Luigi Marini 11 Aug 2015 2ad8b598629be816c2db4eeb2726874726f5b7cb

  Merge pull request #493 in CATS/clowder from bugfix/CATS-106-fix-layout-for-profile-my-datasets to feature/spaces
  * commit '566a05902821a7480c68cb35171dc5f9f6876a1a':
    multiple masonry container in profile page
• 

  Yan Zhao 10 Aug 2015 e03141285d6b26a592b2b4f40a328dec9a8393f2

  email subject & body out of for-loop

  • app/controllers/Spaces.scala (version e03141285d6b26a592b2b4f40a328dec9a8393f2) (diffs)
• 

  Yan Zhao 10 Aug 2015 20deac630b482d22485921a037b5031cf501403c

  send email to all user-in-space with editspace permission

  • app/api/Permissions.scala (version 20deac630b482d22485921a037b5031cf501403c) (diffs)
• 

  Yan Zhao 10 Aug 2015 88e510434ed78a2609e098edb4b16289618d245b

  send email to all user-in-space with editspace permission

  • app/models/Dataset.scala (version 88e510434ed78a2609e098edb4b16289618d245b) (diffs)
• 

  Yan Zhao 10 Aug 2015 97fe931a3b25f2df61fe0d181c83e1aa5f3aaad4

  send email to all user-in-space with editspace permission

  • app/models/Dataset.scala (version 97fe931a3b25f2df61fe0d181c83e1aa5f3aaad4) (diffs)
• 

  Yan Zhao 10 Aug 2015 f798adcc838b2d5896a95150537719558de8c69a

  send email to all user-in-space with editspace permission

  • app/controllers/Application.scala (version f798adcc838b2d5896a95150537719558de8c69a) (diffs)
  • app/controllers/Spaces.scala (version f798adcc838b2d5896a95150537719558de8c69a) (diffs)
• 

  Yan Zhao 10 Aug 2015 8fe9ac9109d56990409b4d6f88ad0e2edb148097

  remove one line in requestemail & use findRoleByName

  • app/controllers/Spaces.scala (version 8fe9ac9109d56990409b4d6f88ad0e2edb148097) (diffs)
  • app/views/spaces/requestemail.scala.html (version 8fe9ac9109d56990409b4d6f88ad0e2edb148097) (diffs)
• 

  Yan Zhao 10 Aug 2015 8c27bfbc4229c043b8119685aca78bc2a6bc2e81

  delete duplicts in Dataset

  • app/models/Dataset.scala (version 8c27bfbc4229c043b8119685aca78bc2a6bc2e81) (diffs)
• 

  Yan Zhao 10 Aug 2015 fe56ee73d9bec25936b1f282c52774fbf2542e83

  rename responce email

  • app/controllers/Application.scala (version fe56ee73d9bec25936b1f282c52774fbf2542e83) (diffs)
  • app/controllers/Spaces.scala (version fe56ee73d9bec25936b1f282c52774fbf2542e83) (diffs)
  • app/services/EventService.scala (version fe56ee73d9bec25936b1f282c52774fbf2542e83) (diffs)
  • app/services/mongodb/MongoDBEventService.scala (version fe56ee73d9bec25936b1f282c52774fbf2542e83) (diffs)
  • app/views/spaces/acceptemail.scala.html (version fe56ee73d9bec25936b1f282c52774fbf2542e83) (diffs)
  • app/views/spaces/requestresponseemail.scala.html (version fe56ee73d9bec25936b1f282c52774fbf2542e83) (diffs)
• 

  Yan Zhao 10 Aug 2015 c966f3c24476202edbd5861cfc6f3f6e9f34c0f3

  reslove compile error

  • app/controllers/SecuredController.scala (version c966f3c24476202edbd5861cfc6f3f6e9f34c0f3) (diffs)
  • app/services/mongodb/MongoDBSpaceService.scala (version c966f3c24476202edbd5861cfc6f3f6e9f34c0f3) (diffs)
• 

  Indira Gutierrez Polo 10 Aug 2015 f8264e85b8b9fd026336b6963aa925a133ee8d31 m

  Comment updates: - Adding btn-primary class to buttons. - Adding class inline instead of style - Added Permission to display the edit buttons - Changed description input to a textarea - Added form-control to the input/text areas.

  • app/views/collectionofdatasets.scala.html (version f8264e85b8b9fd026336b6963aa925a133ee8d31) (diffs)
  • app/views/dataset.scala.html (version f8264e85b8b9fd026336b6963aa925a133ee8d31) (diffs)
  • app/views/datasets/home.scala.html (version f8264e85b8b9fd026336b6963aa925a133ee8d31) (diffs)
  • app/views/spaces/spaceLink.scala.html (version f8264e85b8b9fd026336b6963aa925a133ee8d31) (diffs)
  • public/stylesheets/main.css (version f8264e85b8b9fd026336b6963aa925a133ee8d31) (diffs)
• 

  Indira Gutierrez Polo 10 Aug 2015 1380d800eb0d72a53fe11403fde511366020aad8 m

  Comment updates: - Adding btn-primary class to buttons.

  • app/views/dataset.scala.html (version 1380d800eb0d72a53fe11403fde511366020aad8) (diffs)
  • app/views/datasets/home.scala.html (version 1380d800eb0d72a53fe11403fde511366020aad8) (diffs)
• 

  Indira Gutierrez Polo 10 Aug 2015 da47c8d320554385f48bf31e610b82f6ed74c38f m

  Comment updates: - Checking EditDataset Permission to show the edit buttons. - Sync the style/classes for all the edit buttons - Duplicating import for encodeDecode.js to avoid "Uncaught ReferenceError: htmlEncode is not defined" error.

  • app/views/dataset.scala.html (version da47c8d320554385f48bf31e610b82f6ed74c38f) (diffs)
  • app/views/datasets/editLicense.scala.html (version da47c8d320554385f48bf31e610b82f6ed74c38f) (diffs)
  • app/views/datasets/home.scala.html (version da47c8d320554385f48bf31e610b82f6ed74c38f) (diffs)
  • app/views/newsfeedCard.scala.html (version da47c8d320554385f48bf31e610b82f6ed74c38f) (diffs)
  • app/views/spaces/spaceLink.scala.html (version da47c8d320554385f48bf31e610b82f6ed74c38f) (diffs)
  • public/stylesheets/main.css (version da47c8d320554385f48bf31e610b82f6ed74c38f) (diffs)
• 

  Yan Zhao 10 Aug 2015 c0c455c5bab7a69e1a21227c17ce986b3ac73318

  merge conflict
• 

  Yan Zhao 10 Aug 2015 1a405ba3fcc76f806ee637cd6f6dc53dbec2b193 m

  autoformat

  • app/controllers/SecuredController.scala (version 1a405ba3fcc76f806ee637cd6f6dc53dbec2b193) (diffs)
• 

  Yan Zhao 10 Aug 2015 34b75a7ae763ed1d13ec1877a66eba9602b3e05b m

  email when accept/reject

  • app/api/Permissions.scala (version 34b75a7ae763ed1d13ec1877a66eba9602b3e05b) (diffs)
  • app/controllers/SecuredController.scala (version 34b75a7ae763ed1d13ec1877a66eba9602b3e05b) (diffs)
  • app/controllers/Spaces.scala (version 34b75a7ae763ed1d13ec1877a66eba9602b3e05b) (diffs)
  • app/controllers/Users.scala (version 34b75a7ae763ed1d13ec1877a66eba9602b3e05b) (diffs)
  • app/models/Collection.scala (version 34b75a7ae763ed1d13ec1877a66eba9602b3e05b) (diffs)
  • app/models/Dataset.scala (version 34b75a7ae763ed1d13ec1877a66eba9602b3e05b) (diffs)
  • app/views/notAuthorized.scala.html (version 34b75a7ae763ed1d13ec1877a66eba9602b3e05b) (diffs)
  • app/views/spaces/acceptemail.scala.html (version 34b75a7ae763ed1d13ec1877a66eba9602b3e05b) (diffs)
  • app/views/spaces/requestemail.scala.html (version 34b75a7ae763ed1d13ec1877a66eba9602b3e05b) (diffs)
• 

  Indira Gutierrez Polo 07 Aug 2015 0370c96a004d4c55075c1879728115451f364e4e m

  Comment updates: - Renaming the route for consistency. - typo in invite.scala.html - added comment near specific part for registration that was updated.

  • app/api/Spaces.scala (version 0370c96a004d4c55075c1879728115451f364e4e) (diffs)
  • app/controllers/Registration.scala (version 0370c96a004d4c55075c1879728115451f364e4e) (diffs)
  • app/models/Space.scala (version 0370c96a004d4c55075c1879728115451f364e4e) (diffs)
  • app/views/spaces/invite.scala.html (version 0370c96a004d4c55075c1879728115451f364e4e) (diffs)
  • conf/routes (version 0370c96a004d4c55075c1879728115451f364e4e) (diffs)
• 

  Rob Kooper 07 Aug 2015 46d6681c5ba6392248dd71fa01e40b5f372a32de m

  convert to spaces

  • app/services/mongodb/MongoSalatPlugin.scala (version 46d6681c5ba6392248dd71fa01e40b5f372a32de) (diffs)
  • app/views/spaces/usersBySpace.scala.html (version 46d6681c5ba6392248dd71fa01e40b5f372a32de) (diffs)
• 

  Indira Gutierrez Polo 06 Aug 2015 23416e04e47d8f3ae783da83ff78044145beed89 m

  Added css class inline for display:inline.

  • app/views/dataset.scala.html (version 23416e04e47d8f3ae783da83ff78044145beed89) (diffs)
  • app/views/datasets/editLicense.scala.html (version 23416e04e47d8f3ae783da83ff78044145beed89) (diffs)
  • app/views/datasets/home.scala.html (version 23416e04e47d8f3ae783da83ff78044145beed89) (diffs)
  • app/views/newsfeedCard.scala.html (version 23416e04e47d8f3ae783da83ff78044145beed89) (diffs)
  • public/stylesheets/main.css (version 23416e04e47d8f3ae783da83ff78044145beed89) (diffs)
• 

  Yan Zhao 06 Aug 2015 7a846ca0c430c14c006bc161a8dd4e38aca104df m

  dropdown for roles when accepting request

  • public/javascripts/spaces/modify.js (version 7a846ca0c430c14c006bc161a8dd4e38aca104df) (diffs)
• 

  Yan Zhao 06 Aug 2015 ff8e7fefcfed20834067c8d23ebb043fc85d9a16 m

  dropdown for roles when accepting request

  • app/views/spaces/usersBySpace.scala.html (version ff8e7fefcfed20834067c8d23ebb043fc85d9a16) (diffs)
• 

  Indira Gutierrez Polo 06 Aug 2015 6a2bbe0decbccf73405a519cf0c3afd2ee9ee802 m

  Merge branch 'feature/spaces' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-86-invite-user-who-don-t-have-an-account
  # Conflicts:
  #        app/api/Spaces.scala
• 

  Indira Gutierrez Polo 06 Aug 2015 559e28ff8db64b516f0c21787b532f6a61fff83c m

  Updates from Comments in pull request: - Add documentation for controllers.Registration - Changed roleId to be a String instead of a Role in the SpaceInvite - Minor refactoring

  • app/controllers/Registration.scala (version 559e28ff8db64b516f0c21787b532f6a61fff83c) (diffs)
  • app/controllers/Spaces.scala (version 559e28ff8db64b516f0c21787b532f6a61fff83c) (diffs)
  • app/models/Space.scala (version 559e28ff8db64b516f0c21787b532f6a61fff83c) (diffs)
  • app/views/newsfeedCard.scala.html (version 559e28ff8db64b516f0c21787b532f6a61fff83c) (diffs)
  • app/views/spaces/invite.scala.html (version 559e28ff8db64b516f0c21787b532f6a61fff83c) (diffs)
• 

  Indira Gutierrez Polo 06 Aug 2015 cb01f9f6dff96acf556c28c6ff642d0f9e10e42d m

  When the email entered is associated with a user in the space, send  an email (inviteNotificationEmail) Send email when a person is added to a space (CATS-85). (api/Spaces changes)

  • app/api/Spaces.scala (version cb01f9f6dff96acf556c28c6ff642d0f9e10e42d) (diffs)
  • app/controllers/Spaces.scala (version cb01f9f6dff96acf556c28c6ff642d0f9e10e42d) (diffs)
  • app/views/newsfeedCard.scala.html (version cb01f9f6dff96acf556c28c6ff642d0f9e10e42d) (diffs)
  • app/views/spaces/inviteNotificationEmail.scala.html (version cb01f9f6dff96acf556c28c6ff642d0f9e10e42d) (diffs)
• 

  Yan Zhao 06 Aug 2015 29287dcc193c0cccd9455ce6d4ecb07e4077745e m

  indira commints

  • app/controllers/Application.scala (version 29287dcc193c0cccd9455ce6d4ecb07e4077745e) (diffs)
  • app/controllers/Spaces.scala (version 29287dcc193c0cccd9455ce6d4ecb07e4077745e) (diffs)
  • app/controllers/Users.scala (version 29287dcc193c0cccd9455ce6d4ecb07e4077745e) (diffs)
  • app/services/mongodb/MongoDBSpaceService.scala (version 29287dcc193c0cccd9455ce6d4ecb07e4077745e) (diffs)
  • app/services/mongodb/MongoDBUserService.scala (version 29287dcc193c0cccd9455ce6d4ecb07e4077745e) (diffs)
  • app/views/spaces/usersBySpace.scala.html (version 29287dcc193c0cccd9455ce6d4ecb07e4077745e) (diffs)
• 

  Yan Zhao 06 Aug 2015 56b00509176c7bcdddcc08c7137f9b4bed5cf5ba m

  indira commints

  • app/controllers/Spaces.scala (version 56b00509176c7bcdddcc08c7137f9b4bed5cf5ba) (diffs)
  • app/controllers/Users.scala (version 56b00509176c7bcdddcc08c7137f9b4bed5cf5ba) (diffs)
  • app/services/mongodb/MongoDBUserService.scala (version 56b00509176c7bcdddcc08c7137f9b4bed5cf5ba) (diffs)
  • app/views/newsfeedCard.scala.html (version 56b00509176c7bcdddcc08c7137f9b4bed5cf5ba) (diffs)
  • public/javascripts/spaces/modify.js (version 56b00509176c7bcdddcc08c7137f9b4bed5cf5ba) (diffs)
• 

  Yan Zhao 06 Aug 2015 6411356d3f872255e0229fb8a7b1cb1b54a507c9 m

  indira commints
• 

  Indira Gutierrez Polo 06 Aug 2015 63d68eb833fe3a384d43c14ad141459e32983fce m

  Merge branch 'feature/spaces' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-105-update-edit-functionality-for-title
  # Conflicts:
  #        app/views/datasets/home.scala.html
• 

  Yan Zhao 06 Aug 2015 640e49d668a851130739358b43f2ebd2aa498ce7 m

  indira commints

  • app/controllers/Application.scala (version 640e49d668a851130739358b43f2ebd2aa498ce7) (diffs)
  • app/controllers/Spaces.scala (version 640e49d668a851130739358b43f2ebd2aa498ce7) (diffs)
  • app/views/notAuthorized.scala.html (version 640e49d668a851130739358b43f2ebd2aa498ce7) (diffs)
  • conf/routes (version 640e49d668a851130739358b43f2ebd2aa498ce7) (diffs)
  • public/javascripts/spaces/modify.js (version 640e49d668a851130739358b43f2ebd2aa498ce7) (diffs)
• 

  Indira Gutierrez Polo 06 Aug 2015 b515d0a81c91caff143b6577ef7c1d5470a5451e m

  Merge branch 'feature/spaces' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-104-add-edit-functionality-for-title
  # Conflicts:
  #        app/services/mongodb/MongoDBCollectionService.scala
• 

  Indira Gutierrez Polo 04 Aug 2015 2fc6e9ffe3fecd20a1d30af6850899d4a1227895 m

  Fixing Issue with UUID for securesocial invites. Saving and looking up invites as string.

  • app/controllers/Registration.scala (version 2fc6e9ffe3fecd20a1d30af6850899d4a1227895) (diffs)
  • app/controllers/Spaces.scala (version 2fc6e9ffe3fecd20a1d30af6850899d4a1227895) (diffs)
  • app/models/Space.scala (version 2fc6e9ffe3fecd20a1d30af6850899d4a1227895) (diffs)
  • app/services/SpaceService.scala (version 2fc6e9ffe3fecd20a1d30af6850899d4a1227895) (diffs)
  • app/services/mongodb/MongoDBSpaceService.scala (version 2fc6e9ffe3fecd20a1d30af6850899d4a1227895) (diffs)
• 

  Yan Zhao 04 Aug 2015 566a05902821a7480c68cb35171dc5f9f6876a1a m

  multiple masonry container in profile page

  • app/views/profile.scala.html (version 566a05902821a7480c68cb35171dc5f9f6876a1a) (diffs)
  • app/views/util/multimasonry.scala.html (version 566a05902821a7480c68cb35171dc5f9f6876a1a) (diffs)
• 

  Yan Zhao 04 Aug 2015 6a8da03817b9ab4584638702bbff68edeaaad8b7 m

  send email for space request

  • app/models/RequestResource.scala (version 6a8da03817b9ab4584638702bbff68edeaaad8b7) (diffs)
  • app/views/spaces/usersBySpace.scala.html (version 6a8da03817b9ab4584638702bbff68edeaaad8b7) (diffs)
  • public/javascripts/spaces/modify.js (version 6a8da03817b9ab4584638702bbff68edeaaad8b7) (diffs)
• 

  Yan Zhao 04 Aug 2015 61f2756e627736e489e6067027017b7729ace65c m

  send email for space request

  • app/controllers/Application.scala (version 61f2756e627736e489e6067027017b7729ace65c) (diffs)
  • app/controllers/Spaces.scala (version 61f2756e627736e489e6067027017b7729ace65c) (diffs)
  • app/services/mongodb/MongoDBUserService.scala (version 61f2756e627736e489e6067027017b7729ace65c) (diffs)
  • app/views/spaces/requestemail.scala.html (version 61f2756e627736e489e6067027017b7729ace65c) (diffs)
  • app/views/spaces/usersBySpace.scala.html (version 61f2756e627736e489e6067027017b7729ace65c) (diffs)
  • public/javascripts/spaces/modify.js (version 61f2756e627736e489e6067027017b7729ace65c) (diffs)
• 

  Yan Zhao 04 Aug 2015 d58012e9c94532af10296e0e51d322c5f2b4d1b3 m

  Merge branch 'bugfix/CATS-116-bug-in-updateusersinspace-public.javascript.space.modify.js' into feature/SEAD-908-request-authorization-for-resources
• 

  Indira Gutierrez Polo 03 Aug 2015 793f9a0d66de590df3c8364aa812e085b51aa1e0 m

  * CATS86: At a very preliminary stage... * Creating email to be sent to admins when people are invited to a space. * Creating email to be sent to new members when people are invited to a space. * -Added methods in the SpaceService to save the token with space, and role invitation information, create, read, and delete methods     -Added new method to handle registration, haven't added it to routes yet. * - Changed the method where the signup page posted to. Is a copy of the securesocial post method with an update. It checks if there is an invitation with the token, and if there is, adds the person to the space with the designated role. Otherwise is the same as before.

  • app/controllers/Registration.scala (version 793f9a0d66de590df3c8364aa812e085b51aa1e0) (diffs)
  • app/controllers/Spaces.scala (version 793f9a0d66de590df3c8364aa812e085b51aa1e0) (diffs)
  • app/controllers/Users.scala (version 793f9a0d66de590df3c8364aa812e085b51aa1e0) (diffs)
  • app/models/Space.scala (version 793f9a0d66de590df3c8364aa812e085b51aa1e0) (diffs)
  • app/services/SpaceService.scala (version 793f9a0d66de590df3c8364aa812e085b51aa1e0) (diffs)
  • app/services/mongodb/MongoDBSpaceService.scala (version 793f9a0d66de590df3c8364aa812e085b51aa1e0) (diffs)
  • app/views/inviteEmailThroughAdmin.scala.html (version 793f9a0d66de590df3c8364aa812e085b51aa1e0) (diffs)
  • app/views/inviteThroughEmail.scala.html (version 793f9a0d66de590df3c8364aa812e085b51aa1e0) (diffs)
  • app/views/spaces/invite.scala.html (version 793f9a0d66de590df3c8364aa812e085b51aa1e0) (diffs)
  • app/views/spaces/usersBySpace.scala.html (version 793f9a0d66de590df3c8364aa812e085b51aa1e0) (diffs)
  • app/views/ss/Registration/signUp.scala.html (version 793f9a0d66de590df3c8364aa812e085b51aa1e0) (diffs)
  • conf/routes (version 793f9a0d66de590df3c8364aa812e085b51aa1e0) (diffs)
• 

  Yan Zhao 03 Aug 2015 b78403052767d7e64944bac534101bf5dabf998b m

  merge
• 

  Indira Gutierrez Polo 31 Jul 2015 0a3a15b1c47a5ddd69c2f54f1eb0396e5e85e14c m

  Renaming variable.

  • app/views/datasets/home.scala.html (version 0a3a15b1c47a5ddd69c2f54f1eb0396e5e85e14c) (diffs)
• 

  Indira Gutierrez Polo 31 Jul 2015 dc1929b4af836d5592b95e2253d5ced7c8fb880e m

  Adding css class btn and btn-sm to buttons.

  • app/views/collectionofdatasets.scala.html (version dc1929b4af836d5592b95e2253d5ced7c8fb880e) (diffs)
• 

  Indira Gutierrez Polo 31 Jul 2015 61c59ebef5035f14520c6a4c88ceab7c16c6fb6c m

  Changing btn class meant to add btn-sm instead of btn-xs

  • app/views/dataset.scala.html (version 61c59ebef5035f14520c6a4c88ceab7c16c6fb6c) (diffs)
  • app/views/datasets/home.scala.html (version 61c59ebef5035f14520c6a4c88ceab7c16c6fb6c) (diffs)
• 

  Indira Gutierrez Polo 31 Jul 2015 a50080c235aa7a38b6c9c46c000546ed06b4d474 m

  Adding css classes btn and btn-xs to the save buttons. Making the save button for the description be in the next line.

  • app/views/dataset.scala.html (version a50080c235aa7a38b6c9c46c000546ed06b4d474) (diffs)
  • app/views/datasets/home.scala.html (version a50080c235aa7a38b6c9c46c000546ed06b4d474) (diffs)
  • conf/routes (version a50080c235aa7a38b6c9c46c000546ed06b4d474) (diffs)
• 

  Indira Gutierrez Polo 31 Jul 2015 a6e6b7df106b0863c5bd9049b5fb476f5d1f2077 m

  Merge branch 'feature/spaces' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-105-update-edit-functionality-for-title
  # Conflicts:
  #        conf/routes
• 

  Yan Zhao 30 Jul 2015 231c213ae0e7f78fe5e1a74434d2e186fe8af09c m

  basic request & only for space

  • app/api/Permissions.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/controllers/Application.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/controllers/Authentication.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/controllers/SecuredController.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/controllers/Spaces.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/models/Collection.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/models/Dataset.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/models/Event.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/models/RequestResource.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/models/Space.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/services/EventService.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/services/SpaceService.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/services/mongodb/MongoDBEventService.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/services/mongodb/MongoDBSpaceService.scala (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/views/newsfeedCard.scala.html (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/views/notAuthorized.scala.html (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • app/views/spaces/usersBySpace.scala.html (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • conf/routes (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
  • public/javascripts/spaces/modify.js (version 231c213ae0e7f78fe5e1a74434d2e186fe8af09c) (diffs)
• 

  Indira Gutierrez Polo 22 Jul 2015 6c5b1344ab2b869a1dc649888710ffaa4819dd2e m

  Merging feature/spaces and fixing conflicts.
• 

  Indira Gutierrez Polo 21 Jul 2015 28c055283badccdac9b0f02b16de1b7b64bb94c2 m

  Moving edit name, description, and license to an edit icon next to each one.

  • app/api/Datasets.scala (version 28c055283badccdac9b0f02b16de1b7b64bb94c2) (diffs)
  • app/controllers/Application.scala (version 28c055283badccdac9b0f02b16de1b7b64bb94c2) (diffs)
  • app/services/DatasetService.scala (version 28c055283badccdac9b0f02b16de1b7b64bb94c2) (diffs)
  • app/services/cassandra/CassandraDataset.scala (version 28c055283badccdac9b0f02b16de1b7b64bb94c2) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version 28c055283badccdac9b0f02b16de1b7b64bb94c2) (diffs)
  • app/views/dataset.scala.html (version 28c055283badccdac9b0f02b16de1b7b64bb94c2) (diffs)
  • app/views/datasets/editInfo.scala.html (version 28c055283badccdac9b0f02b16de1b7b64bb94c2) (diffs)
  • app/views/datasets/editLicense.scala.html (version 28c055283badccdac9b0f02b16de1b7b64bb94c2) (diffs)
  • app/views/datasets/home.scala.html (version 28c055283badccdac9b0f02b16de1b7b64bb94c2) (diffs)
  • conf/routes (version 28c055283badccdac9b0f02b16de1b7b64bb94c2) (diffs)
• 

  Indira Gutierrez Polo 21 Jul 2015 17dcc6941f9de4c4b4c003001a29dc34df3d8ccf m

  Changing HTTP method from POST to PUT

  • app/api/Collections.scala (version 17dcc6941f9de4c4b4c003001a29dc34df3d8ccf) (diffs)
  • app/views/collectionofdatasets.scala.html (version 17dcc6941f9de4c4b4c003001a29dc34df3d8ccf) (diffs)
  • conf/routes (version 17dcc6941f9de4c4b4c003001a29dc34df3d8ccf) (diffs)
• 

  Indira Gutierrez Polo 21 Jul 2015 e8828f521bcb5e50bcde701db3717ec84898f994 m

  Updating news feed for showing when a use updates a collection

  • app/api/Collections.scala (version e8828f521bcb5e50bcde701db3717ec84898f994) (diffs)
  • app/views/newsfeedCard.scala.html (version e8828f521bcb5e50bcde701db3717ec84898f994) (diffs)
• 

  Indira Gutierrez Polo 20 Jul 2015 85bb665789d952f8f368262f1842a3ed372cf51c m

  Edit Description  in Collections

  • app/api/Collections.scala (version 85bb665789d952f8f368262f1842a3ed372cf51c) (diffs)
  • app/controllers/Application.scala (version 85bb665789d952f8f368262f1842a3ed372cf51c) (diffs)
  • app/services/CollectionService.scala (version 85bb665789d952f8f368262f1842a3ed372cf51c) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version 85bb665789d952f8f368262f1842a3ed372cf51c) (diffs)
  • app/views/collectionofdatasets.scala.html (version 85bb665789d952f8f368262f1842a3ed372cf51c) (diffs)
  • conf/routes (version 85bb665789d952f8f368262f1842a3ed372cf51c) (diffs)
• 

  Indira Gutierrez Polo 20 Jul 2015 dcc0bd17602c1b3609da47e785ca76efd4ef407c m

  Edit Title in Collections

  • app/api/Collections.scala (version dcc0bd17602c1b3609da47e785ca76efd4ef407c) (diffs)
  • app/controllers/Application.scala (version dcc0bd17602c1b3609da47e785ca76efd4ef407c) (diffs)
  • app/services/CollectionService.scala (version dcc0bd17602c1b3609da47e785ca76efd4ef407c) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version dcc0bd17602c1b3609da47e785ca76efd4ef407c) (diffs)
  • app/views/collectionofdatasets.scala.html (version dcc0bd17602c1b3609da47e785ca76efd4ef407c) (diffs)
  • conf/routes (version dcc0bd17602c1b3609da47e785ca76efd4ef407c) (diffs)