DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
9662 commits 101 branches 268 tags 288 MiB
Commit graph

9662 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe a6f4e53e2b Added translation strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:33:49 -08:00
snipe fe470b32fc Added icon and import type to header, more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:33:40 -08:00
snipe 474e32ea2a Added translations and formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:33:02 -08:00
snipe b9e4b2a0ba Added some translations, date formatting, and filesize human reporting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:32:45 -08:00
Brady Wetherington 087fe19ae7 Merge branch 'livewire_importer_2_squashed_and_rebased' of github.com:uberbrady/snipe-it into livewire_importer_2_squashed_and_rebased 2023-03-08 13:57:21 -08:00
Brady Wetherington 22d7d2a04e Aliases could get selected when they weren't for an import_type 2023-03-08 13:56:29 -08:00
snipe b8887bd3e3 Translated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 13:47:56 -08:00
snipe 65c2d75c04 Added aliases 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 13:47:38 -08:00
snipe ac0b22d696 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 00:33:04 -08:00
snipe 1ed7cd27b4 Lots of HTML/CSS tweaks for better UI 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 00:32:30 -08:00
snipe e143e0c5ee Make the <tr> reflect that it’s active 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 00:32:16 -08:00
snipe 42601fecbf Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased 2023-03-07 21:42:32 -08:00
Brady Wetherington 7c09de3ea8 Re-introduce the 'placeholder' option for our form-helper 2023-03-07 21:38:55 -08:00
snipe 094859cfe8 Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased 2023-03-07 21:38:04 -08:00
Brady Wetherington 037489a6c0 If fields were already mapped, they would cause a 500 on re-mapping on import 2023-03-07 21:33:20 -08:00
snipe e66b19aca0 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 19:44:06 -08:00
snipe fd96ff0160 Add @kenchan0130 as a contributor 2023-03-07 19:42:52 -08:00
snipe 1ccedf6426
Merge pull request #12617 from kenchan0130/patch-12249 
Fixed #12249: fix csv importer for serial_number field
 2023-03-07 19:42:23 -08:00
snipe 8adeee41e6
Merge pull request #12633 from snipe/bug/sc-20332 
Fixed 500 when admin erroneously tries to upload a tiff as logo, cleaned up logo upload layout
 2023-03-07 19:41:10 -08:00
snipe 19d19a4c42 Updated language string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 19:18:32 -08:00
snipe 383b5b43bb Added a few more jquery options for prevoew flexibility 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 18:54:38 -08:00
snipe 379c5f6790 Reworked the layout for logo upoloads 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 18:54:09 -08:00
snipe e55d02fd59 Added new string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 18:53:53 -08:00
Brady Wetherington 942bedaf06 Re-add VIP and BYOD to importer, but in Livewire 2023-03-07 18:53:32 -08:00
Brady Wetherington 09c1298e03 Merge branch 'develop' into livewire_importer_2_squashed_and_rebased 
I'll be taking in the changes to the importer front-end elsewhere
 2023-03-07 18:51:05 -08:00
Brady Wetherington fe699737eb Add improved field-guessing logic; make sure 'do not map' fields work 2023-03-07 18:26:59 -08:00
snipe e60fa15414 Nicer layout, but it kinda dosn’t work :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 17:02:52 -08:00
snipe 45b5a8b6ab Catch exception if the file can’t be handled via Intervention 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 15:56:36 -08:00
snipe 182a5ea5fc
Merge pull request #12631 from snipe/bug/sc-20297/expected-checkin-email-report-link-back-error 
Dynamically determine target route for expected checkin emails
 2023-03-07 13:57:26 -08:00
snipe ea54f540de Dynamically determine target route for expected checkin emails 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 13:42:51 -08:00
snipe e399015427
Merge pull request #12628 from marcusmoore/fixes/keep-asset-name-on-import 
Maintain asset name during import with checkout
 2023-03-07 11:22:53 -08:00
Marcus Moore c80595e05c
Ensure asset name is maintained when importing assets that are checked out 2023-03-07 11:09:25 -08:00
Tadayuki Onishi f4675927a0 fix csv importer for serial_number filed 
Signed-off-by: Tadayuki Onishi <tt.tanishi100@gmail.com>
 2023-03-07 22:53:02 +09:00
snipe 1ebbc767f1
Merge pull request #12624 from snipe/features/added_vip_and_byod_to_importer 
Added `vip` and `byod` to importer
 2023-03-06 17:11:28 -08:00
snipe a34cb8b862 Check for boolean on requestable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 17:11:08 -08:00
snipe d55393a3d9
Merge pull request #12626 from marcusmoore/fixes/checkouts-in-seeders 
Fix seeder so assets are checked out to users
 2023-03-06 17:01:47 -08:00
Marcus Moore ef27c35d1d
Update array keys to set asset location properly 2023-03-06 16:33:40 -08:00
snipe 0d3388b3ae
Merge pull request #12623 from snipe/bug/sc-20254/errorexception-filesize-stat-failed-for-snipe 
Check that the file exists before trying to stat it for filesize
 2023-03-06 15:43:17 -08:00
snipe fffe5da2e0
Merge pull request #12625 from uberbrady/quiet_down_scim_exceptions 
Suppress SCIMExceptions from cluttering up Rollbar
 2023-03-06 15:42:58 -08:00
Brady Wetherington dd3c3a1428 Suppress SCIMExceptions from cluttering up Rollbar 2023-03-06 15:24:16 -08:00
snipe 16bd2cde0f Updated string for file not found 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 15:09:45 -08:00
snipe e1069ac234 Return a file not found error if it doesn’t appear on disk 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 15:09:37 -08:00
snipe 8b6e8898c1 Fixed hardcoded string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 15:09:12 -08:00
snipe 2cb06165c4 Added missing vip field to transformer and request 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 15:00:04 -08:00
snipe b46c455e0a Updated mappings.md with byod and vip fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 14:28:34 -08:00
snipe 304ccaa30e Added byod to asset importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 14:28:24 -08:00
snipe f672bdd3b7 Added vip to user importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 14:28:14 -08:00
snipe eec5163e7f Updated vue assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 14:28:04 -08:00
snipe f460d881da Updated vue 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 14:27:53 -08:00
snipe 27a495223d Updated sample CSVs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 14:27:45 -08:00