DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6102 commits 101 branches 268 tags 288 MiB
Commit graph

6102 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Miller 4f6b1bb12d Fixed #9680: Use Eloquent’s withCount method to count Statuslabel assets 2021-06-09 11:52:04 -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 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
snipe 1a95337db1 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-05-12 16:51:39 -07:00
Ivan Nieto Vivanco 6ed5dff1a5
Fix the target path to copy the demo logos in the database\seeds\SettingsSeeder.php. Also added the code that copies the demo logos to app\Console\Commands\ResetDemoSettings.php (#9571) 2021-05-12 16:41:49 -07:00
snipe 3f559c4a50 Add @tbrconnect as a contributor 2021-05-12 13:38:56 -07:00
tbrconnect a29ef73346
Feature #3088 Print labels from asset detail page (#9559) 
This PR adds a "Generate Label" button to the detail asset page as
described in #3088.

Fixes #3088

Co-authored-by: tilmann.bitterberg <tilmann@tbrglobal.com>
 2021-05-12 13:38:26 -07:00
snipe 015ca1fcdc Merge remote-tracking branch 'origin/develop' 2021-05-07 18:13:22 -07:00
snipe ded61614d1 Attempt to fix transient LDAP bug 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-07 18:13:04 -07:00
Brady Wetherington 62199f6255
Manually re-add support for Label Logos in Labels (#9552) 2021-05-07 17:01:32 -07:00
snipe 75b89b5a97 Merge remote-tracking branch 'origin/develop' 2021-05-07 16:42:41 -07:00
snipe a704614397 Bumped max for country on model 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-07 16:42:26 -07:00
snipe 2dcb50d28e Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-05-07 16:36:12 -07:00
snipe 9aac3ae628 Fixed HTML causing two backup headers to appear 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-07 16:36:07 -07:00
Tom Misilo 397e2df3ea
Upgrade the Alpine docker img to v3.13 for PHP 7.4 (#9550) 
v3.13 of the alpine image has php7.4 instead of php7.3
 2021-05-07 13:50:36 -07:00
Tom Misilo 4e408cbc42
Fix CSP Always being Enabled unless in debug mode. (#9543) 2021-05-05 10:51:47 -07:00
snipe 570a31a1c4 Merge remote-tracking branch 'origin/develop' 2021-05-05 10:29:10 -07:00
snipe ece627b3a3 Small fixes for location printing when relationships are missing/invalid, per #9521 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-05 10:23:46 -07:00
snipe d8d3fa2293 Only show department if it’s valid 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-05 10:13:19 -07:00
snipe ab694347b0 Added favicon to demo dir 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-05 01:18:49 -07:00
snipe aa98e4ea7a Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2021-05-05 00:04:17 -07:00
snipe 6935d94184 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-05 00:03:33 -07:00
snipe d9d5b4d730 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
 2021-05-05 00:01:09 -07:00
Ivan Nieto Vivanco 36a43642d8
Changed the orderBy clause inside the custom reports function that forms the CSV to be 'id' so making it a unique value and don't causes repeated items. [ch14587] (#9535) 2021-05-04 23:50:02 -07:00
snipe ed98683496 Add @mikecmpbll as a contributor 2021-05-04 22:40:04 -07:00