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

15281 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 886514a25f
Merge pull request #15336 from marcusmoore/fixes/remove-displayed-parentheses
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 `)` being added to expected asset checkin report email header
 2024-08-19 22:46:08 +01:00
Marcus Moore fa765667f2
Merge branch 'develop' into livewire-importer-improvements 2024-08-19 14:41:58 -07:00
Marcus Moore 434bdcd6d4
Add missing parentheses to conditional 2024-08-19 14:31:47 -07:00
snipe be5f3f38f8 Settings pages 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 14:48:12 +01:00
snipe 08c3a25b39 Little more padding 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 14:16:57 +01:00
snipe 34cd4b6244 Added links to apple/google maps 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 14:15:36 +01:00
snipe d89c8682be Reversed location button ordering 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:46:31 +01:00
snipe 6f024849e9 Few more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:39:24 +01:00
snipe e048f0955f More icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:27:21 +01:00
snipe 479b2b4fd3 More icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:23:08 +01:00
snipe 84f14a05bd Fixed logging for asset model restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:20:19 +01:00
snipe 8d52fa51b1 Fixed suppliers buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:20:06 +01:00
snipe 229d8b9bf5 Added location restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:19:59 +01:00
snipe eb8d43a804 Updated buttons on models 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 12:32:44 +01:00
snipe f82266fade Cleaned up presenters 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 11:58:31 +01:00
snipe b4b6f7a35f Added css-consumable to overrides for table headers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 11:58:21 +01:00
snipe 0bc995b87f Updated more icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 11:58:05 +01:00
snipe 59725f2031 Removed extra debugging in test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 11:57:40 +01:00
snipe 00bc9ac806 Fixed spacing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 22:39:14 +01:00
snipe f200960a57 Aaaand more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 22:26:57 +01:00
snipe c700127f1a Updated user view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 22:09:00 +01:00
snipe ae2f9571b4 And still more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 21:57:37 +01:00
snipe a77dcad336 More links 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 20:30:53 +01:00
snipe 7ace9324b4 Added padlock sound 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 20:30:22 +01:00
snipe d2e889e927 Still more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 19:21:59 +01:00
snipe 803bdb457c Added calendar 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:48:19 +01:00
snipe 7c9b1f6e38 Added the plus icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:39:22 +01:00
snipe d545537a43 More icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:34:13 +01:00
snipe 4d8904938d Added calendar icon for datepickers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:24:26 +01:00
snipe 0c09f2b2c0 Moar icon replacement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:13:49 +01:00
snipe bffba02511 Updated icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 17:26:44 +01:00
snipe 901f4df7ee Added more icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 17:03:36 +01:00
snipe 9337cba340 Added download 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 15:53:58 +01:00
snipe 2b0c67c263 Load the icon helper 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 15:51:00 +01:00
snipe da71f031f5 Use icon in hardware view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 15:48:24 +01:00
snipe d2e585baa7 Added icon blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 15:47:45 +01:00
snipe a102c085df Added icon helper 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 15:47:37 +01:00
snipe cb40a82e79
Merge pull request #15324 from snipe/jerk_prevention
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 
Prevent passing an array as login
 2024-08-18 04:54:23 +01:00
snipe 4253acad4c Prevent passing an array as login 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 04:51:36 +01:00
snipe 7e6ff3cbe6 Removed trailing rows
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
Update Docker Hub Description / dockerHubDescription (push) Has been cancelled
Details 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-17 00:51:19 +01:00
snipe e7ef3bf515
Merge pull request #15322 from snipe/importer_model_fixes 
Importer model fixes
 2024-08-17 00:37:37 +01:00
snipe a25efe53aa Removed some debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-17 00:35:42 +01:00
snipe de059a715a Cleaner test CSV 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-17 00:30:49 +01:00
snipe 318aff1ef0 Fixed behavior for null model numbers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-17 00:27:44 +01:00
snipe e96b9b2f4f Added test for models with same name but no model number 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 23:04:11 +01:00
snipe 3ae4a5caf0 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 22:53:27 +01:00
snipe 559f0d2f90 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 22:53:21 +01:00
snipe 9b6a36c8aa Removed unusued parameter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 22:45:57 +01:00
snipe 1a4aebf805 Added TwoColumnUniqueUndeletedTrait trait 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 22:45:47 +01:00
snipe 6ad7100aa3 Removed unused use statements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 22:45:17 +01:00