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

6124 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe e44a25126d
Merge pull request #9676 from inietov/fixes/asset_checkin_api_doesnt_send_notification 
Fixes #9666 Asset checkin via api doesn't send notification.
 2021-06-23 14:35:07 -07:00
snipe c801305c9b
Merge pull request #9681 from tulsaschoolsdata/9680-fix-statuslabels-asset-count 
Fixed #9680: Use Eloquent’s `withCount` method to count Statuslabel assets
 2021-06-23 14:34:34 -07:00
snipe 4db5a8f62b
Merge pull request #9695 from Joly0/master 
Update print.blade.php
 2021-06-23 14:33:25 -07:00
snipe 1c1ebdf44d
Merge pull request #9706 from derdeagle/develop 
Fixes #9705: Prevent syntax error in startup.sh
 2021-06-23 14:31:32 -07:00
snipe 1bc4d1b997
Merge pull request #9717 from PetriAsi/fix/accessories-bulk-set-min-amt 
Added #9716: Allow to bulk update accessories min_amt
 2021-06-23 14:28:59 -07:00
snipe ac52ea3463 Porting PR #9720 to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 14:27:15 -07:00
snipe 0153c6ae96 Do not try to add the notes column if it already exists on accessories_users 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-19 16:20:22 -07:00
Petri Asikainen ae2c77f97f Allow to bulk update min_amt 2021-06-17 00:36:04 +03:00
Joly0 9a429952ff update print.blade.php 2021-06-15 08:52:01 +02:00
Johannes Münch 8f4b88a877 Fixes #9705 Prevent syntax error in startup.sh 
If SESSION_DRIVER is not defined it leads to a syntax error.
 2021-06-12 20:21:43 +02:00
Joly0 72f27ccc5b Update print.blade.php 2021-06-11 11:05:39 +02:00
snipe 8cd78b2790 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2021-06-10 17:44:17 -07:00
snipe aae6a8fc6c Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-10 17:42:29 -07:00
snipe ace7abc1ad Merge remote-tracking branch 'origin/develop' 2021-06-10 15:18:24 -07:00
snipe c567ad0617 Add @travismiller as a contributor 2021-06-10 15:18:02 -07:00
snipe 4c007ae085 Merge remote-tracking branch 'origin/develop' 2021-06-10 15:17:19 -07:00
snipe 54cb6c050a
Merge pull request #9679 from tulsaschoolsdata/serial-number-indexes 
Fixed #8486: Add index for asset serial number
 2021-06-09 17:36:06 -07:00
snipe 851e5ca96e
Merge pull request #9683 from tulsaschoolsdata/9682-company-id-indexes 
Thanks!
 2021-06-09 17:35:37 -07:00
Travis Miller 103c4325ce Fixed #9682: Add indexes for company_id 2021-06-09 14:29:00 -05:00
Travis Miller ebe7c2da87 Fixed #8486: Add index for asset serial number 2021-06-09 14:12:35 -05:00
Travis Miller 4f6b1bb12d Fixed #9680: Use Eloquent’s withCount method to count Statuslabel assets 2021-06-09 11:52:04 -05:00
Ivan Nieto Vivanco bb227cafb2 Added event to trigger the notification. 2021-06-08 13:16:13 -05:00
snipe 6c1dd81e0a
Merge pull request #9640 from inietov/fixes/errorexception_invalid_argument_supplied 
Fixes an issue when tried to upload a file to an user without actually selecting a file. [ch16471]
 2021-05-27 14:03:25 -07:00
Ivan Nieto Vivanco 9f944ad497 Added the 'required' attribute to the input file n the upload file form modal. Added a validation for the UserFilesController if the user doesn't select any file to upload [ch16471]. 2021-05-27 15:48:13 -05:00
snipe 01e3296ff3 Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-26 15:58:24 -07:00
snipe 7d5a9180e6 Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-26 15:57:56 -07:00
snipe 9f2b4c721d Allow password reset from user profile 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-26 15:32:23 -07:00
snipe 3d008079c9 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-05-26 14:32:33 -07:00
snipe b8d413a6b8
Merge pull request #9632 from inietov/fixes/api_allow_duplicate_asset_tags 
Fixes an issue that allows duplicate asset tags when the Asset is created via API.
 2021-05-26 13:34:59 -07:00
