Commit Graph

906 Commits

Author SHA1 Message Date
Lucio Maranta 28e65cbdda Fix tool update 2018-07-05 17:35:34 +02:00
Lucio Maranta 30b72ff724 Added offset management
Added family put
Model fix
2018-07-05 17:11:45 +02:00
Lucio Maranta fa335443f3 FIx query and returned data
First shank option management
2018-07-04 17:27:22 +02:00
Lucio Maranta 4accaacc06 Fix shanks query
Added options config
2018-07-03 17:22:32 +02:00
Lucio Maranta d461fde0e8 Added load/Unloading in magazine
Available tools/mounted tools
Added Osai configuration
2018-07-02 17:31:11 +02:00
Lucio Maranta 028770dd0a Added PUT & DELETE API 2018-06-28 17:20:47 +02:00
Lucio Maranta b5d499e6ed WIP Added family/tool/shank add API 2018-06-27 13:01:15 +02:00
Lucio Maranta 8c8e168832 Added models and GET API 2018-06-26 17:21:58 +02:00
Lucio Maranta a791886cea Fix tool api 2018-06-25 16:17:51 +02:00
Alessandro Francia 9de2db1398 fix title ribbon maintenance 2018-06-25 15:58:44 +02:00
Alessandro Francia 649b571b34 fix 2018-06-25 15:33:12 +02:00
Alessandro Francia 823d684622 ribbon title maintenance 2018-06-25 14:42:47 +02:00
Alessandro Francia d514d0606b Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-25 11:55:29 +02:00
Alessandro Francia 2e169a4ba6 get 2018-06-25 11:55:18 +02:00
Nicola Carminati ad30c91b47 Fix User-Info ui + maintenance table 2018-06-25 11:31:12 +02:00
Alessandro Francia 5f25a60cb7 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-25 10:00:44 +02:00
Alessandro Francia 245d8f91b2 table fixed 2018-06-25 10:00:19 +02:00
Nicola Carminati f9ec7df62e Fix Maintenance css 2018-06-25 09:26:23 +02:00
Alessandro Francia 7955c44d14 border color card maintenance 2018-06-22 14:39:41 +02:00
Alessandro Francia 6b4bbc2fe1 fix modal and token delete attachment 2018-06-22 12:51:29 +02:00
Alessandro Francia 89aa05858a userId delete attachment 2018-06-22 12:20:47 +02:00
Alessandro Francia 4a8dfe3204 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-22 12:10:16 +02:00
Alessandro Francia badad5096b iframe 2018-06-22 12:09:53 +02:00
Lucio Maranta 2037b6d173 Added user in attachment
Check userId before delete attachment
New database
2018-06-22 12:04:55 +02:00
Alessandro Francia 810b89a420 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-22 09:47:34 +02:00
Alessandro Francia 150871293d production 2018-06-22 09:47:09 +02:00
Lucio Maranta db9e32e366 Fix header 2018-06-21 16:41:31 +02:00
Lucio Maranta 1fc2629979 Fix download image 2018-06-21 16:24:37 +02:00
Lucio Maranta 6315653d44 Fix file download 2018-06-21 16:08:45 +02:00
Alessandro Francia f73a9cb641 fix icon user 2018-06-21 14:53:04 +02:00
Alessandro Francia 8aaf3c670c fix store note and icon user in table 2018-06-21 14:29:27 +02:00
Alessandro Francia 7ae7878fbc fix store attach 2018-06-21 11:32:20 +02:00
Alessandro Francia b1caa7d649 fix open file 2018-06-21 10:15:16 +02:00
Alessandro Francia d18836c61c merge 2018-06-21 08:56:19 +02:00
Alessandro Francia 147eea8d60 attachment 2018-06-21 08:50:04 +02:00
Nicola Carminati 7209f184f1 Fix Stile Note 2018-06-20 16:08:47 +02:00
Paolo Possanzini de2fae941b upload function 2018-06-20 10:23:52 +02:00
Nicola Carminati de188099b2 Fix Maintenance Style 2018-06-19 17:25:05 +02:00
Lucio Maranta c86d7bf56b Merge branch 'feature/Attachments' into develop
# Conflicts:
#	Step/Controllers/WebApi/MaintenanceController.cs
2018-06-19 17:12:44 +02:00
Lucio Maranta c636745421 Fix maintenance attachments API 2018-06-19 17:06:03 +02:00
Alessandro Francia 9ff278e7af fix 2018-06-19 16:44:55 +02:00
Alessandro Francia 752c8e5ff8 fix 2018-06-19 16:08:44 +02:00
Alessandro Francia e47d44154a Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-19 16:05:55 +02:00
Alessandro Francia d826952e8a run maintanance 2018-06-19 16:05:19 +02:00
Lucio Maranta 5e46caab8d fix returned data in performed api 2018-06-19 15:42:53 +02:00
Nicola Carminati c3ae6e9635 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-19 14:49:56 +02:00
Nicola Carminati ef20f4cab2 Fix "Cancel" operation behaviour 2018-06-19 14:49:38 +02:00
Lucio Maranta 8151ca9154 Added return value to perform value 2018-06-19 14:26:32 +02:00
Alessandro Francia 3a881feeed avatar with initials of name 2018-06-19 14:15:08 +02:00
Alessandro Francia f27d6068fe fix validate 2018-06-19 12:24:31 +02:00