|
|
374ea2cfae
|
Merge remote-tracking branch 'origin/master'
|
2025-01-14 10:16:15 +01:00 |
|
|
|
356857bb58
|
dev
|
2025-01-14 10:13:26 +01:00 |
|
gg
|
24e7eefda8
|
fix
|
2025-01-14 08:47:52 +01:00 |
|
gg
|
8c283376fb
|
RFID connection
|
2025-01-13 11:56:47 +01:00 |
|
germano laptop
|
c83125cb71
|
dev
|
2025-01-09 10:37:49 +01:00 |
|
germano laptop
|
0f1e164c28
|
dev
|
2025-01-09 10:19:41 +01:00 |
|
stres1
|
c38496d657
|
fix csv import
|
2025-01-07 15:43:29 +01:00 |
|
Utente
|
755ce179b0
|
Merge remote-tracking branch 'origin/master'
|
2025-01-07 08:49:12 +01:00 |
|
Utente
|
b07b0ba658
|
fix csv import
|
2025-01-07 08:49:00 +01:00 |
|
gg
|
7c79bfc6a3
|
rfid imports
|
2024-12-24 12:30:17 +01:00 |
|
|
|
b6211a8dcb
|
Merge remote-tracking branch 'origin/master'
|
2024-12-24 11:45:16 +01:00 |
|
|
|
533d010881
|
dev
|
2024-12-24 11:44:57 +01:00 |
|
gg
|
4bf753e50a
|
rfid imports
|
2024-12-24 11:06:51 +01:00 |
|
neo-nb3
|
270366af32
|
fork nfcpy package as local lib, fixed pn532 baudrate, tbt
|
2024-12-22 18:39:13 +01:00 |
|
|
|
e827089e31
|
Merge remote-tracking branch 'origin/master'
|
2024-12-18 14:46:40 +01:00 |
|
|
|
b7a09646a9
|
remote import recipes under testing
|
2024-12-18 14:46:25 +01:00 |
|
stres1
|
1ad3b89814
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# config/machine_settings/st-ten-1.ini
# src/ui/barcode_recipe_selection/barcode_recipe_selection.py
|
2024-12-17 12:31:43 +01:00 |
|
stres1
|
35a0cd9f81
|
stten1 cfg
|
2024-12-17 12:29:43 +01:00 |
|
Utente
|
d6d387f605
|
Merge remote-tracking branch 'origin/master'
|
2024-12-17 12:15:44 +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 |
|
|
|
20831fab58
|
Merge remote-tracking branch 'origin/master'
|
2024-12-06 15:04:29 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
3fd2efcd7b
|
extra server on stten1/4/14 tbt
|
2024-12-06 11:58:57 +01:00 |
|
|
|
f3b19fd32b
|
extra server on stten1/4/14 tbt
|
2024-12-06 11:51:45 +01:00 |
|
|
|
141e1361bb
|
extra server on stten1/4/14 tbt
|
2024-12-06 11:49:43 +01:00 |
|
|
|
1ee19f292a
|
extra server on stten1/4/14 tbt
|
2024-12-06 11:46:06 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
