DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11600 commits 101 branches 268 tags 320 MiB
Commit graph

11600 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe cd3b4754e8
Merge pull request #13704 from Godmartinz/feature/sc-23571_v2 
Added a check-in button on components tab of Asset view
 2023-10-05 14:28:37 +01:00
snipe 1dab4b59e9
Merge pull request #13693 from Godmartinz/bug/sc-9955 
added proper margin-top to sidebar menu on bigger resolutions
 2023-10-05 14:27:25 +01:00
snipe 05dd2b4008
Merge pull request #13709 from spencerrlongg/eol-migration 
Speed up EOL Migration
 2023-10-05 14:26:47 +01:00
snipe b809625856
Merge pull request #13713 from snipe/security/13685 
[Snyk] Security upgrade css-loader from 4.3.0 to 5.0.0 #13685
 2023-10-05 14:13:35 +01:00
snipe 8d921359ca [Snyk] Security upgrade css-loader from 4.3.0 to 5.0.0 #13685 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-05 14:12:36 +01:00
spencerrlongg c07c0c0f74 cleanup 2023-10-04 16:55:35 -05:00
spencerrlongg cc82e86eeb one more check 2023-10-04 16:54:56 -05:00
spencerrlongg 8c9961aba8 refactor 2023-10-04 15:40:42 -05:00
spencerrlongg 46af40bd02 ????? 2023-10-04 15:20:16 -05:00
spencerrlongg 6cda9056b8 oops 2023-10-04 14:56:18 -05:00
spencerrlongg 101bd9c404 kill transaction, try update array 2023-10-04 14:47:14 -05:00
spencerrlongg ad6b502005 comments 2023-10-04 14:37:18 -05:00
spencerrlongg cb10c7af27 oops 2023-10-04 14:33:35 -05:00
spencerrlongg 99d409c0a5 transaction 2023-10-04 14:32:28 -05:00
Godfrey M 37c1d6fc04 removed unnecessary changes 2023-10-03 12:45:13 -07:00
Godfrey M c69958d95d removed dead space 2023-10-03 12:32:24 -07:00
Godfrey M 92776adb93 remove unnecessary changes 2023-10-03 12:31:58 -07:00
Godfrey M dee36fc294 adds component checkin to asset tab 2023-10-03 12:30:08 -07:00
snipe a2773aa895
Merge pull request #13696 from marcusmoore/bug/sc-23796 
Fixed potential call to a member function toArray() on null
 2023-10-03 11:01:40 +01:00
Marcus Moore e82fec2a5f Grammar fix 2023-10-02 16:19:20 -07:00
Marcus Moore db4c86a4f4 Filter null field options before attempting to process them 2023-10-02 16:14:20 -07:00
snipe 1abcc8b802
Merge pull request #13694 from marcusmoore/bug/sc-23795 
Logs non-compliant barcode error as debug message
 2023-10-02 22:13:19 +01:00
Marcus Moore 724c054838 Log non-compliant barcode error as debug message 2023-10-02 12:06:24 -07:00
Godfrey M 1e8f90bcf0 gives proper margin-top to sidebar menu on bigger resolutions 2023-10-02 11:46:08 -07:00
snipe 129e9b90dc
Merge pull request #13585 from spencerrlongg/eol_2 
Standardize Asset EOL Date
 2023-10-02 16:09:22 +01:00
snipe c7b8880d69 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-02 14:28:59 +01:00
snipe 228f21ed91
Merge pull request #13690 from snipe/localization/all 
Updated language strings
 2023-10-02 14:24:52 +01:00
snipe b7c390a257 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-02 14:23:22 +01:00
snipe 758d808772
Merge pull request #13683 from snipe/bug/sc-17602 
Fixed consumable user view route name
 2023-09-29 15:17:23 +01:00
snipe 754ec7563a Fixed consumable user view route name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-29 15:15:03 +01:00
snipe 0184d25a95
Merge pull request #13681 from marcusmoore/bug/sc-23778 
Fixed uncaught type error when attempting to render barcodes with invalid characters
 2023-09-29 01:50:07 +01:00
Marcus Moore bed1055c4e Catch TypeError when rendering 1d barcode 2023-09-28 17:32:16 -07:00
Marcus Moore 41eccaeae0 Set dummy asset tag to value that is valid for EAN13 2023-09-28 17:31:45 -07:00
snipe c1f545a523
Merge pull request #13679 from Godmartinz/bug/sc-23688 
Fixed General Webhooks error messaging and validation
 2023-09-28 20:24:09 +01:00
Godfrey M 8792d654b6 added translations for messages 2023-09-28 12:15:17 -07:00
Godfrey M f8730adb11 removed unnecessary changes 2023-09-28 11:41:43 -07:00
Godfrey M c21586dee5 adds better error messaging 2023-09-28 11:29:46 -07:00
snipe f16e81e0e8
Merge pull request #13678 from spencerrlongg/bug/sc-23596 
Fieldset Properly Sortable in Asset Models Table
 2023-09-28 19:24:04 +01:00
snipe 3b4004ac18
Merge pull request #13677 from snipe/feature/sc-14880 
Set modal focus to modal-name field
 2023-09-28 19:18:16 +01:00
snipe 0bf423cda9 Set modal focus to modal-name field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 19:16:40 +01:00
spencerrlongg a54fab5c33 add fieldset to allowed_columns 2023-09-28 13:02:12 -05:00
snipe 96c6c93197
Merge pull request #13674 from snipe/bug/sc-23774 
Fixed bug where license checkout/checkin notes were not being saved
 2023-09-28 18:37:47 +01:00
spencerrlongg 4d67c72eea scope and switch case in api 2023-09-28 12:26:23 -05:00
snipe 6fa0d42bc2 Fixed bug where license checkout/checkin notes were not being saved 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 15:40:18 +01:00
snipe 7512400b56
Merge pull request #13672 from snipe/feature/sc-23772 
Fixed #13662 - added clipboard.js
 2023-09-28 15:13:42 +01:00
snipe 1acb14a39f Moved dragtable css 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 15:12:44 +01:00
snipe bb7a41628a Fixed #13662 - added clipboard.js 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 15:06:55 +01:00
snipe 402ff58628
Merge pull request #13671 from snipe/bug/sc-23773 
Fixed #13670 - order number missing from license import
 2023-09-28 14:24:49 +01:00
snipe 492fb15036 Fixed #13670 - order number missing from license import 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 14:24:07 +01:00
snipe cc4cb14e9d
Merge pull request #13667 from snipe/bug/sc-23771 
Fixed #13658 for asset history with encrypted fields
 2023-09-28 03:29:06 +01:00