merge master #645
Merged
merge master #645
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
* Changes necessary to support both PrusaSlicerThumbnails and UltimakerFormatPackage plugin's extracted thumbnails * Update src/app/files/files.component.html Co-Authored-By: Timon G. <timon.gaebelein@icloud.com> * Update src/app/files.service.ts Co-Authored-By: Timon G. <timon.gaebelein@icloud.com> * Update src/app/files.service.ts Co-Authored-By: Timon G. <timon.gaebelein@icloud.com> * change to string for thumbnail Co-authored-by: Timon G. <timon.gaebelein@icloud.com>
* ignore first 500 error * properly check for connection errors * check against connecting state as well
* basic pagination * styling filament list * load spools from FilamentManager * spool list almost done, some regex issues * Finished Spool Listing * Started working on heating screen * finish page 2 design * update config for extruder speed * add config parameter + update initial setup screen * progress on page 2 * finish filament unload * finished screen 3 * finish page 4 design * finish page 5 styling * some fixes * starting to add functionality * Should be all working now * make extruder movements works * some fixes * Add settings * naming and default values * CodeFactor issues * disable extruder after unloading filament
UnchartedBull
added a commit
that referenced
this pull request
Aug 20, 2020
* starting the website * more cleanup, add screenshots, installation * add supported plugins * Add tips and tricks * Finish up design so far * move style sheets * merge master (#645) * Additional Thumbnail Support (#601) * Changes necessary to support both PrusaSlicerThumbnails and UltimakerFormatPackage plugin's extracted thumbnails * Update src/app/files/files.component.html Co-Authored-By: Timon G. <timon.gaebelein@icloud.com> * Update src/app/files.service.ts Co-Authored-By: Timon G. <timon.gaebelein@icloud.com> * Update src/app/files.service.ts Co-Authored-By: Timon G. <timon.gaebelein@icloud.com> * change to string for thumbnail Co-authored-by: Timon G. <timon.gaebelein@icloud.com> * Bump electron from 8.2.3 to 8.2.4 (#602) * Properly handle Connection Errors (#569) * ignore first 500 error * properly check for connection errors * check against connecting state as well * Bump @angular/language-service from 9.1.3 to 9.1.4 (#604) * Bump @angular/cli from 9.1.3 to 9.1.4 (#605) * Bump @angular-devkit/build-angular from 0.901.3 to 0.901.4 (#606) * Bump electron from 8.2.4 to 8.2.5 (#608) * Bump electron-builder from 22.5.1 to 22.6.0 (#603) * Bump ts-node from 8.9.1 to 8.10.0 (#611) * Bump ts-node from 8.10.0 to 8.10.1 (#612) * Bump wait-on from 4.0.2 to 5.0.0 (#618) * Bump @types/node from 13.13.4 to 13.13.5 (#619) * Bump tslib from 1.11.1 to 1.11.2 (#621) * Bump @angular/language-service from 9.1.4 to 9.1.5 (#626) * Bump @angular/language-service from 9.1.5 to 9.1.6 (#628) * Bump @angular/cli from 9.1.4 to 9.1.5 (#629) * Bump @angular-devkit/build-angular from 0.901.4 to 0.901.5 (#630) * Bump tslib from 1.11.2 to 1.12.0 (#632) * Bump @types/node from 13.13.5 to 14.0.0 (#634) * Bump @types/node from 14.0.0 to 14.0.1 (#635) * Bump @angular/language-service from 9.1.6 to 9.1.7 (#636) * Bump tslib from 1.12.0 to 1.13.0 (#637) * Bump @angular/cli from 9.1.5 to 9.1.6 (#638) * Bump electron from 8.2.5 to 8.3.0 (#641) * Bump @angular-devkit/build-angular from 0.901.5 to 0.901.6 (#639) * Filament Change Process (#642) * basic pagination * styling filament list * load spools from FilamentManager * spool list almost done, some regex issues * Finished Spool Listing * Started working on heating screen * finish page 2 design * update config for extruder speed * add config parameter + update initial setup screen * progress on page 2 * finish filament unload * finished screen 3 * finish page 4 design * finish page 5 styling * some fixes * starting to add functionality * Should be all working now * make extruder movements works * some fixes * Add settings * naming and default values * CodeFactor issues * disable extruder after unloading filament * Bump @types/lodash from 4.14.150 to 4.14.151 (#644) * working (#643) * Update README * 1.5.0 * Update Changelog * fix config error Co-authored-by: jneilliii <jneilliii+github@gmail.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * update to match wiki * Update FAQ * fixed some issue with mobile devices * Language + Formatting * update images * [CodeFactor] Apply fixes * Codefactor Co-authored-by: jneilliii <jneilliii+github@gmail.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: codefactor-io <support@codefactor.io>
kantlivelong
pushed a commit
to kantlivelong/OctoDash
that referenced
this pull request
May 5, 2021
* starting the website * more cleanup, add screenshots, installation * add supported plugins * Add tips and tricks * Finish up design so far * move style sheets * merge master (UnchartedBull#645) * Additional Thumbnail Support (UnchartedBull#601) * Changes necessary to support both PrusaSlicerThumbnails and UltimakerFormatPackage plugin's extracted thumbnails * Update src/app/files/files.component.html Co-Authored-By: Timon G. <timon.gaebelein@icloud.com> * Update src/app/files.service.ts Co-Authored-By: Timon G. <timon.gaebelein@icloud.com> * Update src/app/files.service.ts Co-Authored-By: Timon G. <timon.gaebelein@icloud.com> * change to string for thumbnail Co-authored-by: Timon G. <timon.gaebelein@icloud.com> * Bump electron from 8.2.3 to 8.2.4 (UnchartedBull#602) * Properly handle Connection Errors (UnchartedBull#569) * ignore first 500 error * properly check for connection errors * check against connecting state as well * Bump @angular/language-service from 9.1.3 to 9.1.4 (UnchartedBull#604) * Bump @angular/cli from 9.1.3 to 9.1.4 (UnchartedBull#605) * Bump @angular-devkit/build-angular from 0.901.3 to 0.901.4 (UnchartedBull#606) * Bump electron from 8.2.4 to 8.2.5 (UnchartedBull#608) * Bump electron-builder from 22.5.1 to 22.6.0 (UnchartedBull#603) * Bump ts-node from 8.9.1 to 8.10.0 (UnchartedBull#611) * Bump ts-node from 8.10.0 to 8.10.1 (UnchartedBull#612) * Bump wait-on from 4.0.2 to 5.0.0 (UnchartedBull#618) * Bump @types/node from 13.13.4 to 13.13.5 (UnchartedBull#619) * Bump tslib from 1.11.1 to 1.11.2 (UnchartedBull#621) * Bump @angular/language-service from 9.1.4 to 9.1.5 (UnchartedBull#626) * Bump @angular/language-service from 9.1.5 to 9.1.6 (UnchartedBull#628) * Bump @angular/cli from 9.1.4 to 9.1.5 (UnchartedBull#629) * Bump @angular-devkit/build-angular from 0.901.4 to 0.901.5 (UnchartedBull#630) * Bump tslib from 1.11.2 to 1.12.0 (UnchartedBull#632) * Bump @types/node from 13.13.5 to 14.0.0 (UnchartedBull#634) * Bump @types/node from 14.0.0 to 14.0.1 (UnchartedBull#635) * Bump @angular/language-service from 9.1.6 to 9.1.7 (UnchartedBull#636) * Bump tslib from 1.12.0 to 1.13.0 (UnchartedBull#637) * Bump @angular/cli from 9.1.5 to 9.1.6 (UnchartedBull#638) * Bump electron from 8.2.5 to 8.3.0 (UnchartedBull#641) * Bump @angular-devkit/build-angular from 0.901.5 to 0.901.6 (UnchartedBull#639) * Filament Change Process (UnchartedBull#642) * basic pagination * styling filament list * load spools from FilamentManager * spool list almost done, some regex issues * Finished Spool Listing * Started working on heating screen * finish page 2 design * update config for extruder speed * add config parameter + update initial setup screen * progress on page 2 * finish filament unload * finished screen 3 * finish page 4 design * finish page 5 styling * some fixes * starting to add functionality * Should be all working now * make extruder movements works * some fixes * Add settings * naming and default values * CodeFactor issues * disable extruder after unloading filament * Bump @types/lodash from 4.14.150 to 4.14.151 (UnchartedBull#644) * working (UnchartedBull#643) * Update README * 1.5.0 * Update Changelog * fix config error Co-authored-by: jneilliii <jneilliii+github@gmail.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * update to match wiki * Update FAQ * fixed some issue with mobile devices * Language + Formatting * update images * [CodeFactor] Apply fixes * Codefactor Co-authored-by: jneilliii <jneilliii+github@gmail.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: codefactor-io <support@codefactor.io>
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.