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

942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Dej
54c3511572 add border to pi chart sections 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-04-02 23:35:26 +02:00
Stefan Dej
a3c9a235e6 fix mixed tab and spaces in zh 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-04-02 23:34:47 +02:00
Stefan Dej
9d065acabd Merge remote-tracking branch 'origin/master' 2021-04-02 23:29:14 +02:00
Eike Ahmels
8eee177c6c image fix, grammar fix 2021-04-02 23:26:46 +02:00
winbin
9289dea1b0 edit translation file 2021-04-02 23:26:27 +02:00
Stefan Dej
dfe2e8ccf6 fix history statistic starts starttime 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-04-02 23:19:43 +02:00
Stefan Dej
7735bedc51 round new tempchart values 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-04-02 23:08:43 +02:00
Stefan Dej
4eb157f1b0 Merge remote-tracking branch 'origin/master' 2021-04-02 23:08:23 +02:00
Stefan Dej
ddd0c61c26 fix print history hide columns 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-04-02 23:08:15 +02:00
lixxbox
f726ec987d Sneak Preview 
new file:   assets/img/preview/Clippy2k.gif
	new file:   assets/img/preview/Mainsail2k.png
	new file:   assets/img/preview/Merlin2k.png
	new file:   assets/img/preview/Wallpaper2k.png
	new file:   assets/img/preview/logo2k.png
	new file:   assets/img/preview/menu2k.gif
	new file:   preview.md
 2021-04-01 10:08:36 +02:00
Stefan Dej
08900f5442 close websocket every time (close/error...) 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-31 23:19:15 +02:00
Stefan Dej
44dec77ad5 max event history 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-31 23:18:47 +02:00
Stefan Dej
41c356bab2 fix typo connection failed 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-31 02:30:04 +02:00
Stefan Dej
f1eca15c2d feature: add recovery function to update manager 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-31 02:25:34 +02:00
Stefan Dej
cae2bfd2cb feature: add ip cam to webcams 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-31 01:32:58 +02:00
Stefan Dej
fcbdd18d04 fix webcam panel bottom margin 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-31 01:17:17 +02:00
Stefan Dej
b2f36b84d9 add loop load to print history 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-31 00:59:11 +02:00
Stefan Dej
b2055ed879 feature: add days to ETA (status panel + tab title) 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-30 23:50:02 +02:00
Stefan Dej
9866030255 remove row status in gcode-files list 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-30 22:00:28 +02:00
Stefan Dej
b45497fb9c bugfix: tool input field as number (mobile input fix) 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-30 21:26:46 +02:00
Stefan Dej
2d74a55026 fix double headlines in gcode-files (copy&paste typo) 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-30 21:22:46 +02:00
Stefan Dej
5c2d37b59b fix thumbnail url for remote printers 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-30 21:00:37 +02:00
Stefan Dej
b320ba4d60 init load of history data 14 days 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-30 00:15:04 +02:00
Stefan Dej
b21231dbd3 disable debug output 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-29 21:25:04 +02:00
Stefan Dej
761f08b87d optimize tempchart workflow 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-29 21:24:16 +02:00
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