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
15393 commits 101 branches 268 tags 288 MiB
Commit graph

483 commits

Author SHA1 Message Date
snipe 36b27fcda3 Check for valid category before getting the eula
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-09-27 13:37:14 +01:00
snipe 9aada2ec70
Merge pull request #15498 from Godmartinz/Modal_fix
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 
Refactoring modals with partials and fixing misalignments
 2024-09-26 09:09:35 +01:00
Godfrey M 926a319552 Merge branch 'develop' into Modal_fix_p2 2024-09-25 11:10:24 -07:00
Marcus Moore a12c9d053f
Hide label when printing 2024-09-23 16:44:25 -07:00
Marcus Moore 8b3b68b308
Show or hide all eulas at once when printing multiple users 2024-09-23 16:43:14 -07:00
Marcus Moore 3870095a28
Fix Cannot read properties of undefined error by removing snipe-table class from eula table 2024-09-23 15:50:24 -07:00
Marcus Moore a02e250b22
Add page breaks for each user 2024-09-23 15:26:15 -07:00
Marcus Moore 8ac5c0e471
Re-combine layout and view 2024-09-23 14:05:47 -07:00
Marcus Moore 2d2d5bdc7e
Pass user in array 2024-09-19 17:23:47 -07:00
Marcus Moore 8364d26c9b
Extract parent layout 2024-09-19 17:18:26 -07:00
Marcus Moore efd6d7625f
Remove bad closing tag 2024-09-19 17:16:05 -07:00
Marcus Moore bdf5708bfc
Remove accidental line 2024-09-19 17:10:43 -07:00
Marcus Moore e95703cb18
Use eager load 2024-09-19 17:10:07 -07:00
snipe 9e957baeb5 Fixed check for outside assets on user update validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 15:46:45 +01:00
snipe 4debaaea39 Fixed #15504 - allow nulling/not changing locale in user bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-16 14:31:10 +01:00
Godfrey M 0bc98e971f refactoring modals with partials and fixing misalignments 2024-09-12 12:26:19 -07:00
snipe 231bc1e2de Updated blade selectors 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 18:31:34 +01:00
snipe c197644ba7
Merge pull request #15284 from spencerrlongg/bug/sc-26584 
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
 2024-08-29 11:38:15 +01:00
snipe 22bc088f6f Added start_date and end_date to user bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-27 07:21:19 +01:00
snipe 5c43a1f87c Use proper style for buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-23 17:54:49 +01:00
snipe 263151658f Moved general label button 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-23 17:44:09 +01:00
snipe bc9ea5a2ec
Merge pull request #15352 from Godmartinz/mobile_breakpoint 
Fixed Mobile misalignment of info on Assets and Users view pages
 2024-08-22 11:18:06 +01:00
snipe 305dc049a4 Added asterisk help text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-22 11:01:28 +01:00
Godfrey M 9d484077ae missed a file 2024-08-20 14:24:37 -07:00
snipe 6f024849e9 Few more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:39:24 +01:00
snipe 0bc995b87f Updated more icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 11:58:05 +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 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 856c57cb12 Corrected some translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 12:39:59 +01:00
spencerrlongg afaf53cdfc failing ui test 2024-08-14 18:14:21 -05:00
Godfrey M 6b1784f2ee makes shortcuts optional 2024-08-07 10:47:16 -07:00
snipe 1c1101aeac Use the pwd_secure_min value (plus 5) for generated password 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-29 14:26:18 +01:00
snipe 759ab78f80 Added more redirects 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 11:27:36 +01:00
MrM e49c96a35e
Added EULAs in print user's assets 
Added EULAs when we want to print all assets assigned to a users and ask him/her to sign.
 2024-07-14 19:10:33 +02:00
Florent Bervas d9a53460ff Fix design inconsistency between assets and assigned assets in Print All Assigned report 2024-07-11 09:41:58 +00:00
Godfrey M 624632d0ca removed push and endpush 2024-07-09 11:41:31 -07:00
snipe 708d7b5fc5 Use icons for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:43:44 +01:00
snipe 62b5a159a9 Added files column 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:31:09 +01:00
snipe 0071596274 Added upload count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:18:43 +01:00
snipe d687b20467 Use more modern reference for input text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-27 15:05:47 +01:00
Marcus Moore c3e6e1144f
Merge branch 'develop' into chore/sc-23725/livewire3 2024-06-12 15:12:40 -07:00
Marcus Moore 60c7efae3c
Remove commented code 2024-06-05 11:48:10 -07:00
snipe 832ceeba56 Fixed missing endpush 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 09:57:10 +01:00
Marcus Moore 1736bf5510
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	app/Livewire/LoginForm.php
#	package.json
#	resources/views/livewire/login-form.blade.php
 2024-05-30 16:56:50 -07:00
snipe a46e2ebfd8 Small tweaks to user export, user view translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 13:59:00 +01:00
Marcus Moore 43616d1874
Remove alpine reference from webpack 2024-05-29 12:30:20 -07:00