CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
717 Commits 1 Branch 0 Tags
Commit Graph

717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Dej
0edb9dd1d2 fix type in en language file 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-29 20:16:24 +02:00
Stefan Dej
c6e6794f0a fix webcam performance 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-29 01:02:56 +02:00
Eike Ahmels
51dda65a6e
feature: new editor (#243) 
* using monaco

* dirty

* wasm gcode editor

* fixing stuff, working now, except on ios

* style fixes

* ios editor fix

* removed comments

* multi language added
 2021-03-29 00:27:59 +02:00
Stefan Dej
10ab6ec088 format framerate in webcam 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-29 00:26:21 +02:00
Stefan Dej
8af80463c3 fix webcam update state 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-29 00:00:47 +02:00
Stefan Dej
cca33770fc cleanup multi webcam 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-28 22:58:27 +02:00
Stefan Dej
85de19ffeb fix chart colors 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-28 22:57:44 +02:00
eliteSCHW31N
5528988566
Add Multiple Cams (#235) 
* add webcam store methodes

* add experimentell multicam panel

* add dev stuff

* update getter

* add stream not found picture workspace

* update button label

* finish webcam setting panel

* remove remote mode, move navbar switch, add multicam support to webcam panel

* fix package-lock

* update url not working picture workspace

* add error messages, add icon to cams, remove picture workspace

* fix spacing

* fix layouts, fix forgotten boolean for nav, fix cam selection

* fix layout

* add url rule

* fix picture format

* replace index with name, add check if selected cam is still configured

* fix default value

* update database layout

* fix database entries

* fix cam url validation

* try other url check methode

* remove url validation

* add experimentell cam migration

* fix cam migration

Co-authored-by: eliteSCHW31N <business@eliteschw31n.de>
Co-authored-by: Stefan Dej <meteyou@gmail.com>
 2021-03-27 14:36:10 +01:00
lixxbox
133bd5598b docs: fix theme list 2021-03-27 14:23:03 +01:00
Stefan Dej
fcf5d38dce
Merge pull request #242 from meteyou/feature/history 
Feature/history
 2021-03-27 13:19:47 +01:00
Stefan Dej
94363d5810 fix tooltip output format of filament usage statistic 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-27 13:14:31 +01:00
Stefan Dej
451e4d2266 fix typo in i18n-en 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-27 12:48:46 +01:00
Stefan Dej
d9e7ff9606 fix relative thumbnail url from files with subdirectories 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-27 12:48:34 +01:00
Stefan Dej
ecae7345ea add history to i18n 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-27 01:15:26 +01:00
Stefan Dej
fe32007582 Merge branch 'master' into feature/history 
# Conflicts:
#	package-lock.json
#	package.json
#	src/components/panels/StatusPanel.vue
#	src/pages/Files.vue
#	src/store/gui/mutations.js
#	src/store/printer/getters.js
 2021-03-27 00:39:01 +01:00
Stefan Dej
641fcfb854 add heightmap to translation 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-27 00:29:37 +01:00
Stefan Dej
3b5723d7ee bugfix merge i18n 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-26 23:18:02 +01:00
Stefan Dej
f50bb9d3ae
Merge pull request #199 from winbin/LanguageChange 
Add Language Change
 2021-03-26 22:42:05 +01:00
lixxbox
39c2b51faa modified: README.md 2021-03-26 22:08:22 +01:00
lixxbox
0d9af550a7 few changes to the docs 2021-03-26 22:08:22 +01:00
winbin
138b9a9e70 Merge branch 'master' of https://github.com/meteyou/mainsail into LanguageChange 
# Conflicts:
#	src/components/panels/ControlPanel.vue
 2021-03-26 09:35:18 +08:00
Stefan Dej
33d431bf3a fix dashboard for minimal klipper config 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-25 23:35:58 +01:00
Stefan Dej
cd6edc33ea feature: add ETA to page title 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-25 23:35:58 +01:00
Stefan Dej
59543418b0 sync tooltips in history statistics 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-25 22:08:01 +01:00
Stefan Dej
7bbf77885d change icons and fix gcode files list 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-25 22:05:54 +01:00
Stefan Dej
9fc16ffe43 update history status in gcode filelist 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-24 23:12:21 +01:00
Stefan Dej
721964cf2c fix tooltip in history allprintstatus chart 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-24 22:28:04 +01:00
Eike Ahmels
39eb654b96 gmoonraker_db_docker_fix 2021-03-24 11:02:01 +01:00
Stefan Dej
f70a1813f4 history change chart colors 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-23 22:01:53 +01:00
Stefan Dej
5eb30ce4bb update history status list 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-23 21:59:53 +01:00
Stefan Dej
0b5188d187 update history to moonraker history totals 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-23 00:05:04 +01:00
Stefan Dej
f943c24086 fix hide status col in gcode files 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-22 23:42:27 +01:00
Stefan Dej
98b8c5ce51 fix status estimated times 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-22 22:44:31 +01:00
winbin
4e06616611 change language file 2021-03-22 11:05:15 +08:00
winbin
ecb88c7092 Merge branch 'master' of https://github.com/meteyou/mainsail into LanguageChange 
# Conflicts:
#	src/components/panels/ControlPanel.vue
#	src/components/panels/MoonrakerFailedComponentsPanel.vue
#	src/components/panels/Settings/ControlPanel.vue
#	src/components/panels/Settings/UpdatePanel.vue
#	src/components/panels/StatusPanel.vue
 2021-03-22 09:43:36 +08:00
Stefan Dej
5b24071b94 Merge branch 'master' into feature/history 2021-03-22 00:11:42 +01:00
Stefan Dej
d643e63017 feature: add ETA to page title 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-22 00:11:27 +01:00
Stefan Dej
e61274938d fix button group in history (1 chart must have) 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-21 21:40:46 +01:00
Stefan Dej
63d55993b5 fix filament usage chart (add every day to dataset) 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-21 20:38:22 +01:00
Stefan Dej
41f625efa5 move chip icons & colors to history module getters 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-21 20:17:32 +01:00
Stefan Dej
ac963a7547 add icons to status chips and rename footer page text 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-21 19:46:03 +01:00
Stefan Dej
261794630d feature: add tooltip with object height on layer counter 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-21 17:04:19 +01:00
Stefan Dej
3972404c5a change icon, when file dont exist anymore in history list 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-21 16:49:56 +01:00
Stefan Dej
1764a6ab4d Merge branch 'master' into feature/history 2021-03-21 14:06:58 +01:00
Stefan Dej
56b9172efa bugfix: also change hover color (emphasis) from dataset 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-21 14:06:05 +01:00
Stefan Dej
7ebb947a58 fix fileload in gcode-files 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-21 03:09:03 +01:00
Stefan Dej
1486f1a1fd code cleanup 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-21 02:23:40 +01:00
Stefan Dej
758932c4af Merge branch 'master' into feature/history 
# Conflicts:
#	src/store/files/getters.js
 2021-03-21 02:07:04 +01:00
Stefan Dej
0dfb06d656 bugfix: only accept data later than the last entry of the dataset (tempchart) 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-21 02:05:41 +01:00
Stefan Dej
d7125e0f8a feature: show/hide printed files in gcode files 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-21 01:57:59 +01:00