Commit Graph

908 Commits

Author SHA1 Message Date
Eduardo
11e21b0c23 fix stten6 gg 2024-12-16 08:58:29 +01:00
Eduardo
434450656a fix stten6 gg 2024-12-16 08:42:17 +01:00
Eduardo
87818cace6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/ui/test/test.py
2024-12-13 10:28:28 +01:00
a33911d549 Merge remote-tracking branch 'origin/master' 2024-12-11 15:17:43 +01:00
226b7d1398 fix st-ten-6 2024-12-11 15:16:35 +01:00
Eduardo
85cacaddfd Merge remote-tracking branch 'origin/master' 2024-12-11 12:48:12 +01:00
ST-TEN-11
cb3841bc36 fix 2024-12-11 12:27:26 +01:00
Edo
6afae93359 Merge remote-tracking branch 'origin/master' 2024-12-10 10:36:04 +01:00
Edo
3aa5b8ae54 st ten 10 img 2024-12-10 10:35:46 +01:00
bda17a5452 Merge remote-tracking branch 'origin/master' 2024-12-09 15:37:25 +01:00
0e6be1f8a6 dev portal ok overwrite png files 2024-12-09 15:37:08 +01:00
ST-TEN-11
1d5845c872 Merge remote-tracking branch 'origin/master' 2024-12-09 15:24:57 +01:00
ST-TEN-11
ce90737c45 fix STTEN11 labels 2024-12-09 15:24:30 +01:00
neo
20831fab58 Merge remote-tracking branch 'origin/master' 2024-12-06 15:04:29 +01:00
neo
3715436280 extra server on stten1/4/14 tbt 2024-12-06 15:04:14 +01:00
neo-2
6202806fab ST TEN 14 2024-12-06 14:32:19 +01:00
neo
4b63f5b14d extra server on stten1/4/14 tbt 2024-12-06 14:25:41 +01:00
neo-2
33ba90a35b ST TEN 14 2024-12-06 12:05:15 +01:00
neo
3fd2efcd7b extra server on stten1/4/14 tbt 2024-12-06 11:58:57 +01:00
neo
f3b19fd32b extra server on stten1/4/14 tbt 2024-12-06 11:51:45 +01:00
neo
141e1361bb extra server on stten1/4/14 tbt 2024-12-06 11:49:43 +01:00
neo
1ee19f292a extra server on stten1/4/14 tbt 2024-12-06 11:46:06 +01:00
neo
4bfdcd1576 Merge remote-tracking branch 'origin/master' 2024-12-06 11:17:43 +01:00
neo-2
959143734b ST TEN 14 2024-12-06 11:16:06 +01:00
neo-2
1bd85cadf0 ST TEN 14 2024-12-06 11:12:55 +01:00
neo
3c95c5a6c7 extra server on stten1/4/14 tbt 2024-12-06 09:37:50 +01:00
ST-TEN-1
f9ec07e948 guaine stten2 2024-12-06 09:12:30 +01:00
ST-TEN-1
bb2d069d49 FIX 2024-12-06 09:12:10 +01:00
neo
357c517638 extra server on stten1/4/14 tbt 2024-12-05 17:31:49 +01:00
Eduardo
96a162fe90 Merge remote-tracking branch 'origin/master' 2024-12-02 17:02:51 +01:00
neo
5d52f423e0 db fix 2024-12-02 17:00:32 +01:00
Eduardo
32b66a03a6 Merge remote-tracking branch 'origin/master' 2024-12-02 16:27:24 +01:00
Eduardo
757867fbda dev stten6 2024-12-02 16:26:33 +01:00
62681cc80f Log management ok 2024-12-02 14:23:33 +01:00
099a07b08b Merge remote-tracking branch 'origin/master' 2024-12-02 12:24:13 +01:00
2c957a64a2 Log management ok 2024-12-02 12:24:02 +01:00
gg
edc3fa9647 Merge remote-tracking branch 'origin/master' 2024-12-02 11:16:27 +01:00
gg
596829f656 stten6 barcode selection 2024-12-02 11:16:15 +01:00
dc4651b43a Log management wip 2024-12-02 10:54:59 +01:00
567a4a4e95 st-ten-15 2024-11-27 11:45:54 +01:00
4facf27bdb st-ten-15 2024-11-27 11:43:36 +01:00
neo
b1a7e69f5d fix 2024-11-23 15:24:42 +01:00
ST-TEN-11
0b9e3d097e fix 2024-11-22 14:04:45 +01:00
ST-TEN-11
492facb2ee fix 2024-11-21 12:03:25 +01:00
ST-TEN-11
4feb92471f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/label_templates/ferrari_30x16_203.prn
2024-11-21 11:58:10 +01:00
ST-TEN-11
286a72f409 STTEN11 2024-11-21 11:50:57 +01:00
Eduardo
8474729dd2 fix 2024-11-15 12:28:28 +01:00
Eduardo
26508cc25c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/ui/recipe_selection/recipe_selection.py
2024-11-15 11:10:15 +01:00
5f1189f277 st-ten-6 ready for update 2024-11-14 16:45:43 +01:00
b13cb0258e Merge remote-tracking branch 'origin/master' 2024-11-11 16:58:13 +01:00