Laravel Shift
9f43ce97e9
Convert deprecated $dates
property to $casts
2021-06-10 20:17:18 +00:00
Laravel Shift
bdf23e472e
Shift to class based routes
2021-06-10 20:17:14 +00:00
Laravel Shift
ddc8b8648b
Shift service providers
2021-06-10 20:17:07 +00:00
Laravel Shift
4ed3d6afb8
Shift HTTP kernel and middleware
2021-06-10 20:17:04 +00:00
Laravel Shift
802dc9240d
Shift bindings
...
PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.
2021-06-10 20:16:56 +00:00
Laravel Shift
934afa036f
Adopt Laravel coding style
...
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.
You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.
[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
2021-06-10 20:15:52 +00: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
9f2b4c721d
Allow password reset from user profile
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-26 15:32:23 -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
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
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
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
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
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
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
ded61614d1
Attempt to fix transient LDAP bug
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-07 18:13:04 -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
Tom Misilo
4e408cbc42
Fix CSP Always being Enabled unless in debug mode. ( #9543 )
2021-05-05 10:51:47 -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
markbrule
6c1553167d
issue #9422 - pivot ID was being used as a user_id ( #9512 )
2021-05-04 22:27:01 -07:00
Tom Misilo
a6bbe1fec3
Delete file from assets folder, not just the ref. ( #9525 )
2021-05-04 22:18:22 -07:00
snipe
cee5eea121
Use 24-hour date format for audit
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-30 15:37:39 -07:00
snipe
c6726015f7
Added missing use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-30 14:52:08 -07:00
snipe
315bcb6b38
Added use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-23 14:26:57 -07:00
Steven
82f73eb9e2
Added user locale to REST API GET /api/users response; ( #9486 )
...
* Clearer reporting on import
Signed-off-by: snipe <snipe@snipe.net>
* Try adding text/x-Algol68 to import
Signed-off-by: snipe <snipe@snipe.net>
* Added user locale to REST API GET /api/users response;
Co-authored-by: snipe <snipe@snipe.net>
2021-04-23 12:09:00 -07:00
Brady Wetherington
72a813f23d
This fixes the controller signature error people are getting with LDAP logins ( #9466 )
2021-04-21 10:23:32 -07:00
snipe
d90abdf86f
Snipe codeacy workflow ( #9460 )
...
* Removed printerClass="NunoMaduro\Collision\Adapters\Phpunit\Printer"
Signed-off-by: snipe <snipe@snipe.net>
* fix ldap ad authentication filter query mechanism (#7441 )
* Create SECURITY.md
* Create codacy-analysis.yml
Co-authored-by: Istvan Basa <basipottom@gmail.com>
2021-04-20 22:17:37 -07:00
aranar-pro
5127727730
Fixed #9424 : import history adds asset model to assigned user and respects checkin date ( #9350 )
...
* Fixed #9294 : Assets import history. Behaviour based on Checkin Date added, including assigning checked out items to users.
* Fixed #9294 : Fixed asset import history to respect checkin and update user with checked out items.
* Fixed #9294 : whitespace and comment cleanup for merge
* Fixed #9294 : Fixed asset import history to respect checkin and update user with checked out items.
2021-04-20 21:25:17 -07:00
snipe
c17eaaad69
Check that the field is valid before checking to see count()
...
This mostly affects the demo, since the seeder updates info often
Signed-off-by: snipe <snipe@snipe.net>
2021-04-20 15:10:28 -07:00
snipe
e286ff0be3
Added show() redirect for CustomFields::show()
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-20 15:09:23 -07:00
Brady Wetherington
2a28f5e66c
(Maybe?) Fixes the problem where we always need LDAP enabled ( #9321 )
...
* I *think* this fixes the problem where we need LDAP even if we aren't using it?
* Pull the LdapAd dependency out of the AuthController constructor
2021-04-20 14:53:47 -07:00
Ivan Nieto Vivanco
36bc47c61c
Handle regex format when assigned from API ( #9443 )
2021-04-20 14:44:47 -07:00
snipe
e1c6d4ced7
Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Requests/SettingsSamlRequest.php
2021-04-14 15:15:07 -07:00
snipe
2986765a68
Implements #9373
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-14 11:17:59 -07:00
Godfrey Martinez
246cc0eaa8
Feature/ch16172/adding other fields to ldap sync settings ( #9416 )
...
* new branch, added manager as an additional field. Currently having DB issues
* WIP DB Issue with eloquent
* added department to LDAP sync
* removed unused variables
2021-04-14 10:17:57 -07:00
Brady Wetherington
792a31cc7f
Merge branch 'develop'
2021-04-06 20:10:22 -07:00
snipe
e47e2e3754
Fixed #9404 - include note in accessory API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-06 10:57:30 -07:00
snipe
390403ddb7
Fixed #9370 - listbox custom fields not decryoted on edit
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-06 05:59:31 -07:00
Serkan
0e34e43abb
The return early pattern applied to improve readability. ( #8894 )
2021-04-05 22:03:15 -07:00
Lars Kajes
49532e1cd6
Add option to force TLS connection ( #9327 )
...
Co-authored-by: Lars Kajes <lars.kajes@iusinnovation.se>
2021-04-05 21:56:25 -07:00
snipe
5c5fe2bd87
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-04-05 21:52:01 -07:00
Tetrachloromethane250
157d9e4ebb
Added #5977 : Add permission to view files attached to licenses ( #9264 )
...
* Add permission to view and modify files for licenses
* Actually use the permission
2021-04-05 21:51:47 -07:00
snipe
3ffa3534a0
Use environmental variables in memory limits
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-05 21:47:57 -07:00
snipe
b9bab05ac3
Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# resources/views/users/print.blade.php
2021-04-05 20:55:49 -07:00
Sxderp
f01c93e162
Extend #6229 to include superuser permission check ( #6772 )
2021-04-05 20:26:06 -07:00
snipe
df72f92bc0
Brings PR #6744 up to parity with previous changes - Set custom field's default value when creating a new asset using the API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-05 20:16:06 -07:00