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

1621 Commits

Author SHA1 Message Date
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
Stefan Dej
657f9392a2 add status in gcode files and code cleanup 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-21 01:24:29 +01:00
Stefan Dej
95d3db49c5 add lazy loader to g-code files & history thumbnails 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-21 00:00:29 +01:00
Stefan Dej
ed3aca4a8b fix history all status chart colors 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-20 23:50:09 +01:00
eliteSCHW31N
f147dc7810 add jpeg file extension 2021-03-20 20:44:50 +01:00
Eike Ahmels
da61946bc1 so nobody asks about it anymore! 2021-03-20 20:44:26 +01:00
Stefan Dej
4260192e9c Merge branch 'master' into feature/history 2021-03-19 19:55:35 +01:00
Stefan Dej
bbdbde3869 bugfix: pwm scale with uppercase fans 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-19 19:55:00 +01:00
Stefan Dej
0c10c178aa switch from base64 thumbnail in printer list to relative_path image 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-19 19:51:02 +01:00
Stefan Dej
4cdb0b1697 switch from github api to moonraker commits_behind for display commits between current commit and newest updateable commit 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-19 19:25:12 +01:00
Stefan Dej
8cb410b99e reverse compatibility for moonraker components/plugins 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-19 19:23:56 +01:00
Stefan Dej
31d898c6ef rename moonraker plugins in components (update for 1dc920019c) 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-19 10:17:55 +01:00
Stefan Dej
f43a6d9c37 fix chart sizes after page switch 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-19 10:08:31 +01:00
Stefan Dej
88d1debd73 add context menu of history jobs (details, reprint, delete) 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-17 22:16:40 +01:00
Stefan Dej
286523a997 add detail dialog to history list 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-16 23:32:35 +01:00
Stefan Dej
62f4a602d9 change history filament usage chart from line to bar 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-16 20:46:38 +01:00
Stefan Dej
38fa2bd75b add notify_history_changed 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-16 20:34:53 +01:00
winbin
9db7638495 Merge branch 'master' of https://github.com/meteyou/mainsail into LanguageChange 
# Conflicts:
#	src/store/gui/index.js
 2021-03-16 09:29:02 +08:00
Stefan Dej
8e77e84a6e fix allPrintStatusChart in history 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-16 00:59:36 +01:00
Stefan Dej
45f726159b Merge branch 'master' into feature/history 2021-03-16 00:51:09 +01:00
Stefan Dej
4119955399 change from base64 thumbnails to relative_path png thumbnails in Files.vue 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-16 00:48:32 +01:00
Stefan Dej
aa803727af feature: add restart webcamd button in top corner menu, when webcam is enabled in sidebar or dashboard 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-16 00:35:45 +01:00
Stefan Dej
fafd10555d feature: add option to display ZOffsetPanel in Standby (fix #230) 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-16 00:26:19 +01:00
Stefan Dej
322bbcb33b bugfix: remove remote printer (save array in moonraker db) 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-16 00:15:48 +01:00
Stefan Dej
4224553710 first implementation of print history 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-16 00:10:52 +01:00
winbin
76aec74e92 add translation 2021-03-15 16:55:31 +08:00
winbin
2ca5adecaa get language list 2021-03-15 16:40:52 +08:00
winbin
9a218c516e get language list 2021-03-15 16:33:32 +08:00
winbin
ef732ebc87 Merge branch 'master' of https://github.com/meteyou/mainsail into LanguageChange 
# Conflicts:
#	package.json
#	src/App.vue
#	src/components/ConnectingDialog.vue
#	src/components/SelectPrinterDialog.vue
#	src/components/panels/ControlPanel.vue
#	src/components/panels/ExtruderPanel.vue
#	src/components/panels/Settings/ConfigFilesPanel.vue
#	src/components/panels/Settings/ControlPanel.vue
#	src/components/panels/Settings/EndstopPanel.vue
#	src/components/panels/Settings/GeneralPanel.vue
#	src/components/panels/Settings/LimitsPanel.vue
#	src/components/panels/Settings/UpdatePanel.vue
#	src/components/panels/StatusPanel.vue
#	src/components/panels/ToolsPanel.vue
#	src/components/panels/WebcamPanel.vue
#	src/components/panels/ZOffsetPanel.vue
#	src/main.js
#	src/pages/Files.vue
#	src/store/gui/actions.js
#	src/store/gui/index.js
 2021-03-15 16:17:56 +08:00
Stefan Dej
b1e13bce28 change gcode files icon in navi 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-12 13:00:28 +01:00
Stefan Dej
9f7dc5effb bugfix: fix typo in connecting dialog 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-12 10:12:09 +01:00
Stefan Dej
58c0aa216d bugfix: fix margins in temperature datasets options dialog 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-12 00:37:33 +01:00
Stefan Dej
914a4baad7 bugfix: fix tempchart resize error after switching page 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-12 00:34:02 +01:00