Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce input during on-boarding #954

Merged
merged 51 commits into from
Sep 16, 2020
Merged

Reduce input during on-boarding #954

Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
8554b88
- Add mdns and ngx-electron plugin
TheSin- Aug 29, 2020
8923014
Merge with upstream master
TheSin- Aug 29, 2020
7313d24
Add postinstall so it auto rebuilds electron against node
TheSin- Aug 31, 2020
b038c08
Update src/app/config/no-config/no-config.component.ts
TheSin- Aug 31, 2020
6c53aec
Update src/app/config/no-config/no-config.component.ts
TheSin- Aug 31, 2020
8716587
Update src/app/config/no-config/no-config.component.ts
TheSin- Aug 31, 2020
68887b1
Resolve a few issues with VSCode and more consistent var naming
TheSin- Aug 31, 2020
afb80d7
Add version compare to disable older Nodes
TheSin- Aug 31, 2020
57172e1
Switch back to 5000 as the default and add a note about port 80
TheSin- Aug 31, 2020
8564d39
test
UnchartedBull Aug 31, 2020
9caf235
Revert "test"
UnchartedBull Aug 31, 2020
73387d2
Attempt to fix CI
TheSin- Aug 31, 2020
36887ce
Merge branch 'master' of git://github.com/TheSin-/OctoDash
TheSin- Aug 31, 2020
a2dff3a
restructure main.js
UnchartedBull Aug 31, 2020
957cb03
With the new changes newer node is working again
TheSin- Aug 31, 2020
735f395
Use proper indentation
TheSin- Aug 31, 2020
0e3d9a6
Forgot to update package-lock with node update
TheSin- Aug 31, 2020
becd2c4
electron stuff finished
UnchartedBull Aug 31, 2020
540fc43
Fix lint errors and warnings
TheSin- Aug 31, 2020
2e2e675
Merge remote-tracking branch 'origin/master'
UnchartedBull Aug 31, 2020
ab726d4
finalise workflow
UnchartedBull Aug 31, 2020
8f91083
small bugfix
UnchartedBull Aug 31, 2020
e2f64d2
prevent the same instance showing multiple times
UnchartedBull Aug 31, 2020
6bafeb3
remove node from angular app
UnchartedBull Aug 31, 2020
d050ae0
Manually trigger change detection
UnchartedBull Aug 31, 2020
727ad51
Also trigger change detection for Page changes to fix bug
UnchartedBull Aug 31, 2020
ad0c41b
intial setup to load op script
UnchartedBull Sep 1, 2020
dd4816f
Fix ngZone issue
UnchartedBull Sep 1, 2020
6bc207d
Merge remote-tracking branch 'upstream/master'
TheSin- Sep 1, 2020
5824236
Remove ngx-electron from package-lock
TheSin- Sep 1, 2020
510bf8a
Remove electron-rebuild, postinstall script and test if the travis ch…
TheSin- Sep 1, 2020
11ff0b5
Tested and no longer required, was a rebuild only issue
TheSin- Sep 1, 2020
b174b30
Merge master
TheSin- Sep 2, 2020
beabf32
fix OctoPrint var
UnchartedBull Sep 2, 2020
ae5a087
finally get that freakin jQuery working
UnchartedBull Sep 2, 2020
5f7fe86
cleanup + reset URL if manual input is opened.
UnchartedBull Sep 2, 2020
2a62ccb
Check OctoPrint connection and load client library
UnchartedBull Sep 2, 2020
dbc7db9
Update package-lock, fix a few navigation bugs
TheSin- Sep 3, 2020
4df9b99
Make sure pages can't go below 0 or above totalPages
TheSin- Sep 3, 2020
a913bd3
refactor navigation controller + show next button after page 1 again
UnchartedBull Sep 4, 2020
77bafa9
login with request working
UnchartedBull Sep 4, 2020
4bc7f96
use printer name from printerprofile
UnchartedBull Sep 4, 2020
bf98a4a
fix setup (all working)
UnchartedBull Sep 4, 2020
5dac7f9
Merge with Master
TheSin- Sep 4, 2020
6083fca
Convert to range slider to numeric input is not required
TheSin- Sep 11, 2020
e63a183
Merge changes from master
TheSin- Sep 11, 2020
f6086df
I think 150 would be fast enough to load
TheSin- Sep 11, 2020
159e418
value selector for numbers
UnchartedBull Sep 15, 2020
dd861f0
Merge branch 'master' into master
UnchartedBull Sep 15, 2020
3f33af4
fix layout issue
UnchartedBull Sep 15, 2020
be231ef
Fix alignemnt on large and small views
TheSin- Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge changes from master
  • Loading branch information
@TheSin-
TheSin- committed Sep 11, 2020
commit e63a183d94fb3f23aaaa93e7693e4428417f1d40
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"angular-svg-round-progressbar": "^4.0.0",
"compare-versions": "^3.6.0",
"electron-store": "^6.0.0",
"got": "^11.6.0",
"got": "^11.6.1",
"jquery": "^3.5.1",
"lodash": "^4.17.20",
"mdns": "^2.5.1",
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.