Update from image sequencer master #1
Merged
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
update to reflect the updates on https://publiclab.org/conduct Aug 28 2019, and also standardize format to match LDI, Mk, etc.
Changed the button's class from "btn-success" to "btn-primary."
…ecting other modules (#1330)
* Fixes dropdown * Update defaultHtmlStepUi.js * Update intermediateHtmlStepUi.js
* FIX: Dragzone overlapping Changes: - inline styles moved from ../ImportImage/Ui.js to demo.css - minor code improvements The change was necessary because in the old UI dragzone was overlapping an image. Resolves #1294 * FIX: Improve commit #ead4b932 Changes: - rollback .dropzone input style - add styles to .import-image-zone input element * FIX: .import-image-zone input element width Changes: - max-width increased to 120% on import-image-zone input element * FIX: .import-image-zone max-width Changes: - rollback .import-image-zone input max-width to fit-content - increase .import-image-zone max-width from 230px to 250px * FIX: .import-image-zone input element max-width Changes: - max-width set to 100%
* Add Save as PDF option * Edit coments for consistency Edits follow the JSDoc guidelines. Comments begin with a capital letter and end with a period.
* Allow saving onto Publiclab.org * success to primary * fixing merge conflictx
* Update demo.js * Codeclimate * Update demo.js * Code comments * Comments codestyle * Update demo.js
…1357) * Disables Other Buttons While Camera is Active * Remove dropzone-text id from ImportImage UI
* fix comments * Update src/modules/BlobAnalysis/BlobAnalysis.js Fix double image * Update src/modules/BlobAnalysis/BlobAnalysis.js * . fix
* standardise comments * fix * fixes * add docs links * remove extra . * ., this and other changes
* add markuo * add markupfix insertPreview * fix insertPreview test * make the new insertPreview work * fix disabled * small fix * fix comments * remove console log * fix enabling/disabling of insert-step btn
* test for add step * adding relative path and testing with npm run test-ui(for testing in travis but it will abort previous test-ui) * checking index.html * checking index.html * changing test location and reverting index.html * remove console.log
* wasmSuccess * modules use wasmSuccess * modules use wasmSuccess * add the tooltip
* fix: Upgrade GPU.js to v2.3.0 and handle browserifying it * fix? * fiiix * fix * fix tests browserify Co-authored-by: Robert Plummer <robertleeplummerjr@gmail.com>
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.
No description provided.