For 3.7.2 #366
Merged
For 3.7.2 #366
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
getUserType: if `admin` then return `Admin`. Otherwise, return `Null`. return type is `string`
* Change 'reutrn' to 'return' and fix lint issues * Improved type checking
The icons have been taken from 'https://material.io/resources/icons/'
in accordance with the new Caracal repository set up
* refactor segment css * fix redirect to table * fix model redirect * refactor model css
* deleteIcon * deleteSlide-Addition * trailingCommaAdd * Update apps/table.html Co-Authored-By: Chirag Jain <cjchirag7@gmail.com> * Update apps/table.html Co-Authored-By: Chirag Jain <cjchirag7@gmail.com> * Update apps/table.html Co-Authored-By: Chirag Jain <cjchirag7@gmail.com> * Update apps/table.html Co-Authored-By: Chirag Jain <cjchirag7@gmail.com> * Update apps/table.html Co-Authored-By: Chirag Jain <cjchirag7@gmail.com> * Update apps/table.html Co-Authored-By: Chirag Jain <cjchirag7@gmail.com> * fix-comma * Delete_According_to_User_Permissions Co-authored-by: akhil-rana <akhilrana0001@gmail.c.com> Co-authored-by: Chirag Jain <cjchirag7@gmail.com>
…321) Prevent the error 'unexpected end of input' at response.json()
Co-authored-by: akhil-rana <akhilrana0001@gmail.c.com>
* Update segment.js * Add feature to change class list * Update model.js * Update segment.js * Update segment.js * Update segment.js * Revert "Update segment.js" This reverts commit 7a1d920. * Revert "Update segment.js" This reverts commit 2f9e8ee. * Revert "Update segment.js" This reverts commit 4f2d83c. * Revert "Update model.js" This reverts commit 0b56ba6. * Update roi.png * Revert "Update roi.png" This reverts commit d292b5c. * Revert "Merge branch 'develop' of https://github.com/amritansh22/caMicroscope into develop" This reverts commit 5edf104, reversing changes made to 7476c94. * Revert "Revert "Merge branch 'develop' of https://github.com/amritansh22/caMicroscope into develop"" This reverts commit 6f9648b. * Revert "Revert "Update roi.png"" This reverts commit 7476c94. * Revert "Revert "Revert "Update roi.png""" This reverts commit cc27cd4. * Update model.js * Update model.js * Update model.js * Update model.js * Update model.js * Update model.js
#313) * Post only when check is successful Also close the upload-dialog when 'post' is successful * Added a popup-message on successful upload * Hide post button initially * Call initialize() instead of document.load * Show check button only if upload succeeds, disable closing modal when user clicks outside it and on closing through close button, clear modal data * Allow post only when FinishUpload and Check both are successful with event listeners on input change Updated instructions for slide upload. Support only for single file upload * Reset the form on submit and also on close
* Initial Implementation of Information Dashboard * Fixed errors
Co-authored-by: akhil-rana <akhilrana0001@gmail.c.com>
* fix duplicate model name * fix eslint issue
* Increased modal size andmade cursor to be 'pointer' at upload button Also, when closing the form, the input containing filename also gets cleared. * Refactored code for loader, to support only single file upload * Remove ID field from upload-modal, to avoid confusion with uuid
* Added tour of viewer tools * removed errors * Changes implemented and lint errors removed * Improved opacity * Error resolve
* fix popup close * fix for particular segment
Added Tutorial icon from [PR #334]
* download_Slide * download_Slide * downloadSlide-promiseChanges * downloadSlide-downloadButtonPosition * Update apps/loader/loader.js Co-Authored-By: Chirag Jain <cjchirag7@gmail.com> * linting-fixes * split_from_last_Slash Co-authored-by: akhil-rana <akhilrana0001@gmail.c.com> Co-authored-by: Chirag Jain <cjchirag7@gmail.com>
* Update segment.js * Add feature to change class list * Update model.js * Update segment.js * Update segment.js * Update segment.js * Revert "Update segment.js" This reverts commit 7a1d920. * Revert "Update segment.js" This reverts commit 2f9e8ee. * Revert "Update segment.js" This reverts commit 4f2d83c. * Revert "Update model.js" This reverts commit 0b56ba6. * Update roi.png * Revert "Update roi.png" This reverts commit d292b5c. * Revert "Merge branch 'develop' of https://github.com/amritansh22/caMicroscope into develop" This reverts commit 5edf104, reversing changes made to 7476c94. * Revert "Revert "Merge branch 'develop' of https://github.com/amritansh22/caMicroscope into develop"" This reverts commit 6f9648b. * Revert "Revert "Update roi.png"" This reverts commit 7476c94. * Revert "Revert "Revert "Update roi.png""" This reverts commit cc27cd4. * Update model.js * Update model.js * Update model.js * Update model.js * Update model.js * Update model.js * Minor UI changes in upload app panel of model app * Minor UI changes in upload panel of model app * Update model.js * Update model.js
…y in model) (#351) Co-authored-by: leoarc <roychpudhury.archit@gmail.com>
* upload_SLide_From_Url * Update chunked_upload.js * onchange url validation * Save => Upload * onchange remove [fix] * Update apps/table.html Co-Authored-By: Chirag Jain <cjchirag7@gmail.com> * Update apps/table.html Co-Authored-By: Chirag Jain <cjchirag7@gmail.com> * Update apps/table.html Co-Authored-By: Chirag Jain <cjchirag7@gmail.com> * toggle_input_type * toggle_input_type_loadingStop * uploadCodeCleaned_ReplicaCodeRemoved * urlParams_Add_UpdatedCheck Co-authored-by: Chirag Jain <cjchirag7@gmail.com>
Now it works in both Chrome and Firefox
* fixed model upload bug * removed unused func Co-authored-by: Ryan Birmingham <birm@rbirm.us>
should've done this in the merge commit for last pr...
* fixed model upload bug * removed unused func * fix delete-model-bug * style-fix * fix-changeClassList * fix css * fix error
* Fixed typo for return * Fix for refresh during first slide upload * Fixed refresh on first slide upload * Added space after 'if' for eslint configuration * Added functionality to delete slide from system * Removed refresh on first slide upload * Added alert for slide deletion success * Update to fix linting errors * Update to fix linting errors * Fix linting errors * Fix lint errors * Fix lint error * Rechained promises to handle mishandled slide deletions * style fix * Added delete slide request functionality * style fix * style fix * style fix * style fix * style fix * Client side changes for handling new 'requests' collection * style fix * style fix * style fix * style fix * style fix * style fix * Merge fix Co-authored-by: Ryan Birmingham <birm@rbirm.us>
…Mode (#367) * Slide_Name_Update * indent_fix * spelling fix * direct_delete_in_NOSecurity * remove_delete_text_in_button_for_Admin * delete_button_visibility_fixed
* Fixed typo for return * Fix for refresh during first slide upload * Fixed refresh on first slide upload * Added space after 'if' for eslint configuration * Added functionality to delete slide from system * Removed refresh on first slide upload * Added alert for slide deletion success * Update to fix linting errors * Update to fix linting errors * Fix linting errors * Fix lint errors * Fix lint error * Rechained promises to handle mishandled slide deletions * style fix * Added delete slide request functionality * style fix * style fix * style fix * style fix * style fix * Client side changes for handling new 'requests' collection * merge fix * merge fix * Fix for direct deletion of slides * style fix Co-authored-by: Ryan Birmingham <birm@rbirm.us>
* Initial draft for Contributing guidelines * Initial draft for Pull Request Template * Updated CONTRIBUTING.md * Updated CONTRIBUTING.md * Update CONTRIBUTING.md Co-Authored-By: Chirag Jain <cjchirag7@gmail.com> * Updated CONTRIBUTING.md * Changed license name from MIT to BSD-3 * Shifted PR Template to .github repo Co-authored-by: Ryan Birmingham <birm@rbirm.us> Co-authored-by: Chirag Jain <cjchirag7@gmail.com>
* Implemented searching and sorting in information dashboard * Included Info option in navbar of landing page
…uccessful (#372) * Re-initialise table on slide name change and show the success message, as a popup Also made the position of popup as fixed * Replaced error alert by inline error message in form to enhance UI * Remove unnecessary console logs * Fixed a typo and updated CSS of popups to handle the edge case when multiple popups are trigerred at once
* model upload and delete popup * style fix * init after upload/delete
* Add link to popup.css * add popup * Update UI of final class change btn * Update model.js * Update model.js * Update segment.js * Update segment.js * Update segment.js * Update segment.js * popup on change class list * Fix lint issues
* Fixed typo for return * Fix for refresh during first slide upload * Fixed refresh on first slide upload * Added space after 'if' for eslint configuration * Added functionality to delete slide from system * Removed refresh on first slide upload * Added alert for slide deletion success * Update to fix linting errors * Update to fix linting errors * Fix linting errors * Fix lint errors * Fix lint error * Rechained promises to handle mishandled slide deletions * style fix * Added delete slide request functionality * style fix * style fix * style fix * style fix * style fix * Client side changes for handling new 'requests' collection * merge fix * merge fix * Fix for direct deletion of slides * style fix * Added feature for user registration requests * style fix * Commented line stating that signup page is just for admins * Added line explaining new workflow of signup page * Added popups for success instead of alerts and moved showSuccessPopup to util.js for reusability * Comment fix * Style fix * Solved permsisions is not defined error in signup.html * Comment fix * catch promise error Co-Authored-By: Ryan Birmingham <birm@rbirm.us> * error handling on fetching requests Co-Authored-By: Ryan Birmingham <birm@rbirm.us> * Update apps/table.html Co-authored-by: Ryan Birmingham <birm@rbirm.us>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Documentation Improvements (#314, #315)
User Creation Workflow (#371)
Slide Deletion Workflow (#303, #367, #369)
Table and Loader Improvements (#340, #345, #356, #358)
Model and Segment App Improvements (#317, #375 #327, #330, #348, #351, #354, #360, #362, #382)
Heatmap Color Changes (#322, #381)
Viewer Tool Tour (#334)
(It's very likely I've missed some, since this is such a big PR; see the commit log for a more complete log)