snipe
12ae408830
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# app/Http/Controllers/Auth/ResetPasswordController.php
# resources/views/auth/passwords/reset.blade.php
2020-10-19 16:40:07 -07:00
snipe
0954ff0659
Fixed lost ldap password on save when nothing entered
2020-10-09 13:08:51 -07:00
snipe
33cf4896d8
Use password complexity rules on password reset
2020-10-08 19:28:21 -07:00
snipe
8a1136d80a
Use password security settings on password reset
2020-10-08 18:43:39 -07:00
snipe
0cd19c87bf
Added utility to delete barcode cache from labels/barcodes setting
2020-10-05 20:34:17 -07:00
snipe
98b9ee9b25
Only save LDAP settings if not in demo mode
2020-09-25 18:38:26 -07:00
snipe
01548ba39d
Add ad_append_domain to settings controller
2020-09-25 18:27:22 -07:00
snipe
ed3afd1e2e
Removed debugging
2020-09-15 23:19:52 -07:00
snipe
7736f12eb4
Switch to Guzzle for the Slack test
2020-09-15 23:05:27 -07:00
Ivan Nieto
501d5680ea
Fix [ch15188] 500 error
2020-09-15 03:51:10 -05:00
Brady Wetherington
f3f7d714a6
Fix ldap test button for php 7.4 (suppressing errors)
2020-09-09 14:18:05 -07:00
snipe
10648de9af
Bulk Checkin and Delete also edit users [ch15107]
2020-09-04 16:02:25 -07:00
snipe
69d7000922
Fixed [ch15085] - duplicate use statements in Consumables controller
2020-09-03 19:47:15 -07:00
Ivan Nieto
3fcd83c499
Fixes some errors in forms using the deprecated Input:: facade
2020-09-03 13:42:33 -05:00
snipe
9c8ca6af21
Squashed commit of the following:
...
commit e321aeabae8ec99ff4337568ae9e37568ae9ec01a83216932ad9050c#8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
commit 32ad9050cf01a832169cbcad49ce73c6883489#8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist
Fixed #8335 - added assignedTo scope on status labels API call for assetlist
commit 3c6883489cbcad49ce79b5acca89d7e52919cf1b714576be429f3a5c48#8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
commit 29f3a5c48f134e8e6fb9714576be45b999c50a2512899294#8328 from snipe/fix_deprecation_report
Fix deprecation report for customers with many active assets
commit 51289929400291323502e0f6f9b839f1a6308002b999c50a2e9ca20e496e3906b245#8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation
Looks great, thank you!
commit e3906b245c9ca20e4964e0644dbbf456a74d88#8313 from snipe/improve_ldap_search_error_reporting
Improve ldap search error reporting
commit 456a74d88c799c059070c62d43a778b725bd0faee0644dbbf65b6925b00004ecad05#8105 from PeterUpfold/PeterUpfold-7661workaround
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
commit 5b6925b00cdf17a859bf24c43056ba606b7e905dd73ddad4779a39cf721e7410b16838994f3e15#8258 from ballertv/features/consumable-api
This looks great, thank you!
commit 7410b16835e955c983ab09e7d19b#8270 from snipe/improve_ad_useraccountcontrol_v4
Add new useraccountcontrol value for valid AD users
commit 8994f3e15ed23f1a77cae955c983a32fa17ac18eed41e454#8250 from snipe/features/adds_addr_city_state_to_importer
Added address, city, state and country to importer and city to bulk editor
commit b09e7d19b32fa17ac185b905154373b1e46f72#8254 from Godmartinz/gmartinez_adds_email_formats
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…
commit 3b1e46f72b0c1a1de2a220c9ae5818eed41e4549b750f4754fc17a06792a4f76cc6cfbb905154373Fixed #8247 - added notes field to user details display
commit daf748e531799a93c46a34aa12e22981a633288897757bd0#8239 from snipe/fixes/api_rtd_to_location_on_create
Set location_id to rtd_location_id on asset creation
commit 897757bd04c7125c393781a63328896e563f6e4b5320f5c677f69ae953https://github.com/snipe/snipe-it
commit 5320f5c67c7f69ae953bc79f8c1ba17f6fbabf#8227 from snipe/fix_select2_ajax_pulldowns
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 17f6fbabfac79f8c1baf12c92e30b536401fe0#8207 from EDVLeer/patch-1
Update snipeit.sh
commit e7a820f7c912c92e30b7fd10b755b0dbbb7680d9cf0dd5bbad25e53d8c7fec6ed256f89d433b41#8216 from snipe/features/checkout_license_to_all_users
Added CLI tool to checkout license to all users
commit 89d433b41ae2570ada6f45afe725a1536401fe0fec6ed256fb2aaa7bed2d339bdddc3cc9f1577a#8183 from snipe/features/merge_users
Added merge utility
commit cc9f1577a4ab1fe8be0c339bdddc3835b9cf4b707ccb41371e2e60a457bf2390d2160bb42801f6a00b051b8c#8164 from snipe/features/additional_security_headers
Additional security headers
commit 00b051b8c705b3a9ad7e4fb880384f43042ad841a716382ac436c8f7f4f1b42801f6aede4934f21946129f20#8163 from snipe/fixes/fix-for-css-on-column-selector
Fixed weird padlock display in asset listing with encrypted custom fields
commit 946129f206b941ef1e08d1aa11ec89de4934f21daf06e4205b10076b01#8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
commit b10076b015af06e420569a2440dc4bbeae8efb22ac1c1636#8141 from snipe/fixes/better_handling_when_license_is_invalid
Better handle the logic to determine if we should display the license checkout blade [ch13792]
commit 2ac1c1636c004ecad059beae8efb21d14ab7e3e9839e5e56#8088 from Godmartinz/Label_Woes
Barcode resizing and text adjustment
commit 9839e5e566d14ab7e3e1#8053 to master
Signed-off-by: snipe <snipe@snipe.net>
commit e7f74d94c1e97cf011b6ed23505054001e721530f886837668210da6e8#8063 from dmeltzer/backport-8092
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
commit 8210da6e82f88683766be4385c0f8cFixes #8051 regression
Signed-off-by: snipe <snipe@snipe.net>
commit 0550fe0ffa7fb3a9b82c9a2ed804cecb1e87fe#8043 from snipe/features/backup-optional-in-import-and-ldap
Added option to disable backup in import
commit ecb1e87fe6f43df5f04195cc48e4229a2ed804cad20fad28e5ae813ddf75bb42109c0cf46ecf8ec0b9e821c0e69ee28c75131a8ba067020fd232e70ee4d69b1chttps://github.com/snipe/snipe-it
commit 0fd232e70dee4d69b1c531c535094d1ad11194#8041 from alek13/patch-1
use supported package for slack
commit d1ad111949https://github.com/maknz/slack/issues/94
commit 31c53509417eb70e17e05bb4f271a3dfcb4699#7993 from snipe/fixes/7989_column_selector
Fixed #7989 - Converted table heading icons in People to CSS glyphs
commit 3dfcb4699196eb96f964a2f08bd3bae009fbe59f5bb4f271aaFixed #7987 - allow toggle of required/optional in custom fields/fieldsets
Signed-off-by: snipe <snipe@snipe.net>
2020-08-31 12:17:19 -07:00
snipe
8ec99ff433
Merge pull request #8374 from snipe/fixes/moar_flysystem
...
WIP - More Flysystem fixes
2020-08-31 09:45:27 -07:00
snipe
f2c60d055b
Updated docblock
2020-08-28 18:22:57 -07:00
snipe
e1cc003cec
Fixed backup urls for download
2020-08-28 18:22:37 -07:00
snipe
5aaa2430b4
Fixes for backups
2020-08-28 14:10:43 -07:00
snipe
c23e28d0df
Merge pull request #8372 from snipe/fix_adldap_sync
...
Fix adldap sync
2020-08-26 13:34:07 -07:00
snipe
24be73f76b
Use image handling request for logo uploads
2020-08-26 12:17:50 -07:00
snipe
fa2dfc3e87
Use updated request signature for models
2020-08-26 11:59:30 -07:00
snipe
d25a05d748
Misc Flysystem/image upload request fixes
2020-08-26 11:53:36 -07:00
snipe
db385b5f6b
Fixed assetmodels selectlist
2020-08-26 02:32:39 -07:00
snipe
f385f3e928
Fixed user image upload
...
TODO: We should probably rename the avatar field on the user’s table, to make it more consistent with the other model images
2020-08-26 02:30:23 -07:00
snipe
de21f00771
Fixed assetmodels upload
2020-08-26 02:29:37 -07:00
snipe
3c6883489c
Added assignedTo scope
2020-08-25 20:37:30 -07:00
snipe
e5dd6035b9
Fixed the other upload handleUploads signatures
2020-08-24 18:32:40 -07:00
snipe
041fc20955
Fixed Companies and Categories uploads
2020-08-24 15:43:11 -07:00
snipe
b97ff4e907
Fixed Depts uploads
2020-08-24 15:10:26 -07:00
Brady Wetherington
4b7f6a95e3
Fix deprecation report for customers with many active assets
2020-08-14 15:07:59 -07:00
Brady Wetherington
5128992940
Fix deprecation report for customers with many active assets
2020-08-14 15:03:03 -07:00
Brady Wetherington
262a964760
[WIP] fix ldap-sync for v5 with AdLdap2
2020-08-14 14:45:05 -07:00
Michael Pietsch
4f5374b2e8
enable use custom file based saml certificate/private key
2020-08-14 12:25:00 +02:00
snipe
6a089f86f8
Fixed pathing for accessories
2020-08-03 11:17:56 -07:00
snipe
9a39cf721e
Merge pull request #8258 from ballertv/features/consumable-api
...
This looks great, thank you!
2020-07-31 12:18:49 -07:00
snipe
3e62a6ea2d
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-07-31 11:01:35 -07:00
andres
8994f3e15e
cleanup
2020-07-22 19:57:06 -04:00
andres
d23f1a77ca
implement checkout API
2020-07-22 19:56:31 -04:00
snipe
b750f4754f
Added city to bulk user importer
2020-07-21 16:49:54 -07:00
snipe
799a93c46a
Allow for email/username search on users
2020-07-17 12:11:32 -07:00
snipe
897757bd04
Removed added line for location
2020-07-16 17:43:44 -07:00
snipe
c7125c3937
Set location_id to rtd_location_id on asset creation
2020-07-16 16:34:39 -07:00
snipe
5320f5c67c
Disallow non-super users from editing their own permissions
2020-07-13 21:16:45 -07:00
Sean Borg
567a9639f4
Enhanced #5762 Able to bulk edit expected checkin date
...
In light of the need to edit 500+ devices #5762 (comment)
I added the expected checkin date to the bulk edit page for assets
2020-07-10 19:21:34 +01:00
Sean Borg
3d8823ede5
Added #5762 Modify expected checkin dates
...
It is now possible to edit expected checkin dates for assets in Actions > Edit Asset
2020-07-10 19:21:04 +01:00
snipe
2ac1c1636c
Better handle the logic to determine if we should display the license checkout blade
2020-06-16 16:12:57 -07:00
snipe
a7eb89f6b6
Misc fixes for flysystem paths
2020-06-16 16:06:25 -07:00
snipe
262eb79471
WIP - this needs refactoring
...
We have to use Storage::get() if the filesystem is local, since the method does a file_get_contents() and the file isn’t accessible via a URL since it’s private and doesn’t live on the web root. (We do this slightly differently than Laravel out of the box)
Signed-off-by: snipe <snipe@snipe.net>
2020-05-28 01:59:01 -07:00
snipe
8ccc1c6515
Fixed weird merge in Bulk Users Controller
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-27 22:46:42 -07:00
snipe
d54acd908c
Made logo file have a better name for multiple tries in the same day
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-27 02:31:04 -07:00
snipe
dee1f5ec35
Merge pull request #8078 from dmeltzer/wrong-id
...
Fix incorrectly named parameter.
2020-05-26 19:51:38 -07:00
Daniel Meltzer
b3fe47bfa7
Remove/Reorganize logic to make codacy happier.
2020-05-23 15:24:10 -04:00
Daniel Meltzer
f0546bf689
Clean up Transformers and extract an isDeletable() method to models where it makes sense.
2020-05-23 15:24:10 -04:00
Daniel Meltzer
136df9418f
Deadcode--
2020-05-23 15:24:10 -04:00
Daniel Meltzer
7ea862787c
Refactor controller to use one method that shows all modals based on name.
2020-05-23 15:24:00 -04:00
Daniel Meltzer
25d6ceee6e
Remove old code.
2020-05-23 12:18:27 -04:00
Daniel Meltzer
fe74394ae6
Short circuit checkout logic to prevent iterating if we're not checking out to an asset
2020-05-23 11:48:02 -04:00
Daniel Meltzer
c70bd62a0f
Missing includes. Fix by using the request object instead of facade.
2020-05-23 11:36:16 -04:00
Daniel Meltzer
ad1db2c640
Fix incorrectly named parameter.
2020-05-23 10:26:56 -04:00
Daniel Meltzer
a6f90cb3fc
Assorted licenses UI fixes while testing.
...
* Rename licenses route checkin parameter to clarify it's purpose and
fix incorrect route in users view page.
* Checkin note can be nullable for checking in a license.
* License Seat view was only showing 20 license seats due to faulty
transformer logic.
2020-05-12 14:38:21 -04:00
snipe
274f82893f
Regenerate session ID on logout
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-12 10:38:00 -07:00
snipe
0550fe0ffa
Fix for session fixation vulnerability
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-12 10:31:54 -07:00
snipe
730632e2eb
Apply PR #8043 to develop
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 22:57:55 -07:00
snipe
95cc48e422
Added option to disable backup in import
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 20:41:10 -07:00
Johnson Yi
c1c37d521c
Allow downloading sp metadata without idp
2020-05-06 19:50:50 +10:00
Johnson Yi
b2930d6069
Added #542 : add saml authentication
2020-05-06 00:06:19 +10:00
snipe
85712a1960
Only override fieldset_id with custom_fieldset_id if it’s present
...
This is mostly to support prior versions. I have NFC why we did this in the first place. I’m sure I had a stellar reason, but couldn’t tell you what it is today.
Signed-off-by: snipe <snipe@snipe.net>
2020-04-30 20:59:42 -07:00
snipe
e9cb17394c
Small validation fix on reset password
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-30 19:10:07 -07:00
snipe
8507bcd16b
Merge pull request #8008 from dmeltzer/component-checkinout-fixes
...
Component checkout/checkin fixes.
2020-04-30 17:49:22 -07:00
snipe
b488cffc7e
Merge pull request #8006 from dmeltzer/api-test-fixes
...
Test fixes pt 2.
2020-04-30 17:46:25 -07:00
snipe
8bb3c01f78
Addressed merge issue for reset password for #7997
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-30 17:45:05 -07:00
snipe
82e02490fd
Removed duplicate update method (per #7997 )
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-30 17:23:56 -07:00
Daniel Meltzer
68224757f4
Validate when editing the quantity of a component that the new quantity is > the amount checked out
2020-04-29 13:25:04 -04:00
Daniel Meltzer
358609720a
Component checkout/checkin fixes.
...
- Provide proper translated messages for checkin vs checkout
- Pass appropriate methods to the Checkout event, fixes an error on
checkin.
- Default to a value of 1 on checkin in UI to save a click sometimes.
2020-04-29 12:50:09 -04:00
Daniel Meltzer
1f8c3cc670
Test fixes.
2020-04-29 11:03:07 -04:00
Daniel Meltzer
f8d18a8eb0
Revert asset-checkout-different validation.
...
This was causing issues when trying to check an item out to a user or a
location because of the way laravel handles validation.
Instead, rely on the exception check we had in the controller. I moved
this exception up to the model checkout method so that it would work
for anywhere that that method was called, even if it avoided the
controller.
2020-04-29 10:59:00 -04:00
Daniel Meltzer
05187eb27f
Fix Functional Tests.
2020-04-28 11:39:53 -04:00
Daniel Meltzer
c74b904f14
Fix Location parent different validation on new location creation.
2020-04-28 11:39:52 -04:00
snipe
412caebf69
Fixed logo uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 23:22:52 -07:00
snipe
5bb4f271aa
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 00:47:19 -07:00
snipe
bea3a7b982
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 00:39:32 -07:00
snipe
f66ce02756
Added debugging logs
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:46:02 -07:00
snipe
c7b300a50d
Updated LDAP sync controller to use new Adldap2 connections
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:45:44 -07:00
snipe
cdd0e405be
Fixed weird merge
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:12:29 -07:00
snipe
b725e788ec
Applied new selectlist search to locations
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 06:39:41 -07:00
snipe
69a1732245
Removed duplicate form request in asset models controller
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 03:51:10 -07:00
snipe
7e9e5214ef
Fixed status label create error
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 03:50:43 -07:00
snipe
7a33e335d4
Fixes PSR autoloading issue
2020-04-21 20:15:24 -07:00
snipe
c17106d1b3
Fixes for settings controller
2020-04-21 04:08:25 -07:00
snipe
cb71bcc4af
Switch to old() helper
2020-04-21 03:58:31 -07:00
snipe
87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge
...
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
2020-04-20 23:20:34 -07:00
snipe
197a84be94
Commented out rtd_location_id override - why did we do that?
2020-04-09 14:17:39 -07:00
snipe
b4fa4c77d7
Check for rtd_location_id before trying to assign
2020-04-09 14:14:30 -07:00
snipe
f8a72db696
Changed LDAP 600 to 500, clearer error messages on LDAP test
2020-04-09 09:55:44 -07:00
snipe
206bd675f2
Pulled slack validation out of setting model validation so it doesn’t fail mysteriously on other pages
2020-04-08 15:07:02 -07:00
snipe
a0f7fdc57a
Merge branch 'fixes/accessibility_fixes'
...
# Conflicts:
# public/css/build/all.css
# public/css/dist/all.css
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
2020-04-08 11:19:42 -07:00
snipe
79232fc434
Fixed #7947 - Added rtd_location_id to API search
2020-04-08 11:00:04 -07:00
snipe
0b3f511534
Fixed compact() errors
2020-04-07 17:26:56 -07:00
snipe
893944403e
Check for location_id being set before trying to set it on checkout via API
2020-04-06 15:54:40 -07:00
snipe
7d466f3584
Update user uploads for more data to work with recport
2020-04-01 02:22:16 -07:00
snipe
6174f9b93f
Check that there is actually a filed ID submitted
2020-04-01 01:25:31 -07:00
snipe
a467a6999e
Use upload modal
2020-03-31 22:50:07 -07:00
snipe
6066c249d5
Moved gate to the top of the method
2020-03-06 16:01:13 -08:00
Ivan Nieto
025ea93f05
Fix for when a user with the correct permissions couldn't update Manufacturers. ( #7882 )
...
* Changed the ability name from 'edit' to 'update'. Changed the order of execution: first checks if the manufacturer exists, then checks permissions
* Handles the update method, that also has the ability parameter as edit instead of update"
q
* Revert "Handles the update method, that also has the ability parameter as edit instead of update""
This reverts commit d7dc0e451e
2020-03-06 15:59:51 -08:00
snipe
54fd8f81ff
Added permissions on user api ( #7883 )
...
* Add permissions to user edit API
* Add user permissions on user create/update API endpoint
2020-03-06 15:28:46 -08:00
snipe
ca43554327
Fixes search by serial or tag even if they have slashes in them ( #7879 )
...
* Fixes search by serial or tag even if they have slashes in them
* Added support for url param byTag and bySerial
* Fixed typo comments
* Sojme additional comments to clarify use-cases
* Updated comments for clarity
2020-03-06 14:55:20 -08:00
snipe
039f5da0e1
Add image upload to user edit [ch10508] ( #7877 )
...
* Use correct Request include
* Updated to use additional form request
* Added SVG sanitizer
* Added response method to form request
* Allow ImageUploadRequest to accept fieldname params, added SVG sanitization, fixed delete
* Fixed upload path for avatars
* Added fieldname variable to blade partial for image upload
* Added enctype="multipart/form-data" to form to allow uploads
* Added image field
* Updated Request::old() to use $request->old()
* Fixed derp in edit blade referring to $item when it should be $user
* Added svg+xml to image rule
2020-03-05 18:00:24 -08:00
snipe
8b2f8ef3cb
Spelling is hard :(
2020-03-04 22:19:59 -08:00
snipe
15518852aa
Added validation to reject email addresses over 250 characters
2020-03-04 22:08:07 -08:00
snipe
dfb9e430fa
Removed debug line
2020-02-11 22:09:37 -08:00
snipe
c33970e3e3
Added timestamp to uploaded files so they are unique and don’t overwrite
...
Laravel 6 now does this automaically, so we should switch to their way
2020-02-11 20:19:59 -08:00
Godfrey Martinez
0e0fe967e4
BadMethodCallException Method update does [ch10544] ( #7804 )
2020-02-10 19:27:23 -08:00
snipe
2f0ed129f0
Use “invalid barcode” image and suppress errors when barcode format is wrong
2020-02-04 18:15:01 -08:00
Fabian Grutschus
5becb93e6c
Added: allow appending of domain name to username when user tries to login ( #7790 )
2020-02-04 12:47:49 -08:00
snipe
3361b859c0
Changes offset to use the actual item count as override instead of 0 ( #7788 )
2020-02-04 12:32:24 -08:00
snipe
89e2a3ae3c
Fixed #7752 - reformat /api/v1/users/me to use transformer
2020-01-30 13:12:43 -08:00
snipe
56582614b6
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-01-22 16:07:46 -08:00
Ivan Nieto
313cacdb71
Select Import File fails in Develop [ch10598] ( #7718 )
...
* Delete an unused import, then replace a deprecated facade with the needed one for uploading files
* Added the needed use for the Request Facade
2020-01-17 16:12:51 -08:00
Ivan Nieto
75bf8f3d58
Remove not existent variable 'id' in the redirect causing [ch10602] ( #7732 )
2020-01-17 16:12:24 -08:00
snipe
324da7c0c8
Include correct license, asset, etc count on user show API call
2019-12-19 18:09:53 -08:00
snipe
779fc6d195
Added license endpoint for users
2019-12-19 18:00:36 -08:00
snipe
159acf6788
Removed extra space
2019-12-19 17:47:50 -08:00
snipe
94ce8cad64
Make sure $user->item exists before trying to count on it
2019-12-11 14:43:46 -08:00
snipe
4d38c44a93
Fixed groups request
2019-12-11 11:26:58 -08:00
snipe
c31e150935
Use $request->input over Request::get()
2019-12-11 11:09:54 -08:00
snipe
a5b180a9c6
Fixed Call to a member function count() on null for location delete
2019-12-11 10:46:07 -08:00
snipe
a8bbb951bc
Use Request instead of Input
2019-12-10 22:05:49 -08:00
snipe
df778cdb80
Include storage in use statements
2019-12-10 22:03:15 -08:00
snipe
d7c51f1a2c
Added Request to use statements
2019-12-10 20:39:29 -08:00
snipe
296de34e8a
WIP: Upgrade develop to Laravel 6.6.1 ( #7637 )
...
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell.
* Upgraded framework to Laravel 6
### TO DO:
- Fix password restriction rules- the old library isn’t compatible with Laravel 6 :(
- Figure out why in-app API calls are returning “Unauthorized”
* More updates from Input:: to Request:: helper
* Switch to Request:: from Input
* Added passport config
* Fixed goofy password minimum in seeder
* Added laravel/helpers
* Changed ($item) to ($item->id) in forms
I have no idea why this is necessary
* Changed ($item) to ($item->id) in forms
* Updated API middleware to auth:api
* Updated with added laravel auth.php values
* FIxed *&!^$%^&$^%!!!! ajax issue
* Switch to Request::get from Input::get
* Switched to Request facade
* Added password security minimums back in
The package we were using has not been updated to Laravel v6, so I created custom validators instead
* Added language strings for error messages for password rules
* Fixed `($item)` issue in formActions for partials
2019-12-10 19:32:50 -08:00
snipe
ff57f10e9f
Fix for searching on child location names ( #7646 )
...
* Fix for child locations
* Reverts temp changes to indenter
2019-12-06 13:14:10 -08:00
Yorick Terweijden
2a6a381bc7
Return real Asset error ( #7054 )
2019-12-06 11:07:12 -08:00
Valentyn Tulub
6ad1f51673
Added #6489 : show asset assignments under user assignments ( #7293 )
...
* Add a setting to show assets assigned to other assets #6489
* Update user's views to show assets assigned to other assets #6489
* Add ukrainian and russian translation for the feature #6489 in settings
2019-12-06 10:57:48 -08:00
herroworrd
3fbfb0c658
Add requestable to asset model api results ( #7577 )
...
Nice, thanks!
2019-12-06 10:33:06 -08:00
Lorenzo P
7225b53986
fix syntax error in CustomFieldsetsController::show() ( #7595 )
...
That someone was probably me :D Thanks for this, good catch!
2019-12-06 10:31:00 -08:00
snipe
e71e57f16a
Fixed XSS vulnerability in SVG image uploads [ch10476] ( #7639 )
...
* Added enshrined/svg-sanitize
* Added modular image resizing/SVG cleaning method
(This already exists in v5, so I mostly ported it forward and added the SVG sanitizer.)
* Use improved handleImages method to upload/resize/clean images
* Removed $old_image
This is handled in the ImageUpload request now
2019-12-05 22:23:05 -08:00
snipe
ff8d98c97c
Update child assets to reflect asset parent location ( #7458 )
2019-12-04 16:19:25 -08:00
snipe
704c696711
Fixed parse error in settings controller
2019-12-04 14:54:36 -08:00
snipe
88cf456386
Adding Dept to license seats ( #7609 )
...
* Adding Dept to license seats
* Added query scope to order by department
* Make license seat department sortable
* Disable license seat internal search - this never actually worked
2019-11-21 22:03:56 -08:00
snipe
5065164c40
Bumped Carbon version
2019-11-21 13:14:18 -08:00
snipe
5290c47e2a
Merge branch 'develop' into v5-master-develop-integration
...
# Conflicts:
# .env.example
# .travis.yml
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Console/Kernel.php
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Middleware/EncryptCookies.php
# app/Http/Requests/AssetRequest.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/AssetImporter.php
# app/Models/AssetMaintenance.php
# app/Models/Location.php
# app/Models/User.php
# composer.json
# composer.lock
# config/backup.php
# config/database.php
# config/version.php
# public/mix-manifest.json
# resources/lang/en-ID/general.php
# resources/lang/vi/admin/settings/general.php
# resources/views/accessories/edit.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# tests/api/ApiCategoriesCest.php
2019-11-18 19:49:39 -08:00
Marián Skrip
53eae6fbfd
Fix issues with update permission naming ( #7493 )
...
This solves an issue when admin would be able to create and delete
categories but not edit them.
2019-10-28 11:44:48 -07:00
Alexandr Hacicheant
a90149940a
Update UsersController.php ( #7528 )
...
Returned missed bracket after merge master to develop
2019-10-28 11:43:29 -07:00
snipe
0769f585ea
Disallow locations from being their own parents
2019-10-21 15:45:05 -07:00
snipe
22d2ad9248
Fixes nested location selectlist ( #7483 )
...
* Rename child locations method
* Use Ajax dropdown for locations selectlist for edit/create
* Removed locations database call on edit/create blades for faster loading
* Updated locations controller to use the new iterator
* Increase pagination on locations controller to 500
We’re already loading all of that data up beforehand anyway, so no point in keeping the query smaller.
* Fixed the else to make codacy happy
* Improve the design and performance of the nested location selectlist (#7484 )
* Improve the design and performance of the nested location selectlist
* Fixed parse errors
* Removed debugging code/comments
2019-10-02 03:56:56 -07:00
snipe
6deb26fafe
Remove unused variable
2019-09-30 19:37:52 -07:00
snipe
c68c0e1208
Account for limit if none is passed in the request
2019-09-03 20:28:49 -07:00
snipe
c256536d21
Math is hard
2019-09-03 14:29:58 -07:00
snipe
b8f7cd81eb
Limit API request results per page ( #7405 )
2019-09-03 14:02:08 -07:00
