DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
16464 commits 52 branches 269 tags 311 MiB
Commit graph

4007 commits

Author SHA1 Message Date
snipe 639afe5b9b Check for blank OR null on formatter 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-09 15:11:22 +00:00
Godfrey M 94f44d1b77 fix label type values in db and defaults. update help text 2025-01-07 10:00:52 -08:00
snipe 4d3db2ab44
Merge pull request #15919 from Godmartinz/table_dropdownmenu-fix
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Details
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Details 
Removed the `table-responsive` div from several index blades
 2025-01-06 18:11:19 +00:00
snipe 15296d2b1c
Merge pull request #15714 from akemidx/saving_custom_report_template 
Saved Custom Report Templates
 2024-12-19 22:43:59 +00:00
snipe 8d24c0af0d
Merge pull request #15982 from spencerrlongg/bug/sc-27228 
Update Checkout Button Permission for Predefined Kits
 2024-12-19 22:25:51 +00:00
snipe 360e0ff534 Added a few order options on audit report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-19 22:19:33 +00:00
spencerrlongg 7eb936883a rm note 2024-12-17 16:38:29 -06:00
spencerrlongg eb054897d6 Remove leftover testing logic and fix checkout permissions 
Removed console logs and temporary testing code from the bootstrap-table view. Updated the transformer to correctly check checkout permissions against the Asset class instead of PredefinedKit.
 2024-12-17 16:06:10 -06:00
snipe 9b04d2e51c Updated route in view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 5226d507d4 Updated route 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 27fab0f573 Use history icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:34:51 +00:00
snipe 183a4d49d8 Refactor of #15235 - added accessory checkout to locations, assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:34:49 +00:00
snipe edacc4eb54
Merge pull request #15446 from Godmartinz/barcode_settings_hide
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Refactored Barcode Settings into Label Settings
 2024-12-16 16:09:34 +00:00
Godfrey M 833af55806 Merge branch 'develop' into barcode_settings_hide 2024-12-12 12:05:29 -08:00
snipe c5e2aed164 Check for assigned (not assigned_to) before trying to present() the name on bulk delete assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-12 17:37:08 +00:00
spencerrlongg 72f58b0405 leaving this here for notes etc 2024-12-11 19:13:51 -06:00
Marcus Moore 67494c1b0b
Fix validation messages for select2 inputs 2024-12-11 16:26:23 -08:00
Marcus Moore 8417fcb604
Revert "Show frontend "required" validation for model and status selects" 
This reverts commit 10a7ae8d47.
 2024-12-11 16:25:45 -08:00
Marcus Moore 10a7ae8d47
Show frontend "required" validation for model and status selects 2024-12-09 16:09:51 -08:00
spencerrlongg 03c90d7b60 note, will come back to this once question is answered 2024-12-09 13:29:06 -06:00
snipe 0149ed75fd
Merge pull request #15565 from spencerrlongg/bug/sc-25921 2024-12-09 17:00:10 +00:00
akemidx ca0f8ace99 fixed 2024-12-03 16:57:28 -05:00
akemidx 6252f0ac5e layout / added category id 2024-12-03 16:10:42 -05:00
Godfrey M b85b4b1e1b remove table-responsive div from several index bladees 2024-12-03 10:26:14 -08:00
snipe 14730184c9 Fixed sr-only blank text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-02 18:48:02 +00:00
snipe 93d4d24194 Fixed funky layout in importer
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Details
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Details
Update Docker Hub Description / dockerHubDescription (push) Has been cancelled
Details 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-02 17:56:15 +00:00
snipe 6874f703bf Some CSS twiddling 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-02 17:42:26 +00:00
snipe 1246ab1de7 Fixed bulk user form in user detail view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-02 17:14:36 +00:00
snipe 716c67d4b8 Fixed #15901 - re-added required indicator on text and select custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-02 15:45:07 +00:00
snipe 82108f8a18
Merge pull request #15208 from akemidx/feature/sc-26415 
FEATURE: Option for Notes to be Required on Asset Checkin/Checkout
 2024-11-26 20:11:04 +00:00
Godfrey M 15c9df0ab1 fix mobile view for asset and user 2024-11-26 10:59:31 -08:00
snipe f125c90c94
Merge pull request #15870 from marcusmoore/bug/sc-26857
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details 
Always call resizeCanvas
 2024-11-22 00:59:36 +00:00
akemidx dd223fc215 commit for testing 2024-11-21 19:01:27 -05:00
Marcus Moore 87756cac66
Remove debugging 2024-11-21 14:30:17 -08:00
Marcus Moore 9f49c25401
WIP: move signature pad creation up and add debugging 2024-11-21 13:12:13 -08:00
Marcus Moore d0378070c8
Always call resizeCanvas 2024-11-21 12:38:53 -08:00
snipe feba860a90
Merge pull request #15850 from akemidx/bug/sc-27448
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Adding colon to password translation string
 2024-11-21 19:58:04 +00:00
akemidx 424316df9f fixing colon placements 2024-11-21 14:32:22 -05:00
NebelKreis 7618169d79 Feature: Added category to asset requested email 2024-11-20 11:22:19 +01:00
NebelKreis eb026248a8 Feature: Added category to asset acceptance/decline email 2024-11-20 10:59:59 +01:00
NebelKreis 4304af0508 Feature: Added category to asset checkin email 2024-11-20 10:27:37 +01:00
NebelKreis 61eff02fcb Feature: Added category to asset checkout email 2024-11-20 10:27:22 +01:00
snipe 30a6a678d4 Indicate requiredness on status select on bulk user checkin+delete 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-19 13:50:18 +00:00
snipe 8f7223128f
Merge pull request #15757 from akemidx/bug/sc-26944 
FIXED: Bulk Delete page not showing full information
 2024-11-19 12:34:57 +00:00
snipe b4a2a4e1ec Fixed #15820 - added model number to view-assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-14 20:51:18 +00:00
snipe 636e466b8a Fixed delete model file route 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-14 17:58:20 +00:00
snipe 838a6d03bd Corrected route name for filestable on assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-14 17:51:49 +00:00
snipe 075e3503b1 Removed Twitter links 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-14 14:38:51 +00:00
akemidx efeef5cdc4 removing || parts of if else 2024-11-13 18:29:58 -05:00
akemidx 9cb411c500 removing required form div container 2024-11-13 18:06:04 -05:00