snipe 30a193502f Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-05-26 13:27:20 -07:00
snipe 11f1b29db9 Add @kcoyo as a contributor 2021-05-26 13:04:51 -07:00
snipe 200d0804ec
Merge pull request #9630 from kcoyo/develop 
Fixed #9607: Sessions expire for SAML/RemoteUser/LDAP
 2021-05-26 13:04:13 -07:00
Ivan Nieto Vivanco d9f5f1182a Delete a couple lines that rewrites validation rules for asset tags in the model Asset.php:save() method. 2021-05-25 23:09:27 -05:00
snipe 3f09d17389 Fixed typo “synchronization” 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-25 18:45:06 -07:00
kcoyo 55555ee233
Merge pull request #1 from kcoyo/Fixed-#9607---Sessions-expire-for-SAML/RemoteUser/LDAP 
Fixed #9607 - Sessions expire for SAML/RemoteUser/LDAP
 2021-05-25 16:44:08 -07:00
kcoyo cee6f0d579
Update LoginController.php 
Fixed #9607 - Sessions expire for SAML/RemoteUser/LDAP
 2021-05-25 16:37:34 -07:00
snipe 5b4550a6a8 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-05-21 16:56:15 -07:00
snipe 1a7edb3411 Accept webp in uploads (not just image files) 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-21 16:56:11 -07:00
snipe 796c7c8431
Merge pull request #9619 from uberbrady/migrator_misses_logos 
Several improvements to the snipeit:restore Artisan command
 2021-05-21 16:02:55 -07:00
Brady Wetherington 94c1d36e08 The legacy 'logo.png' might not be a PNG, so switched to wildcard. 2021-05-21 15:55:37 -07:00
Brady Wetherington e71bba441e Several improvements to the snipeit:restore Artisan command 
The output now focuses on files that were skipped. Wildcard support
was added for individual files. A progress bar fills as the files
are transferred from the ZIPball to the filesystem. A new command-line
switch can be used to disable the progress bar. Barcode restores are
now skipped (we'd probably prefer to regenerate them). A few missed
directories have been added in. Some logic to skip macOS resource-fork
files has been put in. Some bugs with array operations were fixed.
There's now a concept of 'valid' and 'invalid' files for wildcard
operations.
 2021-05-21 15:23:23 -07:00
Sabir Manandhar c3d75d3be3
feat[docker]: create session table migration if session driver is set to database (#9587) 2021-05-20 14:31:22 -07:00
snipe 9eea46adef Fixed parse error in user print view 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-20 13:53:43 -07:00
sabir-dzangolab 19766a0a72
Fix/startup-sh (#9586) 
* fix: update docker/startup.sh broken after merging hotfixs/2fa_qr

* fix: Typo in Dockerfile.alpine
 2021-05-17 15:39:05 -07:00
Marc Leuser 4030789786
fix LicenseSeatsController method documentation (#9584) 
in an attempt to get the automatic API reference generation to work
 2021-05-14 16:14:32 -07:00
Jonathon Reinhart fd082addff
Fix incorrect case of ldap sync status string (#9563) 
Fixes #9562
 2021-05-12 19:15:39 -07:00
snipe d636566012 Merge remote-tracking branch 'origin/master' into develop 2021-05-12 17:45:06 -07:00
Brady Wetherington 6066005aeb
[WIP] Initial rough stabs at the Backup Migrator. It kinda-sorta works? (#9457) 
* Initial rough stabs at the Backup Migrator. It kinda-sorta works?

* Fix hardcoded mysql path var
 2021-05-12 17:44:39 -07:00
snipe 76897f3a3a Make label printing from asset page more consistent with normal UI 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-12 17:08:53 -07:00
snipe c1babdc9b0 Merge remote-tracking branch 'origin/develop' 2021-05-12 16:51:57 -07:00