DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 10:04:13 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
15553 commits 96 branches 267 tags 295 MiB
Commit graph

15553 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 0856ee648e
Merge pull request #15648 from snipe/update_packages 
Updated livewire to 3.5.2
 2024-10-10 12:23:14 +01:00
snipe 1dafc970df Updated livewire to 3.5.2 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-10 12:19:57 +01:00
snipe 94a074a193
Merge pull request #15601 from snipe/check_db_on_healthcheck
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 
Fixed #15439 - check database on healthcheck
 2024-10-10 01:11:10 +01:00
snipe 2d49e1eff2
Merge pull request #15637 from akemidx/bug/sc-26614 
FIXED: Badge counter showing deleted assets on User page
 2024-10-10 01:09:11 +01:00
snipe 705bc6f0c0
Merge pull request #15642 from uberbrady/fix_bulk_checkout 
Fix bulk checkout to users, assets, and locations
 2024-10-10 01:08:25 +01:00
Brady Wetherington 67a605c9a5 Fix bulk checkout to users, assets, and locations 2024-10-09 17:01:26 +01:00
akemidx c2663ea1e0 withouttrashed 2024-10-08 16:38:33 -04:00
snipe 3ee5713740
Merge pull request #15631 from snipe/test/importer-tests
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 
Add importer tests
 2024-10-07 23:13:15 +01:00
snipe ab8a22f77e
Merge pull request #15630 from marcusmoore/bug/sc-27028 
Only show EULA when available on print users page
 2024-10-07 22:56:23 +01:00
snipe 56e7ea6677
Merge pull request #15616 from marcusmoore/test/importer-test-updates 
Improve importer tests
 2024-10-07 22:29:35 +01:00
snipe 26d7572bcc
Merge pull request #15603 from marcusmoore/fixes/add-reguard 
Added `Model::reguard()` to importer
 2024-10-07 22:28:53 +01:00
Marcus Moore 8c9132aff9
Hide EULA text and button when nothing will be displayed 2024-10-07 14:22:49 -07:00
snipe 382ebef8ca
Merge pull request #15621 from sniff122/develop 
Docker Env: Change trusted proxies to RFC1918
 2024-10-07 21:26:21 +01:00
snipe 2be88cb955
Merge pull request #15624 from snipe/fixed_line_break_on_print_all_for_users
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 
Removed duplicate JS and removed line break before user section
 2024-10-07 11:14:24 +01:00
snipe 3f36d5f9b3 Removed duplicate CSS and removed line break before user section 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-07 11:08:02 +01:00
Lewis Foster f76da48448
Docker Env: Change trusted proxies to RFC1918 2024-10-05 18:27:42 +01:00
Marcus Moore 8035326675
Add test 2024-10-03 16:53:19 -07:00
Marcus Moore dfdd85abb1
Remove unused imports 2024-10-03 15:14:07 -07:00
Marcus Moore 063ea1892b
Add trait to clean up files after test runs 2024-10-03 15:02:03 -07:00
Marcus Moore e213053775
Swap factory syntax 2024-10-03 13:59:58 -07:00
Marcus Moore 88d549e7c5
Remove unused data provider method 2024-10-03 13:40:37 -07:00
Marcus Moore 983a25aa5f
Simplify permission tests 2024-10-03 13:39:54 -07:00
Marcus Moore bde05d6ed9
Use new() instead of times() 2024-10-03 13:15:49 -07:00
Marcus Moore b5ffe54bd0
Swap assertEquals parameter order 2024-10-03 13:15:02 -07:00
Marcus Moore 863c0a8b60
Fix import_type for accessory state 2024-10-03 11:43:02 -07:00
Marcus Moore 32551d55d7
Merge pull request #15579 from bryanlopezinc/ImportTests 
Add Import data tests
 2024-10-03 11:39:21 -07:00
snipe 7fc498a597
Merge pull request #15613 from snipe/css_fixes_for_long_values
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 
Smarter word-wrapping on long text
 2024-10-03 17:39:18 +01:00
snipe cb281c6408 Tweaked line height 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-03 17:33:46 +01:00
snipe f483cd448f Smarter work-wrapping on long text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-03 17:27:37 +01:00
snipe 78ca1026fd
Merge pull request #15612 from snipe/fixes_print_assigned_in_profile 
Fixes print assigned in profile
 2024-10-03 16:24:32 +01:00
snipe 722d5a58e7 Added isset on users 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-03 16:19:38 +01:00
snipe 7461c3e0ca Change controller to assume a collection. (This is dumb, but whatever) 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-03 16:19:27 +01:00
snipe 3c0f4181ae Use the newer button style 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-03 16:19:06 +01:00
snipe 3699d79363
Merge pull request #15610 from uberbrady/fix_numeric_sort_bug 
Fix numeric sort 'ambiguous order clause' error
 2024-10-03 14:34:00 +01:00
Brady Wetherington 350b627ce1 Fix numeric sort 'ambiguous order clause' error 2024-10-03 14:23:40 +01:00
Marcus Moore ee046a8688
Add matching Model::reguard() 2024-10-02 10:50:40 -07:00
snipe b34a7c8aad Removed die() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 15:48:35 +01:00
snipe f92bf5dc20 Updated language for failure 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 15:39:27 +01:00
snipe 4d9e85026a Fixed #15439 - check database on healthcheck 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 15:36:01 +01:00
snipe 54fbd0540d Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
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
2024-10-02 12:40:49 +01:00
snipe b483bb1633 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 12:40:45 +01:00
snipe 4db7358086
Merge pull request #15593 from Godmartinz/Fixed-divide-by-zero-bug 
Fixed divide by zero bug in depreciation transformer
 2024-10-02 12:38:46 +01:00
snipe 0dd6f41f66 Simplified 2fa if/else 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 11:04:55 +01:00
snipe 684c20ae39 Fixed parenthasis 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 11:00:49 +01:00
snipe c32f4e34b4 Minor formatting 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 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-01 20:35:49 +01:00
snipe ca1886cebc
Merge pull request #15594 from snipe/localizations/update-2024-10-01 
Updated strings
 2024-10-01 20:31:38 +01:00
snipe a79dfea40a Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-01 20:30:58 +01:00
snipe 45ab49eeab
Merge pull request #15592 from spencerrlongg/bug/catch_request_notify_errors 
Catch Errors Around Request Notifications
 2024-10-01 20:26:42 +01:00
spencerrlongg 8232618a9f change the other one too 2024-10-01 14:26:32 -05:00
spencerrlongg 9a651b567d change error to warning 2024-10-01 14:24:03 -05:00