Ivan Nieto Vivanco
0d860c0b72
Check if target is not null to retrieve the proper data
2023-02-27 19:01:37 -06:00
Ivan Nieto Vivanco
9d94bd6567
Validate if the license seat is not checked out, it can't be checked in
2023-02-27 18:57:38 -06:00
Ivan Nieto Vivanco
b4e578c95e
Convert the alert_email setting from string to array
2023-02-27 17:34:29 -06:00
Brady Wetherington
53db266b69
WIP: cleaning up extraneous gunk and trying to standardize on one single Livewire Select2 implementation
2023-02-27 14:29:02 -08:00
Brady Wetherington
fb201e61f3
More wiring up Livewire to the back-end.
2023-02-27 14:29:02 -08:00
Brady Wetherington
e1c8f155bb
Wiring up more bits to Livewire
2023-02-27 14:29:02 -08:00
Brady Wetherington
8009ee79db
I think I have, now, full parity on the base Importer level
...
Meaning that you can upload new files, delete old files, have error
messages, have status updates - and all of them seem to work.
2023-02-27 14:29:02 -08:00
Brady Wetherington
0a085af0a0
Getting the basic wiring of the importer over into Livewire
...
WIP: Wiring up more and more of the actions on the importer
Files now upload okay, a little glitchy on the display-side though
add to readmes so i dont forget
2023-02-27 14:28:59 -08:00
snipe
c7106a1df2
Added table aliases to fix ambiguous SQL clause
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-27 13:24:09 -08:00
snipe
96c851468c
Added max results limit to report index
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-27 12:04:46 -08:00
Godfrey M
e8fc895e51
"adds variables, but still not working"
2023-02-27 09:19:59 -08:00
snipe
cb0b234b80
Merge pull request #12561 from inietov/fixes/unable_to_import_purchase_date
...
Fixed #12559 Unable to import Purchase Date field
2023-02-24 10:02:25 -08:00
snipe
3e47d9e689
Pass the existing asset name to the bulk checkout form
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-24 09:54:46 -08:00
Ivan Nieto Vivanco
51efd9b413
Adjust the date format for purchase_date field
2023-02-24 10:59:31 -06:00
Ivan Nieto Vivanco
6bd72125bd
Deletes problematic cast
2023-02-23 22:31:41 -06:00
snipe
5e6ebb9a65
Merge pull request #12410 from uberbrady/paginate_accessories_report
...
Paginate accessories report
2023-02-23 12:26:17 -08:00
snipe
8e72da42e8
Merge pull request #12406 from akemidx/vip_tag
...
Added a checkbox to notate VIP status
2023-02-23 12:23:29 -08:00
snipe
eb6357636a
Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies
...
Fix full company scoping in user selects
2023-02-23 10:36:33 -08:00
snipe
5a1e5f740d
Merge pull request #12537 from inietov/fixes/expected_checkin_date_validation
...
Fixed #12531 Expected Checkin Date on Asset Checkout throws an error
2023-02-22 16:03:51 -08:00
akemidx
690970b4aa
fixing ff error
2023-02-22 18:18:20 -05:00
Marcus Moore
f63710fb5c
Remove unused import
2023-02-22 12:34:56 -08:00
Marcus Moore
7667b0a216
Remove extra line
2023-02-22 12:34:35 -08:00
Marcus Moore
931ca98c02
Remove middleware bypass
2023-02-22 12:33:55 -08:00
snipe
81cb29db5e
Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report
...
Added images to emailed user inventory report [sc-19801]
2023-02-22 10:38:07 -08:00
snipe
05f6d0bd5e
Merge pull request #11984 from nh314/Correct-assignedusers-relation
...
Correct assignedusers relation setting
2023-02-21 20:15:20 -08:00
snipe
4bf1566d2a
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during
...
Adds Boolean to Users Table for Auto Assigning Licenses
2023-02-21 20:10:46 -08:00
snipe
0c3115553e
Merge branch 'develop' into vip_tag
2023-02-21 20:03:49 -08:00
Brady Wetherington
645bba96cd
WIP: First stabs at getting Laravel Vite to work; no luck so far :(
...
Probably going to back out all the 'vite' stuff anyways :/
2023-02-21 19:35:37 -08:00
Ivan Nieto Vivanco
d494afcf01
Add order by clause, to ensure assets and accessories are in order in the report
2023-02-21 21:24:19 -06:00
Ivan Nieto Vivanco
6e994c209f
Adds setter to model Asset class for expected checkin
2023-02-19 12:31:10 -06:00
snipe
754842f620
FML - this is a hotfix and I don’t know why this is causing problems
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-16 16:58:00 -08:00
Godfrey M
58801dbb0b
allows users to clear their slack settings
2023-02-16 08:43:12 -08:00
snipe
e9ab90eafc
Merge pull request #12422 from marcusmoore/fix/adhere-to-email-alerts-setting
...
Have acceptance result notifications adhere to alerts enabled setting
2023-02-15 18:46:08 -08:00
Godfrey M
7b510d5f2b
greys out submit button conditionally
2023-02-15 15:46:05 -08:00
snipe
27e5832a28
Use existing slack translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 14:06:52 -08:00
snipe
ff895739f4
Merge pull request #12446 from Godmartinz/livewire_slack_inputs
...
Adds Livewire slack inputs
2023-02-15 13:27:07 -08:00
snipe
de4f7bd274
Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation
...
Enforce Y-m-d as date format for date fields
2023-02-15 12:54:22 -08:00
snipe
25461caa2c
Removed date validation rule
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 12:53:55 -08:00
snipe
bfac0fc811
Merge pull request #12470 from inietov/fixes/rollbar_16883_attempt_assign_on_null
...
Fixed Rollbar 16883 Error: Attempt to assign property "assigned_to" on null
2023-02-15 12:33:32 -08:00
snipe
057f0be20a
Merge pull request #12473 from inietov/fixes/rollbar_attempt_to_read_property_on_null
...
Fixed ErrorException: Attempt to read property "id" on null [sc-19855]
2023-02-15 12:32:53 -08:00
snipe
7980e2ab2e
Merge pull request #12517 from uberbrady/silence_ldap_exceptions
...
Silence E_WARNING "exceptions"
2023-02-15 11:56:37 -08:00
Brady Wetherington
3757c7e353
Make early-boot errors (syntax, others) be more easy-to-read
2023-02-15 11:31:13 -08:00
snipe
3800cdd0da
Merge pull request #12466 from snipe/fixes/style_fixes
...
Style fixes
2023-02-15 11:07:59 -08:00
Ivan Nieto Vivanco
6936efd387
Remove e() function from customfield format input
2023-02-12 16:27:37 -06:00
snipe
b0b1c96ab5
Merge pull request #12514 from marcusmoore/fixes/preserve-asset-name-during-api-checkout
...
Fix asset names being removed during API checkout requests
2023-02-14 12:22:03 -08:00
Marcus Moore
8e00191b69
Add comment
2023-02-14 12:19:16 -08:00
Marcus Moore
a94f19a68e
Use name if provided by asset checkout request
2023-02-14 12:08:20 -08:00
Marcus Moore
2349f54013
Use translation strings for importer exceptions
2023-02-13 13:30:36 -08:00
Marcus Moore
73f355f3a8
Return 422 instead of 500 when import is invalid
2023-02-08 12:39:42 -08:00
Marcus Moore
b3881a43a7
Fix return type
2023-02-08 12:34:25 -08:00
Marcus Moore
c2c666aef0
Formatting
2023-02-08 12:32:57 -08:00
Marcus Moore
5962f1b627
Catch json encoding exceptions and display them to the user
2023-02-08 12:21:51 -08:00
Ivan Nieto Vivanco
49b6a1cc53
Adds translation strings to theinventory report sent to users
2023-02-07 18:29:19 -06:00
snipe
c1d484b5df
Fixed mismatched field/fieldset
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-07 13:31:50 -08:00
snipe
ea644f8d47
Still throwing errors, but trying to fix the docblock
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-07 11:02:20 -08:00
snipe
dd5f256450
We shouldn’t need this because aliases??
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-07 11:02:02 -08:00
snipe
219d92dcfb
The sea, Brady.
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-07 11:00:30 -08:00
Ivan Nieto Vivanco
d4c838a979
Add condition in activity report to only access assigned item id if it exist
2023-02-07 11:26:49 -06:00
Ivan Nieto Vivanco
ddabe7cc9f
Added Guard Clause to License Importer to return if no empty seat is found
2023-02-07 01:36:55 -06:00
snipe
cd5546e4a1
Fixed wonky switch statement indenting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-06 12:44:17 -08:00
snipe
d52d32fed9
Fixed visibility for constants and methods
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-06 12:44:02 -08:00
snipe
7363d4e223
FIxed yoda operator
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-06 12:43:35 -08:00
snipe
c8c5dddcc1
Removed unused else condition
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-06 12:43:19 -08:00
snipe
1651dbb68d
Use null coalescing operator
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-06 12:43:00 -08:00
snipe
d95adcae37
Fixed Implicit array creation is disallowed.
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-06 12:41:54 -08:00
snipe
8a8575bf2d
Made constant DATA_SESSION_KEY public
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-06 12:40:32 -08:00
snipe
590cb6a15b
Removed unneeded concat
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-06 12:40:09 -08:00
Marcus Moore
38cdcdf064
Eager load company
2023-02-06 10:59:51 -08:00
Godfrey M
74c64c1fc5
adds validation to the update hook, removes typos and deadlines
2023-02-06 09:40:57 -08:00
Marcus Moore
0cefc7de15
Skip security headers middleware when testing
2023-02-02 18:37:35 -08:00
snipe
51f3857a31
Fixed something I think I broke
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-02 15:32:45 -08:00
akemidx
b8951e2b54
fixing name from vipuser to vip
2023-02-02 15:58:05 -05:00
Godfrey M
17f1772143
removes postslack from settings controller
2023-02-01 16:58:08 -08:00
Godfrey M
3a86547ef5
fixes messages for integration test, removes slack request file, rehouses ajax method
2023-02-01 16:51:05 -08:00
snipe
0cfeab8c50
Added an exit for the LDAP disabled sync short-circuit
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-01 16:46:58 -08:00
snipe
67e6089805
Short circuit the LDAP sync is LDAP is disabled
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-01 16:36:30 -08:00
snipe
d9cdb92014
Merge branch 'develop' into vip_tag
2023-02-01 16:03:23 -08:00
snipe
2da4578aa5
Merge branch 'develop' into slack_message
2023-02-01 13:43:09 -08:00
snipe
1a8fb5bcfe
Merge pull request #12423 from snipe/features/edit_fieldset_name
...
Fixed #12418 - added ability to edit custom field names via GUI
2023-02-01 13:39:39 -08:00
snipe
0d4ca218c5
Merge pull request #12437 from uberbrady/ldap_allow_undelegatable_users_to_login
...
Fixed: Active Directory "not-delegated+dont-expire-password+normal-accounts" can now login
2023-02-01 13:38:59 -08:00
akemidx
90c1bfe03d
fixing pr
2023-02-01 16:12:39 -05:00
akemidx
4e5b8fa213
fixing pr
2023-02-01 16:05:50 -05:00
Godfrey M
f95a904d90
adds integration button, working on its functionality
2023-02-01 12:08:13 -08:00
Marcus Moore
a45ce468cc
Update return type for routing mail notifications
2023-02-01 11:44:56 -08:00
Marcus Moore
3580bdae86
Use object accessor instead of array accessor
2023-02-01 11:44:35 -08:00
cram42
0f3c5d10ba
Merge branch 'feature-label2' into develop
2023-02-01 18:01:46 +11:00
cram42
73fd0a24ca
Clarify example asset variable
2023-02-01 17:58:58 +11:00
cram42
4b4c228f1a
Correct parameter order
2023-02-01 17:56:23 +11:00
cram42
b72c6b7afc
Fix 2D barcode defaults
2023-02-01 17:48:39 +11:00
snipe
f7ae5db4f3
Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories
2023-01-31 19:56:43 -08:00
snipe
2d45ebe103
Merge pull request #12433 from inietov/fixes/asset_declined_date_issues
...
Fixed Invalid date value on assets acceptance mail notification
2023-01-31 19:14:51 -08:00
Brady Wetherington
a4173e3881
Permit not-delegated+dont-expire-password+normal-accounts to login
2023-01-31 16:49:41 -08:00
Godfrey M
1e0c58c3cf
saves data correctly now
2023-01-31 11:32:05 -08:00
lukasfehling
cddae4869f
fixed the endpoint for user notification with all their assigned assets
2023-01-31 18:27:25 +01:00
Godfrey M
fc044528b8
validation is working, success message appears, database is not updating
2023-01-30 16:10:02 -08:00
Ivan Nieto Vivanco
ccc7b78f62
Store the acceptance dates with format YYY-mm-dd
2023-01-30 15:11:41 -06:00
snipe
22b0b9b090
Fixed gates on fieldsets
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-26 17:05:41 -08:00
snipe
583a0412fe
Added edit fieldsets translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-26 17:03:23 -08:00
Godfrey M
a63ea560ae
adds submit button, getting setAttribute error
2023-01-26 15:17:08 -08:00
Marcus Moore
39289dd18e
Use user provided alert email for checkout acceptances
2023-01-26 13:18:18 -08:00
Marcus Moore
6fc8982478
Have acceptance result notifications adhere to alerts enabled setting
2023-01-26 12:59:33 -08:00
akemidx
df31a76906
fixed apostraphe
2023-01-26 15:02:39 -05:00
Brady Wetherington
4a54586690
Add to Accessories#index an additional gate-check against reports.view
2023-01-26 11:56:06 -08:00
Godfrey M
62b4c79150
adds a couple error messages
2023-01-25 16:38:08 -08:00
Godfrey M
a69cb6204a
adds rest of inputs, and corrects Data binding
2023-01-25 16:22:34 -08:00
Brady Wetherington
cfe9c687f9
Mark a bunch of SCIM config as nullable
2023-01-25 15:54:57 -08:00
Brady Wetherington
91cf683f3d
Re-do the entire SCIM config so it no longer inherits
2023-01-25 15:53:46 -08:00
Godfrey M
2e22eeade5
adds one input
2023-01-25 14:29:20 -08:00
akemidx
53d8008a5f
Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag
2023-01-25 17:14:29 -05:00
akemidx
b363524305
vipuser label updated to vip
2023-01-25 15:58:44 -05:00
snipe
4c3354b778
Merge branch 'develop' into vip_tag
2023-01-24 20:29:43 -08:00
Brady Wetherington
ab12ad1140
Resolves Rollbar error 16746 - missing array key 'extension'
2023-01-24 18:19:26 -08:00
snipe
9c79fc19cb
Tightened up and removed some validation that wasn’t needed
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-24 17:37:15 -08:00
snipe
fd2a057d38
Make audit dates fillable
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-24 17:36:58 -08:00
Brady Wetherington
b00333c9f5
Merge remote-tracking branch 'upstream/develop' into develop
2023-01-24 17:36:39 -08:00
Brady Wetherington
c9f0f5fe8b
Change Accessories report to use server-side pagination from URL
2023-01-24 17:35:44 -08:00
snipe
3c4f254583
Enforce Y-m-d as date format for date fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-24 13:38:53 -08:00
akemidx
596846a94a
Add VIP Checkbox
2023-01-24 15:29:27 -05:00
Marcus Moore
b92d1d3ec7
Logically group query when searching users to scope to company
2023-01-24 11:54:56 -08:00
Godfrey M
0f8ee22053
Creates Slack Setting Form
2023-01-24 09:25:05 -08:00
snipe
dc155846ca
Hoist the autorization higher in the stack so we’re not doing logic or math when the user isn’t authorized to touch this
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-23 21:49:17 -08:00
snipe
7a9ea91be0
Merge pull request #12387 from snipe/fixes/inconsistent_UI_for_image_delete
...
Updated - Refactored ImageHandler request to be more re-usable, and checkboxes with missing `minimal` class for iCheck
2023-01-23 21:39:55 -08:00
snipe
02dcb0fbd7
Shorten the additiona form request invocation to just ImageUploadRequest
...
We already have the `use App\Http\Requests\ImageUploadRequest` clause at the top of this file.
Signed-off-by: snipe <snipe@snipe.net>
2023-01-23 21:37:35 -08:00
cram42
c2c009a018
Merge branch 'develop' into develop
2023-01-24 09:53:42 +08:00
Jeremy Price
d3bcc48ae5
[imports] fix "Backup before importing?" checkbox on import page
...
We were always taking backups before import, no matter the status of
this box.
Turns out we were testing for the presence of the property defined by
the checkbox, rather than the value of the property, and as such were
always doing a backup.
We're now checking the status, and it behaves as expected
2023-01-23 15:08:59 -08:00
snipe
41537a2449
Added field to the API controller endpoints
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-22 00:56:44 -08:00
snipe
5f9af7d509
Updated API response
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-22 00:56:28 -08:00
snipe
febfcd4803
Updated model with new field
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-22 00:56:19 -08:00
snipe
cad76f671a
Added asset_eol_date to blade
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-22 00:55:42 -08:00
snipe
cd8cb445ba
Corrected fieldname for user fieldname for avatar in Controller
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 18:20:53 -08:00
snipe
48c85966d7
Added gravatar and avatar as fillable
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 18:07:17 -08:00
snipe
a0aed19f95
Refactor image handler
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 18:05:55 -08:00
snipe
f77d871dff
Use the imageHandler for profile avatar changes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 18:05:20 -08:00
snipe
60eab08735
Added ->with(‘users as users_count’) in Accessory query
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 14:41:07 -08:00
snipe
90c1631820
Added users_count to transformer for API
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 14:40:35 -08:00
snipe
dceb77d4d4
Refactored numRemaining, removed unnecessary numCheckout
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 14:40:20 -08:00
snipe
46e3e8a3dd
Added new users_count field to API
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 14:39:53 -08:00
Marcus Moore
181f96ad33
Allow users to set a blank asset name during checkout
2023-01-19 12:35:44 -08:00
snipe
fa9116b184
Merge pull request #12369 from snipe/features/add_byod_to_assets
...
Added BYOD to assets
2023-01-18 16:09:45 -08:00
snipe
155977de2d
Merge pull request #12370 from marcusmoore/fix/file-upload-tab-permissions
...
Fixed file uploads for accessories, components, and consumables
2023-01-18 16:08:53 -08:00
snipe
378dc968b7
Derp. Copypasta
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 15:44:28 -08:00
snipe
0c39c7a53d
Updated blades to add byod as a “status”
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:25:46 -08:00
snipe
acd182e3d2
Added byod to presenter with boolean formatter
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:10:30 -08:00
snipe
48b8cfcef9
Added byod to model, removed duplicate validation rule
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:04:36 -08:00
snipe
f626413502
Added byod to API transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:04:02 -08:00
snipe
b80d52a9c3
Added byod to asset controller for create and update methods
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:03:51 -08:00
snipe
ee4b8f4694
Added byod to API controller
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:03:31 -08:00
Godfrey M
7ce230fadc
missed a few renames
2023-01-18 08:57:59 -08:00
snipe
956bd384b0
Merge pull request #12364 from snipe/features/make_2fa_sortable
...
BREAKING: Partial fix for #12356 : Make 2FA sortable in user list
2023-01-17 20:24:05 -08:00
snipe
c3e4d9d773
Make column name consistent with field name (BREAKING)
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-17 18:27:47 -08:00
snipe
f08babfa8a
Just moved some stuff around - no actual meaningful code changes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-17 17:22:03 -08:00
snipe
4ef0005e7c
BREAKING: changed API fieldname result for 2FA
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-17 17:21:40 -08:00
snipe
dbda288a44
Formatting changes only for readability
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-17 17:21:20 -08:00
snipe
eaf9332096
Added filterability to 2FA fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-17 17:21:03 -08:00
Marcus Moore
23a1b2d60a
Register the consumables.files ability
2023-01-17 17:15:23 -08:00
Marcus Moore
6c89f08193
Register the accessories.files ability and allow users with the ability to upload files for accessories
2023-01-17 16:59:50 -08:00
corydlamb
295f0dd1f5
Update WelcomeNotification.php
...
Used htmlspecialchars_decode to fix the issue I had involving Ampersands in the password field (and I'm assuming the other fields) of the welcome notification email. Changes are all in lines 22-26. Sorry if I'm not doing this very well as this is my first pull request.
2023-01-17 19:33:25 -05:00
Marcus Moore
e23ee7540d
Register the components.files ability
2023-01-17 15:45:40 -08:00
snipe
f4630d67be
Added catergories to default visiable set
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-15 17:07:50 -08:00
snipe
9d0a15990e
Check that the $use_db_field has a value before attempting a delete
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-13 11:26:11 -08:00
snipe
4f8951f6f1
Merge pull request #12335 from uberbrady/windows_snipeit_restore
...
Fixed #12004 : Snipe-IT restore didn't work on Windows
2023-01-11 11:03:44 -08:00
snipe
459c95064e
Fixed default
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-10 17:54:04 -08:00
snipe
0b0fdd8aa5
Small formatting fixes, fixed typo in comment
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-10 16:32:18 -08:00
snipe
8f3a237ea0
More comments
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-10 16:29:51 -08:00
snipe
151719a91c
Added comments
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-10 16:24:46 -08:00
snipe
825df2cf75
Load up the item counts with the individual API methods for accurate numbers without n+1
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-10 16:17:03 -08:00
snipe
b66cd313b9
Refactored itemCount() to use existing blah_count fields if they exist
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-10 16:16:25 -08:00
snipe
bef4224e14
Added notes to itemCount()
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-10 13:50:24 -08:00
snipe
249b188654
Refactor category API and transformer for query optimization
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-10 13:30:01 -08:00
Brady Wetherington
2170343958
Fixed #12004 : Snipe-IT restore didn't work on Windows
2023-01-10 13:06:47 -08:00
snipe
529b005d1e
We were previously returning a collection - this reverts the change in the last PR to keep that behavior consistent
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-09 21:05:51 -08:00
snipe
7846251d25
Re-added return for no results (derp)
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-09 20:43:57 -08:00
snipe
cc665d50ed
One more refactor, hopefully simplifying
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-09 20:40:12 -08:00
snipe
ae76d46f87
Small refactor to ALWAYS return deleted assets in a collection transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-09 20:23:05 -08:00
snipe
bf849128fc
Replicate the response behavior in the bySerial endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-09 19:57:47 -08:00
snipe
44be8c8f60
Determine which transformer to use based on number of assets
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-09 19:54:21 -08:00
Brady Wetherington
39b1a5a8a0
Remove old cache key for settings
2023-01-09 16:19:25 -08:00
Brady Wetherington
2d0ac5b48b
The cache system in getSettings() cached values "forever." That's bad.
2023-01-09 16:16:09 -08:00
Brady Wetherington
cbffd105a2
Fix LDAP default group feature
2023-01-09 15:23:19 -08:00
snipe
6e42bce409
Removed $start variable from calback
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-05 18:04:06 -08:00
snipe
1a3c947b14
Chunk sync script
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-05 17:57:52 -08:00
snipe
381f89c5a8
Added format to array
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-05 13:15:30 -08:00
snipe
db43628bdc
Added default field info to models API response
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-05 13:12:54 -08:00
snipe
9c63f426d9
Added missing translation string
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-04 14:09:14 -08:00
Brady Wetherington
c4f900e9af
Change license_seat changing method to properly 'true up' license seats
2023-01-04 13:02:53 -08:00
snipe
fa439a1928
Check that the array key exists before trying to seed it
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-03 14:45:23 -08:00
snipe
d187174f00
Merge pull request #12090 from Godmartinz/deparmtnet_name_validator
...
Added: validation for department names at Company locations
2022-12-22 11:29:12 -08:00
Ivan Nieto Vivanco
3a9b8a4993
Calculate the proper amount of people in the dashboard if Full Company Support is enabled
2022-12-20 18:39:17 -06:00
snipe
88291cadc1
Merge pull request #12254 from akemidx/documentating_something
...
Commenting on a scope in Models/Company.php
2022-12-19 12:41:32 -08:00
akemidx
94afe2bc6a
edits & typo fixes
2022-12-19 14:48:43 -05:00
snipe
399c7590cd
Merge pull request #12209 from snipe/fixes/error_downloading_unaccepted_assets
...
Fixed 500 when downloading the Unaccepted Assets report [sc-19555]
2022-12-15 14:19:41 -08:00
snipe
d0c5ba70f6
Merge pull request #12242 from inietov/features/add_purchase_cost_column
...
Added `purchase_cost` to user's default view [sc-19680]
2022-12-15 12:42:29 -08:00
akemidx
133d6ffa50
Commenting on a scope in Models/Company.php
2022-12-15 15:18:24 -05:00
snipe
29c2ff56ec
Merge pull request #12188 from snipe/fixes/decrease_logging_for_saml_when_not_enabled
...
Removed extra logging case that was very noisy
2022-12-15 11:26:49 -08:00
snipe
227fef76ee
Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group
...
Adds a permission group selection for directory sync
2022-12-15 11:06:53 -08:00
Ivan Nieto Vivanco
b142f8e012
Add the permission to show purchase cost column to non-admin sessions
2022-12-14 23:00:35 -06:00
snipe
418ddcfac3
Merge pull request #9876 from Toreg87/fixes/locations-deletable
...
Fixed #9875 : Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport
2022-12-14 17:46:53 -08:00
snipe
d13a237000
Merge pull request #12205 from Godmartinz/sc19675_add_remote_to_importer
...
Adds remote field to the user importer
2022-12-14 12:13:18 -08:00
snipe
fabefa61b0
Merge pull request #12243 from akemidx/new_grey_out_when_no_assets
...
Created method in users.php for adding up all assigned to user and pr…
2022-12-13 14:00:48 -08:00
akemidx
f3e57d7dc0
fixing PR
2022-12-13 16:00:59 -05:00
snipe
c432fb9d70
Merge pull request #12181 from Godmartinz/gh12163_asset_age
...
Adds asset age to asset index and asset view pages
2022-12-13 10:28:17 -08:00
akemi
07ae91b00f
Created method in users.php for adding up all assigned to user and providing an integer value. this then used to grey out buttons on user view if user has nothing assigned.
2022-12-12 15:47:53 -05:00
Godfrey M
fa872b09a9
fixes a typo, the world is great again
2022-12-12 10:38:31 -08:00
snipe
4ac09ff4e4
Add email in assigned_to on asset transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2022-12-09 16:07:17 -08:00
snipe
775df0ab60
Merge pull request #12221 from snipe/fixes/throttles_reset_password_form
...
Add throttle for password reset form
2022-12-08 14:51:22 -08:00
snipe
f7da87520c
Merge pull request #12134 from Godmartinz/custom_report_user_fields_missing
...
fixes a regression with the csv assigned to fields
2022-12-07 16:18:32 -08:00
snipe
c3a6874b16
Add throttle for password reset form
...
Signed-off-by: snipe <snipe@snipe.net>
2022-12-06 20:42:40 -08:00
Ivan Nieto Vivanco
eb67d1b064
Filter items from the report if null returned
2022-12-06 18:00:16 -06:00
Godfrey M
bbd04f8876
adds the rest of the fields for Remote
2022-12-06 11:13:24 -08:00
Godfrey M
36901d271b
adds csvmatch for remote. Im a bit lost though lol
2022-12-05 16:28:19 -08:00
akemi
2f8a435e18
fixing curly quotes
2022-12-05 18:06:28 -05:00
akemi
55f5e7866d
edits for PR
2022-11-29 15:59:36 -05:00
Godfrey M
3206929ee4
adds AgeFormatter, not working yet
2022-11-29 09:51:42 -08:00
snipe
1fe0bfe17e
Removed extra logging case that was very noisy
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-28 19:27:42 -08:00
akemi
39e06a8856
Update to PR#12119, adding inventory notification to messages and changing code to be dynamicaly translated
2022-11-28 14:16:22 -05:00
Godfrey M
8d861cfd82
adds age to the asset table
2022-11-28 10:59:18 -08:00
snipe
3ef578eb56
Merge pull request #12164 from Robert-Azelis/patch-7
...
Fix categories view columns matching
2022-11-23 18:47:02 -08:00
Ivan Nieto Vivanco
c082d8b90e
Return empty string if no MAIL_REPLYTO_ADDR var set
2022-11-23 18:22:31 -06:00
Robert-Azelis
c2cfd8ff53
Update CategoryPresenter.php
2022-11-23 19:00:08 +01:00
Robert-Azelis
20ad4fb681
Update CategoryPresenter.php
...
Fix snipe#12153
2022-11-23 18:42:38 +01:00
snipe
ba4c37a7f4
Merge pull request #12139 from snipe/fixes/custom_fields_api_patches
...
Fixed #9949 - PATCH to custom fields failing on validation (alt approach to #12011 )
2022-11-17 21:28:39 +00:00
snipe
f0c5560c1b
Merge pull request #12141 from Godmartinz/adds_serial_number_to_history
...
Added `serial` column to the user history page
2022-11-17 21:15:26 +00:00
snipe
774962c122
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-17 21:14:35 +00:00
Godfrey M
86bc409d3a
adds serial column to the action logs
2022-11-17 12:57:53 -08:00
snipe
24841a75d4
Move common things into the model level validation
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-17 19:41:10 +00:00
Godfrey M
a02a04d601
fixes a regression with the csv assigned to fields
2022-11-16 16:34:57 -08:00
snipe
3997085faf
Merge pull request #12122 from Godmartinz/fixes_checkout_to_all_description
...
fixes checkout to all description
2022-11-16 21:56:53 +00:00
snipe
489895a5fa
Added comments and spacing for readability
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-16 17:48:28 +00:00
snipe
1122562b4e
Handle use case where there are no custom fields for any assigned models
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-16 17:45:50 +00:00
snipe
5df76155ce
Check for the format index in the $data array when creating a new custom field via API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-16 15:53:16 +00:00
Instead of looking elsewhere, it is better to come here together
2fc7a15372
Fixed : #12109
2022-11-16 18:22:11 +08:00
Godfrey M
8a0517fb5d
removes data dump
2022-11-15 15:59:47 -08:00
Godfrey M
90828e3a87
fixes variable name
2022-11-15 15:51:52 -08:00
Godfrey M
45636b8114
adds should_autoassign boolean to users table
2022-11-15 15:42:57 -08:00
Godfrey M
9fefdea9de
fixes checkout to all description
2022-11-15 12:50:46 -08:00
snipe
6400bdc266
Merge pull request #12120 from snipe/features/added_deleted_filter_to_search_by_tag
...
Added ability to include deleted items in tag search endpoint
2022-11-15 17:54:34 +00:00
snipe
ffd252a00c
Merge pull request #12119 from lukasfehling/feature/added-endpoint-for-user-notification
...
Added: API endpoint to trigger a user email notification with their assigned assets
2022-11-15 17:51:15 +00:00
snipe
7fcf6f2463
Removed deleted parameter
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-15 17:47:21 +00:00
snipe
2c5a0d370c
Clean up API byserial and bytag, allow deleted param
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-15 17:33:56 +00:00
snipe
bcbe517446
Added ability to include deleted items in tag search endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-15 17:18:09 +00:00
lukasfehling
d9a9bd1c0d
Added a api endpoint for sending email notifications to users with their assigned assets
2022-11-15 18:17:51 +01:00
snipe
9a5d431962
Allow searching firectly for asset tag and serial
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-15 17:13:26 +00:00
snipe
50431c046f
Fixed missing slash in stdClass
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-15 17:04:06 +00:00
snipe
ae259f36ae
Merge pull request #12106 from fernando-almeida/develop
...
Fix HTTP AssetTransformer to generate an empty object for missing custom fields
2022-11-15 15:54:43 +00:00
snipe
56c4fa7c27
Override display settings if field is encrypted
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-14 22:41:31 +00:00
Fernando Almeida
47ee2a8153
Fix HTTP AssetTransformer to generate an empty object for missing custom_fields instead of an empty array.
2022-11-14 16:31:08 +00:00
Cram42
17e81af4cd
Add more Avery label sheets
2022-11-12 20:29:50 +08:00
Cram42
ffce6ec327
Need uppercase
2022-11-12 20:29:34 +08:00
snipe
1e34398c99
Permissions check on the field itself
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-10 17:19:12 +00:00
snipe
1fa624420e
Removed unneeded relationships
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-10 16:46:49 +00:00
Cram42
f849fcca89
Change the way fields are passed
2022-11-10 18:54:02 +08:00
Godfrey M
92ae271292
adds validation for department names at Company locations
2022-11-09 13:11:33 -08:00
snipe
7c37c70164
Added new field to allowed_fields so that the API can change them if needed
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-08 15:27:22 +00:00
snipe
52dc5aa4ba
Added field to controller and tranformer
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-08 15:26:59 +00:00
snipe
04b6f023ae
Use new upload string
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-03 13:57:50 -07:00
snipe
3c7d63c060
Disallow uploads if app is locked
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-03 13:52:23 -07:00
snipe
6d5ace0458
Merge pull request #12049 from uberbrady/improve_scim_externalid_support
...
Fixed writes to the `externalId` from SCIM
2022-11-02 15:43:55 -07:00
Cram42
53513d93fa
Rework TZe labels for Asset Tag support
2022-11-02 22:38:00 +08:00
Cram42
36210f1c6a
Allow settings to be overridden in request
2022-11-02 19:30:45 +08:00
Cram42
48fb4f2439
Add labels route for testing layouts
2022-11-02 17:23:52 +08:00
Cram42
fb467d9078
Include Asset for advanced users
2022-11-02 17:20:01 +08:00
Cram42
4fee5ece43
Support Avery L7163
2022-11-02 16:08:10 +08:00
Cram42
4bb40adfce
Add Asset Tag as separate supported feature
2022-11-02 16:07:50 +08:00
Cram42
06ce40ac08
Don't add data if it's not there
2022-11-02 16:05:52 +08:00
Cram42
a8b6a4a259
Allow passing "template" param
2022-11-02 16:04:40 +08:00
Cram42
a60ee7736b
Add P-touch TZe 12mm Tape Example
2022-11-02 12:22:55 +08:00
snipe
eb81c290dc
Accessory file upload
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:50:39 -07:00
snipe
97aeb1fcec
Use the generic file uploads strings
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:31:23 -07:00
snipe
f1cb7ee410
Fixed some translations
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:28:39 -07:00
snipe
84c0f50266
Added ComponentFilesController
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:10:04 -07:00
Cram42
d0eb3cfc9b
Merge branch 'feature-label2' into develop
2022-11-02 10:09:46 +08:00
snipe
3d3a4b02fc
Added helper method for uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:09:34 -07:00
Cram42
19150aeb44
Add P-touch TZe 24mm Tape Example
2022-11-02 10:09:11 +08:00
snipe
2106b64da6
Fixed some layout issues
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:06:49 -07:00
snipe
25f69a7bd2
Added consumable methods for uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 17:52:28 -07:00
Cram42
6b2fe582ca
Merge branch 'feature-label2' into develop
2022-11-01 20:12:28 +08:00
cram42
7e2546b31f
Merge branch 'snipe:develop' into develop
2022-11-01 20:04:59 +08:00
Cram42
7b29ddd283
Tie into tag generation
2022-11-01 20:02:12 +08:00
Cram42
6de48b4dc8
Implement settings for labels
2022-11-01 20:00:53 +08:00
Cram42
5558a005b9
Implement API for labels
2022-11-01 19:57:51 +08:00
Cram42
bb09f0168f
Create Label View/Generator
2022-11-01 19:56:53 +08:00
Cram42
4ed728d954
Add template to simulate legacy label
2022-11-01 19:54:00 +08:00
Cram42
bbecdb6768
Add QR example
2022-11-01 19:53:11 +08:00
Cram42
df89406987
Create Label model and example
2022-11-01 19:52:34 +08:00
Cram42
7c355cef2d
Add helper to convert between units of measurement
2022-11-01 19:49:57 +08:00
Brady Wetherington
4e5c878b73
Needed to fix the way we write externalId from SCIM
2022-10-31 19:15:08 -07:00
snipe
7cb4740359
Merge pull request #11766 from snipe/fixes/wtf_method_names_derp
...
Fixed (?) method name?
2022-10-26 17:39:11 -07:00
Cram42
0e69e4248c
Fix: Multiple outputs at hardware/{id}/label
2022-10-27 08:12:42 +08:00
snipe
c1eee2cc72
Corrected string for invalid current password
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-26 12:18:29 -07:00
snipe
12c7223bcd
Renamed column back to assets_count for legacy
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-26 09:39:03 -07:00
snipe
28b0d8cf0f
Null expected_checkin on user bulk checkin and delete
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-26 00:54:37 -07:00
snipe
e670ffe349
Added Assets Assigned to tab
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-26 00:16:06 -07:00
snipe
a94f1c4a64
Cleaned up and added comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-26 00:15:52 -07:00
Brady Wetherington
1e3281c76c
Add externalId support to SCIM integration
2022-10-25 14:19:01 -07:00
snipe
3b16157d6b
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-21 17:43:53 -07:00
snipe
4eed2baa31
Added default tab to locations
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-20 19:06:58 -07:00
Brady Wetherington
bc78d341a0
Caches manager lookups in LDAP for performance boost
2022-10-20 16:52:40 -07:00
Brady Wetherington
12d86bd6e2
Erroneous line-break removal - re-add
2022-10-19 19:01:52 -07:00
Brady Wetherington
c4f11de90d
Remove incorrect comment.
2022-10-19 18:49:19 -07:00
Brady Wetherington
8fb61cf5f8
Try to better handle LDAP Manager settings that don't line up with what we expect
2022-10-19 18:36:16 -07:00
Godfrey M
f2d4a61e3c
removes dead space
2022-10-18 15:31:37 -07:00
Godfrey M
3f25a1bf61
removes dead code
2022-10-18 15:25:38 -07:00
Godfrey M
f9ac447dd1
adds default group to LDAP
2022-10-18 15:18:09 -07:00
Godfrey M
d359bcb88d
adds proper spacing
2022-10-17 13:15:10 -07:00
Godfrey M
28059c878a
gets the proper amount of months and fixes typo of the word depreciation
2022-10-17 11:16:29 -07:00
Phan Nguyen
e457b2e98d
Correct assignedusers relation setting
2022-10-17 13:10:09 +07:00
snipe
b7bcfaccc9
Merge pull request #11834 from uberbrady/try_catch_notifications
...
try/catch wrap notifications on checkin/checkout
2022-10-13 14:20:22 -07:00
snipe
ac055c01dc
Use admin ID for audit log notification
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-12 15:59:43 -07:00
snipe
98f2e0271b
Merge pull request #11942 from nh314/develop
...
Correct comparison logic
2022-10-12 10:55:29 -07:00
snipe
0312ecf09d
Sets nullable attribute on validation
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-12 10:30:47 -07:00
Phan Nguyen
8ff109e9da
Correct comparison logic
...
Comparison operator should be greater than or equal
2022-10-08 12:54:15 +07:00
snipe
14b7319b63
Added start/end to sortable columns
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-05 17:07:07 -07:00
snipe
9d641573b5
Make the APU return null instead of blank
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-05 17:01:04 -07:00
snipe
bdfac1a345
Added start/end to the users API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-05 16:58:37 -07:00
snipe
f7a9be92ca
Store data for start and end
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-05 16:58:26 -07:00
snipe
56ba8a7e24
Added API select fields and filters
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-05 16:58:16 -07:00
snipe
cf62761d18
Added date casting and fillable to models
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-05 16:57:59 -07:00
snipe
bcebc1e33b
Stylistic refactoring
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-04 16:37:33 -07:00
snipe
891b5b2882
Added routes, language
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-04 15:45:25 -07:00
Ivan Nieto Vivanco
25c10c3819
Filter non-asset items from download unaccepted assets report
2022-10-03 18:12:30 -05:00
snipe
b07c4caa37
Extra whitespace
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-30 11:47:27 -07:00
snipe
5a7e35c0e8
Made a conditional escape according to .env
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-30 09:48:43 -07:00
snipe
bae200edd7
Use EscapeFormula() in CSV export
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-30 09:29:17 -07:00
snipe
36484d50ef
Fixed depreciation API call
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-29 17:07:42 -07:00
Brady Wetherington
420c216973
Added counts to Dashboard Pie Chart legends and tooltips
2022-09-29 13:20:58 -07:00
snipe
70c766e8b3
Added setting to choose dashboard type
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-29 04:16:46 -07:00
snipe
0b2ce7be07
Fixed #11521 - switch to using status meta from status label name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-29 03:48:58 -07:00
Katharina Drexel
4f5d536e32
Fixed : #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.
2022-09-28 14:52:02 +02:00
snipe
055a2f827f
Merge pull request #11872 from sunflowerbofh/tmp-replace-patchwork-utf8
...
Fixed #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.
2022-09-27 16:46:12 -07:00
snipe
a7b83fc531
Merge pull request #11854 from inietov/fixes/location_issue_during_import
...
Fixed #11847 404 error during Import if a checkout type of location is specified and no checkout location is passed
2022-09-27 14:34:26 -07:00
Katharina Drexel
8316a4eb92
Fixed : #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.
2022-09-26 12:06:06 +02:00
Ivan Nieto Vivanco
c0f83a7927
Delete not necessary conditional
2022-09-20 19:02:01 -05:00
Ivan Nieto Vivanco
5a1062f0f4
Delete debugging symbols (just kidding, it's just a dd() function)
2022-09-20 18:58:31 -05:00
Ivan Nieto Vivanco
c32676596c
Redirect correctly if not enough license seats exists to be checkout
2022-09-20 18:55:53 -05:00
Ivan Nieto Vivanco
e267f5491a
Adds a check for empty location values on import
2022-09-19 19:05:48 -05:00
snipe
f75d348dc0
Fixed license policy method
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-16 14:06:46 -07:00
snipe
dcab1381e7
Check for licenses.files permissions
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-16 14:00:27 -07:00
snipe
24910433a1
Fixed 500 when depreciation is set but no purchase_date
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-15 15:39:47 -07:00
Brady Wetherington
1899e4d1e8
try/catch wrap notifications on checkin/checkout
2022-09-15 13:18:42 -07:00
Ivan Nieto Vivanco
41b75704e3
Removes format when changing to custom fields elements that doesn't need it
2022-09-15 11:21:02 -05:00
snipe
ac4f91918e
Merge pull request #11771 from rnelsonee/PAT_test
...
Fixed #11769 : PAT Test hardcoded text
2022-09-14 20:01:18 -07:00
snipe
3192a68b06
Pulled assetlog from custom report controller
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-14 18:17:52 -07:00
Godfrey M
6b6a079440
fixes current value and monthly depreciation on reports and calculations
2022-09-14 17:01:18 -07:00
Godfrey M
a0624fe179
reworks the depreciation formula, includes months passed instead of months remaining
2022-09-14 16:00:21 -07:00
Godfrey M
9b448227f7
tinkering to no avail
2022-09-13 11:40:10 -07:00
Ivan Nieto Vivanco
d51eca20f0
Add min_amt field in Consumables and Accessories imports
2022-09-12 18:11:48 -05:00
Godfrey M
28bc97f29f
one line away from this being over with
2022-09-12 11:40:16 -07:00
Ivan Nieto Vivanco
3aff97ace1
Remove the previous user hashed password
2022-09-06 18:43:35 -05:00
Rick Nelson
6e82de2f47
Fixed #11769 : PAT Test hardcoded text
2022-09-01 11:21:02 -04:00
snipe
ae505ef44d
Literally have no idea how this ever worked
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-31 19:20:35 -07:00
Godfrey M
193b31e427
select options working, testing sync then done
2022-08-31 12:58:33 -07:00
Godfrey M
70ac8af9c4
.
2022-08-31 09:53:20 -07:00
snipe
dcbd407698
Merge pull request #11661 from inietov/fixes/notifications_asset_acceptance
...
Send notifications when Acceptance Assets actions occur [sc-9917]
2022-08-30 12:14:58 -07:00
snipe
7fa9214beb
Merge pull request #11489 from Godmartinz/bug/sc-19333/expiring-assets-report-email-content-ordering
...
Fixed the order expiring assets are listed in notifications
2022-08-29 12:37:01 -07:00
Godfrey M
ea63049b4b
removed redundancy with raw query
2022-08-29 12:33:51 -07:00
Godfrey M
0c362e8b57
gets the groups selector to appear but options are blank
2022-08-29 12:09:56 -07:00
snipe
9cf5f30c77
Set safeMode to true and use helper for all parsedown
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-29 11:26:47 -07:00
snipe
96ec96ff7f
Merge pull request #11737 from inietov/fixes/validation_error_still_without_required_rule
...
Fixed Validation error when empty default customfield values
2022-08-25 17:54:04 -07:00
Ivan Nieto Vivanco
0d4e9c183b
Save correct id in action log if the bulk-checkin is of type license
2022-08-25 19:16:48 -05:00
Ivan Nieto Vivanco
1ff2d15c4a
Replace 'required' rule with 'nullable' to allow blank default customfields values
2022-08-25 18:16:50 -05:00
Godfrey M
fc6fefdb4e
adds migration, variables, checkbox,working on groups
2022-08-25 15:19:38 -07:00
snipe
482a7b2a3a
Merge pull request #11700 from inietov/fixes/unaccepted_assets_reminder_500
...
Fixed 500 error when sending unaccepted assets reminder
2022-08-25 14:00:00 -07:00
snipe
6f0f6c8042
Don’t prevent deletion if user has consumables checked out
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-25 12:51:02 -07:00
snipe
6fde72a693
Log user out of other devices when they change their password
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-25 12:24:26 -07:00
snipe
2ad9c39090
Merge pull request #11730 from inietov/fixes/importing_licenses_field_mismatch
...
Fixed #11679 Importing Licenses - Field Mismatch
2022-08-24 17:31:12 -07:00
Ivan Nieto Vivanco
c59fd7b8da
Fix importer field mapping for command line
2022-08-24 19:20:23 -05:00
Ivan Nieto Vivanco
6e85c2e5cb
Delete unused import
2022-08-24 16:30:25 -05:00
Ivan Nieto Vivanco
30d0125cbd
Remove the rule 'required' for default values, if custom field is obligatory
2022-08-24 16:18:11 -05:00
snipe
45f17fea8a
Merge pull request #11510 from sunflowerbofh/tmp-ldap
...
Fixed #11509 allow-ldap-anonymous-bind
2022-08-22 16:32:07 -07:00
snipe
3ac84eab58
Merge pull request #11651 from inietov/fixes/activity_report_search
...
Fixed Search in activity report for full name in relation
2022-08-22 16:23:50 -07:00
snipe
906a36dc1a
Merge pull request #11703 from julian-piehl/fixes/wrong-trans-string
...
Fixed Translation String: wrong key at request canceled message
2022-08-22 16:16:10 -07:00
Warren White
ba7d6dde3f
Fixed #11706 : changes the display of managers username to First Last name
2022-08-19 10:17:25 -07:00
Warren White
4b9a91f55b
Fixed #10565 , #11086 : correctly looks up Manager DN from AD Manager attribute and sets manager id
2022-08-19 09:09:03 -07:00
Peace
94bbf2bf2f
fixed translation string for canceled requests
2022-08-19 13:59:01 +02:00
Ivan Nieto Vivanco
e5cc6ec972
Fixes error 500 if checkout_acceptances table have a created_at null column
2022-08-17 22:02:13 -05:00
snipe
91e824c5b0
Check for nullifying checkboxes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-11 18:25:07 -07:00
Ivan Nieto Vivanco
a33ca39237
Figure out declined notifications
2022-08-11 16:00:21 -05:00
Ivan Nieto Vivanco
98bcd82108
Add the mail recipient from configuration in the CheckoutAcceptance model
2022-08-11 15:33:18 -05:00
Ivan Nieto Vivanco
d2c486bb1e
Create the mail template for the acceptance
2022-08-11 15:28:30 -05:00
Godfrey M
814992eb7d
allows company and location ids to be null
2022-08-11 12:47:40 -07:00
Ivan Nieto Vivanco
267997f0a6
Customize the notifications with the needed data
2022-08-11 14:01:11 -05:00
Ivan Nieto Vivanco
0172fe6403
Add Notifiable trait to the CheckoutAcceptance Model
2022-08-11 13:02:25 -05:00
Ivan Nieto Vivanco
509bbbc685
Create Notifications classes for accepted and declined and add some necesary lang strings
2022-08-11 13:01:21 -05:00
Ivan Nieto Vivanco
8cee5060af
Remove unused DB statement
2022-08-10 19:16:04 -05:00
Ivan Nieto Vivanco
a7de97f060
Found a better place for the where condition
2022-08-10 19:13:28 -05:00
Ivan Nieto Vivanco
c1074000f9
Add a concat to search for full name when the relationship search in the users table
2022-08-10 18:27:28 -05:00
snipe
ef099aa644
Reverted notes to note since pivot
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 16:09:56 -07:00
snipe
acd666fdf5
Added notes to user consumables tab
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 15:34:07 -07:00
snipe
512348cc5a
Added withInput()
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 15:15:09 -07:00
snipe
e3293151a2
Added note on checkout
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 15:04:59 -07:00
snipe
3ec77724d8
Added note pivot
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 15:04:34 -07:00
snipe
024a014298
Changed notes to note
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 15:04:19 -07:00
snipe
c1e5d03340
Added pivot for note
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 15:03:41 -07:00
snipe
e7c47408a7
Derp
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 13:57:42 -07:00
snipe
637604dfaf
Fixed #8928 - add URL and ID to custom asset report
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 13:51:47 -07:00
Brady Wetherington
b6adfa294c
Fixed the active flag to be as it was in later v5 releases
...
Originally implemented here:
https://github.com/snipe/snipe-it/pull/10610/files
2022-08-10 12:55:30 -07:00
Godfrey M
92e6ea96b2
if eol is missing from asset model monthly depreciation will be recalculated
2022-08-09 15:05:15 -07:00
snipe
bc4032c2cd
Merge pull request #11617 from inietov/fixes/components_wrong_remaining_inventory
...
Fixed wrong calculation of assigned components
2022-08-05 18:05:21 -07:00
Ivan Nieto Vivanco
c055c91739
Change db query for an existing method
2022-08-04 09:20:20 -05:00
Ivan Nieto Vivanco
ea8f12579d
Calculate the proper amount of assigned components
2022-08-04 07:58:25 -05:00
snipe
5f93d7b3be
Merge pull request #11615 from inietov/fixes/autoincrement_in_importer
...
Fix auto incrementing in CSV importer [sc-19366]
2022-08-03 17:50:23 -07:00
Ivan Nieto Vivanco
9f0ecba9b9
Add autoincrementing asset tags to the import if the CSV column is empty
2022-08-03 12:48:48 -05:00
snipe
9acfceba29
Added relations to report search
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 23:50:10 -07:00
snipe
20fcf7a1e9
Added configuration change to maintenance types
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 20:19:43 -07:00
snipe
cc92d342ea
Added deleted at value
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:58:37 -07:00
snipe
02caa13222
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:58:30 -07:00
snipe
975b4dee2f
Added deleted header
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:58:17 -07:00
snipe
87bed9b294
Fixed typo in code comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:24:46 -07:00
snipe
ac72b69ece
Update method name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:12:28 -07:00
snipe
8e18ce74b2
Update method name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:12:18 -07:00
snipe
1b657ee995
Merge pull request #11601 from vickyjaura183/bugfix/error_404_bulkcheckout
...
Error 404 fixed on submitting without mandatory field
2022-08-02 17:19:22 -07:00
snipe
71facb1850
Merge pull request #11596 from snipe/fixes/unique_undeleted_for_custom_fields
...
Use unique_undeleted instead of unique for custom fields
2022-08-02 17:16:12 -07:00
snipe
e3b13143bf
Merge pull request #11594 from Godmartinz/adds_deleted_asset_options_to_custom_reports
...
Adds options to include Deleted assets to custom asset reports
2022-08-02 10:33:57 -07:00
Godfrey M
ff080a2d8f
replace checkboxes with radiobuttons
2022-08-02 10:27:55 -07:00
vishalkumar183
96b40a5edd
Error 404 fixed on sumitting witout mandtory field
2022-08-02 18:44:16 +05:30
Katharina Drexel
8596c54d6a
Fixing query order (otherwise you run into app_key exception before anonymous ldap applied).
...
Signed-off-by: Katharina Drexel <katharina.drexel@bfh.ch>
2022-08-02 14:24:00 +02:00
snipe
0fdbd410b6
Use unique_undeleted instead of unique for custom fields
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 17:10:39 -07:00
snipe
af7ccf3beb
Handle logout route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 16:17:40 -07:00
snipe
53ff28d2b0
Handle consumables route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 16:07:56 -07:00
snipe
4a4636bd03
Handle accessories route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 16:06:28 -07:00
snipe
b035003546
Handled hardware route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 15:59:54 -07:00
Godfrey M
842dafefec
adds options to include Deleted assets to custom asset reports
2022-08-01 14:52:12 -07:00
snipe
78097df7ff
Aplpies current time to checkin date
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-21 21:45:25 -07:00
snipe
7313bca403
Checkin without deleting
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-20 17:57:19 -07:00
Katharina Drexel
9d627936e6
Fixed #11509 : Allow LDAP anonymous bind.
2022-07-20 17:24:20 +02:00
snipe
6428dc5cd2
Removed duplicate supplier_id
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-13 13:08:15 -07:00
mikeroq
f21824a8e2
Changed comparing the action type from translated in presenter to actual value
2022-07-12 17:59:03 -05:00
snipe
0ccd7e09de
Merge pull request #11488 from Godmartinz/feature/sc-19107/add-box-to-custom-reports-to-not-include
...
adds a checkbox to exclude archived assets from custom reports
2022-07-12 12:59:18 -07:00
Godfrey M
27039325f3
removed comments, because I forgot
2022-07-12 12:41:07 -07:00
Godfrey M
58c54cc3dc
uses notArchived scope instead now
2022-07-12 12:20:11 -07:00
Godfrey M
48349071ed
accounts for status_id as well
2022-07-12 09:46:44 -07:00
mikeroq
5efe45226d
Fixes Email List of All Assigned being "successful" when the user has no email
...
Added check in view to disable button if there is no email
Added translation for title on disabled button and for email check in controller
Fixed missing trans for user not found message
2022-07-11 20:02:10 -05:00
snipe
bb091760af
Fixedd unclosed brace
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-11 17:11:28 -07:00
Godfrey M
309229619b
fixes the order expiring assets are listed in notifications
2022-07-11 12:25:38 -07:00
Godfrey M
75844c5942
adds a checkbox to exclude archived assets from custom reports
2022-07-11 09:56:58 -07:00
snipe
2518e2f0ee
Removed > 300
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-08 17:09:56 -07:00
snipe
43e370f35a
Move migrations further up
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-08 16:40:51 -07:00
snipe
ee4f355e49
Changed logging to debug
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-05 17:58:45 -07:00
mikeroq
be8869978d
Added import for Setting model
2022-07-04 07:29:01 -05:00
snipe
92d46edca3
Cleaned up logging output
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-01 13:33:58 -07:00
snipe
45c616639c
Replicates #11444
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-01 11:21:02 -07:00
snipe
4e547a3639
Fixed typos :(
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 21:06:36 -07:00
snipe
b910db0617
Fixed #11393 - reject acceptance if no file is present
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 21:01:58 -07:00
snipe
25cb32ca6a
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 18:51:44 -07:00
snipe
e366caf3d1
Merge pull request #11438 from uberbrady/backout_linear_depreciation_math
...
Revert a change in our Linear Depreciation math
2022-06-30 18:38:03 -07:00
Brady Wetherington
f72aa2415f
Revert a change in our Linear Depreciation math; I think the old algorithm was correct
2022-06-30 18:24:45 -07:00
snipe
4edba064d5
Removed duplicate model column in depreciation report
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 18:17:30 -07:00
snipe
1a423a252b
Derp
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 15:22:58 -07:00
snipe
7591f3f092
Added auth filter check regex
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 15:15:49 -07:00
snipe
2cace3c73a
Added LDAP warnings on page load
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 15:08:12 -07:00
snipe
656efc5f92
Fixed missing trans()
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 14:20:15 -07:00
Nathan Butler
0617480f73
Asset checkinbytag now consistent with existingAPI
...
This is a non-breaking change to the checkinbytag endpoint to bring it
inline with the usage/formatting of the other bytag endpoints that
currently exist - using the URL path to define the asset_tag instead of
passing it through as a url query.
Both methods will work, but the URL Path method will take precidence if
it is used (the query will be ignored if included)
2022-06-30 09:23:52 +10:00
snipe
2262ef818e
Merge pull request #11427 from Godmartinz/email_users_list
...
[feature] adds button to email user list of assets from profile
2022-06-29 15:25:18 -07:00
Brady Wetherington
2451bb9a2b
Make SCIM be more tolerant of missing fields
2022-06-29 14:48:59 -07:00
Godfrey M
cd9d2d0cec
adds docblock
2022-06-29 13:01:29 -07:00
Godfrey M
e471aa8639
adds button to email user list of assets from profile
2022-06-29 11:15:15 -07:00
snipe
5af6330398
Merge pull request #11417 from ntbutler-nbcs/master
...
[Feature] - Add checkoutByTag API endpoint for assets
2022-06-29 05:03:01 -07:00
snipe
daaf8713d8
Merge branch 'dampfklon-9813-duplicate-accept-asset' into develop
2022-06-29 04:58:26 -07:00
snipe
5b02d9ed06
Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# resources/views/account/accept/create.blade.php
2022-06-29 04:58:13 -07:00
snipe
b04cf20735
Merge pull request #10758 from inietov/fixes/badmethodcallexception_undefined_method_Asset.unaccepted_develop
...
Fixes BadMethodCallException Call to undefined method App\Models\Asset::unaccepted() for master [ch-17636]
2022-06-29 04:34:51 -07:00
Nathan Butler
e28e7e37b8
Removed unneeded checks when searching for asset
2022-06-29 17:49:50 +10:00
snipe
b590f29f33
Attempt a download via API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:59:13 -07:00
snipe
1debdc47cf
Backups endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:30:17 -07:00
snipe
53bc15900b
Formatted show api
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:23:55 -07:00
snipe
90fe7af863
Small refactor
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:18:16 -07:00
snipe
67ad24af08
Return token ID in cli
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:13:25 -07:00
Nathan Butler
67e9b7795a
Added asset checkoutByTag API endpoint
2022-06-29 16:11:57 +10:00
snipe
52332bc9ed
Include token ID in payload
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:10:56 -07:00
snipe
a711e608c9
Changed siganture to be clearer
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 22:26:37 -07:00
snipe
2f7c04362e
Make -kkey-only a flag
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 22:20:55 -07:00
snipe
9b6fd7e19a
Set $accessTokenName
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 22:11:46 -07:00
snipe
9680b02bce
Check that the user has permission to create their own API keys
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 22:09:18 -07:00
snipe
e7de7d1716
Show user info as well
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 22:06:46 -07:00
snipe
112f147596
Console script to generate API tokens
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 22:04:39 -07:00
snipe
413487de80
Made method naming consistent
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 21:32:12 -07:00
snipe
1158fa9ea8
Added personal access tokens to api
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 21:29:15 -07:00
snipe
3df9260ca8
Added additional filters for api indexes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 19:59:45 -07:00
snipe
71c8050883
Added additional search filters for location API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 19:07:11 -07:00
snipe
c90ed9f25f
Allow models uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 15:50:07 -07:00
snipe
d8d12d4590
Merge pull request #11408 from uberbrady/add_filter_option_to_ldap_sync
...
Add a new `--filter` option to Artisan ldap-sync command
2022-06-28 09:50:48 -07:00
Brady Wetherington
be3388d647
Add a new --filter option to Artisan ldap-sync command
2022-06-27 19:49:59 -07:00
snipe
94e723a88f
Merge pull request #11404 from snipe/features/fix_transliteration
...
Fixed custom field transliteration
2022-06-27 17:42:02 -07:00
snipe
14d8fb66aa
Merge pull request #11405 from snipe/fixes/use_db_column_instead_of_converted_value
...
Only care about the custom field's converted name when updating the custom field itself
2022-06-27 17:36:26 -07:00
snipe
bf08e73f8f
Removed comments and server side cookie info
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 16:36:09 -07:00
snipe
52bd7d0d68
Merge remote-tracking branch 'origin/develop'
2022-06-27 14:25:38 -07:00
snipe
baad3b9d58
Only care about the converted name when updating the custom field itself
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 14:17:07 -07:00
snipe
131edb611e
Refine output and checks
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 13:54:21 -07:00
snipe
bee694e605
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 09:57:20 -07:00
snipe
d70b36750c
Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset
...
Fixes #8155 - improve the workflow during asset creation
2022-06-24 18:53:07 -07:00
snipe
8c85d7bc97
Merge pull request #11370 from inietov/fixes/customfields_default_values_not_validating
...
Adds validation to custom fields' default values
2022-06-24 18:11:16 -07:00
snipe
d167d2a10f
Disallow backup deletion and log attempt if not allowed
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-24 15:49:22 -07:00
snipe
77bf28bcb6
Disallow purge
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 20:11:43 -07:00
snipe
86d2c2b153
Small naming changes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 19:11:59 -07:00
snipe
f0cc418965
Merge pull request #11383 from snipe/features/adds_user_id_to_users
...
Added created_by to users
2022-06-23 18:48:42 -07:00
snipe
0bc3ca5c42
Fixed comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 18:44:27 -07:00
snipe
9fd3541520
Missed on createdBy
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 18:42:22 -07:00
snipe
3e559044b2
Changed method and scope names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 18:41:13 -07:00
snipe
1c25057e42
Merge pull request #11379 from Godmartinz/license_acceptance_eula
...
adds eula blade for licenses/consumables/components and fixes assigned_to for dom_pdf
2022-06-23 18:26:19 -07:00
snipe
9c9f5be6fe
Do not show the creating admin by default in list view
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:28:34 -07:00
snipe
d8daec2e0a
Added created_by results to user index API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:19:30 -07:00
snipe
c9b81d65f1
Save the user id who is creating the user
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:19:08 -07:00
snipe
7f05029089
Added created_by to API output
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:18:31 -07:00
snipe
23c50ea9a5
Added admihn scopes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:18:11 -07:00
snipe
2e5e8f363b
Added admin to oresenter
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:18:04 -07:00
snipe
daf6c72005
Fleshed out comments on new scope
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 16:02:54 -07:00
snipe
d45d322b54
Use scoped query for asset count
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 13:43:23 -07:00
Godfrey M
b0897a1fc9
adds acceptance for consumables and components
2022-06-23 11:52:35 -07:00
Godfrey M
d00b469001
fixed the search for the license
2022-06-23 11:33:36 -07:00
Godfrey M
df76e6eacf
adds eula blade for licenses and fixes assigned_to for dom_pdf
2022-06-23 11:15:15 -07:00
Ivan Nieto Vivanco
7976401aa2
Add error message when the default customfield values can't be validated
2022-06-22 22:17:05 -05:00
Ivan Nieto Vivanco
321367b974
Adds validation to custom fields' default values
2022-06-22 21:06:07 -05:00
snipe
89c234b1c2
Merge pull request #11358 from snipe/fixes/missing_token_lang
...
Fixed missing password.token string and checked for user existing before attempting to send reset email
2022-06-22 11:15:08 -07:00
snipe
135fdae209
Merge pull request #11337 from mikeroq/fixes/user_edit_website_missing
...
Fixed #11332 Added website field that was missing from update and store method.
2022-06-22 10:16:38 -07:00
snipe
a7dc6162fa
Simplify password attempts rate limiting
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-22 09:11:24 -07:00
snipe
1c1f3dc42c
Added password requests cleanup to scheduler
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 19:35:16 -07:00
snipe
a5b857c753
Return error if token is incorrect
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 19:30:51 -07:00
snipe
a31bca1798
Check that the user is activated before letting them reset their password
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 18:48:02 -07:00
snipe
7f8fc7add9
Make SAML debugging less noisy
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 17:57:17 -07:00
snipe
6bc525bc25
Merge pull request #11352 from inietov/fixes/assets_transformer_date_customfields_fixes
...
Fixed #11335 Assets transformer date customfields issues
2022-06-21 17:56:17 -07:00
snipe
f4f400ed87
Handle workflow better for invalid users
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 16:13:43 -07:00
snipe
a49ccf0863
Removed unused rules
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 16:13:26 -07:00
snipe
300879847f
Added a few comments to make it clearer what’s happening
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 14:33:10 -07:00
snipe
21875100b6
Fixed missing password.token string and checked for user existing before trying to reset
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 14:15:38 -07:00
snipe
675f42401c
Fixed #11343 - ability to null asset name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 10:57:39 -07:00
Ivan Nieto Vivanco
3a5c09c424
Used the getFormattedDateObject() function with the expected parameters
2022-06-20 19:58:51 -05:00
mikeroq
d60af478ad
Added website field that was missing from update and store method.
2022-06-17 08:09:39 -05:00
Mike Roquemore
8a27ef30d5
Missing total argument on transformDeprecations method
...
Removed duplicate array key on transformDeprecation method
2022-06-15 21:52:15 -05:00
snipe
af66f83a3d
Check for blank (not null) values i asset transformer date
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-15 13:42:30 -07:00
snipe
74bc06cc49
Removed debugging code
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-15 02:07:58 -07:00
snipe
07bc2fd742
Added maintenance scope for ordering by supplier
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-14 16:11:43 -07:00
snipe
a57a6486e7
Only add http:// if the url variable isn’t blank
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-14 16:11:13 -07:00
snipe
a33276cb3d
Additional filters on maintenances UI
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-14 16:10:48 -07:00
snipe
954b54f914
Removed duplicated $allowed_columns
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-14 15:06:04 -07:00
snipe
bff34063cd
Merge pull request #11309 from uberbrady/ldap_troubleshooter_improvements
...
Fixed SC-19104 - fixes to ldap:troubleshoot artisan command
2022-06-14 12:24:24 -07:00
Brady Wetherington
1e685ca835
Fixed SC-19104 - fixes to ldap:troubleshoot artisan command
2022-06-14 12:18:42 -07:00
snipe
c3b644797e
Merge pull request #11169 from inietov/fixes/user_update_from_import_location_in_assets
...
Fixes Asset location doesn't change when assigned user's location change via importer
2022-06-14 11:44:26 -07:00
Ivan Nieto Vivanco
50c008ead5
Adds check in condition that format custom dates
2022-06-14 01:37:15 -05:00
snipe
dd9c9520fb
Correctly filter by category_id
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-13 20:42:21 -07:00
snipe
92bb8fac32
Removed log statement
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-13 19:49:14 -07:00
snipe
20a0c4e3b5
Merge pull request #11272 from inietov/fixes/date_localization_in_customfields
...
Fixes #8143 Date localization not working on custom fields
2022-06-13 19:47:20 -07:00
snipe
0153a37cd7
Merge pull request #11264 from snipe/fixes/set_default_ldap_version
...
Fixed default ldap version if not specified
2022-06-13 17:14:57 -07:00
snipe
4c11041477
Fixed regression: missing restore option for assets via API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-09 17:17:38 -07:00
Ivan Nieto Vivanco
f8718ffc1e
Fixes observer fails when creating and assigning asset
2022-06-09 18:08:04 -05:00
Ivan Nieto Vivanco
0c3972d7b7
Add spaces to the code for consistency
2022-06-09 13:02:31 -05:00
Ivan Nieto Vivanco
4a0eb2b3f1
Add element type of customfield to API response
2022-06-09 12:57:20 -05:00
snipe
728338bfa8
Merge pull request #10824 from inietov/fixes/accessories_consumables_negative_numbers_develop
...
Fixes Accessories total quantity shows a negative number for develop branch
2022-06-08 10:53:57 -07:00
Ivan Nieto Vivanco
740f27198f
Evaluate if a custom field is a Date to present it with the correct format
2022-06-07 18:00:46 -05:00
snipe
5458676ead
Default to v3 of LDAP on settings save
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-06 21:00:22 -07:00
snipe
8337628323
Set elvis operator to ensure ldap version is 3 if null
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-06 20:57:18 -07:00
snipe
7faaa4ce24
Merge pull request #11263 from inietov/fixes/dont_save_update_action_if_nothings_changed
...
Fixes log update action even if no changes are made to assets [sc-19131]
2022-06-06 20:06:19 -07:00
snipe
e0102ddbf0
Fixes #11093 Return true/false for custom fields/fieldsets required in API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-06 20:03:20 -07:00
Ivan Nieto Vivanco
1030ad9a27
Early returns if no change is made in the Asset so the 'update' action doesn't log
2022-06-06 22:00:05 -05:00
snipe
8333c80b7a
Added address2 to column selector for locations listing
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-06 19:31:08 -07:00
Ivan Nieto Vivanco
f977c53ecb
Fixes some issues in the asset observer
2022-06-06 19:14:32 -05:00
snipe
7c77e03c5a
Initial rework of locations display
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 18:08:15 -07:00
snipe
133da6569b
Merge pull request #11252 from snipe/fixes/locations_improvements
...
Fixes/locations improvements
2022-06-05 17:05:25 -07:00
snipe
dba06a3a9e
Check for valid location before trying to print
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 16:56:15 -07:00
snipe
07b1062fb2
Better handle API calls to nonexistent users
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 16:55:23 -07:00
snipe
d31f185cce
Display the actual value
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 15:36:52 -07:00
snipe
5901182885
Removed stray character
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 15:30:34 -07:00
snipe
f033aeda83
Fixed typo in comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 15:28:00 -07:00
snipe
53f9e2bc7a
Wrap the Carbon method in a try/catch to prevent crashing on bad data
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 15:25:39 -07:00
snipe
910fc08406
Dropped log level to warn on SAML error
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-02 17:07:49 -07:00
Achmad Fienan Rahardianto
fe65de1207
implements cookie to maintain display preference
2022-06-01 11:54:05 +07:00
Ivan Nieto Vivanco
eb34cf7917
Evaluates if logo is uploaded before export PDF
2022-05-31 15:59:01 -05:00
Ivan Nieto Vivanco
37f9cca5ec
Minor stylistic change
2022-05-28 08:11:13 -05:00
Ivan Nieto Vivanco
e0050bc844
Don't let a license to be checked out to a non-existent target
2022-05-26 18:06:53 -05:00
Ivan Nieto Vivanco
1f6ab340a6
Give a more descriptive name to variable
2022-05-25 18:53:17 -05:00
Ivan Nieto Vivanco
f208869aff
Add column to show filenames in Activity Report if the log action is 'uploaded'
2022-05-25 18:50:32 -05:00
Brady Wetherington
8fdedf9441
Downgraded/Removed log statements
2022-05-24 19:30:22 -07:00
Ivan Nieto Vivanco
e0b64a4879
Fixes constraint violation when ordering some columns
2022-05-24 14:00:23 -05:00
Brady Wetherington
5130a86854
Google client-side TLS auth works better with null as context(?)
2022-05-23 20:31:43 -07:00
snipe
8333089278
Merge pull request #11172 from snipe/rebased_added_gitkeep_to_to_eula_pdfs
...
Accept asset/accessory improvements and fixes
2022-05-23 12:59:01 -07:00
snipe
70344cc02e
Merge pull request #11149 from Godmartinz/gh11129_setting_disclosure_arrow
...
Fixed #11129 - settings treeview won't stay active.
2022-05-23 12:55:11 -07:00
Godfrey M
160a147a58
removed line breaks and deadspace
2022-05-23 09:35:19 -07:00
snipe
bd384d3f10
Small formatting fixes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
ad8143b0bd
Added comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
625f120813
Removed unused cases
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
b7eb72fe49
Rough refactor of the acceptance controller
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
afb3843fad
Added sig and filename to acceptedCheckout method
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
8e85d316c9
Removed stored_eula_file from API transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
ebd3c11129
Added singleton
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
75acb0f28a
Added sig and eula pdf to checkout_acceptance
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
eb5f33e815
Removed logging statement
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
adbac82c30
Removed stored_eula_file from actionlog
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
e467ce912b
Added some debugging and comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
4eab5fd075
Removed older comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
d0e8a4ca09
Added some comments for clarity
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
266a9e5328
Removed stored_eula_file from controller
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
Ivan Nieto Vivanco
52901f50eb
Add date to checkout action when importing assets
2022-05-19 17:38:10 -05:00
Ivan Nieto Vivanco
340c59969c
Add query to update assigned assets location when importing users
2022-05-19 13:34:50 -05:00
Ivan Nieto Vivanco
5d29f77d60
Initialize result variable so return don't crash
2022-05-19 12:47:12 -05:00
snipe
4669bb54fe
Small fixes for asset tag regeneration script
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 17:14:22 -07:00
snipe
f609146c29
Corrected field name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 15:37:10 -07:00
snipe
891009dc67
Nicer formatting for buttons in bulk user edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 15:35:57 -07:00
snipe
014a32b050
Run migrations after restore
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 14:12:17 -07:00
Godfrey M
23891054dc
removed dead space and unused namespace
2022-05-18 13:11:20 -07:00
Godfrey M
cfc4c58da3
fixes the Settings Tree menu to remain active when opened
2022-05-18 13:06:06 -07:00
Ivan Nieto Vivanco
1453b36484
Add filter to only get Assets for the unaccepted assets report
2022-05-18 14:46:48 -05:00
Ivan Nieto Vivanco
32111a863b
Call User::generateFormattedNameFromFullName() in the UserImporter
2022-05-18 13:02:44 -05:00
snipe
b7b21689f2
Merge remote-tracking branch 'origin/develop'
2022-05-18 04:25:23 -07:00
Ivan Nieto Vivanco
a771984619
Add an early return if for some reason the import record is not found
2022-05-18 06:15:46 -05:00
snipe
71828d5461
One more trim…. sigh..
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 03:53:42 -07:00
snipe
d9817ec696
Added a trim
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 03:51:53 -07:00
snipe
33ded3f18a
More debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 03:48:09 -07:00
snipe
004d567253
Added some debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 03:31:00 -07:00
Brady Wetherington
b4a0d33ba8
Reduce logging further; we know the main error condition now
2022-05-17 19:57:42 -07:00
Brady Wetherington
4e65a8d755
Reduce SAML debugging output to actual error conditions
2022-05-17 19:54:14 -07:00
snipe
11db243514
Merge pull request #11135 from uberbrady/improve_restore_erroring
...
Do some better erroring if you can't launch the mysql binary
2022-05-17 18:16:40 -07:00
Brady Wetherington
d391980b06
Do some better erroring if you can't launch the mysql binary
2022-05-17 17:01:23 -07:00
snipe
a8eb138ae0
Merge pull request #11133 from inietov/fixes/backup_createdat_time_incorrect
...
Fixes #11096 Backup created_at time is incorrect
2022-05-17 14:39:19 -07:00
Ivan Nieto Vivanco
72493d54aa
Show the date and time as the user select in their settings
2022-05-17 16:36:05 -05:00
Ivan Nieto Vivanco
91c7a89f93
Change to use the date() function instead of Helper::getFormattedDateObject()
2022-05-17 16:24:52 -05:00
snipe
11f540daaf
Added debug line
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-17 09:41:35 -07:00
snipe
0dfc98a493
Force db:wipe
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-17 04:27:48 -07:00
snipe
7a1b17ff6a
Backslash log:: (we shouldn’t have to do this tho?)
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-16 15:59:41 -07:00
snipe
d4f7b5f80c
Fixed #11100 for individual users
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-16 12:07:18 -07:00
snipe
64b582c657
Merge pull request #11108 from uberbrady/fix_ldap_first_login_password
...
Pass the password along directly instead of retrieving it from the In…
2022-05-16 11:01:35 -07:00
Brady Wetherington
6c86a28d18
Pass the password along directly instead of retrieving it from the Input or Request
2022-05-16 10:58:27 -07:00
Brady Wetherington
b05d85ab0a
Fix bulk-user reset-password links
2022-05-16 10:38:12 -07:00
snipe
1c32dcae9f
Add login note to demo resetter
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-15 10:20:03 -07:00
Brady Wetherington
f608e4586c
Only set manager ID when the lookup succeeds.
2022-05-15 09:25:28 -07:00
Johnson Yi
4401dab8d6
fix saml slo for logout
2022-05-14 11:59:34 +00:00
snipe
3a31104b5c
Fixed #11052 - add file sizes to upload displays
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 19:33:14 -07:00
snipe
333aa05809
Added missing use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 16:46:13 -07:00
snipe
c5ec3efc70
Merge pull request #11065 from snipe/fixes/double_encoding_for_custom_fields
...
Fixed #11014 - double encoding for custom fields
2022-05-13 16:12:24 -07:00
Brady Wetherington
0ddb0f2c81
Switch the barcode backend to SVG, and fix the two-factor middleware
2022-05-13 14:22:27 -07:00
snipe
6fc222a648
Fixed #11014 - Removed double escaping on custom fields
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 05:45:00 -07:00
snipe
deb2d958d8
Sets maxlength of user fields to 191
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 04:54:12 -07:00
snipe
ef1eb15a91
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/permissions.php
2022-05-12 09:31:42 -07:00
snipe
c52faaf23d
Added checkout to permissions check
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-11 19:02:23 -07:00
snipe
446e44deb6
Merge pull request #11048 from Godmartinz/bug/sc-18989/purchase-cost-can-be-negative
...
Fixed validation for purchase cost allowed to be negative
2022-05-10 17:36:01 -07:00
snipe
780222d372
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# resources/views/users/print.blade.php
2022-05-10 17:26:26 -07:00
Godfrey M
2c1f368828
adds validation for all purchase costs variables
2022-05-10 16:26:06 -07:00
Godfrey M
33b1ab3658
prevents values for assets being negative through validation
2022-05-10 16:19:06 -07:00
snipe
f4650c65db
Clearer phrasing for log
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 13:00:48 -07:00
snipe
d3830a44d8
Added more verbose messaging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 12:40:50 -07:00
snipe
5869b6ed0c
And still more debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 12:38:46 -07:00
snipe
4fccf4ddc4
Few more log lines
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 12:27:42 -07:00
snipe
646166b2b6
Removed debug line
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 12:16:07 -07:00
snipe
f4e737eaf3
More SAML debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 12:14:22 -07:00
snipe
f572eaa421
Added debugging for SAML login
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 12:07:07 -07:00
snipe
dc8669121d
Added license seat ID to the UI
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-09 10:59:06 -07:00
snipe
dfd4d54433
Fixed route name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 15:46:25 -07:00
snipe
220f94faee
Check that the session key exists
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 14:10:47 -07:00
snipe
22ec3c1398
Use error style instead of warn/info when nothing was selected
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:41:52 -07:00
snipe
caf17d4f25
Fixed wrong variable name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:41:32 -07:00
snipe
e1b24bb763
Added a comment
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:30:21 -07:00
snipe
adc017db23
Added checkbox to audit listing
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:16:13 -07:00
snipe
76213ec3d9
Create a session on bulk actions, store it for redirect, then delete it
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:14:08 -07:00
snipe
243739e9c3
Added missing gate for bulk checkout
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:13:36 -07:00
snipe
784bf4d784
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .github/ISSUE_TEMPLATE/feature_request.yml
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ReportsController.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/users/print.blade.php
# webpack.mix.js
2022-05-06 01:52:43 -07:00
snipe
b20921cb62
Removed duplicate session regenerate
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-05 21:35:05 -07:00
snipe
0939591efb
Merge pull request #11003 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null_develop
...
Fixes QueryException Integrity constraint violation: Column 'order' cannot be null for develop
2022-05-05 13:28:00 -07:00
snipe
a859eac4a0
Merge pull request #11002 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null
...
Fixes QueryException Integrity constraint violation: Column 'order' cannot be null
2022-05-05 13:27:45 -07:00
snipe
953b3a8d6e
Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8
...
Merge master into develop for RC 6.0.0-8
2022-05-05 10:53:17 -07:00
snipe
5c78a15835
Removed dupe lines from merge conflict
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-03 12:56:29 -07:00
Ivan Nieto Vivanco
37805509da
Adds an integer casting to the order input field so it cannot be null
2022-05-01 15:27:05 -05:00
Ivan Nieto Vivanco
01232d9a54
Adds an integer casting to the order input field so it cannot be null
2022-05-01 15:16:56 -05:00
Ivan Nieto Vivanco
ac8da55270
Evaluate if an item still exists before trying to get its name in the report
2022-05-01 13:25:55 -05:00
Ivan Nieto Vivanco
1cbbf8f976
Evaluate if an item still exists before trying to get its name in the report
2022-05-01 13:11:05 -05:00
Johnson Yi
92fe1287ea
Do not saml login automatically after normal logout
2022-04-29 15:35:08 +00:00
snipe
9aac1cbba4
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/MoveUploadsToNewDisk.php
# app/Http/Controllers/ActionlogController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/BulkUsersController.php
# app/Http/Requests/AssetCheckoutRequest.php
# app/Importer/LicenseImporter.php
# app/Models/Actionlog.php
# app/Models/License.php
# app/Models/User.php
# app/Observers/AssetObserver.php
# composer.lock
# config/version.php
# database/factories/LicenseFactory.php
# database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
# database/migrations/2018_10_18_191228_add_kits_licenses_table.php
# database/migrations/2018_10_19_153910_add_kits_table.php
# database/migrations/2018_10_19_154013_add_kits_models_table.php
# database/migrations/2019_02_07_185953_add_kits_consumables_table.php
# database/migrations/2019_02_07_190030_add_kits_accessories_table.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/ar/general.php
# resources/lang/ar/passwords.php
# resources/lang/cs/general.php
# resources/lang/cs/passwords.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/fr/admin/custom_fields/general.php
# resources/lang/fr/admin/hardware/general.php
# resources/lang/fr/admin/locations/table.php
# resources/lang/fr/admin/settings/message.php
# resources/lang/hu/admin/custom_fields/general.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/general.php
# resources/lang/it/admin/settings/general.php
# resources/lang/nl/admin/custom_fields/general.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/sv-SE/passwords.php
# resources/lang/tr/general.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/reports/activity.blade.php
# resources/views/users/print.blade.php
2022-04-28 17:49:06 +01:00
snipe
2e9cf8fa87
Added access gate to the requested assets index
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-28 15:45:37 +01:00
snipe
f623d05d0c
Escape checkout target name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-24 15:27:11 +01:00
Godfrey M
91694064fb
fixes double updates from action log and history
2022-04-18 11:30:24 -07:00
snipe
b2087a9947
Adds validator to make sure the status ID is deployable
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-15 13:06:55 +01:00
snipe
6b1329133b
Adds status ID to asset checkout API endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-15 13:06:35 +01:00
snipe
698c7f4904
Fixes potential XSS vuln in user requestable results
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-15 12:22:20 +01:00
snipe
1441cf9f4f
Ports #10494 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-12 21:04:57 +01:00
snipe
7b891f0952
Merge pull request #10913 from inietov/fixes/bulk_user_edit_not_updating_asset_locations
...
Fixes Bulk user edit not updating checked out asset locations
2022-04-07 19:41:01 +01:00
snipe
8218b5ef47
Merge pull request #10914 from inietov/fixes/bulk_user_edit_not_updating_asset_locations_develop
...
Fixes Bulk user edit not updating checked out asset locations
2022-04-07 19:40:42 +01:00
snipe
b73542664b
Merge pull request #10919 from Godmartinz/gh10866-checkin_time_always_show_12am
...
Fixed #10866 - Checkin time always shows 12am
2022-04-07 19:40:11 +01:00
Godfrey M
3eb7a87a66
fixes action_date for check-in not including H:i:s
2022-04-07 11:24:12 -07:00
Godfrey M
1325628039
fixes typo
2022-04-07 11:18:16 -07:00
Godfrey M
8498082f21
fixes typo
2022-04-07 11:16:40 -07:00
Godfrey M
6dc45c189b
removed deadspace
2022-04-07 11:10:36 -07:00
Godfrey M
5d0a1ebb7a
fixes action_date for check-in not including H:i:s
2022-04-07 11:08:43 -07:00
Ivan Nieto Vivanco
e1927aa154
Update Assets locations when user's location changes whey they got bulk-edited
2022-04-06 19:23:49 -05:00
Ivan Nieto Vivanco
6529a75683
Update Assets locations when user's location changes whey they got bulk-edited
2022-04-06 19:12:02 -05:00
snipe
01342ca266
Fixed activity report
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-05 22:58:25 +01:00
Ivan Nieto Vivanco
b5378eff64
Fix several typos
2022-04-05 16:12:31 -05:00
snipe
8195a664a9
Merge pull request #10883 from inietov/fixes/update_existing_value_import_develop
...
Fixes Importer always update existing values develop
2022-04-05 21:11:24 +01:00
Brady Wetherington
6756dd193e
SCIM integration using the 're-do-the routes' approach, which seems like a dead-end
...
Cleaning up routes to match laravel-scim-server's recommended implementation
Some actually *working* changes for SCIM support?!
Whoops, forgot my route file
Fix public SCIM routes
Removed Ziggy, removed old generated file, yanked Ziggy references
Resolves the first set of comments for SCIM
Ensure all /api routes have baseUrl prepended
Fix the parent:: call to be, uh, actually correct :P
Clarify the route-ordering, as it is quite tricky
This gets it so that users can actually be saved..
Work around the lack of callbacks with some inheritance
Mapped a bunch more fields from SCIM into Snipe-IT's user table
More baseUrl shenanigans since we yanked Ziggy :/
Properly map job title and work with some other necessary attributes
Map more fields...
Finalized basic mapping for core and enterprise namespaces
Latest tuned settings for SCIM config to work with Azure (and others)
2022-04-05 20:26:37 +01:00
Ivan Nieto Vivanco
2d213a9c77
Make the report take the dates of pivot table instead of asset log
2022-04-05 12:57:49 -05:00
snipe
08588a2e6a
Merge pull request #10901 from veenone/fix/invalid_consumable_date_in_user_view
...
Fixes #10898 (invalid consumable date time info in user view)
2022-04-05 18:30:23 +01:00
Achmad Fienan Rahardianto
231a34ace3
FIX : #10898 (invalid consumable date time info in user view)
2022-04-05 15:31:27 +07:00
Ivan Nieto Vivanco
1a448cc4b6
Take the values from the importer form to configure the used importer
2022-03-29 17:31:43 -06:00
snipe
a937bd34f6
Merge master back down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 16:28:43 +01:00
snipe
bdabbbd4e9
Logout user when their activated status is switched to off
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 13:44:53 +01:00
snipe
7941a88623
Merge pull request #10817 from dampfklon/fix-10810-unaccepted-assets
...
Fix #10810 unaccepted assets
2022-03-29 12:10:37 +01:00
snipe
b5f3a357e2
Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync
...
This looks good, thanks!
2022-03-29 12:06:01 +01:00
Yevhenii Huzii
863ea62551
Fix problem with static paths
2022-03-27 23:12:38 +03:00
snipe
639409fb3f
Backporting #10829 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-25 13:00:16 +00:00
snipe
e207a5043e
Merge pull request #10737 from Godmartinz/feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf
...
Fixed #7891 , #3019 and #8260 [sc-15014] - added asset acceptance and signed eula as pdf
2022-03-24 20:52:41 +00:00
Godfrey M
a1429ce86b
removed manager_name from user files
2022-03-24 11:47:13 -07:00
Godfrey M
c1f8252388
adds manager field to LDAP sync
2022-03-24 11:24:39 -07:00
andreaci
ff5a95a6a4
next_audit_date error on saving asset
...
Solved error 500 when saving new Asset and no next_audit_date is defined
2022-03-23 17:23:53 +01:00
Godfrey M
55680762de
Merge branch 'develop' into feature/sc-18937/add-manager-to-ldap-sync
2022-03-22 16:33:58 -07:00
snipe
20e65804ef
Removed comment
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-22 18:12:08 +00:00
Godfrey Martinez
fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf
2022-03-22 10:10:56 -07:00
Godfrey M
3e01981576
clean up
2022-03-22 10:07:08 -07:00
Godfrey M
62352ef1a1
completes accessory eula agreement blade
2022-03-22 10:04:22 -07:00
Ivan Nieto Vivanco
98b78837e1
Validate custom fieldset only if the asset have one
2022-03-22 09:38:57 -06:00
snipe
8c92198636
Possible fix for boolean field check
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-22 13:47:43 +00:00
Ivan Nieto Vivanco
7571c0b850
Add support for boolean type customfields
2022-03-21 18:48:42 -06:00
Ivan Nieto Vivanco
319d816002
Update in the license seat the user that the asset with that license have assigned
2022-03-21 15:06:43 -06:00
Godfrey M
4956eb0410
WIP: needs to be tested. adds ldap_manager field to ldap sync
2022-03-21 11:15:39 -07:00
Godfrey M
220df9710e
adds most of the fields for an accessory eula agreement pdf
2022-03-21 09:18:29 -07:00
snipe
df60729140
Fixed #10769 - redirect user back to due for audit page
...
This could probably take a little reworking, since if you are auditing from the Overdue for Audit page, we’d want to take you back *there* instead of the Due for Audit page.
Signed-off-by: snipe <snipe@snipe.net>
2022-03-21 14:27:18 +00:00
snipe
e04ae63d02
Apply the fix to API controller too :(
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-19 23:12:48 +00:00
snipe
7db252ade3
Fixed #10840 - defaulting to 0 on supplier ID if no value provided
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-19 23:11:42 +00:00
snipe
42220cc566
Merge pull request #10809 from inietov/fixes/customfields_boolean_format_not_saving
...
Fixes Customfields with boolean format not saving [ch-9973]
2022-03-19 22:10:54 +00:00
Godfrey M
b2e78e3382
formats most of the pdf blade
2022-03-16 15:53:32 -07:00
Dampfklon
9818d16834
fix showDeletedFunction by reverting #9508
2022-03-16 20:20:46 +01:00
Godfrey M
5fcc3c39f3
routes eula agreements for download correctly to the asset history
2022-03-16 11:56:56 -07:00
snipe
0f95802699
Fixed mis-automerge
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 18:05:47 +00:00
snipe
9db8bd782d
Merging master down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 18:02:07 +00:00
Godfrey M
6386fa1c5e
clean up
2022-03-16 09:54:10 -07:00
snipe
89ddbddada
Fixed comment
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 16:53:18 +00:00
snipe
7498fe36e9
Removed extra space because pedantry
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 16:45:03 +00:00
snipe
babf7c064b
Added ability to filter status label index endpoint by status type
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 16:38:45 +00:00
Ivan Nieto Vivanco
570dd09dcd
Add validation to Accessories and Consumables to not let the user update the number of items to less than they already have checked out
2022-03-15 17:52:19 -06:00
Godfrey M
b2f7262cd2
adds table structure for asset history
2022-03-14 19:38:36 -07:00
snipe
1ac293a12a
Add a force override
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-10 13:30:03 -08:00
snipe
3e3c277a3f
Better phrasing
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-10 13:29:52 -08:00
snipe
93d6ce1a6a
Added session killer artisan command
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-10 13:20:23 -08:00
Godfrey M
e1a6a2afc6
adds translation for accept_eula, a bit more logic on the Acceptance Controller that is not working yet
2022-03-10 12:15:50 -08:00
Ivan Nieto Vivanco
cdc0805fc4
Sanitize dates input in the importer before saving
2022-03-10 12:07:07 -06:00
Ivan Nieto Vivanco
9caf27ce60
Sanitize dates input in the importer before saving
2022-03-10 11:48:57 -06:00
Ivan Nieto Vivanco
e104195796
Convert value of the customfield element from string to boolean
2022-03-09 18:49:39 -06:00
snipe
e3d2f7cc96
Missed a few
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-08 20:05:17 -08:00
snipe
d1358b6249
Removed experimental feature policies
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-08 16:58:24 -08:00
Godfrey M
59c583ac74
adds the ability to save eula pdfs to storage, still working on storing them in the DB and exposing them in the UI
2022-03-08 16:42:27 -08:00
Brady Wetherington
ab7bf3c5d4
Get rid of stale commented-out line
2022-03-07 20:22:23 -08:00
Brady Wetherington
0556c7653a
Implement a generic timeout function, and run methods that need to run with a timeout using it.
2022-03-07 19:51:21 -08:00
Brady Wetherington
b96303cb38
Clean up errors, add new required package to Dockerfile
2022-03-07 19:51:21 -08:00
Brady Wetherington
312a90ce77
Add start of Tracing to LDAP troubleshooter
2022-03-07 19:51:21 -08:00
Brady Wetherington
71b5c0e80f
Add new LDAP troubleshoot ldapsearch subcommand, broaden out troubleshooting
2022-03-07 19:51:21 -08:00
Brady Wetherington
519bd00bef
WIP - just need to get authed connections to work
2022-03-07 19:51:21 -08:00
Brady Wetherington
ffd8f583b4
Got most of the stages working for the LDAP troubleshooter
2022-03-07 19:51:21 -08:00
Brady Wetherington
8cd5ec6799
Most of the host-port-tls discovery stuff is in-place now
2022-03-07 19:51:20 -08:00
Brady Wetherington
ef0e9a3c93
WIP: Enhancing stage 2 of LDAP troubleshooter
2022-03-07 19:51:20 -08:00
Brady Wetherington
8aa975e959
First pass at Artisan-based LDAP troubleshooter
2022-03-07 19:51:20 -08:00
snipe
e9d297e97d
Added cache comment
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-07 19:37:06 -08:00
snipe
9269d5945e
Added QR and alt barcode urls to asset transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-07 19:32:18 -08:00
snipe
3e2fe10480
Fixed getAssetBySerial
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-05 09:03:29 -08:00
snipe
2d7a8b5e15
Merge pull request #10776 from snipe/added_trim_to_email_and_username
...
Added trim to email and username
2022-03-04 11:57:33 -08:00
snipe
9a358087ec
Add remote user to bulk edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 06:47:23 -08:00
snipe
b6a1d245e8
Added trim to CC email as well
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 06:20:34 -08:00
snipe
67134ca387
Do a trim() before inserting/updating
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 06:18:52 -08:00
snipe
0dfc27f56e
Added remote to allowed_columns for sorting
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 05:44:46 -08:00
snipe
43c1949092
Add remote option to user
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 05:35:26 -08:00
snipe
f840652395
Suppress errors for missing signatures
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 03:18:28 -08:00
snipe
67ed0d91c0
Handle file_get_contents more gracefully
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 02:54:37 -08:00
snipe
b876d0abb0
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .env.example
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Kernel.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Importer/AssetImporter.php
# app/Models/Accessory.php
# app/Models/Consumable.php
# app/Presenters/AccessoryPresenter.php
# app/Presenters/ComponentPresenter.php
# app/Presenters/ConsumablePresenter.php
# app/Providers/AuthServiceProvider.php
# composer.json
# composer.lock
# config/app.php
# config/cors.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/build/app.js.LICENSE.txt
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/accessories/view.blade.php
# resources/views/consumables/view.blade.php
# resources/views/settings/saml.blade.php
# routes/api.php
2022-03-03 21:59:38 -08:00
snipe
29a2e80984
Merge pull request #10771 from uberbrady/retry_fix_bad_metadata_display
...
Retry fix bad metadata display
2022-03-03 20:49:30 -08:00
snipe
94dded3785
Added notes field to presenters for table view show/hide columns
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:30:07 -08:00
snipe
ac8a7d0bc9
Made notes field fillable and searchable
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:29:48 -08:00
snipe
6fca8350f9
Added notes field to transformers
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:29:35 -08:00
snipe
9acb5413f6
Added notes field to controllers
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:29:25 -08:00
snipe
08a2fe4edb
Merge pull request #10773 from snipe/features/adds_ldap_import_and_assets_count_to_user_api
...
Features/adds ldap import and assets count to user api
2022-03-03 19:15:14 -08:00
snipe
6abe8f296b
We don’t need the users table here
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 19:12:03 -08:00
snipe
a53a67be4a
Added consumables, licenses, accessories count filters too
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 19:08:08 -08:00
snipe
b72cac3511
Adds ldap_import and assets_count filter to user API endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 19:03:35 -08:00
snipe
c940d36fff
Updated maintenance gate in API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 18:49:54 -08:00
snipe
cd12028845
Use “update” instead of edit in gate
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 18:47:20 -08:00
Brady Wetherington
3225605ef3
Handling the old weirdly-formatted data wasn't quite working.
2022-03-03 18:17:29 -08:00
Brady Wetherington
31dde20a2b
Actually, re-introduce this code comment as it's still relevant and tricky
2022-03-03 15:48:04 -08:00
Brady Wetherington
aa36ebc947
Merge branch 'fix_bad_metadata_display' into retry_fix_bad_metadata_display
2022-03-03 15:46:19 -08:00
Brady Wetherington
92434fa943
Revert "Revert "refactor and clean up attribute-changing logic for assets""
...
This reverts commit bdc737ce0c
2022-03-03 15:45:54 -08:00
Brady Wetherington
0164354463
Fix for the weird error that blew up the demo when my PR got merged
2022-03-02 15:15:16 -08:00
snipe
bdc737ce0c
Revert "refactor and clean up attribute-changing logic for assets"
...
This reverts commit 290baf1c8d
2022-03-02 14:45:14 -08:00
snipe
733b3a7550
Merge pull request #10682 from uberbrady/fix_bad_metadata_display
...
Fixed weird JSON-handling on log_meta updates
2022-03-02 14:36:38 -08:00
snipe
3339a691e1
Merge pull request #10721 from snipe/features/adds_users_consumables_endpoint
...
Added consumables endpoint to user API
2022-03-02 14:33:45 -08:00
Ivan Nieto Vivanco
0df9dd8320
Delete a function that is not longer used
2022-03-01 18:59:50 -06:00
snipe
2eef43e8bf
Applies develop fix to master for location drop downs
2022-03-01 12:43:35 -08:00
Andrew Roth
2e60420aeb
Fix for location and model drop down with granular permissions.
2022-02-28 17:38:38 -05:00
Godfrey M
533670f3f1
faulty method for converting asset acceptance to pdf
2022-02-24 14:50:16 -08:00
Ivan Nieto Vivanco
64fa7e23fc
Separate notes on assets and asset models
2022-02-24 16:05:03 -06:00
Ivan Nieto Vivanco
577dc6b02c
Separate notes on assets and asset models
2022-02-24 15:50:59 -06:00
snipe
2906a89442
Make the 429 error less stupid
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-24 13:10:34 -08:00
snipe
50f55b4308
Fixes broken API throttling
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-24 13:10:10 -08:00
snipe
a8028e7dd0
Merge pull request #10727 from uberbrady/master
...
Fix for negative CORS/SAML interaction
2022-02-23 11:17:17 -08:00
Brady Wetherington
15abc84ab0
Migrate to Fruitcake/laravel-cors which has path-exclusion built-in
2022-02-23 11:06:19 -08:00
snipe
42fcd29200
Fixed #10436 on master, applies #10449
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-22 21:06:54 -08:00
snipe
dc2e6c2b06
Adds consumables endpoint to user API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-22 20:44:34 -08:00
Brady Wetherington
294606fb0b
Move new CORS library to global middleware, the only place it works
2022-02-22 19:07:23 -08:00
Brady Wetherington
64f83f9a5f
Move HandleCors middleware to be universal
2022-02-22 17:43:40 -08:00
snipe
0a4a548f9c
Added use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-22 10:46:02 -08:00
snipe
dd5f812d88
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/FixDoubleEscape.php
# app/Console/Commands/LdapSync.php
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/CompaniesController.php
# app/Http/Controllers/Api/DepartmentsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Models/Loggable.php
# app/Providers/AuthServiceProvider.php
# config/version.php
# database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
# database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
# package-lock.json
# package.json
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
# resources/views/hardware/view.blade.php
2022-02-20 13:29:12 -08:00
Ivan Nieto Vivanco
23a6907975
Some minor stylistic changes
2022-02-17 18:05:06 -06:00
Ivan Nieto Vivanco
5b2a5ff124
Put the 'remember_token' column as null in the users table
2022-02-17 18:03:00 -06:00
Ivan Nieto Vivanco
548b172744
Logout every connected user
2022-02-17 18:00:24 -06:00
Ivan Nieto Vivanco
263893b3c6
Search logged in user that made the restore, if they doesn't exist in the restored system, add it again
2022-02-17 17:42:06 -06:00
Ivan Nieto Vivanco
811ca51c4f
Wipe database before restoration
2022-02-17 16:59:44 -06:00
snipe
d1b45a83b8
Blergh, one more linebreak
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-17 14:51:06 -08:00
snipe
01a8701a8c
Removed extra linebreaks
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-17 14:50:38 -08:00
snipe
67fe53e32a
Removed debugging, added comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-17 14:50:07 -08:00
snipe
7f6b8cc43d
Removed carbon, since we went with PHP's datetime instead
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-17 14:48:12 -08:00
snipe
5fe999eb02
Shored up the date math, updated the explanation
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-17 14:34:33 -08:00
snipe
ea429d650e
Initial audit date fix
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-16 20:19:38 -08:00
snipe
824eedf7c2
Added UI elements for is_unique
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-16 13:47:48 -08:00
snipe
a4a0aa5124
Removed debugging line
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-16 13:47:22 -08:00
snipe
6a91d4d19e
Check for uniqueness constraint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-16 13:46:22 -08:00
snipe
ea8f9a6dd9
Make is_unique fillable
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-16 13:45:44 -08:00
snipe
b78f32e876
Merge pull request #10655 from inietov/fixes/trying_to_get_property_checkin_email_of_non-object_develop
...
Fixes ErrorException: Trying to get property 'checkin_email' of non-object for develop[sc-17568]
2022-02-16 11:19:14 -07:00
snipe
592f66bd0c
Merge pull request #10670 from Godmartinz/gh10639/linear-depreciation-calculation
...
Fixed #10639 - incorrect linear depreciation calculation
2022-02-16 11:18:27 -07:00
snipe
4f89dfee49
Merge pull request #10679 from snipe/fixes/timing_attack_mitigation_for_forgot_password
...
Added usleep random to forgotten password method to mitigate timing attacks
2022-02-16 11:17:00 -07:00
snipe
017534bc07
Added deleted_at to license transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-16 09:33:28 -08:00
snipe
5540069cce
Be more specific with deleted license point
...
Require this value to be "true" speciically to get the deleted list
Signed-off-by: snipe <snipe@snipe.net>
2022-02-16 09:14:04 -08:00
snipe
1ad56760ce
Adds delete endpoint for licenses
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-16 09:08:50 -08:00
Brady Wetherington
290baf1c8d
refactor and clean up attribute-changing logic for assets
2022-02-15 18:29:45 -08:00
snipe
f878e0ad66
Fixes 2FA cookie -> user issue
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-15 18:29:23 -08:00
snipe
178e440951
Added usleep :(
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-15 18:09:58 -08:00
snipe
cab4fa1687
Fixes some conceptual gates
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-14 15:42:23 -08:00
snipe
4804e5b3ab
Added Asset edit/delete gates to maintenances
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-14 15:34:06 -08:00
Godfrey M
7b9a2ae909
added rounding
2022-02-14 09:34:42 -08:00
Godfrey M
6e204a20ca
fixed current value formula
2022-02-14 09:28:35 -08:00
Godfrey M
e6e68934f7
adds a months depreciated variable
2022-02-14 09:13:14 -08:00
Godfrey M
cdc402fa04
WIP formula for linear Depreciation has been corrected. still one variable left to fix.
2022-02-14 09:01:42 -08:00
snipe
1c0a96b0ce
Added gate to supplier
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-13 11:58:12 -07:00
snipe
d77a47765e
Adds gate to supplier
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-13 11:53:45 -07:00
Dampfklon
0d49fc3a2e
remove unused route, controller functions and view
2022-02-13 12:10:19 +01:00
snipe
d6b8222371
Refactor to combine permissions
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-11 12:48:30 -08:00
snipe
2c5abaaea4
Fixed copypasta
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-11 12:32:09 -08:00
snipe
c1a0653847
Restrict to update or create gate methods for select lists
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-11 12:31:11 -08:00
snipe
9226c8292d
Fixed typos in comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-11 12:02:14 -08:00
snipe
5fafa81dc1
Forgot components
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-11 11:57:29 -08:00
snipe
b30d1dce89
Removed selectlist
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-11 11:55:24 -08:00
snipe
2dad27eed6
Added additional gate for selectlists
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-11 11:46:14 -08:00
snipe
f5ffda8053
Ahem.
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-10 22:43:51 -08:00
snipe
ed931ef0cd
Merge pull request #10654 from inietov/fixes/trying_to_get_property_checkin_email_of_non-object
...
Fixes ErrorException: Trying to get property 'checkin_email' of non-object [sc-17568]
2022-02-10 12:23:50 -08:00
Ivan Nieto Vivanco
f36de6c670
Validates if model and model->category exist before return the checkin_email property
2022-02-10 13:53:49 -06:00
Ivan Nieto Vivanco
bf4ee18123
Validates if model and model->category exist before return the checkin_email property
2022-02-10 11:58:55 -06:00
snipe
70af10ae6c
Merge pull request #10640 from JonathonReinhart/10552-add-checkin-api-date
...
Fix #10552 : Add checkin_at parameter to /hardware/:id/checkin API
2022-02-10 09:54:20 -08:00
snipe
b9a8d45c07
Better messaging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-09 16:30:42 -08:00
snipe
7794c2f44b
Check that the fieldset exists before trying to detach it from the fieldset
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-09 16:16:16 -08:00
snipe
eedc14401a
Switch to searching on semicolon instead of &
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-09 15:55:22 -08:00
snipe
4e14d70427
Added jobtitle to unescaper
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-09 15:50:44 -08:00
snipe
2a71690aaf
Added license_name to unescaper
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-09 15:17:57 -08:00
snipe
e4da00ca82
Catch potential validation errors on unescape tool
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-09 15:09:49 -08:00
snipe
4fd14e5859
Added slightly more output because wtf?
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-09 15:05:28 -08:00
snipe
441f1fbb64
Remove html_entities_decode restriction
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-09 14:56:36 -08:00
snipe
d06e3dd892
Merge branch 'master' of https://github.com/snipe/snipe-it
2022-02-09 14:40:33 -08:00
snipe
6b25b53462
Merge pull request #10628 from inietov/fixes/default_values_dont_allow_checkbox_radio
...
Fixes #10299 Default Values do not allow Checkbox/Radio Buttons
2022-02-09 14:39:46 -08:00
Ivan Nieto Vivanco
6d79c9f3e2
Save the default values for custom fields with same format than Assets do for actual values
2022-02-09 13:41:33 -06:00
Ivan Nieto Vivanco
a36957dd77
Finish the implementation of custom fields default values for checkboxes
2022-02-09 13:12:42 -06:00
Ivan Nieto Vivanco
2f3499e4b9
Show checkboxes a little less assy, actually save the data checked by them
2022-02-09 10:49:10 -06:00
Jonathon Reinhart
3536d08477
Add checkin_at parameter to /hardware/:id/checkin API
...
Fixes #10552
2022-02-08 20:23:09 -05:00
Brady Wetherington
c300e7c7f6
Remove extraneous backslash
2022-02-08 12:23:15 -08:00
Brady Wetherington
fb890fbc30
Properly alert when invalid JSON is submitted to something that wants JSON
2022-02-08 12:22:59 -08:00
Brady Wetherington
9a66f6a254
Remove extraneous backslash
2022-02-08 12:09:40 -08:00
Brady Wetherington
5e94726ec1
Properly alert when invalid JSON is submitted to something that wants JSON
2022-02-08 12:05:05 -08:00
Ivan Nieto Vivanco
413e44be2f
Add custom date to checkin actionlogs and show it in the history of the asset tab
2022-02-08 11:58:23 -06:00
Ivan Nieto Vivanco
d71aa859fc
Add custom date to checkin actionlogs and show it in the history of the asset tab
2022-02-08 11:43:24 -06:00
Jonathon Reinhart
cd963179fd
Fix /hardware/{id}/checkin API response on error
...
Fixes #10629
2022-02-08 01:08:42 -05:00
snipe
474f24e40e
Merge branch 'master' of https://github.com/snipe/snipe-it
2022-02-07 18:27:59 -08:00
snipe
b3a0f86431
Temp fix for weird JSON format in history
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-07 18:27:55 -08:00
Brady Wetherington
a15c0adc79
Fix "secure hostnames" feature for subdirectory-based Snipe-IT installs
2022-02-07 11:33:38 -08:00
Brady Wetherington
f1d4087317
Fix "secure hostnames" feature for subdirectory-based Snipe-IT installs
2022-02-07 11:26:54 -08:00
Brady Wetherington
36ae6f9430
Yanked debugging code, tightened up comments.
2022-02-03 19:41:16 -08:00
Brady Wetherington
1945b97b72
Just trying to really tighten up on the LDAP Active Flag and how we parse it.
2022-02-03 19:04:56 -08:00
Brady Wetherington
392e61688d
Rework the LDAP sync command to better handle the active flag
2022-02-03 15:01:45 -08:00
snipe
ac5c6123bc
Fixes #10563 - LDAP active flag - hopefully?
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-02 18:07:34 -08:00
Ivan Nieto Vivanco
eac8e0bdba
Add a casting to a truthy/falsy that needs to be integer
2022-02-02 13:54:57 -06:00
snipe
ce154a2382
Merge pull request #10455 from adagioajanes/features/quickscan_checkin
...
Added #10454 : Quick Scan Checkin
2022-02-01 20:19:45 -08:00
snipe
06a5ea1530
Fixed duplicate use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-01 18:57:45 -08:00
snipe
5fded57ec6
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/ProfileController.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# app/Models/License.php
# app/Providers/AppServiceProvider.php
# app/Services/LdapAd.php
# config/version.php
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/lang/ar/button.php
# resources/lang/de/admin/companies/general.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/groups/titles.php
# resources/lang/de/admin/hardware/form.php
# resources/lang/de/admin/hardware/general.php
# resources/lang/de/admin/hardware/message.php
# resources/lang/de/admin/hardware/table.php
# resources/lang/de/admin/kits/general.php
# resources/lang/de/admin/locations/table.php
# resources/lang/de/admin/reports/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/de/admin/users/general.php
# resources/lang/de/general.php
# resources/lang/de/mail.php
# resources/lang/en/admin/asset_maintenances/message.php
# resources/lang/en/admin/asset_maintenances/table.php
# resources/lang/en/admin/companies/general.php
# resources/lang/en/admin/companies/message.php
# resources/lang/en/admin/custom_fields/general.php
# resources/lang/en/admin/depreciations/general.php
# resources/lang/en/admin/groups/titles.php
# resources/lang/en/admin/hardware/form.php
# resources/lang/en/admin/hardware/general.php
# resources/lang/en/admin/hardware/table.php
# resources/lang/en/admin/kits/general.php
# resources/lang/en/admin/locations/table.php
# resources/lang/en/admin/reports/general.php
# resources/lang/en/admin/settings/general.php
# resources/lang/en/admin/settings/message.php
# resources/lang/en/admin/users/general.php
# resources/lang/en/button.php
# resources/lang/en/general.php
# resources/lang/en/help.php
# resources/lang/en/mail.php
# resources/lang/en/passwords.php
# resources/lang/hu/admin/hardware/general.php
# resources/lang/hu/admin/hardware/table.php
# resources/lang/hu/admin/locations/table.php
# resources/lang/is/admin/locations/table.php
# resources/lang/ko/admin/custom_fields/general.php
# resources/lang/ko/general.php
# resources/lang/nl/admin/hardware/general.php
# resources/lang/nl/admin/hardware/message.php
# resources/lang/nl/admin/hardware/table.php
# resources/lang/nl/admin/locations/table.php
# resources/lang/nl/admin/statuslabels/message.php
# resources/lang/nl/admin/users/general.php
# resources/lang/no/admin/companies/general.php
# resources/lang/no/admin/custom_fields/general.php
# resources/lang/no/admin/depreciations/general.php
# resources/lang/no/admin/depreciations/table.php
# resources/lang/no/admin/groups/titles.php
# resources/lang/no/admin/hardware/form.php
# resources/lang/no/admin/hardware/general.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/locations/table.php
# resources/lang/no/admin/reports/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/admin/settings/message.php
# resources/lang/no/admin/statuslabels/message.php
# resources/lang/no/admin/users/general.php
# resources/lang/no/button.php
# resources/lang/no/general.php
# resources/lang/no/mail.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/companies/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/pl/admin/depreciations/general.php
# resources/lang/pl/admin/depreciations/table.php
# resources/lang/pl/admin/groups/titles.php
# resources/lang/pl/admin/hardware/form.php
# resources/lang/pl/admin/hardware/general.php
# resources/lang/pl/admin/hardware/table.php
# resources/lang/pl/admin/kits/general.php
# resources/lang/pl/admin/locations/table.php
# resources/lang/pl/admin/reports/general.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/admin/settings/message.php
# resources/lang/pl/admin/users/general.php
# resources/lang/pl/button.php
# resources/lang/pl/general.php
# resources/lang/pt-PT/admin/companies/general.php
# resources/lang/pt-PT/admin/custom_fields/general.php
# resources/lang/pt-PT/admin/depreciations/general.php
# resources/lang/pt-PT/admin/depreciations/table.php
# resources/lang/pt-PT/admin/groups/titles.php
# resources/lang/pt-PT/admin/hardware/form.php
# resources/lang/pt-PT/admin/hardware/general.php
# resources/lang/pt-PT/general.php
# resources/lang/pt-PT/help.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/admin/companies/general.php
# resources/lang/ro/admin/custom_fields/general.php
# resources/lang/ro/admin/groups/titles.php
# resources/lang/ro/admin/hardware/form.php
# resources/lang/ro/admin/hardware/general.php
# resources/lang/ro/admin/hardware/message.php
# resources/lang/ro/admin/hardware/table.php
# resources/lang/ro/admin/locations/table.php
# resources/lang/ro/admin/settings/message.php
# resources/lang/ru/admin/companies/general.php
# resources/lang/ru/admin/custom_fields/general.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/general.php
# resources/lang/ru/validation.php
# resources/lang/sk/admin/settings/general.php
# resources/lang/sk/button.php
# resources/lang/sk/general.php
# resources/lang/tr/admin/hardware/form.php
# resources/lang/tr/admin/hardware/table.php
# resources/lang/tr/admin/kits/general.php
# resources/lang/tr/admin/locations/table.php
# resources/lang/tr/admin/reports/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/admin/settings/message.php
# resources/lang/tr/admin/statuslabels/message.php
# resources/lang/tr/admin/users/general.php
# resources/lang/tr/button.php
# resources/lang/tr/general.php
# resources/lang/zh-CN/admin/companies/general.php
# resources/lang/zh-CN/admin/custom_fields/general.php
# resources/lang/zh-CN/admin/depreciations/general.php
# resources/lang/zh-CN/admin/depreciations/table.php
# resources/lang/zh-CN/admin/groups/titles.php
# resources/lang/zh-CN/admin/hardware/form.php
# resources/lang/zh-CN/admin/hardware/general.php
# resources/lang/zh-CN/admin/hardware/message.php
# resources/lang/zh-CN/admin/hardware/table.php
# resources/lang/zh-CN/admin/kits/general.php
# resources/lang/zh-CN/admin/locations/table.php
# resources/lang/zh-CN/admin/reports/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/admin/settings/message.php
# resources/lang/zh-CN/admin/statuslabels/message.php
# resources/lang/zh-CN/admin/users/general.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-CN/general.php
# resources/lang/zh-CN/mail.php
# resources/views/depreciations/edit.blade.php
2022-02-01 18:53:05 -08:00
snipe
669826f6b2
Merge pull request #10574 from uberbrady/fix_force_root_url_v6
...
Add some guardrails around very-badly formatted APP_URL settings
2022-02-01 16:14:48 -08:00
snipe
8083ba8dca
Merge pull request #10590 from inietov/fixes/bulkedit_does_not_show_in_history_develop
...
Fixes Bulk edit doesn't show in Asset's history nor Activity report for develop [sc-16550]
2022-02-01 16:14:25 -08:00
Ivan Nieto Vivanco
3ef775533a
Adds actionlog for bulk edits
2022-02-01 12:10:46 -06:00
Ivan Nieto Vivanco
2fec40d7df
Adds actionlog for bulk edits
2022-02-01 00:00:12 -06:00
Brady Wetherington
72e9360228
Merge remote-tracking branch 'upstream/develop' into develop
2022-01-31 10:13:30 -08:00
snipe
aa3aa78204
Adds Lookup Asset by Custom Field via API [sc-18632]
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-28 09:08:48 -08:00
snipe
db0a078c0b
Merge pull request #10573 from uberbrady/fix_force_root_url
...
Add some guardrails around very-badly formatted APP_URL settings
2022-01-27 11:29:29 -08:00
Brady Wetherington
44719e3dcc
Fix whitespace issues
2022-01-27 11:29:20 -08:00
Brady Wetherington
1cf1278b3b
Fix whitespace issues
2022-01-27 11:28:51 -08:00
Brady Wetherington
476075235a
Add some guardrails around very-badly formatted APP_URL settings
2022-01-27 11:24:21 -08:00
Brady Wetherington
70648dedd3
Add some guardrails around very-badly formatted APP_URL settings
2022-01-27 11:21:46 -08:00
snipe
a65fb63b6b
Merge pull request #10511 from inietov/features/audit_date_in_importer
...
Adds audit dates in the asset importer
2022-01-27 10:58:53 -08:00
snipe
9634dde0dd
Merge pull request #10567 from inietov/fixes/importing_and_checking_out_licenses_master
...
Fixes Importing licenses without product key duplicates the license
2022-01-27 10:58:06 -08:00
snipe
c70ae19c28
Merge pull request #10529 from uberbrady/fix_insecure_host_headers
...
Force UrlGenerator's Root URL to be the base of APP_URL unless overriden (v5)
2022-01-26 16:59:55 -08:00
snipe
b153138d1e
Merge pull request #10534 from inietov/feature/add_remaining_address_field_to_user_import_develop
...
Add Zip field in the User Importer for develop [sc-18556]
2022-01-26 16:58:37 -08:00
Ivan Nieto Vivanco
55fdc86e02
Tweak query in the License Importer to not require a Product Key
2022-01-26 17:51:04 -06:00
Ivan Nieto Vivanco
450cb8f92f
Tweak query in the License Importer to not require a Product Key
2022-01-26 17:49:34 -06:00
Brady Wetherington
48f1380f6e
Merge pull request #10528 from uberbrady/fix_insecure_host_headers_v6
...
Force UrlGenerator's Root URL to be the base of APP_URL unless overriden
2022-01-24 18:26:30 -08:00
Ivan Nieto Vivanco
7383ec7f1e
Add an early return if the model id is not set (for new Asset Models)
2022-01-21 11:45:45 -06:00
Ivan Nieto Vivanco
c86ed892ab
Add Zip field in the User Importer
2022-01-19 13:52:15 -06:00
Ivan Nieto Vivanco
1fc71a4111
Add Zip field in the User Importer
2022-01-19 13:35:54 -06:00
Brady Wetherington
0c4768fd2a
Force UrlGenerator's Root URL to be the base of APP_URL unless overriden
...
(For v5)
2022-01-18 15:52:59 -08:00
Brady Wetherington
455bc736be
Force UrlGenerator's Root URL to be the base of APP_URL unless overriden
2022-01-18 15:31:30 -08:00
Ivan Nieto Vivanco
a05795420a
Respect the default value of 60 days in expiring licenses
2022-01-18 14:34:14 -06:00
Ivan Nieto Vivanco
42d86bf57b
Adds default values if the expiring alerts threshold is null
2022-01-18 14:21:49 -06:00
Ivan Nieto Vivanco
f510b9c2a9
Add query to filter non-deprecable assets when the Depreciation Report is called
2022-01-15 14:21:31 -06:00
Ivan Nieto Vivanco
8334ed6f7e
Add query to filter non-deprecable assets when the Depreciation Report is called
2022-01-15 14:01:19 -06:00
Ivan Nieto Vivanco
153c30eda8
Add to Importer the capacity to search Models only with Model Name since Model Number is not required
2022-01-15 04:32:47 -06:00
Ivan Nieto Vivanco
58b1db29e2
Adds condition to only update the Asset's Model Number if is provided by import file
2022-01-15 04:15:38 -06:00
Ivan Nieto Vivanco
8bd280b416
Add to Importer the capacity to search Models only with Model Name since Model Number is not required
2022-01-15 04:12:30 -06:00
Brady Wetherington
ef463a37d8
Make 'pending' assets properly requestable; use requestable scope
2022-01-14 12:48:33 -08:00
snipe
207ff014b1
Merge pull request #10514 from uberbrady/fix_double_wildcard_query_requestable
...
Fixed extraneous wildcard query in requestable asset search
2022-01-13 19:39:08 -08:00
Brady Wetherington
65e584c2bd
Revert the unnecessary optimization for asset->count()
2022-01-13 19:37:08 -08:00
snipe
24a234ede3
Merge pull request #10503 from uberbrady/develop_fix_dont_req_preauth_uac
...
Permit DONT_REQ_PREAUTH AD users to log in
2022-01-13 17:01:59 -08:00
snipe
be7e6ed847
Merge pull request #10502 from uberbrady/ldap_useraccountcontrol_dont_req_preauth
...
Add new UserAccountControl to permitted UAC's for AD.
2022-01-13 17:01:47 -08:00
Brady Wetherington
4e8ae8a162
Fix extraneous wildcard query in requestable asset search
2022-01-13 16:32:40 -08:00
Ivan Nieto Vivanco
949fe2a14a
Adds last_audit_date and next_audit_date in the asset importer
2022-01-13 15:14:20 -06:00
snipe
984db1ef44
Apply personal API token fix to master
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-13 01:39:56 -08:00
snipe
512dbfee7a
Added gate to check that the user is allowed to view API keys
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-13 01:33:27 -08:00
snipe
eb8f23a888
Removed commented code
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-13 01:32:28 -08:00
snipe
8f4ec95fbb
Remove assets query, since we handle that via API call now and just need the count()
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-12 23:23:00 -08:00
snipe
224d0b2fd2
Small language file additions
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-12 22:21:00 -08:00
snipe
43c57c8461
Merge master into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Http/Controllers/BulkAssetModelsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ModalController.php
# app/Http/Transformers/GroupsTransformer.php
# config/version.php
# package-lock.json
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/less/overrides.less
# resources/lang/en/admin/hardware/message.php
# resources/lang/en/admin/settings/general.php
# resources/views/partials/bootstrap-table.blade.php
# routes/web.php
2022-01-12 20:51:33 -08:00
Brady Wetherington
a063806bcc
Permit DONT_REQ_PREAUTH AD users to log in
2022-01-12 12:50:39 -08:00
Brady Wetherington
c8fe929e09
Add new UserAccountControl to permitted UAC's for AD.
2022-01-12 12:07:51 -08:00
Alex Janes
d2bb3e6377
Merge branch 'develop' into features/quickscan_checkin
2022-01-11 16:40:20 -05:00
Alex Janes
edef640d35
Merge branch 'develop' into features/lock_logins_to_saml
2022-01-11 09:05:14 -05:00
snipe
ea83567e7d
Merge pull request #10494 from exula/fix/increase_max_licenses
...
Fixed #7824
2022-01-10 15:04:47 -08:00
snipe
d9624b59b4
Merge pull request #10264 from nuraeil/added-localized-strings
...
Added #10242 : Improved localized strings
2022-01-10 14:48:52 -08:00
Brad
6b6a83a525
Removing something stupid PHPStorm put in the use area
2022-01-10 14:21:19 -05:00
Brad
81084fa717
Fixed #7824
...
Previously there was a 999 max seats on Licenses as anything above that seemed to cause slowdowns and failure.
This commit allievates those pain points
- removed freeSeats as a hydrated Eloquent model on JSON requests for the licenses index
- removed 'licenseSeats.user', 'licenseSeats.asset' from the 'with' clause as it's not needed in the view (Datatabales takes care of that)
- removed the 999 max seats limit from the License Model,
- reworked how new license seats are created when increasing seats or creating licenses
- Added an index the license_seats table to help speed up lookups
2022-01-10 14:03:28 -05:00
Wächtler, Yannick
04d649122b
Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO
2022-01-06 12:35:37 +01:00
Haxatron
bb095641c2
Update BulkAssetModelsController.php
...
https://huntr.dev/bounties/efdf2ead-f9d1-4767-9f02-d11f762d15e7
2022-01-06 09:50:11 +08:00
snipe
884b6b0270
Fixes format property on invalid custom field object
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-03 19:14:50 -08:00
Brady Wetherington
95c30cae8d
Some duplicate imports at the top of the Settings file
2022-01-03 13:53:53 -08:00
Brady Wetherington
3c7f2e89ec
Merge branch 'develop' into remove_old_ldap
...
Had to re-do the composer install because the conflicts were too complicated.
2022-01-03 12:56:58 -08:00
snipe
2ee84c2675
Added a few more comments
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-30 18:33:28 -08:00
snipe
c6ce928567
Added allow list to modal view options
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-30 18:16:49 -08:00
snipe
b4fac3e4ae
Fixed missing index for fieldsets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-30 13:16:44 -08:00
snipe
bad6b862ca
assets_count doesnt exist as a column
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-30 12:59:16 -08:00
snipe
359b22e17a
Applies #10470 to develop
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-27 13:22:47 -08:00
snipe
8588e9ebf1
Fixed #10469 - increased size of supplier address field
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-27 12:28:02 -08:00
Alex Janes
d0bfd8dfd2
Fixed the collection of the groups total to GroupsTransformer.php. Groups page should now paginate correctly.
2021-12-23 20:54:34 -05:00
Alex Janes
7acb559069
corrected issue with asset not found errors
2021-12-20 19:55:00 -05:00
Alex Janes
2b5aca183c
removed unnecessary additional data call from api method
2021-12-19 19:21:58 -05:00
Alex Janes
14b21a6e95
removed some whitespace
2021-12-19 19:17:32 -05:00
Alex Janes
08cb8c354b
more cleanup to fit formatting convention
2021-12-19 19:11:24 -05:00
Alex Janes
29da4f4325
Removed a bunch of redundant code I created from the API
2021-12-19 18:39:57 -05:00
Alex Janes
bc4fe88ac0
First version of bulk checkin
2021-12-19 16:53:31 -05:00
Alex Janes
a68ec8bb57
Update LoginController.php
...
Updated if statements to match convention exactly.
2021-12-17 18:52:42 -05:00
Alex Janes
74de91c31a
Merge pull request #1 from snipe/develop
...
Develop
2021-12-17 14:51:03 -05:00
snipe
9b2dd6522f
Switch GET to POST for asset request
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:36:08 -08:00
Alex Janes
d99db5c63b
bug fix and formatting fix
2021-12-16 19:04:37 -05:00
snipe
398180dc59
Small merge unmagling
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 14:38:04 -08:00
snipe
c3d55ee27e
Merge master down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Models/Setting.php
# config/version.php
# resources/lang/af/button.php
# resources/lang/ar/button.php
# resources/lang/bg/button.php
# resources/lang/cs/button.php
# resources/lang/cy/button.php
# resources/lang/da/button.php
# resources/lang/de/button.php
# resources/lang/el/button.php
# resources/lang/en-GB/button.php
# resources/lang/en-ID/button.php
# resources/lang/es-CO/admin/groups/message.php
# resources/lang/es-MX/button.php
# resources/lang/et/admin/custom_fields/general.php
# resources/lang/et/admin/hardware/table.php
# resources/lang/et/admin/kits/general.php
# resources/lang/et/admin/manufacturers/message.php
# resources/lang/et/admin/models/general.php
# resources/lang/et/admin/settings/general.php
# resources/lang/et/button.php
# resources/lang/et/mail.php
# resources/lang/fa/button.php
# resources/lang/fa/help.php
# resources/lang/fi/button.php
# resources/lang/fil/button.php
# resources/lang/fr/button.php
# resources/lang/ga-IE/button.php
# resources/lang/he/button.php
# resources/lang/hr/button.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/auth/message.php
# resources/lang/hu/button.php
# resources/lang/hu/mail.php
# resources/lang/id/admin/hardware/table.php
# resources/lang/id/button.php
# resources/lang/it/button.php
# resources/lang/iu/button.php
# resources/lang/ja/button.php
# resources/lang/ko/button.php
# resources/lang/lt/button.php
# resources/lang/lv/button.php
# resources/lang/mi/button.php
# resources/lang/mk/button.php
# resources/lang/ml-IN/button.php
# resources/lang/mn/button.php
# resources/lang/ms/admin/hardware/table.php
# resources/lang/ms/admin/kits/general.php
# resources/lang/ms/admin/models/general.php
# resources/lang/ms/admin/models/message.php
# resources/lang/ms/admin/settings/general.php
# resources/lang/ms/button.php
# resources/lang/nl/button.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/auth/message.php
# resources/lang/no/button.php
# resources/lang/no/help.php
# resources/lang/no/mail.php
# resources/lang/pl/button.php
# resources/lang/pt-BR/button.php
# resources/lang/pt-PT/auth/message.php
# resources/lang/pt-PT/button.php
# resources/lang/pt-PT/mail.php
# resources/lang/ro/button.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/help.php
# resources/lang/sl/admin/custom_fields/general.php
# resources/lang/sl/admin/hardware/table.php
# resources/lang/sl/admin/kits/general.php
# resources/lang/sl/admin/manufacturers/message.php
# resources/lang/sl/admin/models/general.php
# resources/lang/sl/admin/settings/general.php
# resources/lang/sl/admin/users/general.php
# resources/lang/sl/auth/message.php
# resources/lang/sl/button.php
# resources/lang/sl/help.php
# resources/lang/sr-CS/button.php
# resources/lang/ta/button.php
# resources/lang/th/button.php
# resources/lang/th/mail.php
# resources/lang/tl/button.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/auth/message.php
# resources/lang/tr/button.php
# resources/lang/uk/button.php
# resources/lang/ur-PK/button.php
# resources/lang/vi/button.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-HK/button.php
# resources/lang/zh-TW/admin/hardware/table.php
# resources/lang/zh-TW/button.php
# resources/lang/zu/button.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/slack.blade.php
2021-12-16 14:26:24 -08:00
Alex Janes
6898119891
Replaced env() with config() to check environment variables
...
Made the app.php description for 'REQUIRE_SAML' a bit more... descriptive.
2021-12-16 16:56:39 -05:00
Alex Janes
a6116a1b15
If SAML required, don't accept login form post.
2021-12-16 14:33:25 -05:00
Alex Janes
3c8d70c5fb
Add option to environment to require SAML for a more secure installation.
2021-12-16 11:44:07 -05:00
Bradley Coudriet
dbdc1c7f3f
Update SettingsController.php to save Slack Settings
...
This goes with #10438 that I just submitted about Slack Settings not saving.
This adds the necessary code to actually save the Slack Settings,
As they are already validated by the SlackSettingsRequest, this seems like an easy and low-impact fix.
2021-12-15 10:38:51 -05:00
Ivan Nieto Vivanco
c80aa2a289
Add title column to custom reports
2021-12-14 12:05:33 -06:00
Ivan Nieto Vivanco
0037cdb00c
Add title column to custom reports
2021-12-13 20:27:23 -06:00
snipe
25e2e7ecc6
Merge pull request #10418 from inietov/fixes/bulk_edit_count_more_users_than_selected
...
Fixes bulk edit message counts more users than the actual selected users number
2021-12-13 14:13:14 -08:00
snipe
9d5d1a9f9a
Added escape to assigned_to API response
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-13 12:03:03 -08:00
Ivan Nieto Vivanco
a419a690d4
Add a variable to better control the selected user's ids
2021-12-11 18:01:38 -06:00
Brady Wetherington
ea71086dfc
Yank assetlog from eager-load clause in API query for develop
2021-12-10 18:50:34 -08:00
Brady Wetherington
acfb41f129
Remove 'actionlog' from the ::with() clause in the asset query API
2021-12-10 18:42:56 -08:00
Haxatron
1699c09758
Update AssetModelsController.php
2021-12-09 21:42:18 +08:00
Haxatron
918e7c8dae
Fix access control - https://huntr.dev/bounties/19453ef1-4d77-4cff-b7e8-1bc8f3af0862/
2021-12-09 12:57:04 +08:00
snipe
86afe6c4b1
Cleanup slack validation
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-08 18:03:56 -08:00
snipe
ff97b359ad
Removed form request on ajax, cleaned up some other things
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-08 17:58:46 -08:00
snipe
81b66d0039
Change validation failure to 422 to make it consistent with Laravel's default
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-08 17:54:35 -08:00
snipe
8fa690b635
Reverting form request because it doesn't seem to work (????!!)
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-08 17:54:15 -08:00
snipe
8c1cd87831
Added slacksettingsrequest as use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-08 15:56:22 -08:00
snipe
80d36cd72b
Added slack settings request
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-08 15:53:05 -08:00
snipe
6d84482104
Merge pull request #10388 from snipe/features/switch_to_dusk
...
WIP - Fixing unit tests, switching to dusk
2021-12-06 14:19:36 -08:00
snipe
ebdbc20740
Adds stricter validation for slack endpoints
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-06 11:40:24 -08:00
snipe
f334bf1058
Fixed notification tests
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 20:01:03 -08:00
snipe
00b63fe7c7
Fixed category factory methods
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 13:40:16 -08:00
snipe
cae62fd4c7
Merge pull request #9902 from SidingsMedia/sum_cost_by_quantity
...
Fixed #5676 : Sum cost by quantity
2021-12-02 12:13:04 -08:00
snipe
d08c1787a1
First steps at getting dusk working
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-30 20:09:29 -08:00
snipe
ff81e6d536
Merge pull request #10361 from snipe/fixes/xss_in_accessories_checkout_notes
...
Escape notes in transformCheckedOutAccessory
2021-11-24 19:56:36 -08:00
snipe
00fad35c2a
Escape notes in transformCheckedOutAccessory
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-24 19:54:45 -08:00
snipe
3debe78574
Merge pull request #10350 from inietov/fixes/trim_custom_fields_names
...
Apply trim() function when storing Custom Fields names
2021-11-24 19:42:04 -08:00
snipe
29bbfad693
Applied escaping fix from master to develop
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-24 19:38:27 -08:00
snipe
830d07f84f
Removed escaping on input save for asset checkout on creation
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-24 19:19:32 -08:00
Ivan Nieto Vivanco
1ca770895a
Apply trim() function when storing Custom Fields names
2021-11-22 18:43:21 -06:00
Matthew Nickson
9381ba2404
Merge branch 'develop' into sum_cost_by_quantity
2021-11-21 18:59:34 +00:00
Brady Wetherington
e8f5dc85a6
Downgraded a FIXME to a TODO
2021-11-19 16:38:46 -08:00
snipe
c49c5f4164
Added text-right to presenters for money values
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-18 15:09:17 -08:00
snipe
bbb0d1be17
Possible fix for asset model editing when no custom fieldset is associated
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-15 21:09:35 -08:00
snipe
f7b483358f
Escape custom field values in API response
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-15 20:32:59 -08:00
snipe
476e17055b
Escape custom fields in API response
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-15 20:31:01 -08:00
snipe
46d2f8a81d
Disallow file upload to backups on demo
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-15 19:42:02 -08:00
snipe
92b7aaf44b
Log the user out upon successful restore
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-15 19:40:01 -08:00
snipe
f2f8f96991
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Importer/ConsumableImporter.php
# app/Models/Consumable.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/layouts/default.blade.php
# routes/web.php
# routes/web/fields.php
2021-11-15 19:24:38 -08:00
Brady Wetherington
c2b5f9b372
Cleaned up the output and added some better checks for errors
2021-11-10 17:08:04 -08:00
Brady Wetherington
2b6614e2dd
Tweak Restore command to _also_ run via webserver via Artisan::call()
2021-11-10 12:44:19 -08:00
Brady Wetherington
864cc4f8d5
Fix FIXME's by downgrading them to TODO's :)
2021-11-10 11:37:10 -08:00
snipe
457c6080cc
Better handling if there was no file uploaded
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 01:43:45 -08:00
snipe
76685d7fd3
Clearer text in restore artisan command
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 00:07:32 -08:00
snipe
96f76e1f6b
INCOMPLETE: Added restore and upload methods for backups
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 00:07:17 -08:00
snipe
3b25093aeb
Removed noisy debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-09 22:38:27 -08:00
snipe
76506dabbf
Made helpers call full namespace (tho I have no idea why this was necessary)
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-09 22:38:14 -08:00
snipe
1b1b54fbf4
Add modified_value and modified_display so we can use the formatted date but still sort correctly
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-09 22:37:49 -08:00
snipe
0e21a95817
Escape error message in asset autdit apI (same as in v5)
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-09 19:39:32 -08:00
Brady Wetherington
91f087258b
Merge branch 'develop' into remove_old_ldap
2021-11-09 18:33:41 -08:00
Brady Wetherington
3ea209a507
Escape asset_tag attribute at controller level for consumption in bulk checkout
2021-11-08 20:27:43 -08:00
Brady Wetherington
a58c5ce27f
Better documentation, disable AdLdap2-based "Add domain" setting
2021-11-08 17:11:47 -08:00
Brady Wetherington
b0417e5bd7
Finish pulling out the AdLdap2-based LDAP remnants that were still in the system
2021-11-03 15:22:06 -07:00
Terrell Eaton
2c7a71a2a1
Fixes not being able to search by checked out user in advanced search
2021-11-01 22:14:19 +01:00
Brady Wetherington
4dda28de9e
WIP: cleaning up LDAP
2021-10-28 18:19:50 -07:00
Brady Wetherington
31933a56fa
Trying to get the login screen working
2021-10-28 18:18:11 -07:00
snipe
ea0d92c439
Merge branch 'develop' into fixes/fmcs_departments
2021-10-28 18:18:08 -07:00
snipe
d36849bd41
Merge branch 'develop' into feature/remove_deleted_user_from_unaccepted_assets_report
2021-10-28 18:11:03 -07:00
snipe
84a3a85823
Fixed parse error for merge conflict
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-28 18:04:03 -07:00
snipe
798f6d65de
Merge pull request #9847 from inietov/bug/ch15357/requested_assets_allow_to_cancel_if_checkedout_to_self
...
Adds a check to know if the asset is checked out to the logged in user to allow check the state in the view
2021-10-28 17:53:24 -07:00
snipe
76cc46c419
Merge pull request #9814 from 01ste02/importMinAmt
...
Improved Consumable Import: Import min_amt for consumables
2021-10-28 17:49:44 -07:00
snipe
bdf321ecc9
Merge branch 'develop' into change-var-aws-public-url
2021-10-28 17:46:16 -07:00
snipe
645529ba78
Merge pull request #9889 from ncareau/api-licenses
...
Add licenses api parameters and fix a missing variable in license view.
2021-10-28 17:20:09 -07:00
snipe
2f9e5f79af
Merge pull request #10139 from FliegenKLATSCH/patch-1
...
API: Do not include deleted items per default on lookup by serial
2021-10-28 17:09:20 -07:00
snipe
3088230236
Merge pull request #10209 from Godmartinz/feature/sc-1474/sync-parent-asset-location-with-children-assets
...
Fixes Bug: When parent asset is assigned to other location, children assets loca…
2021-10-28 16:49:44 -07:00
snipe
371a39a118
Merge branch 'develop' into fixes/advanced_search_serial_v2
2021-10-28 16:42:10 -07:00
snipe
7821d38e60
Merge pull request #10238 from inietov/fixes/asset_components_must_return_relationship_instance
...
Fixes asset components must return relationship instance
2021-10-28 16:38:21 -07:00
snipe
1895dd326f
Merge pull request #10245 from Sxderp/pr-support-appache-rewrite-redirect-headers-for-remote-user
...
support apache REDIRECT_* for remote user login
2021-10-28 16:34:57 -07:00
snipe
52ef9280ba
Adds reqestable as model bulk edit field
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-28 15:15:54 -07:00
Steven Daniele
efc644c960
support apache REDIRECT_* for remote user login
2021-10-28 14:23:38 -04:00
Ivan Nieto Vivanco
ee9133f722
Return the proper Asset-Components relationship
2021-10-27 16:42:51 -05:00
snipe
17bf899a17
Set default_label to 0 instead of null in API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-25 20:14:01 -07:00
snipe
8b1c60a17a
Make gates a little more consistent
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-25 15:34:22 -07:00
snipe
033c3253bb
Fixed permissions array to handle missing clone button
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-25 14:10:17 -07:00
Ivan Nieto Vivanco
9eaf89aaa7
Add a variable to better control the selected user's ids
2021-10-21 13:28:58 -05:00
snipe
31d49b5c9b
Fixed merge error parse error
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-20 18:11:34 -07:00
snipe
6e0f8068b2
Fixed duplicate use statement from merge fuckery
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-20 17:54:32 -07:00
snipe
9ee13f0d2a
Fixed dupe use statement from merge fuckery
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-20 17:53:43 -07:00
snipe
ae1a4bb3c9
Fixed extra braces from merge fuckery
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-20 17:36:06 -07:00
snipe
aa8f1378c9
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Http/Controllers/Accessories/AccessoriesController.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Assets/BulkAssetsController.php
# app/Http/Controllers/Components/ComponentsController.php
# app/Http/Controllers/Consumables/ConsumablesController.php
# app/Http/Controllers/Licenses/LicenseFilesController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/UserFilesController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Http/Transformers/LicensesTransformer.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# config/app.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/en/admin/users/message.php
# resources/lang/is/button.php
# resources/lang/ja/admin/kits/general.php
# resources/lang/ro/admin/users/general.php
# resources/lang/zh-HK/admin/depreciations/general.php
# resources/lang/zh-HK/admin/models/general.php
# resources/views/hardware/qr-view.blade.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/users/view.blade.php
# routes/web.php
# routes/web/hardware.php
# routes/web/models.php
# routes/web/users.php
2021-10-20 17:26:41 -07:00
Godfrey M
9ae7d0b23a
when parent asset is assigned to other location, children assets location are updated as well.
2021-10-20 17:01:25 -07:00
Matthew Nickson
8996c24d1f
Merge branch 'develop' into sum_cost_by_quantity
2021-10-10 13:01:44 +01:00
FliegenKLATSCH
24c484303e
Do not include deleted assets by default when doing lookup by serial
...
This commit introduces a new query parameter `deleted`, which can be set to `true` to include deleted assets in the response.
2021-10-09 08:56:31 +02:00
snipe
5d94b99035
Switched to 5 in one minute
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-08 15:53:32 -07:00
snipe
0674ef5a3d
Fixed number to 1 (for minutes)
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-08 15:43:32 -07:00
snipe
702791210e
Throttle password reset requests to 5 every 60 seconds
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-08 14:26:30 -07:00
Ivan Nieto Vivanco
23b770fac6
Added a validation to use the same name in categories with different types
2021-10-08 15:19:16 -05:00
snipe
1c77fd0d09
Merge pull request #10178 from inietov/bug/sc-17520/symfony_component_debug_exception_fatalthrowableerror
...
Fixed typo when setting the headers
2021-10-08 12:04:45 -07:00
Ivan Nieto Vivanco
d184da8611
Fixed typo (thanks @ssddanbrown)
2021-10-08 13:39:49 -05:00
Dampfklon
ab4a234e20
fix rebase errors
2021-10-07 21:32:57 +02:00
Dampfklon
7645f23f5c
remove pending Acceptances on checkin
2021-10-07 21:03:46 +02:00
Dampfklon
4418ad2340
Enable display of deleted acceptances, strike deleted users, add date, enable sorting
2021-10-07 21:03:46 +02:00
Dampfklon
12ee06deb6
add Download All Button, change route analogue to activity report
2021-10-07 21:01:50 +02:00
Dampfklon
9a9ca59544
Fix decprecated implode usage
2021-10-07 20:55:47 +02:00
Dampfklon
ed99532c30
Unaccepted Assets Report Actions (send reminder, delete) added
...
Unaccepted Assets Export fixed
2021-10-07 20:53:02 +02:00
snipe
ccd430ce07
Switched back down to debug level
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-06 12:38:21 -07:00
snipe
f306401e7e
Fixed SVG XSS vuln
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-06 12:26:45 -07:00
snipe
c06a93ef13
Removed extra brace in assets for components
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-06 10:38:13 -07:00
Ivan Nieto Vivanco
ef6eea67d8
Set headers in a different manner in the middleware
2021-10-05 14:09:35 -05:00
Brady Wetherington
bbeedc026d
A lot of cleanups to the Livewire stuff, and got it kinda-sorta basically working.
2021-10-04 22:07:29 -07:00
Brady Wetherington
d80604f2ac
Most of the basics are working, but not done and lots of debug messages are about
...
I picked up the change that picked a point-release difference on the AWS library since that usually
works out for us (x.y.1 vs. x.y.2 - usually a good call)
2021-10-04 22:06:48 -07:00
snipe
34eab88b7e
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 20:25:31 -07:00
snipe
b20c841a89
Fixed asset models restore
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 19:29:13 -07:00
snipe
52caee2a9f
Handle checking and unchecking for bulk actions
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:18:26 -07:00
snipe
52ea172e5d
Fix ID array
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:18:07 -07:00
snipe
9b48732cd2
Force revalidation headers when user logs out
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 12:52:48 -07:00
snipe
daa88f06f7
Added pivot to components JSON
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-30 15:51:08 -07:00
snipe
d0acb9fdb4
Applies PR #10150 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-30 15:33:00 -07:00
Ivan Nieto Vivanco
11aa8971c8
Fix error if the Department is also empty
2021-09-30 17:20:44 -05:00
Ivan Nieto Vivanco
5c7aaaac22
Fix error when department is null
2021-09-30 16:46:23 -05:00
snipe
61f16f47a2
Use Helper alias
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-28 19:44:55 -07:00
Brady Wetherington
ae466be153
Fix license output, tweak CleanFloat function to handle numbers over 1 million
2021-09-28 19:10:25 -07:00
Brady Wetherington
f3338667c7
Create new ParseCurrency helper and use it in the appropriate controllers
2021-09-28 18:20:39 -07:00
Brady Wetherington
f380da3f19
Try to ensure all currency output is formatted correctly.
2021-09-28 16:45:47 -07:00
NMC
c680977791
Merge branch 'develop' into api-licenses
2021-09-27 15:02:51 -04:00
snipe
d88c0ae5ec
Merge pull request #10103 from snipe/fixes/make_boolean_fields_nullable
...
Fixed issue when creating a status label via API - default_label and show_in_nav being not nullable
2021-09-26 13:41:52 -07:00
snipe
7e41c74cc3
Updated more fa icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-26 01:11:08 -07:00
snipe
67d898e897
Updated map icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 14:30:36 -07:00
snipe
e03d7b7016
More fa icon updates
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 13:07:02 -07:00
snipe
ad6f073c82
Few more icon updates
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 06:38:23 -07:00
snipe
dbe93d91cd
Updated fontawesome icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 06:07:46 -07:00
snipe
2f9582ee5c
Switched to loadMissing for performance
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-23 17:31:19 -07:00
snipe
3b7ce0091c
Load components in the assets API if components=true in API request
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-23 17:23:53 -07:00
snipe
6e270c0ed2
Include created_at in pivot
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-23 17:23:17 -07:00
snipe
3862b6476b
Merge pull request #10122 from inietov/fixes/api_issue_when_component_checkout
...
Fixes API Issue when checking out a component
2021-09-23 13:21:48 -07:00
Ivan Nieto Vivanco
7dfab3a6e2
Change the condition to 'bigger or equal' instead of just 'bigger than' in ComponentsController checkout api
2021-09-23 15:02:39 -05:00
snipe
a6b3aa5f04
Don't try to delete the file if there is no log entry
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-22 19:04:25 -07:00
snipe
61cf9ec009
Small conflict handling bits
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-22 00:00:44 -07:00
snipe
e27065fe16
Merge branch 'develop-v6-integration' into develop-v6-rc1
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/ResetDemoSettings.php
# app/Helpers/Helper.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/ComponentsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/DepreciationsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Requests/ImageUploadRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Http/Transformers/DepreciationsTransformer.php
# app/Listeners/CheckoutableListener.php
# app/Models/Accessory.php
# app/Models/Asset.php
# app/Models/Company.php
# app/Models/Ldap.php
# app/Models/User.php
# app/Presenters/AssetPresenter.php
# app/Presenters/CategoryPresenter.php
# composer.json
# composer.lock
# config/version.php
# database/factories/AssetModelFactory.php
# database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
# database/seeds/AssetModelSeeder.php
# package-lock.json
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/js/vue.js
# resources/lang/af/validation.php
# resources/lang/ar/admin/settings/general.php
# resources/lang/ar/validation.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/bg/validation.php
# resources/lang/cs/admin/settings/general.php
# resources/lang/cs/validation.php
# resources/lang/cy/help.php
# resources/lang/cy/validation.php
# resources/lang/da/admin/settings/general.php
# resources/lang/da/validation.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/validation.php
# resources/lang/el/validation.php
# resources/lang/en-GB/admin/settings/general.php
# resources/lang/en-GB/validation.php
# resources/lang/en-ID/admin/hardware/table.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/validation.php
# resources/lang/es-CO/admin/settings/general.php
# resources/lang/es-CO/auth/message.php
# resources/lang/es-CO/button.php
# resources/lang/es-CO/help.php
# resources/lang/es-CO/validation.php
# resources/lang/es-ES/admin/settings/general.php
# resources/lang/es-ES/auth/message.php
# resources/lang/es-ES/button.php
# resources/lang/es-ES/help.php
# resources/lang/es-ES/validation.php
# resources/lang/es-MX/admin/settings/general.php
# resources/lang/es-MX/validation.php
# resources/lang/es-VE/admin/settings/general.php
# resources/lang/es-VE/auth/message.php
# resources/lang/es-VE/button.php
# resources/lang/es-VE/help.php
# resources/lang/es-VE/validation.php
# resources/lang/et/validation.php
# resources/lang/fa/validation.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/fi/validation.php
# resources/lang/fil/validation.php
# resources/lang/fr/admin/settings/general.php
# resources/lang/fr/validation.php
# resources/lang/ga-IE/validation.php
# resources/lang/he/admin/settings/general.php
# resources/lang/he/general.php
# resources/lang/he/validation.php
# resources/lang/hr/validation.php
# resources/lang/hu/validation.php
# resources/lang/id/validation.php
# resources/lang/is/admin/categories/general.php
# resources/lang/is/admin/companies/message.php
# resources/lang/is/admin/companies/table.php
# resources/lang/is/admin/components/general.php
# resources/lang/is/admin/components/table.php
# resources/lang/is/admin/consumables/table.php
# resources/lang/is/admin/depreciations/general.php
# resources/lang/is/admin/depreciations/message.php
# resources/lang/is/admin/hardware/form.php
# resources/lang/is/admin/hardware/general.php
# resources/lang/is/admin/hardware/message.php
# resources/lang/is/admin/hardware/table.php
# resources/lang/is/admin/kits/general.php
# resources/lang/is/admin/licenses/form.php
# resources/lang/is/admin/licenses/general.php
# resources/lang/is/admin/locations/table.php
# resources/lang/is/admin/manufacturers/table.php
# resources/lang/is/admin/reports/message.php
# resources/lang/is/admin/settings/general.php
# resources/lang/is/admin/settings/message.php
# resources/lang/is/admin/statuslabels/message.php
# resources/lang/is/admin/suppliers/message.php
# resources/lang/is/admin/suppliers/table.php
# resources/lang/is/admin/users/table.php
# resources/lang/is/mail.php
# resources/lang/is/validation.php
# resources/lang/it/admin/settings/general.php
# resources/lang/it/validation.php
# resources/lang/iu/validation.php
# resources/lang/ja/mail.php
# resources/lang/ja/validation.php
# resources/lang/ko/validation.php
# resources/lang/lt/validation.php
# resources/lang/lv/validation.php
# resources/lang/mi/validation.php
# resources/lang/mk/validation.php
# resources/lang/ml-IN/validation.php
# resources/lang/mn/validation.php
# resources/lang/ms/validation.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/validation.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/validation.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/mail.php
# resources/lang/pt-BR/validation.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/validation.php
# resources/lang/ru/validation.php
# resources/lang/sl/validation.php
# resources/lang/sr-CS/admin/settings/general.php
# resources/lang/sr-CS/validation.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/sv-SE/auth/message.php
# resources/lang/sv-SE/button.php
# resources/lang/sv-SE/mail.php
# resources/lang/sv-SE/validation.php
# resources/lang/ta/validation.php
# resources/lang/th/validation.php
# resources/lang/tl/validation.php
# resources/lang/tr/mail.php
# resources/lang/tr/validation.php
# resources/lang/uk/admin/accessories/table.php
# resources/lang/uk/admin/asset_maintenances/message.php
# resources/lang/uk/admin/asset_maintenances/table.php
# resources/lang/uk/validation.php
# resources/lang/ur-PK/validation.php
# resources/lang/vi/admin/settings/general.php
# resources/lang/vi/validation.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/validation.php
# resources/lang/zh-HK/validation.php
# resources/lang/zh-TW/validation.php
# resources/lang/zu/validation.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# routes/api.php
2021-09-21 23:46:50 -07:00
snipe
b4a90045e6
Added totals to depreciation report footer
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 21:52:18 -07:00
snipe
0763c76a4e
Fixed scoping with leftjoin
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 20:54:24 -07:00
snipe
5d32c17a2e
Removed comments
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 20:01:36 -07:00
snipe
10ca7cffc3
Fixes for query scoping, ordering, and nicer readability
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 19:59:23 -07:00
snipe
61176335d7
Improved category_type with strtolower() to make it case insensitive
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 15:51:41 -07:00
Delta5
c8c3c7fbbd
Fixed issue with incorrect error message
2021-09-21 19:45:18 +00:00
Delta5
59302e1d19
Add restore to users api endpoint
2021-09-21 17:42:26 +00:00
snipe
9b52c61d95
Updated banner with better warning
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 18:49:04 -07:00
snipe
36464bc17d
Fix confirmation, because apparently you can't pass that along via cli vs interactively
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 18:22:06 -07:00
snipe
f35208d58d
Clean up, find custom fields and drop those columns
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 18:03:13 -07:00
snipe
4d30edd535
Let's make sure to keep some of the stuff we need on the demo as well
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 17:29:32 -07:00
snipe
957f33c8cf
First stab at a better pave command
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 17:19:41 -07:00
snipe
b331bb33d9
Code fixes and a new migration
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 15:37:24 -07:00
snipe
8a93e1e796
Remove asset call on depreciation report controller method
...
We ajax this in now, so no need for it
Signed-off-by: snipe <snipe@snipe.net>
2021-09-15 13:49:53 -07:00
snipe
d96f877aa4
Default show_in_nav to 0
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-15 11:33:13 -07:00
snipe
02705d0d1a
Fixed S3 upload path
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-14 12:49:17 -07:00
snipe
80175cffdc
Fixed #9969 - added color, show_in_nav, and default_label to status labels API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-10 20:44:49 -07:00
snipe
514f9aa64a
Fixed #9973 - add use_default_eula to categories API endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-10 20:23:49 -07:00
Ivan Nieto Vivanco
f1b8b7d11d
Convert whatever value we get in column 'checkout type' to all lowercase
2021-09-08 12:49:29 -05:00
snipe
cfaa6679af
Merge pull request #10031 from inietov/fixes/checkout_date_not_saved_in_asset_history
...
Fixed #10026 : Checkout date not saved in asset history
2021-09-07 17:37:30 -07:00
snipe
bb5a04491d
Merge pull request #10053 from inietov/fixes/accepted_assets_still_showing_unaccepted_report
...
Fix Accepted Assets still showing on Unaccepted Asset Report
2021-09-07 12:15:17 -07:00
snipe
f9c0eee7c9
Merge pull request #10048 from inietov/fixes/blank_results_for_non_superadmins
...
Fix to PR #10009 . The asset search now works as intended for normal users
2021-09-07 12:14:29 -07:00
Ivan Nieto Vivanco
27ff0be9a8
Delete checkout acceptances when an asset is checked in without response
2021-09-07 12:01:32 -05:00
Ivan Nieto Vivanco
b5525e6a21
Deleted additional bindings present also in the User model
2021-09-07 00:57:12 -05:00
Ivan Nieto Vivanco
c3eb7a3425
Remove aditional bindings that 'overflows' the generated queries
2021-09-07 00:15:21 -05:00
snipe
94310e18b1
Presenters and Transformers for Depreciation report
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-01 17:33:59 -07:00
snipe
2f25eb598b
Allow the Assets API controller to handle depreciation reports
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-01 17:33:39 -07:00
Ivan Nieto Vivanco
e621eaf456
Change date showed in the activity report view, the condition is now on action_date
2021-09-01 13:58:17 -05:00
Ivan Nieto Vivanco
ea1d7a42e2
Add condition to check if action_date have value and if it have assign it to created_at parameter
2021-09-01 13:08:08 -05:00
snipe
4293674f4a
Added a few more fields to the users API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-31 12:36:06 -07:00
snipe
aeae681326
Fixecd copypasta from state to zip
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-31 12:28:20 -07:00
snipe
4794f93224
Added additional fields for user search
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-31 12:24:53 -07:00
snipe
f58ed6bd1f
Merge pull request #9982 from Shankschn/master
...
Fixes: When using API CheckIn assets, there will be two CheckIn records in the Activity Report log for each asset.
2021-08-31 11:08:52 -07:00
Ivan Nieto Vivanco
d917ae51b7
Remove e() function from other input fields
2021-08-31 04:01:20 -05:00
Ivan Nieto Vivanco
e7470b5545
Remove e() function from the saved notes when updating an asset maintenance
2021-08-31 03:50:57 -05:00
snipe
a02534b6c8
Merge pull request #10009 from inietov/fixes/blank_results_for_non_superadmins
...
Fixes #9985 . Error 500 when using the asset search - blank results for non super-admins
2021-08-30 13:29:18 -07:00
snipe
6d3a82aacf
Merge pull request #10008 from uberbrady/fix_unlink_error_ldap
...
Fixed rb445 and rb446 - the unlink calls for the client-side certs...
2021-08-30 12:47:38 -07:00
Brady Wetherington
da0b375773
Fixed rb445 and rb446 - the unlink calls for the client-side certs
...
need to be wrapped around a file-existence check
2021-08-30 12:29:16 -07:00
Ivan Nieto Vivanco
d1304cc975
Add sentence to infer the table's name according to the query passed
2021-08-30 13:44:26 -05:00
snipe
085be16966
Merge remote-tracking branch 'origin/develop'
2021-08-25 14:45:41 -07:00
Ivan Nieto Vivanco
4a79c77630
Add a condition to checkin licenses assigned to Assets
2021-08-25 16:38:34 -05:00
Ivan Nieto Vivanco
137f55e4ce
Change condition to return the actual max upload size allowed to files
2021-08-25 15:27:25 -05:00
snipe
4abb9baa95
Merge remote-tracking branch 'origin/develop'
2021-08-24 15:29:41 -07:00
Shanks
961e80404a
Update AssetsController.php
...
Fix：When using API CheckIn assets, there will be two CheckIn records in the Activity Report log for each asset.
2021-08-24 16:39:58 +08:00
snipe
70f6753f50
Merge pull request #9979 from uberbrady/add_client_side_ldap_certs
...
Add client side ldap certs
2021-08-23 16:30:46 -07:00
snipe
9285697611
Merge remote-tracking branch 'origin/develop'
2021-08-20 17:30:52 -07:00
snipe
9687bcb41c
Fixed issue where consumables model number was not searchable
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-20 17:30:35 -07:00
snipe
24af2ab67a
Merge remote-tracking branch 'origin/develop'
2021-08-18 14:31:53 -07:00
snipe
7b447a2f16
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-08-18 14:31:38 -07:00
Ivan Nieto Vivanco
f04e23cacb
Add a small refactor so we not repeat logic
2021-08-18 15:22:53 -05:00
Ivan Nieto Vivanco
4207858a14
Fix the count in StatuslabelsController@getAssetsCountByStatuslabel() function that allows it to pass the correct index
...
Also edit the default color for assets with the Pending label, so it match the color in the docs
2021-08-18 14:08:35 -05:00
snipe
b88fde5dae
Nicer comment formatting
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-18 12:07:09 -07:00
snipe
b5bb74b8ca
Merge remote-tracking branch 'origin/develop'
2021-08-17 22:01:23 -07:00
snipe
cce808c784
Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]
...
Duplicates d4e46ee41f
2021-08-17 21:59:33 -07:00
Brady Wetherington
4d4badf830
Got the client-side LDAP setup working well enough for sync!
2021-08-17 14:43:36 -07:00
Godfrey M
cef0e424e1
adds a Floor value for depreciation models
2021-08-16 18:14:10 -07:00
James Emanuel
98285001ac
Fixing Typo on creating Depreciation
2021-08-16 15:33:17 +03:00
snipe
29c584289f
Merge remote-tracking branch 'origin/develop'
2021-08-14 14:09:31 -07:00
snipe
ef687fdc7b
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-14 14:07:04 -07:00
snipe
45caa8a90d
Added restore functionalty to asset API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-14 14:06:15 -07:00
Godfrey M
01037cf9cb
initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358]
2021-08-10 18:26:43 -07:00
Tobias Regnery
eced1ab77f
Fix advanced search with serial and another field
...
The advanced search in /hardware produces incorrect results if the serial is combined with another field like category.
There is a typo as the fieldname 'product_key' doesn't exist. Change this to 'serial'.
Also change the last If-Statement from ->orWhere() to ->where(). Now additional fields like custom fields can be combined with other searches in an And-Clause.
I think this function could be simplified further, but this is the minimal bugfix.
2021-08-05 15:07:28 +02:00
Computroniks
f994af16da
Added function to calculate cost based on quantity
...
sumFormatterQuantity takes the same input as sumFormatter but instead
of calculating the specified columns total it calculates the total
purchase cost of an item based upon its quantity. Also updated affected
pressenters to use this formatter.
Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
2021-08-04 22:09:50 +01:00
NMC
4cfc4aec1d
fix false search in api.
2021-08-01 15:10:22 -04:00
NMC
976957ddd4
Add Maintained filed in licenses view and api. + Expires in API
2021-08-01 14:30:16 -04:00
snipe
cdc4940338
Merge pull request #9881 from inietov/fixes/integrity_constraint_violation__emailing_password_reset
...
Fixes Integrity constraint violation when emailing password reset.
2021-07-30 16:01:53 -07:00
Ivan Nieto Vivanco
27cdfbc579
Edit the log message
2021-07-29 16:14:52 -05:00
Ivan Nieto Vivanco
405545cd88
Add exception handling in the ForgotPasswordController
2021-07-29 16:02:45 -05:00
Tobias Regnery
1a908e361e
Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport
...
locations->isDeletable() checks via gate::allows if a locations is deletable.
This calls SnipePermissionsPolicy->before() and checks for !Company::isCurrentUserHasAccess($item).
This returns false because locations don't have a company_id.
Check for this and return true if the item don't have a company_id.
2021-07-29 10:43:01 +02:00
snipe
593e1234a5
Merge pull request #9797 from markbrule/fixes/search_parameter_checkedout_api
...
Fixed #9671 : wrap OR queries in sub-condition in checkedout search
2021-07-27 14:39:10 -07:00
snipe
9a5d9eafeb
Merge pull request #9709 from morning-bird/master
...
add CompanyableTrait
2021-07-27 14:38:21 -07:00
Ivan Nieto Vivanco
38a2a0c1ee
Add the pertinent filters in Accessories and Consumables controllers
2021-07-26 12:59:15 -05:00
snipe
75d4a46fff
Merge pull request #9856 from inietov/bug/ch15413/model_number_is_not_on_accessory_import_dropdown
...
Fixes: Model Number is not on the Accessory import dropdown of mappable fields [ch15413]
2021-07-24 01:05:26 -07:00
Ivan Nieto Vivanco
0f1c48cb6f
Add the field model_number to Accessory importer
2021-07-24 02:38:44 -05:00
Ivan Nieto Vivanco
35ffe8b902
Adds a check to know if the asset is checked out to the logged in user to allow check the state int the view
2021-07-20 18:56:22 -05:00
snipe
5f842d02ef
Fixed namespace
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-15 13:24:40 -07:00
Petri Asikainen
f753404197
missed this when rebasing
2021-07-15 12:26:14 +03:00
Petri Asikainen
5d999d2572
legacy image_source support for store
2021-07-15 12:26:14 +03:00
Petri Asikainen
d50294e8e2
Just mention source of idea as code rewriten
2021-07-15 12:26:14 +03:00
Petri Asikainen
2fc3ff671e
hand legacy image_source field
2021-07-15 12:26:14 +03:00
Petri Asikainen
89cc84f1d9
convert image_source field
...
This reverts commit b2d3ba7410
2021-07-15 12:26:14 +03:00
Petri Asikainen
f24138da44
Revert "Handle image_source with ConvertBase64ToFiles"
...
This reverts commit 168d7f7004
2021-07-15 12:26:14 +03:00
Petri Asikainen
a76b36cad9
Handle image_source with ConvertBase64ToFiles
2021-07-15 12:26:14 +03:00
Petri Asikainen
1936fc2ea9
Better debug comment
2021-07-15 12:26:14 +03:00
Petri Asikainen
23f77b2894
Fixed case again
2021-07-15 12:26:14 +03:00
Petri Asikainen
15dd7061ed
removed unused Bag-functions
2021-07-15 12:26:14 +03:00
Petri Asikainen
5f81488679
fix debug placement
2021-07-15 12:26:14 +03:00
Petri Asikainen
c894e8ceb3
handle files via standard field
2021-07-15 12:26:14 +03:00
Petri Asikainen
bbe964c6b2
debug trait
2021-07-15 12:26:14 +03:00
Petri Asikainen
2325b1d8c2
Try without trait
2021-07-15 12:26:14 +03:00
Petri Asikainen
948a741935
case case again..
2021-07-15 12:26:14 +03:00
Petri Asikainen
d7d3681d71
trait base64 encoded files
2021-07-15 12:26:13 +03:00
Petri Asikainen
e6d432423d
trait base64 encoded files
2021-07-15 12:26:13 +03:00
Petri Asikainen
6173aaa25c
fixed capitalization
2021-07-15 12:26:13 +03:00
Petri Asikainen
91af3f2661
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
4191dd39ea
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
2f3501bdc2
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
f1b8ce0a1b
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
6a21660c14
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
64c8767e81
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
0e7af80806
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
e95b15d553
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
bb269e0e5f
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
60f13c8d79
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
5081ca3512
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
b4380c8012
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
f6766c5f23
Support images and multipart requests
2021-07-15 12:26:07 +03:00
Petri Asikainen
8bbbb06c5e
testing image upload via api
2021-07-15 12:24:25 +03:00
Petri Asikainen
febf1ec20f
Support legacy image_source property
2021-07-14 13:09:50 +03:00
Petri Asikainen
7b12668af4
Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads
2021-07-13 17:23:44 +03:00
Oskar Stenberg
5b5874499d
Added import for min_amt for consumables
2021-07-12 11:46:19 +02:00
snipe
f785c3e759
Default to 1 if no qty is passed
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-08 16:04:52 -07:00
Petri Asikainen
4379ea61fa
Just mention source of idea as code rewriten
2021-07-08 19:50:33 +03:00
Petri Asikainen
41deabf998
hand legacy image_source field
2021-07-07 09:33:48 +03:00
Petri Asikainen
7a424649c8
convert image_source field
...
This reverts commit b2d3ba7410
2021-07-07 09:24:24 +03:00
Petri Asikainen
b2d3ba7410
Revert "Handle image_source with ConvertBase64ToFiles"
...
This reverts commit 168d7f7004
2021-07-07 09:20:38 +03:00
Petri Asikainen
168d7f7004
Handle image_source with ConvertBase64ToFiles
2021-07-07 09:08:37 +03:00
Mark Brule
f706c87cbc
wrap OR queries in sub-condition
2021-07-06 20:43:17 +00:00
Tobias Regnery
9e1d7ffb5d
Fix scope of departments for FullMultipleCompanySupport
...
If a user tries to view or edit a department from a different company
with FullMultipleCompanySupport enabled, there is a 403 error displayed.
Apply the correct company scope in order to only display the departments
from the own company in the departments view.
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
2021-07-06 09:45:46 +02:00
Petri Asikainen
f53cabee24
Better debug comment
2021-07-06 07:26:16 +03:00
Petri Asikainen
e275c9ee90
Fixed case again
2021-07-06 07:10:03 +03:00
Petri Asikainen
3d8acd1bd8
removed unused Bag-functions
2021-07-06 07:00:12 +03:00
Petri Asikainen
2169c62700
Merge branch 'feature/api-image-uploads-json' into feature/api-image-uploads
2021-07-06 06:55:54 +03:00
Petri Asikainen
c21b291484
keep using request
2021-07-06 06:51:07 +03:00
Petri Asikainen
c1bc2486ad
keep using request
2021-07-06 06:49:19 +03:00
Petri Asikainen
e3166c2209
fix debug placement
2021-07-06 06:41:37 +03:00
Petri Asikainen
7a5b5c291d
merged from develop
2021-07-06 06:38:32 +03:00
Petri Asikainen
d66ef233bf
handle files via standard field
2021-07-06 06:25:37 +03:00
Petri Asikainen
013df747d7
debug trait
2021-07-05 09:59:19 +03:00
Petri Asikainen
02fb7ac03e
Try without trait
2021-07-04 13:39:46 +03:00
Petri Asikainen
d48a9d549d
Try without trait
2021-07-04 13:37:05 +03:00
Petri Asikainen
f59f3dbde4
case case again..
2021-07-02 10:43:15 +03:00
Petri Asikainen
f4fa6836cb
trait base64 encoded files
2021-07-02 10:29:26 +03:00
Petri Asikainen
e846e6ac76
trait base64 encoded files
2021-07-02 10:18:18 +03:00
Petri Asikainen
e15159b9c3
trait base64 encoded files
2021-07-02 10:17:29 +03:00
Ivan Nieto Vivanco
5545457536
Remove an else statement that doesn't allow to continue the importer flow.
2021-07-01 14:26:03 -05:00
Brady Wetherington
102591b009
Better debugging output, and remove non-PHP-7.3-compatible option
2021-06-30 14:53:08 -07:00
Petri Asikainen
347e742e88
merged current upstream/develop
2021-06-30 12:02:05 +03:00
snipe
868419b35b
Components checkin/checkout via API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-30 01:02:44 -07:00
Petri Asikainen
6048acc95d
fixed capitalization
2021-06-30 06:36:12 +03:00
snipe
50a644a2c0
Did I seriously spell my own goddamned name wrong in the docblock??
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 10:28:00 -07:00
snipe
c517ec849d
Small refactor for login Livewire
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 10:05:23 -07:00
snipe
8780fa0a26
Use correct auth failure message
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 07:46:39 -07:00
Petri Asikainen
b0aa26e6cb
Support images and multipart requests
2021-06-29 14:25:20 +03:00
Petri Asikainen
b49733832c
Support images and multipart requests
2021-06-29 12:29:17 +03:00
Petri Asikainen
8c0be3aa87
Support images and multipart requests
2021-06-29 12:29:07 +03:00
Petri Asikainen
a936744e2e
Support images and multipart requests
2021-06-29 12:28:52 +03:00
Petri Asikainen
f9da83bc46
Support images and multipart requests
2021-06-29 12:28:42 +03:00
Petri Asikainen
fc8498972e
Support images and multipart requests
2021-06-29 12:28:32 +03:00
Petri Asikainen
4ba75291e4
Support images and multipart requests
2021-06-29 12:27:18 +03:00
Petri Asikainen
a7b1e31776
Support images and multipart requests
2021-06-29 12:27:08 +03:00
Petri Asikainen
604a0b6df1
Support images and multipart requests
2021-06-29 12:26:59 +03:00
Petri Asikainen
4ed9788a0e
Support images and multipart requests
2021-06-29 12:26:45 +03:00
Petri Asikainen
e8a4059db9
Support images and multipart requests
2021-06-29 12:26:24 +03:00
Petri Asikainen
aa402bf896
Support images and multipart requests
2021-06-29 12:26:15 +03:00
Petri Asikainen
8d4219759e
Support images and multipart requests
2021-06-29 12:25:47 +03:00
snipe
704eb728bc
Added livewire the login screen
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 02:16:57 -07:00
snipe
ebb0aa5532
Merge pull request #9766 from uberbrady/livewire_integration_v6
...
Livewire integration for Snipe-IT v6
2021-06-28 21:51:00 -07:00
Brady Wetherington
a6ac4f94f1
Breaking out field-listing into its own Livewire blade for use elsewhere
2021-06-28 21:00:20 -07:00
Brady Wetherington
ea1f1eb972
Get some basic Livewire going for 'edit model's default values.
2021-06-28 21:00:20 -07:00
Brady Wetherington
8e66abb926
Basic Laravel7 compatibility, starting getting Livewire going
2021-06-28 21:00:16 -07:00
snipe
4af247f845
Added additional boxes to the dashboard
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 16:36:15 -07:00
snipe
d4e46ee41f
Added comma in US currency format [ch16628]
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 16:14:32 -07:00
snipe
68c751fe63
Break out name into first name and last name [ch1382]
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 15:55:33 -07:00
snipe
a016f4ecd0
Applies PR #9761 to integration
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 13:11:22 -07:00
snipe
19413a63da
Make notes field searchable on status labels
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 11:53:17 -07:00
snipe
a4fd0c9c6d
Fixed #9745 - added searchable, sortable notes field to status labels
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 11:52:57 -07:00
Petri Asikainen
e0c5205e9b
save images
2021-06-28 08:11:33 +03:00
Petri Asikainen
695bf1e15f
save images
2021-06-28 07:58:08 +03:00
Petri Asikainen
0e2efb6573
Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads
2021-06-27 14:38:55 +03:00
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
Petri Asikainen
491a788cd0
testing image upload via api
2021-06-23 11:22:41 +03:00
snipe
dc157f8f78
Add components and users count to dashboard
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-19 16:16:18 -07:00
Petri Asikainen
ae2c77f97f
Allow to bulk update min_amt
2021-06-17 00:36:04 +03:00
GMS ICT 2
ea7f18d0e6
add CompanyableTrait
2021-06-15 15:32:44 +07:00
snipe
c407b52bbf
Updated Cors
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-12 00:23:30 -07:00
snipe
226b208f7c
Reset handler to stock for now
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 22:19:10 -07:00
snipe
c08f70b03c
Restore exeption handler functionality
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 21:51:28 -07:00
snipe
fa786e615e
Moved HasFactory
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 19:02:19 -07:00
snipe
3095a78664
Small tweaks to Dashboard controller
...
Still gettiing a bizarre `Non-static method App\Http\Controllers\DashboardController::index() should not be called statically` error
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 14:43:47 -07:00
snipe
a8123092af
Misc fixes for shift
...
// TODO - re-fix the exception handler
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 14:07:50 -07:00
Laravel Shift
b62d1f49e4
Shift cleanup
2021-06-10 20:19:27 +00:00
Laravel Shift
104b441e0d
Shift to class based factories
2021-06-10 20:17:44 +00:00
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
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
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
sh1hab
f43413bdc3
Feature snipe#9378 update
2021-05-21 10:19:04 +06: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
Thomas Misilo
18b1a155bf
Change from ENV to config value for PUBLIC_AWS_URL
...
When running config:cache the env('PUBLIC_AWS'URL') value disappears and isn't available, so it doesn't get added to the CSP Policy.
2021-05-11 09:51:35 -05: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
AlexanderWPapyrus
a1f9642a18
Increases DPI of barcode for small lables ( #9344 )
...
solves issue #9293
2021-04-05 19:33:10 -07:00
Ivan Nieto Vivanco
90a24539b0
Fixes/cli importer issue ( #9199 )
...
* Added logic to handle the CLI importer.
* Fix bug introduced with the commit previous to the regression.
* Adds a validation for variable when is null, add comments to clarify where the class variable came from.
* Add support for when variable is an instance of User class.
2021-04-05 19:28:31 -07:00
Godfrey Martinez
5ea759f615
Fixed #7211 , #9197 , #7864 , [ch15504] - Added additional LDAP fields to sync ( #9318 )
...
* LDAP and Active Directory has plenty of other [ch15504]
* removed department id from ldap sync
* removed department id from ldap sync
* Update 2021_03_18_184102_adds_several_ldap_fields.php
2021-04-05 19:26:04 -07:00
Ivan Nieto Vivanco
eb0ae74ef8
Fixes typo that doesn't accepts 'textarea' as custom field type element. ( #9387 )
2021-04-01 18:23:05 -07:00
snipe
a199c75f5c
Added textarea and checkbox to validation rules
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-31 14:04:01 -07:00
snipe
618e4439e2
Fixed validation to include textarea
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-31 14:02:10 -07:00
snipe
6a8e761c5e
Added created_at and updated_at to presenter
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-30 08:57:20 -07:00
Marc Leuser
90b7d34c69
Added #6695 : add API endpoint for license seats ( #8058 )
...
* remove miselading comment line
* added dedicated API endpoint for license seats
* don't display a seat name via API
it makes no sense and we don't have any particular sorting order
so the numbering would be inconsistent anyway
* reduce amount of IFs
* add sanity checks to show()
* fix goofed logging logic
* add tests for action log entries
2021-03-29 19:41:26 -07:00
NMC
3e934a1b96
Add a way for a user to override the site skin setting + fix mislabeled comment. ( #6891 )
...
* Add a way for a user to override the skin setting.
* Add site setting to allow user to change the skin.
* Fix skin list.
Co-authored-by: NMC <info@nmc-lab.com>
2021-03-29 19:09:23 -07:00
Raell Dottin
78cc47a859
Added sanity check to determine if a bind user account is set. ( #9340 )
2021-03-24 14:08:37 -07:00
Tom Misilo
7557879d4a
Add support for overriding the Time and Memory Limits ( #8389 )
...
This is similar to what exists for the LDAP Import, and adds support for
setting th Import and Report max execution time and memory limits
Co-authored-by: snipe <snipe@snipe.net>
2021-03-24 11:40:43 -07:00
snipe
0b41f9182a
Merge remote-tracking branch 'origin/develop'
2021-03-24 11:35:39 -07:00
Jo Drexl
0114373468
Fixing #9224 ( #9328 )
2021-03-22 12:57:26 -07:00
snipe
86fef3f40a
Set SAML errors to warning instead of error
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-17 22:30:26 -07:00
snipe
c90604b5ae
Merge remote-tracking branch 'origin/develop'
2021-03-17 22:19:24 -07:00
snipe
069e9e52fe
Try/catch barcodes so they don’t shit up the logs
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-17 22:19:10 -07:00
snipe
9f3a8a43cc
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# composer.lock
2021-03-17 19:41:02 -07:00
snipe
8fd8e716ac
Changed debug level on bad LDAP connection ( #9314 )
...
* Changed debug level on bad LDAP connection
TODO:
Unfuck all of this. It’s a mess and it really doesn’t work the way we think it does. AdLdap library strikes again. :(
Signed-off-by: snipe <snipe@snipe.net>
* Improved phrasing
Signed-off-by: snipe <snipe@snipe.net>
2021-03-17 19:24:28 -07:00
snipe
ab092fd209
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# app/Providers/AppServiceProvider.php
# config/logging.php
# config/services.php
2021-03-15 12:29:29 -07:00
Brady Wetherington
c7626f8387
Add new StorageHelper and use it where it makes sense ( #9276 )
2021-03-15 12:26:39 -07:00
snipe
f164f0ea60
Fixed #9266 - set a colors_array variable even if other conditions are not met
2021-03-09 21:04:32 -08:00
snipe
c3871c98df
Updated rollbar package
2021-03-09 16:16:57 -08:00
snipe
cf4e97f103
Log namespacing
2021-03-09 13:39:53 -08:00
snipe
e9ee9ea2e9
Fixed rollbar integration
2021-03-09 12:40:00 -08:00
Ivan Nieto Vivanco
9ed226a0af
Fixes links in Models Actions, and to view the fieldset assigned to that Model. ( #9232 )
2021-03-01 13:08:29 -08:00
Ivan Nieto Vivanco
d64b35c348
Added a condition to ensure that only assets checked out to an user that is being deleted are updating their status ( #9233 )
2021-03-01 13:07:23 -08:00
Ivan Nieto Vivanco
ab7dd90602
Fixes ternary that sets the offset in 0 when the offset passed to the API for the user is greater than total locations. ( #9210 )
2021-02-26 12:56:04 -08:00
snipe
f37d5d3d03
Fixed #9085 - asset models not showing proper pagination
...
Huge thanks to @inietov for catching this one
2021-02-25 16:43:38 -08:00
johnson-yi
763e17f491
Added saml custom setting retrieveParametersFromServer to enable fixing SLO issues with Azure AD ( #9187 )
2021-02-23 11:05:22 -08:00
Brady Wetherington
44eee019d9
Add variable declaration for $result ( #9168 )
2021-02-19 10:19:24 -08:00
snipe
5754f0aa3f
Revert "Added logic to handle the CLI importer. ( #9088 )"
...
This reverts commit 2e2d087639
2021-02-18 14:21:19 -08:00
Ivan Nieto
2e2d087639
Added logic to handle the CLI importer. ( #9088 )
2021-02-17 13:13:17 -08:00
Ivan Nieto
12ff465cdb
Added feature: Checkbox Custom Fields as list of values. ( #9112 )
...
* Added functionality for checkboxes in custom fields. Similar to how radio buttons work.
* Added the same functionality when the custom fieldset is encrypted.
* Added missing bits, so the edit custom assets view shows what values have been already stored in database
2021-02-16 17:20:29 -08:00
Ivan Nieto
f89d789832
Fixes #8918 The validation rules on Manufacturer Model 'name' attribute are malformed. ( #9133 )
...
* Fixes the validation rules on Manufacturer Model
* Fixes a little issue; if the manufacturer is active soft-deletes it, if is already deleted permanently deletes it
2021-02-16 12:52:55 -08:00
Giuseppe Iannello
5edbb4b229
Support Google Cloud IAP ( #8768 )
...
Following up on 7c2da81700
2021-02-03 11:59:55 -08:00
snipe
985193ffff
Fixed #9082 - allow deployable status type on checkout
2021-02-03 01:29:54 -08:00
snipe
124343911f
Merge remote-tracking branch 'origin/develop'
2021-02-02 16:57:18 -08:00
Brady Wetherington
462f8c791f
Hotfix to develop to yank extraneous e() ( #9080 )
2021-02-02 16:44:54 -08:00
Brady Wetherington
9a224a07ba
Modified how we do Select2 dynamic drop-down menus to be more secure ( #9079 )
...
* Modified how we do Select2 dynamic drop-down menus to be more secure
As noted by the author of select2, the more-secure way of creating
rich Select-dropdowns is to use jquery to create HTML snippets and
carefully modify text attributes within there. This prevents any
XSS from being brought to the page. As a side-effect, the extra
escaping that we had to do in all of the internal selectlist calls
is now no longer necessary, and has been removed. Rebased and
squashed from the original.
* Rebuilt all assets, but this still feels like it's too much stuff in here.
* Whoops, need to run that in dev, not prod
2021-02-02 15:55:21 -08:00
Ivan Nieto
df4686bc96
Added a clause that lets the function that updates the department to fail gracefully if no dept. name is provided in the CSV passed to the Importer. ( #9078 )
2021-02-02 12:23:36 -08:00
snipe
b6c432a596
One more line of logging for purges
2021-02-02 02:20:30 -08:00
snipe
ef668317a9
Log user initiating a purge
2021-02-02 01:58:50 -08:00
snipe
fdb5b3baf1
Depreciation detail view fixes [ch15776] ( #9059 )
...
* Allow sorting by months for depreciation list view
* Added dataTableLayout to standardize the list display table
* Implement the dataTableLayout() on the list view blade
* Split the view into tabs so we can combine asset depreciations and license depreciations
* Updated depreciation view to use tabbed interface for assets and licenses
* Added asset models to depreciation details page
* Make asset model category sortable
* Added cateory as allowed to be sorted on
* Added category sort scope
* Removed offset variable
* Small fixes to asset modes display in depreciation to bulk edit models
2021-01-27 17:44:05 -08:00
Brady Wetherington
70e6a6ced6
Fix issue where users with edit permission cannot invoke LDAP sync ( #9058 )
...
* Fix issue where users with edit permission cannot invoke LDAP sync
* Make User::class consistent with usage elsewhere in the same directory
2021-01-27 15:36:43 -08:00
Ivan Nieto
6772835efc
Added support for radio buttons in Custom Fields. ( #9053 )
2021-01-27 14:41:58 -08:00
Ivan Nieto
6e83679528
Instead of return a JSON response, redirect back to the previous screen ( #9055 )
2021-01-27 12:01:42 -08:00
snipe
0031fab0fe
Added termination date, depreciation in license column selection [ch14505] ( #9052 )
2021-01-27 01:34:32 -08:00
snipe
9f7f1460e9
Simplified availableForCheckout() on asset
2021-01-26 22:12:24 -08:00
Evgeny
d8bb69533c
To eliminate 12/24hours ambiguity fix. This fix prevents loss of time accuracy. ( #8887 )
...
Its a tiny fix to eliminate 12/24hours ambiguity. Fix prevents time accuracy loss in field "last_audit_date" for assets.
2021-01-26 12:22:59 -08:00
snipe
01d3606c42
Merge remote-tracking branch 'origin/develop'
2021-01-26 12:20:57 -08:00
Vincent Lainé
d6ead5ae17
Added #8931 : add health controller without session ( #8978 )
...
* Added health controller
* Trying to move session middleware to web and api group to have health controller without session
* Fix health route store the session
Co-authored-by: Vincent Lainé <v.laine@dental-monitoring.com>
2021-01-26 12:10:54 -08:00
Ivan Nieto
2da6f9136f
Add 'Last Audit Date/Next Audit Date' filter to custom report ( #8989 )
...
* Add 'Last Audit Date/Next Audit Date' filter to custom report
* Added a constraint: cannot require a report with a Last Audit Date in the future.
2021-01-26 12:05:31 -08:00
Ivan Nieto
79549dbfb9
Use the correct env variables in config/auth.php file. ( #9048 )
2021-01-26 12:04:41 -08:00
snipe
a48d09f37e
Fixed non-superadmin gate permissions for kits ( #9029 )
2021-01-26 11:56:42 -08:00
snipe
75a8639a20
Fixed weird checkbox display
...
TODO: fix the 500 on the save
2021-01-12 18:16:42 -08:00
snipe
bbcd215ea4
Suppress OAuth token errors
2021-01-12 08:58:40 -08:00
snipe
e6ba4a423d
Fixed #8721 - duplicate asset tags in select list when asset has name
2020-12-21 13:43:54 -08:00
snipe
cac78cdbf3
Use snipe-logo.png as default in settings seeder
2020-12-21 11:36:43 -08:00
Brady Wetherington
0329028e2c
Fixed #8926 , #8252 - introduce circular reference check for location parent_id - rebased from #8253 ( #8927 )
...
* Fixed #8252 - circular references in location parents
* Remove non-translated translation changes
* Fix typo
* Add loop limit to avoid unforseen infinite loops
* Remove check against parent_id in location controllers
* Remove the Location->id=null piece (no longer needed)
* Fix some formatting and whitespace
* Re-introduce accidentally merged-out language file
Co-authored-by: Travis Miller <milletr@tulsaschools.org>
2020-12-18 17:18:04 -08:00
snipe
5909860c5a
Updated exception handler
2020-12-15 17:25:05 -08:00
Evgeny
bbf7fbcff4
Localization digit separator feature. ( #8915 )
...
Provides an ability to localize the purchase_cost field in front-end hardware index table.
Has two digit separator formats in admin settings with comma and dot.
2020-12-15 11:49:13 -08:00
snipe
45bfec5cd3
Match setup admin on Quickstart password with min reqs for Settings model
2020-12-11 13:52:48 -08:00
snipe
055522510b
Fixed logo in seeder
2020-12-09 08:48:47 -08:00
Johnson Yi
1c4e20c712
Allow saml to be more easily debugged
2020-12-04 21:54:04 +11:00
snipe
71d0e6369e
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-12-02 11:01:10 -08:00
snipe
b27aeb1952
Added LDAP flag in users API for #8741
2020-12-02 11:01:05 -08:00
snipe
bec2b170ec
Only overwrite notes if the LDAP user is new
2020-12-02 11:00:18 -08:00
Brady Wetherington
34d5473553
Fixes 8472 (again) - LDAP sync was assigning a bad default location ( #8846 )
2020-12-01 21:26:52 -08:00
snipe
4ac15daee7
Fixed #8147 - allow webp image format for public file uploads
2020-12-01 19:06:53 -08:00
Brady Wetherington
93cf8d4e0a
Forward-port of the old LDAP sync system ( #8801 )
...
* Forward-port of the old LDAP sync system
* Need to rename the class to avoid classname conflicts
* Make 'classic' LDAP sync not add surrounding parens to filters that already have them
* Re-work Test LDAP button to return 10 sample users
* Remove useless debugging code
2020-11-30 17:11:44 -08:00
snipe
e83bc03d97
Switch backup files array order to show latest first [ch15486]'
2020-11-30 14:46:10 -08:00
snipe
705dd34f3e
Removed older SAML fields
2020-11-27 18:14:32 -08:00
snipe
6cf5426540
Removed unused validation rule
2020-11-25 11:00:28 -08:00
snipe
f475bdbb2d
Fixed #8797 - use html_entity_decode in fullName presenter for User
2020-11-25 08:54:23 -08:00
snipe
820a39cc90
Fixed #8814 - added App\Models\Recipients\AlertRecipient
2020-11-25 01:52:56 -08:00
snipe
72fc03aa50
Adds location to searchableRelations for asset model
2020-11-24 19:49:46 -08:00
snipe
c0d7564658
Fixed #8794 - Switched to firstOrCreate to create parents on import
2020-11-24 16:05:24 -08:00
snipe
973eacf6c3
Small fixes for SAML
...
The SAML routes are in a service provide (sigh), so they did not have the `web` middleware group assigned to it.
I also added some additional checks so that the setup blade won’t fail (the migrations wouldn’t have been run yet, so outside of a try/catch, it would return an error since those tables don’t exist.)
2020-11-24 13:51:02 -08:00
snipe
b2660002b9
Fixed #8781 - added asset count by status type ( #8806 )
2020-11-24 12:15:07 -08:00
snipe
2c0b9f959b
Comment with possible alternatve to the custom undeleted validator
2020-11-24 12:01:09 -08:00
johnson-yi
0cdd83aabf
Fixes #8584 , #8654 , #8727 - fixes and improvements for saml ( #8795 )
...
* Let onelogin/php-saml know to use 'X-Forwarded-*' headers if it is from a trusted proxy
* Gracefully handle the case where openssl_csr_new fails when openssl.cnf is invalid/missing
* Improve ui of saml sp metadata by displaying it's url and a download button
2020-11-20 18:54:25 -08:00
snipe
8a38b9d018
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-11-20 14:34:35 -08:00
Brady Wetherington
734cb941dd
Fix for #8772 - initial LDAP import of users are deactivated ( #8776 )
2020-11-20 11:11:14 -08:00
snipe
c66f8c04c8
For for deleted user API
2020-11-18 14:57:44 -08:00
snipe
551e28eec9
Fixed #8749 - added more default colors to prevent missing index in pie chart math
2020-11-18 07:06:14 -08:00
Brady Wetherington
8457207c8f
Fix for 500-page on deactivated LDAP user trying to log in ( #8774 )
2020-11-17 22:31:22 -08:00
snipe
2ea805b7ed
Added search/sort by Location OU, added to listing
2020-11-17 22:17:07 -08:00
Brady Wetherington
3dda4c9116
Add a new UAC setting to valid User Accounts for Active Directory ( #8775 )
2020-11-17 19:25:49 -08:00
snipe
0286cf6d46
Prevent license categories from being deleted if there are licenses in that category
2020-11-17 19:22:10 -08:00
Brady Wetherington
de6f3f866f
Attempt to solve LDAP sync overriding administrator choices ( #8742 )
2020-11-17 00:11:00 -08:00
NMC
402fecd408
Fixed #7850 : allow xlsx file. ( #8386 )
...
Thanks!
2020-11-16 21:32:15 -08:00
Brady Wetherington
a97b15ec96
Re-add LDAP "test login" feature to LDAP settings (helps with #8751 ) ( #8757 )
...
* Start work on re-adding back the "Test LDAP logins" feature to develop
* Add back-end method to allow LDAP test users to try to log in.
2020-11-16 21:23:08 -08:00
snipe
fbaf6e2494
Fixed #8747 - upload path for uploaded images
2020-11-16 16:39:02 -08:00
snipe
1f5bcf2475
Added option to download activity report
2020-11-13 16:25:05 -08:00
snipe
052f8e2c42
Addresses - not fixes - #8740
...
More investigation here is needed
2020-11-13 12:34:42 -08:00
snipe
e9578ba8a1
Fixed #8737 - incorrect validation string for components update
2020-11-13 12:09:48 -08:00
snipe
644084658a
Merge remote-tracking branch 'origin/develop'
2020-11-13 04:30:03 -08:00
snipe
08784f9cc5
Make expected_checkin fillable
2020-11-13 03:22:26 -08:00
snipe
a87e615e7f
Fixed #8544 - escaping on maintenance notes
2020-11-12 23:55:16 -08:00
snipe
fc6a33ad38
Added some LDAP debugging - related to #8670
2020-11-12 22:19:16 -08:00
snipe
896ce3456e
Possible fix for #8670 - LDAP users deactivated on login
2020-11-12 22:18:49 -08:00
snipe
9db191f0b2
Fixes for #8732 - Flysystem paths, migrator script
2020-11-12 21:46:06 -08:00
snipe
c7d752fb65
Added S3 url into CSP
2020-11-12 19:50:01 -08:00
snipe
6dccf399a5
Fixed offset issue for #8732
2020-11-12 15:51:31 -08:00
snipe
d537fc5c32
Added linebreak to console confirmation
2020-11-12 15:21:00 -08:00
snipe
9164dda64f
Added artisan command to purge logins
2020-11-12 15:20:15 -08:00
snipe
5ea9c31eab
Removed debugging
2020-11-12 15:14:56 -08:00
snipe
c8572deb5c
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-11-12 15:13:50 -08:00
snipe
57d25ebb20
Fixed #8719 - use same convention for file names on licenses as we do on assets
2020-11-12 15:13:45 -08:00
Dampfklon
be114176a2
Refactor Expected Checkin Notification into markdown and enable translation ( #8236 )
...
Co-authored-by: snipe <snipe@snipe.net>
2020-11-12 15:09:40 -08:00
Dampfklon
4ef11c463c
Enable translations of checkin notifications ( #8235 )
2020-11-12 15:05:57 -08:00
snipe
f0e04ab9e4
Fixed #8726 - disallow archived assets to be checked out
2020-11-12 15:01:13 -08:00
snipe
8a65081768
Possible fix for #8732
2020-11-12 14:47:38 -08:00
snipe
c451fde466
Fixed exception namespace
2020-11-12 14:27:59 -08:00
Anthony Winstanley
cc79bb1449
Exclude blank LDAP attributes
...
Asking for '' attributes is an error for some LDAP servers.
2020-11-12 09:34:28 -08:00
snipe
7f7064c835
Make last_checkout fillable
2020-11-11 13:30:11 -08:00
snipe
7d708572fc
Slightly nicer formatting for query
2020-11-10 07:43:54 -08:00
snipe
ea68ff1284
Sigh. Typo
2020-11-10 06:51:40 -08:00
snipe
66ccf4da03
Merge remote-tracking branch 'origin/develop'
2020-11-10 06:44:10 -08:00
snipe
0b4a13156f
Added more detail and dryrun to assigned_to vs log checker script
2020-11-10 06:43:36 -08:00
snipe
a8a3962008
Merge remote-tracking branch 'origin/develop'
2020-11-10 06:17:04 -08:00
snipe
e110a7b15e
Experimental script to find mismatched IDs based on logs
2020-11-10 06:16:15 -08:00
snipe
30d68309a9
Add ability to checkout an asset if the user it’s assigned_to isn’t valid
...
This would only happen if a merge-users went wonky
2020-11-10 05:06:47 -08:00
snipe
547d1a5a93
Merge remote-tracking branch 'origin/develop'
2020-11-10 04:43:20 -08:00
snipe
a43fb060f4
Throw an error if the asset cannot be updated in the merge
2020-11-10 04:41:40 -08:00
snipe
c607d89817
Merge remote-tracking branch 'origin/develop'
2020-11-10 01:59:18 -08:00
snipe
044dfe2620
Fixed [ch945] - Status colors are not displaying correctly in the chart on the dashboard
2020-11-10 00:54:39 -08:00
snipe
b7cc12a466
Merge remote-tracking branch 'origin/develop'
2020-11-09 22:53:23 -08:00
snipe
5abfbdd1d2
Allow API token expiration in years to be configured via env
2020-11-09 22:52:55 -08:00
snipe
31bbb2d035
Merge remote-tracking branch 'origin/develop'
2020-11-09 22:43:41 -08:00
snipe
460485d843
Make API tokens expire in 20 years
...
TODO: Make this configurable and report the expiration in the UI
2020-11-09 22:33:43 -08:00
snipe
63a8535de1
Merge remote-tracking branch 'origin/develop'
2020-11-09 19:11:37 -08:00
snipe
148b375ec2
Make 600 a string for ini_set
2020-11-09 19:11:00 -08:00
snipe
b026953190
Merge pull request #8688 from sanjay900/patch-1
...
Fix AD Accounts with delegation disabled
2020-11-09 16:13:13 -08:00
Brady Wetherington
966179290b
Restore the LDAP_TIME_LIM env var for ldap sync of very large directories
2020-11-09 11:11:42 -08:00
Sanjay Govind
ab6d2987a4
Include documentation from @uberbrady
...
Previously on v4 this was all documented, so i have copied that documentation across to v5
2020-11-06 12:31:33 +13:00
Sanjay Govind
45c140814f
Fix AD Accounts with delegation disabled
2020-11-06 12:02:19 +13:00
snipe
4d003ac97a
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# app/Http/Controllers/Auth/ResetPasswordController.php
# config/version.php
2020-11-03 11:49:34 -08:00
snipe
a8390ce4bd
Removed debugging
2020-11-03 11:45:19 -08:00
snipe
cfc1e1366c
Added new password complexity rules to forgot password
2020-11-03 11:42:42 -08:00
snipe
bbd7a752a0
Minor cleanup
2020-11-02 23:58:49 -08:00
snipe
a66a22ffb2
Updated passwordComplexityRulesSaving() signature so it isn’t nullable
2020-11-02 23:58:37 -08:00
snipe
c800662f0c
Use username for forgotten password
...
Since emails are not required to be unique
2020-11-02 23:57:00 -08:00
snipe
b828985151
Fixed strpos to !== FALSE in ProfileController for complexity eval
2020-11-02 22:28:56 -08:00
snipe
0c2800c7dd
Removed debugging line
2020-11-02 21:26:13 -08:00
snipe
63bb2de4d4
Derp. Check and make sure that setting is actually on
2020-11-02 20:13:54 -08:00
snipe
c4b2ef5660
Removed debugging code
2020-11-02 20:10:18 -08:00
snipe
296655542d
Added comments
2020-11-02 20:07:39 -08:00
snipe
a55694da2f
Added validation to disallow password to be the same as username, email, etc
2020-11-02 20:03:26 -08:00
snipe
6554903aeb
Removed “use slack” debugging code
2020-11-02 17:46:09 -08:00
snipe
502322be4b
Fixed v5 500 server error when requesting multiple [ch15345]
2020-11-02 16:08:38 -08:00
snipe
72facffcbe
Fixed demo settings value for support_footer
2020-10-26 15:09:02 -07:00
snipe
f42bd3a144
Fixed #8613 - Added deleted_at to user API response, added all=true to include deleted and not-deleted in one call
2020-10-26 14:58:45 -07:00
snipe
b9330cf6b1
Fixed #8613 - 500 error on deleted users API call
2020-10-26 14:55:18 -07:00
snipe
2844800caf
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# config/version.php
2020-10-26 14:26:05 -07:00
Brady Wetherington
cce0739bb7
Clean up AdLdap2 integration to better handle paged result-sets
2020-10-26 12:53:45 -07:00
snipe
c93f4ef0d5
Merge remote-tracking branch 'origin/develop'
2020-10-23 19:50:56 -07:00
Brady Wetherington
0eda53c484
Add a new custom validator for Users to prevent someone from managing themselves
2020-10-23 16:55:10 -07:00
snipe
5f82214703
Merge remote-tracking branch 'origin/develop'
2020-10-23 14:24:24 -07:00
Brady Wetherington
d517e2fd61
Merge pull request #8594 from uberbrady/try_to_fix_ldap_oom
...
Possible fix to #8563 - unset $ldapUsers to avoid OOM'ing
2020-10-23 14:23:53 -07:00
snipe
28612d8b61
Merge remote-tracking branch 'origin/develop'
2020-10-23 14:23:46 -07:00
snipe
6ee3d0eb97
Merge pull request #8605 from snipe/fixes/legacy_location_id_equals_zero
...
Fix for legacy location_id=0 issue that can cause failure to checkout/checkin
2020-10-23 14:22:53 -07:00
snipe
2aa8e1e76b
Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes
...
Fixes #8462 - move accessory notes into pivot table
2020-10-23 14:19:51 -07:00
snipe
9a1acced58
Fix for legacy location_id=0 issue
2020-10-23 14:00:04 -07:00
snipe
d74df93c48
Merge remote-tracking branch 'origin/develop'
2020-10-23 12:10:13 -07:00
snipe
4ccba5337a
Added https://gravatar address to CSP
2020-10-23 12:09:03 -07:00
snipe
8aae2b46cd
Merge remote-tracking branch 'origin/develop'
2020-10-23 11:56:10 -07:00
snipe
d03d4deef9
Temp fix for #8561 - manager_id validation error
2020-10-23 11:55:53 -07:00
snipe
21ceea0aed
Removed extra debugging
2020-10-23 08:19:04 -07:00
snipe
2219c9ccb5
Merge remote-tracking branch 'origin/develop'
2020-10-23 06:55:39 -07:00
snipe
f2aebe5f9a
Fixed #8558 - error on asset acceptance when no sig is required
2020-10-23 05:09:03 -07:00
snipe
40c0ba9a95
Merge remote-tracking branch 'origin/develop'
2020-10-23 04:46:44 -07:00
snipe
f5a0726f98
Fixed #8597 - Added leading slash to notifications console commands
2020-10-23 04:46:26 -07:00
snipe
88f03e6b55
Added last_checkout and notes from pivot for accessories
2020-10-23 00:44:26 -07:00
snipe
c3e8f64064
Merge remote-tracking branch 'origin/develop'
2020-10-22 23:24:56 -07:00
snipe
68cfbaab2e
Fixed signature issue on accepted assets - related to #8577
...
I have no idea how this ever worked? We didn’t rename that fieldname recently.
2020-10-22 23:20:55 -07:00
snipe
66ac5d05ad
Started migration to normalize note
2020-10-22 23:18:14 -07:00
Brady Wetherington
18012279f9
Possible fix to #8563 - unset $ldapUsers to avoid OOM'ing
2020-10-22 21:51:23 -07:00
snipe
153f849ef7
Merge pull request #8581 from fashberg/iss8580
...
Fixed #8580 : ReportsController called method on NULL Object
2020-10-22 13:00:08 -07:00
Folke Ashberg
377c92a290
update
2020-10-22 14:33:24 +02:00
Folke Ashberg
5824ac3b28
Fix for #8580
...
Checking $asset->depreciation before calling $asset->depreciated_date()
2020-10-22 14:22:42 +02:00
Brady Wetherington
fad0ed6d5b
Add a dirtiness check to slim down JSON LDAP sync summaries
2020-10-21 15:13:36 -07:00
snipe
ec9c69323a
Merge remote-tracking branch 'origin/develop'
2020-10-21 13:58:58 -07:00
snipe
338106734a
Fixed #8562 - manufacturer logo upload failing
2020-10-21 13:57:56 -07:00
snipe
81fcb4c7b3
Merge remote-tracking branch 'origin/develop'
2020-10-21 13:33:04 -07:00
snipe
5ae65d5329
Fixed #8566 - PDF files displaying as ascii instead of downloading
2020-10-21 13:32:46 -07:00
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
e80b63b5c1
Fixed #8526 - skip cache for setup check
2020-10-19 12:33:38 -07:00
Brady Wetherington
b626b7895a
Ensure misdefined active flags will not prevent user syncing
2020-10-15 19:10:47 -07:00
Brady Wetherington
be4aa07d8c
Some logic bugs in the AD-specific code for logging in via AD/LDAP
2020-10-09 15:33:17 -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
292370b02f
Cleaned up validation
2020-10-08 18:43:23 -07:00
Brady Wetherington
b015cff8bd
Modify Snipe-IT v5 AD handling to use the same ldap_host, and improve OU handling
2020-10-06 18:31:06 -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
da9896b59a
Remove SAML settings on demo reset
2020-09-24 19:13:31 -07:00
snipe
b508482441
Merge pull request #8438 from snipe/features/nicer_slack_ui
...
Nicer slack settings UI
2020-09-16 12:29:58 -07:00
snipe
81548e581d
Fixed #8443 - wrong value for array_key_exists on location import
2020-09-16 11:45:47 -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
snipe
b1dda88c9d
Removed SlackTest notification
2020-09-15 23:05:05 -07:00
Ivan Nieto
501d5680ea
Fix [ch15188] 500 error
2020-09-15 03:51:10 -05:00
snipe
52848ca8d8
Fixed checkin/checkout notification crashing
2020-09-11 16:10:18 -07:00
snipe
a91e81fc42
Added checkin_email to category listing
2020-09-11 16:06:38 -07:00
snipe
514e7ca072
Added boolean has_eula to categories
2020-09-11 16:05:42 -07:00
Brady Wetherington
f3f7d714a6
Fix ldap test button for php 7.4 (suppressing errors)
2020-09-09 14:18:05 -07:00
snipe
cb5104c27d
Hopefully fixes #8418 - migrations on new install go wonky because of LDAP service provider
2020-09-08 21:13:24 -07:00
snipe
10648de9af
Bulk Checkin and Delete also edit users [ch15107]
2020-09-04 16:02:25 -07:00
snipe
1bea83ee5a
Fixed missing setting call
...
This is still broken further down the line in the event handler for license checkin, but this gets us closer
2020-09-04 15:44:37 -07:00
snipe
5f5b80acae
Added maintained and reassignable to license listing
2020-09-04 10:02:04 -07:00
snipe
69d7000922
Fixed [ch15085] - duplicate use statements in Consumables controller
2020-09-03 19:47:15 -07:00
snipe
249b9b7509
Fixed [ch15086] - [object object] in companies date displays
2020-09-03 19:40:17 -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
bc5a82e734
Small fixed for file mover artisan command
2020-08-28 14:10:28 -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
5abd85003c
Merge pull request #8371 from snipe/bushelpowered-develop
...
Fixed #7919 - LDAP Logins + query filters
2020-08-26 13:33:41 -07:00
Brady Wetherington
67a1d2fa5f
Remove hardcoding of LDAP Auth query to 'uid=', use setting instead
2020-08-26 12:25:10 -07:00
snipe
24be73f76b
Use image handling request for logo uploads
2020-08-26 12:17:50 -07:00
snipe
a86dc52695
Added fieldname to file name for better clarity on setting logos
2020-08-26 12:17:36 -07:00
snipe
1ff7e6b834
Use Storage facade for user presenter
2020-08-26 12:17:18 -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
139c874308
Fixed delete old image on upload
2020-08-26 02:48:07 -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
37568ae9ec
Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP
...
Fixed #8338 - Added google maps to CSP
2020-08-25 20:49:37 -07:00
snipe
32ad9050cf
Added google maps to CSP
2020-08-25 20:48:53 -07:00
snipe
3c6883489c
Added assignedTo scope
2020-08-25 20:37:30 -07:00
Brady Wetherington
6c23e881c7
Merge branch 'develop' of https://github.com/bushelpowered/snipe-it into bushelpowered-develop
2020-08-24 21:42:04 -07:00
Brady Wetherington
b721a977c0
Fix PHP 7.4 deprecation warnings in ldap-sync script.
2020-08-24 21:35:00 -07:00
snipe
e5dd6035b9
Fixed the other upload handleUploads signatures
2020-08-24 18:32:40 -07:00
snipe
66686f8080
Added some debugging - will remove at RC
2020-08-24 18:32:15 -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
snipe
5aeac3c9e0
Fixed parse error
2020-08-24 14:30:43 -07:00
snipe
bcad49ce79
Try to better handle slack “too many requests” issue
2020-08-14 16:10:22 -07:00
snipe
b5acca89d7
Check for admin for slack notifications
2020-08-14 16:02:15 -07:00
snipe
e52919cf1b
Merge pull request #8327 from snipe/features/checkin_license_from_all_users
...
Checkin license from all users cli tool
2020-08-14 15:35:15 -07:00
snipe
29f3a5c48f
Use more verbose annotation for Auth::user if/else
2020-08-14 15:27:40 -07:00
snipe
134e8e6fb9
Moved user email nulling until after the save
2020-08-14 15:25:07 -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
snipe
0291323502
Use the user as the target
2020-08-14 14:57:58 -07:00
Brady Wetherington
262a964760
[WIP] fix ldap-sync for v5 with AdLdap2
2020-08-14 14:45:05 -07:00
snipe
e0f6f9b839
Artisan command to check in licenses from all users
2020-08-14 14:43:37 -07:00
snipe
f1a6308002
Check for Auth::user before trying to log id (for cli)
2020-08-14 14:43:07 -07:00
Michael Pietsch
4f5374b2e8
enable use custom file based saml certificate/private key
2020-08-14 12:25:00 +02:00
Brady Wetherington
799c059070
Add internationalized version of LDAP error message
2020-08-11 16:39:02 -07:00
Brady Wetherington
c62d43a778
Improve Exception management in Artisan LDAP Sync method. Still need to localize this better
2020-08-11 16:39:02 -07:00
Brady Wetherington
e0644dbbf6
Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround
...
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
2020-08-10 17:22:31 -07: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
Brady Wetherington
7410b16835
Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4
...
Add new useraccountcontrol value for valid AD users
2020-07-24 16:22:44 -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
e955c983a3
Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer
...
Added address, city, state and country to importer and city to bulk editor
2020-07-22 13:43:29 -07:00
Brady Wetherington
b09e7d19b3
Add new useraccountcontrol value for valid AD users; document algorithm and values
2020-07-22 13:32:16 -07:00
Godfrey M
20c9ae5818
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats
2020-07-22 10:21:19 -07:00
snipe
b750f4754f
Added city to bulk user importer
2020-07-21 16:49:54 -07:00
snipe
c17a06792a
Added address, city, state, country to user importer
2020-07-21 16:49:38 -07:00
snipe
4f76cc6cfb
I don’t actually know what this file is for
2020-07-21 16:46:13 -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
dbbb7680d9
A few more fixes for the cli
...
Do not check out a piece of software if it’s already been checked out to the user
2020-07-09 21:12:50 -07:00
snipe
cf0dd5bbad
Small fixes for cli tool
2020-07-09 20:43:13 -07:00
snipe
89d433b41a
Removed duplicate seat call
2020-07-09 20:26:02 -07:00
snipe
e2570ada6f
CLI tool to checkout a license to ALL users
2020-07-09 20:04:05 -07:00
snipe
45afe725a1
Only try to get the company if there is an auth’d user
...
(Needed for command line tools, where no Auth::user() is present)
2020-07-09 20:03:47 -07:00
snipe
cc9f1577a4
Removed unused use directives
2020-06-25 17:43:53 -07:00
snipe
ab1fe8be0c
Added merge utility
2020-06-25 17:42:39 -07:00
snipe
339bdddc38
Fix for Vue js not loading due to CSP :(
2020-06-25 11:00:33 -07:00
snipe
35b9cf4b70
Fixed missing db prefix on scopeDueOrOverdueForAudit
2020-06-23 02:41:59 -07:00
snipe
7ccb41371e
Removed unoptimized images directive
...
securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯
2020-06-23 01:09:39 -07:00
snipe
2e60a457bf
Dumb fix for feature-policy being dumb.
2020-06-23 01:07:00 -07:00
snipe
00b051b8c7
Added a few more comments
2020-06-23 00:26:09 -07:00
snipe
05b3a9ad7e
Config variable for HSTS
2020-06-22 23:17:27 -07:00
snipe
4fb880384f
Changed comment
2020-06-22 22:37:14 -07:00
snipe
43042ad841
Consolidated ReferrerPolicy into new SecurityHeaders file
2020-06-22 22:35:59 -07:00
snipe
a716382ac4
Removed CSP middleware (it’s added in the general header)
2020-06-22 22:33:37 -07:00
snipe
36c8f7f4f1
Additional security headers
2020-06-22 22:31:01 -07:00
snipe
946129f206
Made quote style consistent
2020-06-22 20:45:20 -07:00
snipe
d1aa11ec89
Fix for weird padlock display in asset listing with encrypted custom fields
2020-06-22 20:29:19 -07: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
Peter Upfold
004ecad059
Force suppress deprecation warning on ldap_control_paged_result()
2020-06-03 08:59:50 +01:00
snipe
1267c68f28
Removed barcodes from S3 uploader
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-28 19:56:18 -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
d14ab7e3e1
Porting change from #8053 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-27 00:22:44 -07:00
snipe
f196b5bd94
Merge pull request #8077 from dmeltzer/more-paving
...
Sync paveit command with new database tables.
2020-05-26 21:18:22 -07:00
snipe
e0d9cc4e73
Merge pull request #8053 from CharlotteDunoisLabs/fix-gravatar
...
Take gravatar email into account in presenter
2020-05-26 19:58:45 -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
1e5d40f32e
Clean up extra code in notifications files.
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
4fef065010
Refactor big switch to lookup in array. A bit cleaner/codacy happier.
2020-05-23 12:17:56 -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
2e936a9883
Sync paveit command with new database tables.
2020-05-23 09:08:32 -04:00
snipe
f88683766b
Roll back previous change
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-14 00:55:47 -07:00
snipe
e4385c0f8c
Fixes #8051 regression
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-14 00:48:30 -07:00
Charlotte Dunois
7f8c6fe282
Take gravatar email into account in presenter
2020-05-13 20:30:47 +02: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
Daniel Meltzer
e4888b23e2
Save User ID when checking out a license. Also buff up importing tests to confirm license can be checked out.
2020-05-12 14:38:20 -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
snipe
bb42109c0c
Added a clarifying comment
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 18:10:45 -07:00
snipe
b9e821c0e6
Small fix for Group Functional Tests
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 18:07:14 -07:00
Johnson Yi
3d8fce50d0
Removed unnecessary default saml settings
2020-05-09 01:51:48 +10: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
441049d8ac
Sort license seats by their number only, making the sort order more logical
2020-04-30 10:34:30 -04:00
Daniel Meltzer
b28a4f3108
Add component unit test and unify some validation.
2020-04-30 09:50:12 -04: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
6847a331a7
Backport the column icon fix from master
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 05:55:38 -07:00
snipe
e009fbe59f
Converted table heading icons in People to CSS glyphs
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:04:53 -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
c9ed205bb0
Added @throws to documentation
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 14:41:37 -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
fa5134603f
Added type casting and a few more validation rules
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 06:37:40 -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
c02adace61
Ensure at the model level that location.id/user.id and location.parent_id/user.manager_id cannot be the same
2020-04-21 19:51:20 -07:00
snipe
5dc64ea91b
Re-added EasySlugger to fix tests
2020-04-21 19:28:24 -07:00
snipe
29b05d2020
Fixed syntax error in image upload request from mangled merge
2020-04-21 06:29:57 -07:00
snipe
066e5588b5
Fixed slugging in custom fields to no longer use old library
2020-04-21 04:14:23 -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
154db9a416
This literally never fucking worked. Ever. Shoot me.
2020-04-09 22:20:05 -07:00
snipe
cf9d0201e0
Catch weird edge case where target wouldn’t have an ID (?!)
2020-04-09 20:23:02 -07:00
snipe
5707df0239
Check that location isset in checkout
2020-04-09 18:32: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
cfec142c3b
Better handle models without a fieldset in the asset request [RB 9935]
2020-04-09 11:18:54 -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
d7873f257d
Fixed CSP for importer
2020-04-06 14:18:45 -07:00
snipe
bdddab5b8b
Added role=“option” to option items, additional icon font fixes
2020-04-02 18:17:21 -07:00
snipe
e7c1418314
Fixed possible typo in CSP
2020-04-01 19:47:42 -07:00
snipe
4dcc1ffdbc
More form labels
2020-04-01 02:22:24 -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
f0ef06ebe1
Added more alt tags
2020-03-27 15:35:29 -07:00
Jared Biel
bbeb51461f
Fix LDAP logins
2020-03-24 16:27:14 -05: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
663c0f3713
Fixed typo
2020-02-11 22:09:46 -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
192917cc84
Slightly better fix for requestable import bug
2020-02-10 17:34:32 -08:00
snipe
60b271c6a8
Use import instead of direct model call
2020-02-10 12:36:40 -08:00
snipe
81880645ed
Possible requestable fix
2020-02-10 11:40:39 -08:00
snipe
9eb4b0dda7
Disallow 0 as a number for labels per page
2020-02-04 19:14:58 -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
bigtreeEdo
e27a9b137b
added 'requestable' to fillable attributes. ( #7787 )
2020-02-03 19:37:03 -08:00
snipe
89e2a3ae3c
Fixed #7752 - reformat /api/v1/users/me to use transformer
2020-01-30 13:12:43 -08:00
snipe
5f85d8132b
Fix for weird JSON parsing in actionlogs ( #7753 )
...
* Fix for weird JSON parsing in actionlogs
* Removed debugging code
* Check for the meta array
(If no fields, no array)
2020-01-24 17:31: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
Colin McNeil
db59106c3e
Move ldap import ini settings to config ( #7679 )
2019-12-19 11:51:55 -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
88fb1370f0
Added slightly friendlier error handling for assets without models
...
This scenario should never happen, barring someone manually editing their data, but better to handle that scenario in a more user-friendly way.
2019-12-06 18:17:03 -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
Ivan Nieto
9291e3ada3
Added a validation to Transformers/LocationsTransformer.php:transformLocations() in case location doesn't have children location ( #7640 )
2019-12-06 11:42:36 -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
04cf8d7fbf
Removed Helper reference since it’s autoloaded
2019-12-04 15:56:55 -08:00
snipe
c635db0a76
Fixed upload parh for asset models
2019-12-04 15:23:49 -08:00
snipe
704c696711
Fixed parse error in settings controller
2019-12-04 14:54:36 -08:00
snipe
2fbbe430b5
Removed escaping on custom fields in presenter ( #7631 )
2019-12-03 17:42:13 -08:00
Godfrey Martinez
f0af750b0a
Fixed comment ( #7617 )
...
* Set theme jekyll-theme-hacker
* fixed commenty about scopebyDeprecationID being identified as a method to location ID
* fixed commenty about scopebyDeprecationID being identified as a method to location ID
2019-11-22 16:13:42 -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
dd40ddf5a5
Fixed an error on audit due list when no audit_warning_days had been set [ch9764]
2019-11-21 21:34:41 -08:00
snipe
5065164c40
Bumped Carbon version
2019-11-21 13:14:18 -08:00
snipe
8127fdc5bc
Min password requirement set to 8 characters
2019-11-18 21:17:51 -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
snipe
957c7f4e79
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-11-18 19:01:35 -08:00
snipe
a73fd24695
Fix maintenances permissions check to allow users who can edit assets to edit maintenances
2019-11-08 17:02:17 -08:00
snipe
0290257734
Limit license seats to 999 to prevent latency
2019-10-28 13:48:18 -07: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
4fe689dc5d
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-10-21 15:45:17 -07:00
snipe
0769f585ea
Disallow locations from being their own parents
2019-10-21 15:45:05 -07:00
snipe
04562e6d4a
Added 4260352 to ldapsync enabled account constraint
2019-10-18 17:48:50 -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
6c1de7ff05
Apply fix for #6642 to master
2019-09-30 19:21:57 -07:00
snipe
ab05a44e0b
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-09-30 19:18:54 -07:00
snipe
7f5f4a1297
Added softwarew support and hardware support to maintenance types
2019-09-24 01:34:23 -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
Martin Berg
3dcef9aac9
Add support for custom remote user header ( #7370 )
2019-09-03 11:07:26 -07:00
snipe
b381528668
Added console rekey tool ( #7330 )
...
* Removed console command specifications, since they’re pulled dynamically now
* Added rekey console command
* Removed unused code
* Comment clarifiction
* Handle LDAP password
2019-09-03 11:03:32 -07:00
Logan Swartzendruber
4c8b26f732
Implement #3088 : Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view. ( #7388 )
...
* Implement #3088 : Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view.
* Add conditional for including the asset number in the URL of the barcode image.
* Change case of variables to pass Codacy PR review standards.
2019-09-03 11:02:55 -07:00
Rick Heil
7b0b28aed0
Add #7393 - next_audit_date set on asset creation if an audit interval is configured in settings ( #7394 )
2019-09-03 10:58:51 -07:00
snipe
6d66d7e215
Removed withErrors on JSON response
2019-08-22 21:36:47 -07:00
snipe
0544164015
Fixed Eloquent Builder path in docblock
2019-08-20 18:10:36 -07:00
snipe
b6a188a87b
Removed erroneous linebreak
2019-08-20 18:10:21 -07:00
snipe
b5bf8e9a37
Smaller chunking for custom report, add max_execution_time
2019-08-15 06:14:25 -07:00
snipe
da52511bf9
Use asset tags
2019-08-14 23:13:23 -07:00
snipe
c5e6f06e9b
Revert import history to master version to fix errors
2019-08-14 22:27:17 -07:00
snipe
6db915b7f0
Removed serialize duplicate
2019-08-14 22:22:50 -07:00
snipe
a6d486ea8a
Fix invalidJSON exception
2019-08-14 22:18:48 -07:00
snipe
441ae69f5c
Integrations/develop into master ( #7352 )
...
* Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992 )
* Added upcoming audit report
TODO: Fid diff/threshold math
* Added route to list overdue / upcoming assets via API
* Controller/API methods for due/overdue audits
We could probably skip this and just handle it via view in the routes…
* Added query scopes for due and overdue audits
* Added audit due console command to kernel
* Added ability to pass audit specs to main API asset search method
* Added audit presenter
* Added bootstrap-tables presenter formatter to display an audit button
* Added gated sidenav items to left nav
* Added audit due/overdue blades
* Cleanup on audit due/overdue console command
* Added language strings for audit views
* Fixed :threshold placeholder
* Removed unused setting variable
* Fixed next audit date math
* Added scope for both overdue and upcoming
* Derp. Wrong version
* Bumped version
(I will release this version officially tomorrow)
* Leave the activated state for users alone in normal LDAP synchronisation. (#6988 )
* Fixed #7003 - crash when warranty months or purchase date is null
* Fixed #6956 - viewKeys policy inconsistent (#7009 )
* Fixed #6956 - Added additional gates show showing/hiding license keys
* Modified gate to allow user to see licenses if they can create or edit the license as well
* Added API middleware to API routes to enable throttling
TODO: Figure out how to make this costumizable without touching the code
* Import locations from CSV via command line (#7021 )
* Added import locations command
* Small fixes to location importer
* Added country, LDAP OU
* Cleaned up comments, added more clarification to what the script does
* Added ability to update groups via API
Fixes [ch9139]
* Bumped version
* Fixed #6883 - remove escaping of fields on LDAP import
* Fixed #6880 - correctly encrypt encrypted fields via the API
* Fixes #5054 : LDAP users deactivated for none-ad (#7032 )
When using none-AD ldap, users are automatically deactivated every LDAP
sync. This commit changes the behaviour so that if the active flag isn't set,
the users are enabled.
Fixed #5054 , at least for 4.X
* Updated packages
- Updating erusev/parsedown (v1.7.2 => 1.7.3): Downloading (100%)
- Updating squizlabs/php_codesniffer (3.4.1 => 3.4.2): Downloading (100%)
- Updating symfony/polyfill-mbstring (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/var-dumper (v3.4.23 => v3.4.27): Downloading (100%)
- Updating league/flysystem (1.0.50 => 1.0.51): Downloading (100%)
- Updating symfony/translation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating nesbot/carbon (1.36.2 => 1.37.1): Downloading (100%)
- Updating symfony/debug (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/console (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/finder (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-ctype (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php70 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/http-foundation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/event-dispatcher (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/http-kernel (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/process (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/routing (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-util (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php56 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/psr-http-message-bridge (v1.1.1 => v1.1.2): Downloading (failed)
Downloading (100%)
- Updating rollbar/rollbar (v1.7.5 => v1.8.1): Downloading (100%)
- Updating symfony/yaml (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/browser-kit (v3.4.23 => v3.4.27): Downloading (100%)
* Fixed #7044 - API update deleted custom fields if they are not re-presented
* Fixed XSS vulnerability when creating a new categories, etc via modal on create
Same fix as before, because of the weird select2 post-parsing ajax behavior
* Updated email strings
* Fixed #7046 - added user website url back into UI
* Updated language strings
* Bumped version
* Updated packages
* New backups config for spatie
* Removed debugbar service provider (autodiscovery)
* Use laravel v5.5 withCount manual aliases
* Added spatie language files
* Removed old laravel backups config
This config file was renamed in a newer version of spatie laravel-backup
* Set the serialization
* Added the command loader to console kernel
* Renamed fire() to handle()
* Updated withCount to use manual naming
* Updated backup path in backup admin
* Updated travis with new php versions
* Bumped laravel version in readme
* Fixed custom field edit screen
* Fixed baseUrl is undefined error
I literally cannot figure out how this ever worked before.
* Fix for included files in backup
* Bumped version
* Switch has() to filled()
* Change ->has() to ->filled()
* Removed cosole log
* Bumped packages
* Use getReader instead of fetchAssoc for CSV parser
https://csv.thephpleague.com/9.0/upgrading/
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Trying to fix ajax asset validation
This I think gets us closer, but still not handling the validation on the asset properly.
When I do a print_r of the validation in the other items, its looking for an error bag that looks something like this:
```
Illuminate\Support\MessageBag Object
(
[messages:protected] => Array
(
[name] => Array
(
[0] => The name field is required.
)
[seats] => Array
(
[0] => The seats field is required.
)
[category_id] => Array
(
[0] => The category id field is required.
)
)
[format:protected] => :message
)
```
Currently the Assets ajax returns:
```
[2019-05-24 06:52:06] develop.ERROR: array (
'messages' =>
array (
'model_id' =>
array (
0 => 'The model id field is required.',
),
'status_id' =>
array (
0 => 'The status id field is required.',
),
'asset_tag' =>
array (
0 => 'The asset tag field is required.',
),
),
)
```
So not sure why it’s not working.
* Fixed missing asset validation
* Check that a model exists before trying to fiddle with fieldsets
* Tidied up license check
* Removed extra escaping on checkin
* Updated importer to work with newer CSV Reader::getRecords() method
* Fixed field mapping
* Small fix for reordering fields
Fixes Illuminate\Database\QueryException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'order' cannot be null (SQL: insert into `custom_field_custom_fieldset` (`custom_field_id`, `custom_fieldset_id`, `order`, `required`) values (12, 7, , 0)) [ch1151]
This needs revisiting for a more solid fix, especially for data that was already entered bad.
* Fixed bug where sorting by company name in Users API did not work
Fixes [ch9200]
* Removed custom fields from AssignedSearch to prevent confusing data in selectlist
Fixes [ch9193]
* Removed alert-danger from tests
* Fixed missed consumables_count withCount() statement
* Fixed Undefined variable user in $backto if checked out to a non-user
Fixes [ch9194]
* Check for valid model before attempting to access fieldsets
Fixes [ch1249]
* Only build the log upload destination path if there is a matching record
Fixes [ch1232]
* Fixed free_seats_count variable name
(I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables)
* Only gtry to delete the file if a record is found in the log
* Only try to get fieldset if model is valid
* Fixed more camel-casing -> snake-casing
* Only display the file if the log record can be found
* Fixed casing in sync command
* Updated README
* Derp - typo
* Added link to Atlassian plugin
* More Atlassian clarifications
* Show accessory image on view page
* Increased image size to 800px, added lightboxes
* Fixed #7083 - Removed user_exists constraint on department save
If the user has been deleted, this prevented the department from being successfully saved on edit
* Updated branch in version file
* Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084 )
* bump up to php7.1
& change deprecated MAINTAINER to a LABEL so it is visible with `docker inspect`
* AND modapache ><
* 2 updates required to get software-properties+ppa
* Bumped version
* Bumped release again :(
* Missed one
* Fixed #7098 - updated backup config for deleteFile() method
* Fixed #7092 - handle weird port forwarding/port numbers for baseUrl
* Bumped version
* Fixed #7099 - set email to null by default for backup notifications
* Removed old comments
* Fixed #7100 - Check if $user isset on checkin
* Increased throttle to 120 requests per minute
* Added Filipino, corrected order for Spanish variations
* Update language strings
* Bumped hash
* Changed has to filled to fix bulk asset editing
* Bumped point version
* Small fixes for phpleague CSB reader v9
* Improved error checking in locations importer
* Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility
* Reduce minimum group name length to 2 (from 3)
eg: IT
* Back in time fix FOR #7145 for new installs on MySQL 8+
* Fixed permission insert
//TODO
Handle this via model
* Possible fix for reporting/admin migration back in time
* Fixed #7164 - change table name to permission_groups
* Fixed LDAP password blanking on save
* fixing previous commit's actual wiping of password (#7183 )
replaced Input::fille('ldap_pword') with _filled_. Should be good to go.
https://github.com/snipe/snipe-it/issues/7179
https://github.com/snipe/snipe-it/issues/7169
* Bumped version
* Downgrading rollbar for Laravel 5.5
* Spelling Correction (#7206 )
Fixed Spelling for the word reqrite, to be rewrite.
* Fix #6910 : Add logic to manipulate the eloquent query. (#7006 )
* Added company_id to consumables_users table
* Added logic to manage when a pivot table doesn't have the column company_id trough a join with users
* Remove a migration that tries to fix this problem, but is not longer necessary
* Addresses #7238 - add PWA code to layout
Needs additional UX testing
* Better log message for bad LDAP connection
* Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed
* Comment clarification on #7186
* Check for valid seat on hardware view
* Added space between footer and custom message
* Cap warranty months to three characters
Filles rollbar 209
* Cap warranty months to 3 on the frontend blade
* Fixed countable() strings on user destroy
* Check that the user has assets and that the aset model is valid
* Bumped hash
* Caps asset warranty to 20 years
* Command to fix custom field unicode conversion differences between PHP versions (#7263 )
* Fixes #7252 form request changes (#7272 )
* Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests
* Removed debug info
* More fixes for #7252
This is mostly working as intended, if not yet the way Laravel wants us to do it.
Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress.
* Removed experimental method
* Check for digits_between:0,240 for warranty
* Removed debug code
* Apply fix from PR #7273 to master
* Bumped hash
* Fixed #7250 - permission issue for API fieldsets and fields endpoints
This applies the change from #7294 to master
* Add @mskrip as a contributor
* Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name
* CORS for api (#7292 )
* Added CORS support to API
* Changed order so CORS will still work if throttle hit
* Added APP_CORS_ALLOWED_ORIGINS env option
* Fixed typo
* Clarified header comments
* More clarification
* DIsable CORS allowed origins by default to replicate existing behavior
* Change variable name to be clearer
* Bumped version
* Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7317 )
* Added comments to the ByFilter query scope for clarity
* Added accessories checkout/checkin API endpoint
* Fixed CVE-2019-10742
https://nvd.nist.gov/vuln/detail/CVE-2019-10742
* Update README.md (#7334 )
Add reference to CSV importer.
* Group related variables in .env
* History importer fixes
* Fixes to history importer
2019-08-14 21:48:14 -07:00
snipe
8b4a9aa382
Fixes to history importer
2019-08-13 18:15:42 -07:00
snipe
99cd552d5c
History importer fixes
2019-08-13 18:00:21 -07:00
snipe
e7b0ee2539
Added accessories checkout/checkin API endpoint
2019-08-02 15:08:26 -07:00
snipe
1608dba7dd
Commenting again?
2019-07-31 14:29:19 -07:00
snipe
c593b3645c
Added comments to the ByFilter query scope for clarity
2019-07-31 14:24:01 -07:00
Ivan Nieto
28ae90fa8a
Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database ( #7317 )
2019-07-31 13:55:21 -07:00
Ivan Nieto
f407b86aa8
Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database ( #7318 )
...
💥 Nice work, Ivan!
2019-07-31 13:54:55 -07:00
snipe
3dc2cc9f22
CORS for api ( #7292 )
...
* Added CORS support to API
* Changed order so CORS will still work if throttle hit
* Added APP_CORS_ALLOWED_ORIGINS env option
* Fixed typo
* Clarified header comments
* More clarification
* DIsable CORS allowed origins by default to replicate existing behavior
* Change variable name to be clearer
2019-07-26 12:38:31 -07:00
snipe
ab86e42b2e
Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name
2019-07-26 12:37:38 -07:00
snipe
250a797339
Fixed #7250 - permission issue for API fieldsets and fields endpoints
...
This applies the change from #7294 to master
2019-07-24 11:00:42 -07:00
Marián Skrip
8a1f6b74e8
Fix permission issue for API fieldsets and fields endpoints ( #7294 )
...
Close snipe/snipe-it#7250
2019-07-24 10:57:09 -07:00
snipe
74e647fea7
Apply fix from PR #7273 to master
2019-07-18 14:37:48 -07:00
snipe
55ee90b25d
Fixes #7252 form request changes ( #7272 )
...
* Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests
* Removed debug info
* More fixes for #7252
This is mostly working as intended, if not yet the way Laravel wants us to do it.
Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress.
* Removed experimental method
* Check for digits_between:0,240 for warranty
* Removed debug code
2019-07-18 14:32:23 -07:00
snipe
eec445fcf5
Command to fix custom field unicode conversion differences between PHP versions ( #7263 )
2019-07-18 14:30:18 -07:00
Ivan Nieto
af1857b6ee
Fix for the issue when the user tries to query assets due for audit without appropiate configuration [ch9625] ( #7273 )
...
* Added propper routes to the controller
* Logic to handle the not setted ->audit_warning_days variable
* Change the variable name for more clarity
* Got rid of the unnecesary if sentence in sake of brevity
* Adding the null coalesce operator so it can properly handle when the setting is null
2019-07-18 14:08:55 -07:00
snipe
cef22c3158
Caps asset warranty to 20 years
2019-07-18 09:49:58 -07:00
snipe
444e250609
Fixed countable() strings on user destroy
2019-07-17 17:51:13 -07:00
snipe
15bfd07f30
Cap warranty months to three characters
...
Filles rollbar 209
2019-07-17 12:13:15 -07:00
snipe
b4b6d6b571
Comment clarification on #7186
2019-07-15 15:31:09 -07:00
snipe
8c73a47afb
Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed
2019-07-15 15:27:02 -07:00
snipe
f82ffe378c
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-07-15 14:11:18 -07:00
snipe
984c2a8fd4
Better log message for bad LDAP connection
2019-07-15 14:10:57 -07:00
Ivan Nieto
d409be6d43
Fix #6910 : Add logic to manipulate the eloquent query. ( #7006 )
...
* Added company_id to consumables_users table
* Added logic to manage when a pivot table doesn't have the column company_id trough a join with users
* Remove a migration that tries to fix this problem, but is not longer necessary
2019-07-15 13:02:44 -07:00
Thomas Misilo
e1b33f3087
Spelling Correction ( #7206 )
...
Fixed Spelling for the word reqrite, to be rewrite.
2019-06-27 18:33:13 -07:00
Kasey
03a4512406
fixing previous commit's actual wiping of password ( #7183 )
...
replaced Input::fille('ldap_pword') with _filled_. Should be good to go.
https://github.com/snipe/snipe-it/issues/7179
https://github.com/snipe/snipe-it/issues/7169
2019-06-19 14:21:53 -07:00
snipe
de992e4df3
Fixed LDAP password blanking on save
2019-06-14 17:20:37 -07:00
snipe
a85251aa83
Fixed #7164 - change table name to permission_groups
2019-06-14 10:37:20 -07:00
Diogenes S. Jesus
4c61d330e6
fix Paginator ( #7157 )
2019-06-14 09:54:09 -07:00
snipe
30904dd019
Reduce minimum group name length to 2 (from 3)
...
eg: IT
2019-06-12 15:56:19 -07:00
snipe
1d0d25db37
Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility
2019-06-12 15:51:47 -07:00
snipe
cbff66c9db
Improved error checking in locations importer
2019-06-10 18:50:41 -07:00
snipe
27231d49ea
Small fixes for phpleague CSB reader v9
2019-06-03 22:05:16 -07:00
snipe
49a255c8fb
Changed has to filled to fix bulk asset editing
2019-05-31 14:11:43 -07:00
snipe
d2bbc09892
Increased throttle to 120 requests per minute
2019-05-31 11:57:57 -07:00
vicleos
c6039cbc1d
Vicleos fix storage namespace ( #6901 )
...
* Update CompaniesController.php
fixed companies destroy error
* fix Storage namespace loss
2019-05-30 19:10:04 -07:00
snipe
74a2c29bc2
Fixed #7100 - Check if $user isset on checkin
2019-05-30 19:06:30 -07:00
snipe
2c64739e8f
Removed old comments
2019-05-30 19:02:20 -07:00
snipe
829d44bd27
Fixed #7098 - updated backup config for deleteFile() method
2019-05-29 14:47:55 -07:00
snipe
a014af4c47
Fixed #7083 - Removed user_exists constraint on department save
...
If the user has been deleted, this prevented the department from being successfully saved on edit
2019-05-28 13:18:31 -07:00
snipe
2dd31544fe
Increased image size to 800px, added lightboxes
2019-05-24 19:11:08 -07:00
snipe
237acdcff0
Show accessory image on view page
2019-05-24 18:22:57 -07:00
snipe
b2c9a38db8
Fixed casing in sync command
2019-05-24 16:12:43 -07:00
snipe
6dcdb5abae
Only display the file if the log record can be found
2019-05-24 16:06:52 -07:00
snipe
56576d9e45
Fixed more camel-casing -> snake-casing
2019-05-24 16:01:12 -07:00
snipe
d5c3ee5ed0
Only try to get fieldset if model is valid
2019-05-24 15:44:54 -07:00
snipe
18db0a50f1
Only gtry to delete the file if a record is found in the log
2019-05-24 15:44:40 -07:00
snipe
d596ced0a0
Fixed free_seats_count variable name
...
(I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables)
2019-05-24 15:44:18 -07:00
snipe
78fb2b2239
Only build the log upload destination path if there is a matching record
...
Fixes [ch1232]
2019-05-24 15:28:53 -07:00
snipe
1472e9d5b5
Check for valid model before attempting to access fieldsets
...
Fixes [ch1249]
2019-05-24 15:03:15 -07:00
snipe
fcbc7e4540
Fixed Undefined variable user in $backto if checked out to a non-user
...
Fixes [ch9194]
2019-05-24 14:51:27 -07:00
snipe
93bf541ce7
Fixed missed consumables_count withCount() statement
2019-05-24 14:21:53 -07:00
snipe
1e6c85da41
Removed custom fields from AssignedSearch to prevent confusing data in selectlist
...
Fixes [ch9193]
2019-05-24 13:50:11 -07:00
snipe
c5a23e8f5e
Fixed bug where sorting by company name in Users API did not work
...
Fixes [ch9200]
2019-05-24 13:37:20 -07:00
snipe
b6d2392303
Small fix for reordering fields
...
Fixes Illuminate\Database\QueryException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'order' cannot be null (SQL: insert into `custom_field_custom_fieldset` (`custom_field_id`, `custom_fieldset_id`, `order`, `required`) values (12, 7, , 0)) [ch1151]
This needs revisiting for a more solid fix, especially for data that was already entered bad.
2019-05-24 12:05:52 -07:00
snipe
d6f251e992
Updated importer to work with newer CSV Reader::getRecords() method
2019-05-24 11:44:57 -07:00
snipe
4be95eac4b
Removed extra escaping on checkin
2019-05-24 11:44:39 -07:00
snipe
8914d14681
Tidied up license check
2019-05-24 05:26:52 -07:00
snipe
d4725b61be
Check that a model exists before trying to fiddle with fieldsets
2019-05-24 04:48:04 -07:00
snipe
aa0b627fe7
Fixed missing asset validation
2019-05-24 04:47:35 -07:00
snipe
5be5e3271d
Trying to fix ajax asset validation
...
This I think gets us closer, but still not handling the validation on the asset properly.
When I do a print_r of the validation in the other items, its looking for an error bag that looks something like this:
```
Illuminate\Support\MessageBag Object
(
[messages:protected] => Array
(
[name] => Array
(
[0] => The name field is required.
)
[seats] => Array
(
[0] => The seats field is required.
)
[category_id] => Array
(
[0] => The category id field is required.
)
)
[format:protected] => :message
)
```
Currently the Assets ajax returns:
```
[2019-05-24 06:52:06] develop.ERROR: array (
'messages' =>
array (
'model_id' =>
array (
0 => 'The model id field is required.',
),
'status_id' =>
array (
0 => 'The status id field is required.',
),
'asset_tag' =>
array (
0 => 'The asset tag field is required.',
),
),
)
```
So not sure why it’s not working.
2019-05-24 03:55:31 -07:00
snipe
dd5d5cc07c
Handle JSON validation errors like 5.4
2019-05-24 01:12:38 -07:00
snipe
84c3709161
Handle JSON validation errors like 5.4
2019-05-24 01:12:21 -07:00
snipe
96e2d74ae3
Handle JSON validation errors like 5.4
2019-05-24 00:46:30 -07:00
Steffen
27dcb4d27b
Allow empty filter (=== '' doesn't work) ( #6999 )
2019-05-23 19:59:27 -07:00
sreyemnayr
f85ac97d8c
Feedback for Kits; Fix checkins for accessories ( #7060 )
...
* Kits feedback
* Fix accessory checkin
2019-05-23 19:39:30 -07:00
snipe
bf93e8cc32
Use getReader instead of fetchAssoc for CSV parser
...
https://csv.thephpleague.com/9.0/upgrading/
2019-05-23 19:09:58 -07:00
snipe
2d036c64e9
Change ->has() to ->filled()
2019-05-23 17:39:50 -07:00
snipe
8db2470ac4
Switch has() to filled()
2019-05-23 17:17:46 -07:00
snipe
12ec2d1f7a
Fixed custom field edit screen
2019-05-22 01:07:14 -07:00
snipe
6cd25fbdeb
Updated backup path in backup admin
2019-05-22 00:56:14 -07:00
snipe
4be8ba9f17
Updated withCount to use manual naming
2019-05-22 00:52:51 -07:00
snipe
df8008f1ed
Renamed fire() to handle()
2019-05-22 00:52:32 -07:00
snipe
77547c528b
Added the command loader to console kernel
2019-05-22 00:52:14 -07:00
snipe
bfb910f375
Set the serialization
2019-05-22 00:51:43 -07:00
snipe
b2eacb147b
Fixed #7046 - added user website url back into UI
2019-05-21 18:55:12 -07:00
snipe
0358d13ddb
Fixed #7044 - API update deleted custom fields if they are not re-presented
2019-05-20 11:49:18 -07:00
Bob Clough
096393389c
Fixes #5054 : LDAP users deactivated for none-ad ( #7032 )
...
When using none-AD ldap, users are automatically deactivated every LDAP
sync. This commit changes the behaviour so that if the active flag isn't set,
the users are enabled.
Fixed #5054 , at least for 4.X
2019-05-16 09:31:55 -07:00
snipe
9eb7b668d1
Fixed #6880 - correctly encrypt encrypted fields via the API
2019-05-15 19:33:30 -07:00
snipe
6728089106
Fixed #6883 - remove escaping of fields on LDAP import
2019-05-15 19:15:41 -07:00
snipe
888bdbdb68
Added ability to update groups via API
...
Fixes [ch9139]
2019-05-15 16:39:34 -07:00
Ivan Nieto
e40a5a70a5
RTF support added ( #7024 )
...
* Added the Gatte Facade to AssetsController
* Added the filetype RTF in the modal to upload files
* Added validation of RTF files
2019-05-15 15:47:40 -07:00
snipe
d67c931f6a
Import locations from CSV via command line ( #7021 )
...
* Added import locations command
* Small fixes to location importer
* Added country, LDAP OU
* Cleaned up comments, added more clarification to what the script does
2019-05-13 02:27:19 -07:00
snipe
d016076806
Fixed #6956 - viewKeys policy inconsistent ( #7009 )
...
* Fixed #6956 - Added additional gates show showing/hiding license keys
* Modified gate to allow user to see licenses if they can create or edit the license as well
2019-05-08 08:14:49 -04:00
snipe
23fa5d0bf4
Fixed #7003 - crash when warranty months or purchase date is null
2019-05-07 15:33:57 -04:00
Joris van Eijden
486c708911
Leave the activated state for users alone in normal LDAP synchronisation. ( #6988 )
2019-05-06 09:40:53 -04:00
snipe
407445456a
Merge branch 'features/6204_email_audit-alerts' into develop
...
# Conflicts:
# app/Console/Commands/LdapSync.php
# app/Console/Kernel.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/LicensesController.php
# composer.json
# composer.lock
# config/version.php
# resources/views/auth/two_factor_enroll.blade.php
2019-05-06 08:45:13 -04:00
snipe
e5c2d77c7d
Fixes #6204 - added email alerts and web/API access to assets due for audits ( #6992 )
...
* Added upcoming audit report
TODO: Fid diff/threshold math
* Added route to list overdue / upcoming assets via API
* Controller/API methods for due/overdue audits
We could probably skip this and just handle it via view in the routes…
* Added query scopes for due and overdue audits
* Added audit due console command to kernel
* Added ability to pass audit specs to main API asset search method
* Added audit presenter
* Added bootstrap-tables presenter formatter to display an audit button
* Added gated sidenav items to left nav
* Added audit due/overdue blades
* Cleanup on audit due/overdue console command
* Added language strings for audit views
* Fixed :threshold placeholder
* Removed unused setting variable
* Fixed next audit date math
* Added scope for both overdue and upcoming
* Derp. Wrong version
* Bumped version
(I will release this version officially tomorrow)
2019-05-05 22:32:52 -04:00
snipe
a86409868e
Derp. Wrong version
2019-05-05 22:31:43 -04:00
snipe
e4a298ca2a
Added scope for both overdue and upcoming
2019-05-05 22:13:30 -04:00
vicleos
ab8792a13d
Update CompaniesController.php ( #6900 )
...
fixed companies destroy error
2019-05-05 20:57:28 -04:00
snipe
7497eaf302
Removed unused setting variable
2019-05-05 19:58:08 -04:00
snipe
7d416d1175
Fixed :threshold placeholder
2019-05-05 19:57:23 -04:00
snipe
7b194c678c
Cleanup on audit due/overdue console command
2019-05-05 19:22:08 -04:00
snipe
05a85c628f
Added audit presenter
2019-05-05 19:20:17 -04:00
snipe
0f0ffd39a8
Added ability to pass audit specs to main API asset search method
2019-05-05 19:19:56 -04:00
snipe
996a4cc29b
Added audit due console command to kernel
2019-05-05 19:15:24 -04:00
snipe
0e234bac70
Added query scopes for due and overdue audits
2019-05-05 19:14:02 -04:00
snipe
ab060288fa
Controller/API methods for due/overdue audits
...
We could probably skip this and just handle it via view in the routes…
2019-05-05 19:13:37 -04:00
snipe
e46cccdf90
Added upcoming audit report
...
TODO: Fid diff/threshold math
2019-05-04 17:52:17 -04:00
ajsy
9b3a8c046c
Update LocationsController.php
2019-05-03 15:21:57 +03:00
snipe
ce16eae508
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-05-02 15:20:52 -07:00
snipe
dc73dbfbfd
Fixed #6911 - note must be a string on license checkin
2019-05-02 15:20:47 -07:00
ajsy
38e8028300
Update LocationsController.php
2019-04-19 13:20:37 +03:00
snipe
dae26e0378
Remove “Imported from LDAP” note override
2019-04-18 17:56:08 -04:00
snipe
1bb1f7342f
Fixed #6922 - date_add crashing if EOL is null
2019-04-18 15:49:59 -04:00
snipe
420e8bc85a
Allow phone number to be changed in Profile
2019-04-18 14:13:50 -04:00
snipe
fe553aec02
Added first-initial dot lastname format for usernames/email
...
Fixed [ch1379]
2019-04-02 18:21:54 -07:00
Ivan Nieto
b1f96448af
Remove old redundant code in LicensesController, added an offset to AccessoriesController for pagination to work correctly ( #6847 )
2019-04-02 10:13:58 -07:00
Martin Meredith
b779e274cc
Fix usage of Google2FA Facade ( #6864 )
2019-03-27 22:01:38 -07:00
Martin Meredith
83257af267
Fix imports for 2FA Login ( #6855 )
2019-03-26 14:10:56 -07:00
snipe
109a29b5fc
Fix error in tests
2019-03-20 04:39:50 -07:00
snipe
acb90c7aee
Horrible master -> dev merge that makes baby jesus cry :(
...
# Conflicts:
# app/Http/Controllers/Auth/LoginController.php
# composer.json
# composer.lock
# resources/views/auth/two_factor_enroll.blade.php
2019-03-20 02:24:23 -07:00
snipe
bca82684a1
Merge branch 'hotfixes/2fa_qr' into develop
...
# Conflicts:
# .all-contributorsrc
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/ImportsController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Requests/ItemImportRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# composer.json
# composer.lock
# config/app.php
# config/version.php
# docker/startup.sh
# 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
2019-03-20 02:17:02 -07:00
snipe
da015ec4a8
Fixed #6834 and #6402 - use inline QR code generation for 2FA ( #6840 )
...
* Fixed #6834 and #6402 - use inline QR code generation for
* Update auth controllers to use translations
* Updated composer lock
* Added comments
* Moar comments
* Typo
2019-03-20 01:24:31 -07:00
snipe
335e8ffaaa
Typo
2019-03-20 01:22:20 -07:00
snipe
8d0ee9e531
Moar comments
2019-03-20 01:21:34 -07:00
snipe
cc5c7d33e7
Added comments
2019-03-20 01:14:58 -07:00
snipe
5699e021de
Update auth controllers to use translations
2019-03-20 00:50:09 -07:00
snipe
cf92618c70
Fixed #6834 and #6402 - use inline QR code generation for
2019-03-20 00:49:44 -07:00
snipe
a874dbb0d0
Working attempt, but will try with old library for mininal footprint
2019-03-19 23:18:16 -07:00
snipe
8ed268819e
Fixed XSS
2019-03-18 21:09:57 -07:00
snipe
dee92cfc6c
Fixes XSS vulnerabilities ( #6831 )
...
* Properly escape log_meta values
* Vue syntax fix to allow npm run dev to work again
* Janky fix for Select2 bug
* Compiled production assets
* Escape user’s last name in API
* Removed duplicate alertClass
* Compiled production assets
2019-03-18 20:49:32 -07:00
snipe
0e1289f12f
Fixes #6821 - fixed 2 fa active for users list ( #6822 )
...
* Fixed #6821 - confusing UI for 2FA when 2FA is universally enforced
I also updated the language in the user’s listing table to clarify what “activated” means
* Added login enabled info to user view
* Clarified comments
* Added info about 2FA on user profile
Because why not
* Added nowrap to table, and added 2FA reset for superadmins
2019-03-18 11:59:02 -07:00
snipe
7b33f95e83
Fixes/import permissions mask ( #6826 )
...
* Check for empty headers in import
* Added import permission
* Fixed model path in docblock
* Added import gate to default blade
* Check if the user is an admin OR idf they have import permissions
* Walked back that admin permission
Since admins are bound by full company support, it makes less sense to let admins have this permission by default, versus having them specifically designated to the import permission
2019-03-18 11:58:08 -07:00
Ivan Nieto
bebdbdfb87
Fix #6763 . Import Stuck Processing - Error - Can only flip STRING and INTEGER values! ( #6804 )
...
* Added validation for errors when the Import Field to map isn't setted
* A slightly correction to the error message
* Added the translation strings for the Error Message
2019-03-14 12:32:40 -07:00
snipe
26c0cf5d33
Allow null for logCheckin $action_date
2019-03-14 01:22:29 -07:00
snipe
239f21b0d7
Set null option for $action_date
2019-03-14 01:09:16 -07:00
snipe
96f069c417
Change action_datwe to datetime in transformer
2019-03-13 21:57:06 -07:00
Ivan Nieto
c7f48951a9
Valo/checkin date in history of asset ( #6733 )
...
* To see checkin/checkout Date in History of Asset
* Added some logic to get today's date if the checkin_at input is blank
* Updating the action_date taking the value from the action_log table
* Hide created_at field and rename 'Action Date' as only 'Date'
2019-03-13 21:36:32 -07:00
Marián Skrip
8d63533205
Add write-only image_source field for asset create/edit API endpoint ( #6146 )
...
`image_source` should contain base64 encoded image data with mime-type.
2019-03-13 21:00:40 -07:00
Ivan Nieto
8c65214b1f
Ignore the soft deleted assets in the eloquent query ( #6824 )
2019-03-13 20:14:30 -07:00
Martin Meredith
e3e0d57f56
Minor code cleanup bits and bobs ( #6805 )
...
* Add IDE Helper files
* Cleanup imports
- Alphabetises imports
- Removes unused imports
* Add Platform requirements
* Move filling asset into block where asset exists
* Remove duplicate array keys
2019-03-13 20:12:03 -07:00
snipe
858d382e26
Changed logging to info level for LDAP
2019-03-13 15:14:03 -07:00
snipe
de16fee00a
Change image unlink error log to info from error
2019-03-13 12:22:12 -07:00
snipe
8efbde61c9
Merge branch 'fixes/kit_fixes' into develop
2019-03-13 12:16:20 -07:00
snipe
1b0d855c00
Added translation, removed commented out code
2019-03-13 12:15:48 -07:00
Martin Meredith
f403db274a
(develop) Fix asset auto-incrementation ( #6806 )
...
* Fix auto-increment not updating
This is due to the addition of caching for settings. If we're not
explicitly saving the Settings model, then the cache isn't getting
updated, causing the asset tag auto-increment to get an old cached
version with the wrong number
* Move Setting cache clear to an observer
2019-03-13 10:58:35 -07:00
Martin Meredith
a462e91983
(develop): Fix failing Unit Tests ( #6807 )
...
* Reference correct class for Licence Model
* Make sure we activate users in test to send Welcome Notification
2019-03-13 10:57:43 -07:00
ajsy
57c0f69286
Update LocationsController.php
2019-03-09 13:45:19 +03:00
ajsy
311dd18443
Update LocationsController.php
2019-03-09 11:34:47 +03:00
snipe
61afdeac2e
Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop
2019-03-08 16:18:48 -08:00
Martin Meredith
0840ab41d5
Hotfix: Fix ability to create assets ( #6790 )
2019-03-06 16:37:58 -08:00
snipe
5293cb30bd
Merge branch 'fixes/only_present_image_url_if_image_present_in_profile_api' into develop
2019-03-05 23:54:08 -08:00
snipe
6d98bd6846
Fixed error if item requested or request was deleted ( #6786 )
...
ch628
2019-03-05 23:47:36 -08:00
snipe
0b0813b260
Fixed error if item requested or request was deleted
...
ch628
2019-03-05 23:46:40 -08:00
snipe
6f1a70ee09
Fixed ch1086 - Merge branch 'fixes/search_consumables_by_item_number' into develop
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
2019-03-05 23:23:46 -08:00
snipe
58768e5aee
Added ability to search consumables by item number ( #6785 )
...
Fixes ch1086
2019-03-05 23:21:22 -08:00
snipe
3b41aa52c8
Added ability to search consumables by item number
...
Fixes ch1086
2019-03-05 23:20:16 -08:00
snipe
28a450ea25
Added ability to do full name search in user dropdown selectlist ( #6784 )
2019-03-05 21:13:39 -08:00
snipe
6696685d0b
Merge branch 'fixes/full_name_search_user_selectlist' into develop
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
# routes/api.php
2019-03-05 20:57:10 -08:00
snipe
f065bd7784
Added ability to do full name search in user dropdown selectlist
2019-03-05 20:40:05 -08:00
Steffen
de39906cae
Put file contents instead of file object (creates subdirectory with a single file) ( #6760 )
2019-03-05 12:08:18 -08:00
snipe
288cc01c41
Merge branch 'features/accessories_users' into develop
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
# config/version.php
# routes/api.php
2019-03-01 17:30:03 -08:00
snipe
9575cd2651
Add accessories endpoint to user API ( #6775 )
2019-03-01 17:21:03 -08:00
snipe
348c13f318
Add accessories endpoint to user API
2019-03-01 16:31:22 -08:00
Steffen
e1907e30b1
Allow multiple upload fields and add logo option to labels ( #6736 )
...
* Change upload js to work with multiple upload elements on a single page
* Change uploadFile in upload modal and form partial
* Change uploadFile to js-uploadFile to avoid potential issues in the future
* Remove duplicate style attribute causing webpack to fail
* Missed a css class in rename to js- prefix
* - Move logo uploads to partial for eaiser usage
- Add label logo
- Add css classes to label elements
- Change label prefix text (M: S: ...) to css::before content for easy removal in config
* Add more css classes to labels
* Allow unescaped " (quot) in css ouput
* Add max size param to partial, set defaults for allowedType and size
2019-03-01 15:25:42 -08:00
Dmitrii Minaev
16bb784e78
Codestyle & bug fixes
2019-02-28 01:37:58 +03:00
Dmitrii Minaev
d3c320e56f
Code comments and format
2019-02-23 22:44:03 +03:00
Dmitrii Minaev
5f3a0bdea5
app\Services\PredefinedKitService.php rename to app\Services\PredefinedKitCheckoutService.php
...
add accessories and consumables tables
add selectlist api to:
app\Http\Controllers\Api\AccessoriesController.php
app\Http\Controllers\Api\ConsumablesController.php
app\Http\Controllers\Api\LicensesController.php
templates for selectlist
apply kit to user works
2019-02-19 22:19:00 +03:00
snipe
0242b3ec74
Handled JS cookie offset issue on the server side
...
We may want to handle this via the blades instead, as I’m not sure if API users will run into weirdness here.
2019-02-14 15:01:34 -08:00
snipe
b26fbf986f
Fixed issue where offset could be greater than total items, resulting in “No results” confusion
2019-02-14 14:49:08 -08:00
snipe
5c9b1ed43a
Fixed #6676 - consumables API not respecting category id
2019-02-14 14:48:43 -08:00
snipe
0000f487ac
Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop
...
# Conflicts:
# config/version.php
2019-02-13 23:02:21 -08:00
snipe
35ebe33e4e
Fixed #6703 - fixes password confirmation ( #6711 )
...
* Fixed #6703 - fixes password confirmation
* Removed debugging
* Fixed tests
* I guess we use 10 as the settings for password min in tests
* One more try to fix tests - confirmation won’t validate until password validates
2019-02-13 23:01:19 -08:00
snipe
d893837c86
Removed debugging
2019-02-13 21:32:26 -08:00
snipe
230c9da1df
Fixed #6703 - fixes password confirmation
2019-02-13 21:30:15 -08:00
snipe
9247dc592b
Removed debugging statements
2019-02-13 07:09:49 -08:00
snipe
cd333fa93b
Fixed wonky merge :(
2019-02-13 06:52:36 -08:00
snipe
533649f24e
Merge branch 'develop' into dev-master-integration
...
# Conflicts:
# .gitignore
# .travis.yml
# app/Console/Commands/LdapSync.php
# app/Console/Commands/SendExpectedCheckinAlerts.php
# app/Console/Commands/SendExpirationAlerts.php
# app/Console/Commands/SendInventoryAlerts.php
# app/Console/Kernel.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/Auth/ResetPasswordController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/UsersController.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/Importer.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/License.php
# app/Models/Location.php
# app/Models/Recipients/AlertRecipient.php
# app/Models/User.php
# app/Providers/AppServiceProvider.php
# composer.json
# composer.lock
# config/trustedproxy.php
# config/version.php
# 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
# resources/lang/ar/admin/settings/general.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/passwords.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/passwords.php
# resources/lang/es-ES/passwords.php
# resources/lang/es-MX/passwords.php
# resources/lang/es-VE/passwords.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/id/admin/settings/general.php
# resources/lang/id/passwords.php
# resources/lang/ja/passwords.php
# resources/lang/nl/passwords.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/passwords.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/passwords.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/admin/statuslabels/table.php
# resources/lang/ru/passwords.php
# resources/lang/sr-CS/general.php
# resources/lang/sr-CS/mail.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/passwords.php
# resources/lang/vi/admin/models/message.php
# resources/lang/vi/admin/users/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/views/importer/import.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/view.blade.php
# tests/unit/ImporterTest.php
2019-02-13 06:42:52 -08:00
snipe
f1fa5bdaa9
Fixed (develop) #6704 - don’t apply gate to $arrays collection, just check that they can view assets
2019-02-13 04:56:13 -08:00
snipe
aa1e06f021
One more time…. Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets
2019-02-13 04:46:19 -08:00
snipe
30b1cfabf5
Fixed dumb formatting
2019-02-13 04:45:21 -08:00
snipe
e75d22ab73
Revert "Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets"
...
This reverts commit b1e17743b8
2019-02-13 04:44:19 -08:00
snipe
b1e17743b8
Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets
2019-02-13 04:35:55 -08:00
snipe
1e1d32dc85
Make user notes field editable via API
2019-02-13 01:32:00 -08:00
snipe
b317fb8d83
Fixed #6367 - pass table name and column_id to scopeCompanyables
2019-02-13 01:29:53 -08:00
snipe
e2c0f01a10
Fixed #6367 - pass table name and column_id to scopeCompanyables
...
Solves error: Integrity constraint violation: 1052 Column 'company_id' in where clause is ambiguous
2019-02-13 01:26:11 -08:00
snipe
f88fee0f21
Make user notes field editable via API
2019-02-12 23:58:30 -08:00
snipe
245b3ca09f
Fixed #6061 - Assigned user group cannot be removed
2019-02-12 23:49:42 -08:00
snipe
f3c12f38b6
Fixed #6061 - Assigned user group cannot be removed
...
This bug was a result of attempting to check if the groups field had a value, and only THEN trying to sync the groups. This meant that uf you were removing ALL groups, the sync wouldn’t be triggered.
This still needs to be updated in the API.
2019-02-12 23:43:38 -08:00
snipe
da34b82b3e
Do not count deleted locations in managedLocation check on user delete
2019-02-12 23:33:01 -08:00
snipe
5e19178a30
Do not count deleted locations in managedLocation check on user delete
2019-02-12 23:32:10 -08:00
snipe
8e358faebc
Fixed #6113 - use $asset->fill vs filled() to allow blanking values via API
2019-02-12 22:15:32 -08:00
snipe
90cddb7aee
Fixed #6113 - use $asset->fill vs filled() to allow blanking values via API ( #6693 )
...
Need to confirm that re-enabling `\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,` won’t mangle anything. I know we ran into some issues when testing a long time ago, but not sure those issues apply anymore, and I can’t remember what they were.
2019-02-12 22:08:38 -08:00
herroworrd
3f7d2aebc7
Fixed #6634 : Asset Import History fixes and optimizations ( #6657 )
...
* Starting work on asset history importer.
* Starting work on asset history importer.
* Added checkin target.
* Last change... importing history should also probably be an admin only task.
* Added caching for user and asset queries.
* Updated cache keepalive time to DateTimeInterface
* Updated cache keepalive time to DateTimeInterface
2019-02-08 16:05:56 -08:00
Steffen
5624ea14e7
Fix accessories edit error ( #6698 )
...
* Add accessories_upload_path singleton (used in accessories/edit)
* Fix indent
2019-02-08 15:43:11 -08:00
Steffen
3530603797
Simplify slack channel regexp and allow private (no # prefix) channels and direct messages (@ prefix) ( #6699 )
2019-02-08 15:41:54 -08:00
snipe
4fd469e07b
Prevent editing special users demo mode
2019-02-04 19:13:55 -08:00
snipe
59cb1e561e
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-02-04 18:59:53 -08:00
snipe
4fe63d2966
Fixed #6633 - return 200 status code on asset API
2019-02-04 18:59:49 -08:00
snipe
971fcf5800
Fixed #6633 - return 200 status code
2019-02-04 18:58:28 -08:00
Ivan Nieto
9ac40f705c
Valo/ch37/cannot log in with generated password from ( #6655 )
...
* Cannot log in with generated password from [ch37]
* Cannot log in with generated password from [ch37]. Light cleanup
* Added the fetchHumanBoolean() method.
* Cleaning up the ternary
2019-01-31 19:58:54 -08:00
Colin Campbell
ef8e20f66b
Alpine linux docker image ( #6645 )
...
* docker-alpine: Alpine linux container + apache 2.4 support
* docker-alpine: Force passport migrations (production mode Exception)
* docker-alpine: Copy default env in Dockerfile
2019-01-30 14:45:36 -08:00
Dmitrii Minaev
e01e0c5596
Add licenses, accessories and consumables table presenters app\Presenters\PredefinedKitPresenter.php resources\views\partials\bootstrap-table.blade.php
...
Add refresh licenses, accessories and consumables tables refresh when add a new element resources\assets\js\snipeit_modals.js
Some design fixes resources\views\kits\edit.blade.php
Add default value to form (template) resources\views\modals\kit-model.blade.php
New routes for kit accessories and kit consumables routes\api.php
New routes for kit models, kit accessories and kit consumables routes\web\kits.php
New templates
2019-01-27 23:19:24 +03:00
Ivan Nieto
79b41ee662
Importing with CSV into Encrypted Custom [ch86] ( #6642 )
2019-01-25 14:26:59 -08:00
snipe
c1a4fbee16
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-01-25 13:34:57 -08:00
Colin Campbell
8c632f63b0
Misc ldap fixes ( #6631 )
...
* misc_ldap_fixes: Map location from OU, not group
* misc_ldap_fixes: Ensure ldap is initialised for import
* misc_ldap_fixes: Import Job Title
* misc_ldap_fixes: Import telephone, fix field select from schema
* misc_ldap_fixes: Cleanup login error-handling, fix boolean tests
2019-01-24 16:15:44 -08:00
snipe
ec4161a959
Fixed typo
2019-01-24 15:21:38 -08:00
snipe
a371e8d53f
Added calibration as a maintenance type
...
Should just make these custmizable options
2019-01-24 15:17:33 -08:00
snipe
8f09cca043
Fixed incorrect group route
2019-01-24 15:17:11 -08:00
snipe
b326d8593b
Fixed bad groups route on error
2019-01-24 14:56:47 -08:00
snipe
d1fe7abb18
Replaced custom deleted query scopes with onlyTrashed()
2019-01-24 14:47:44 -08:00
snipe
39bca49e8f
Specify table name in deleted user display
2019-01-24 14:38:18 -08:00
snipe
b8269020ae
Specify table name in deleted user display
2019-01-24 14:37:39 -08:00
snipe
ffc51d6db6
Specify table name in deleted user display
2019-01-24 14:33:54 -08:00
snipe
394e51029e
Only try to upload the audit file if one is provided
2019-01-24 14:04:06 -08:00
snipe
4b8f9d810b
Fixed #6625 - include fully depreciated date in custom asset report
2019-01-24 12:38:17 -08:00
bricelabelle
5281713fd9
Added #6617 : View licenses checked out to an asset with the hardware API ( #6621 )
2019-01-22 14:47:40 -08:00
snipe
7982b3f237
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-01-22 14:13:39 -08:00
snipe
07eead2dbf
Fixed bug where assets could be deleted without being checked back in [ch38]
2019-01-22 14:13:30 -08:00
Ivan Nieto
3fa5976315
Language of mail doesn't show as intended by the settings. [ch87] ( #6619 )
...
* Fixes #5554 . Language of mail doesn't show as intended by the settings.
2019-01-22 14:02:08 -08:00
NMathar
66f557d436
add user license api endpoint fix #6241 ( #6616 )
2019-01-22 13:48:15 -08:00
snipe
fdd6ddf61b
Fixed favicon upload
...
[ch309]
2019-01-18 14:05:52 -08:00
Ivan Nieto
310ed0f1d3
Fix an issue when trying to checkin a license seat. [ch46] ( #6599 )
...
* Fix an issue when trying to checkin a license seat.
* Minor changes in the checkin view, so it can returns to the expected place where the checkin is launched.
2019-01-17 20:36:40 -08:00
snipe
b293d00699
Switch LDAP error to debug, to avoid crapping up the logs
2019-01-17 20:18:03 -08:00
snipe
1eace04ad9
Handle asset maintenances that do not have a valid asset associated
2019-01-16 02:26:42 -08:00
snipe
75a0cf97e2
Return an error if asset maintenance is associated with a non-existant asset
2019-01-16 02:19:57 -08:00
snipe
a1f93e733c
Fixed undefined error when maintenance is associated with a deleted asset
2019-01-16 01:45:51 -08:00
Steffen
74c099f0b3
fix LDAP/AD sync: function calls for password creation ( #6581 )
...
* - change generatePassword to be more secure (allow duplicate chars)
- move generatePassword from trait to helper
- fix summary output for sync command
* - Don't treat ldap_active_flag as boolean - fixes sync not working at all when ldap field is set
- Sync non activated users (But set activated=0)
* - Read user first before checking against user settings
* Fix failed logins to not throw exceptions
2019-01-15 14:05:47 -08:00
fanta8897
49073742b5
Updating LDAP such that each user is not required to be bindable to LDAP ( #6571 )
...
* Update Ldap.php
* Update Ldap.php
* Update Ldap.php
* Update Ldap.php
* Update Ldap.php
Updating LDAP.php such that the admin bind will ONLY occur if the user attempting auth cannot bind. If that is the case, it will attempt to bind as admin and search for that user, prior to failing.
2019-01-15 14:04:21 -08:00
snipe
125938762b
Patched #6565 to develop
2019-01-15 14:02:10 -08:00
Sxderp
187206cb88
Fix saving of REMOTE_USER setting broken by 1a64879b6 ( #6565 )
...
The previous commit made it such that remote user login could only
be enabled if two factor authentication was also enabled. Unnest
the configuration so that the setting can be applied without.
2019-01-15 13:59:36 -08:00
Hubert
8420cb7ec1
Fixed problem with import when using snipeit:import command ( #6550 )
2019-01-15 13:58:23 -08:00
Steffen
61c619660d
Initialize customFormat to prevent Blade error when creating new fields ( #6596 )
2019-01-15 13:56:56 -08:00
Steffen
1de9087427
LDAP fixes ( #6533 )
...
* Add iCheck png files to webpack config (inconsistency for css <> png) and blue.png to public folder
* php 7.3 collect() fix (undefined variable)
* Fix travis ci
* Add iCheck png files to webpack config (inconsistency for css <> png) and blue.png to public folder
* php 7.3 collect() fix (undefined variable)
* change LDAP implementation from model to (singleton) service
* Re-apply check for content in ldap_server variable before parsing
* Update LDAP implementation
* Switch iCheck to minimal as referenced in js
* Don't init on load but on first access via init (returns ldap enabled status)
* Re-Enable notifications
* Re-add missing test target php versions
* Only init() once (singleton class, so ldap variable is already set)
2019-01-10 13:20:43 -08:00
Brady Wetherington
1fdb057199
New LDAP system tries to load LDAP configuration before determining ( #6512 )
...
whether or not LDAP is actually enabled
2018-12-17 14:04:35 -08:00
Ivan Nieto
876ff2ef72
Fixes #6341 . Some style changes in this fix. ( #6492 )
2018-12-14 18:08:33 -08:00
KeenRivals
f5ba2106cd
Fix snipeit:unescape not unescaping quotes ( #6506 )
2018-12-14 18:08:00 -08:00
snipe
67f6df2be3
Fixed (develop) #4568 - escaping values in custom report
2018-12-12 19:40:15 -08:00
snipe
8f6ea84fca
Fixed #4568 - escaping values in custom report
2018-12-12 19:38:24 -08:00
snipe
ea1b792a93
Fixed #6491 - cleaner return methods for PHP 7.3 compact()
2018-12-12 18:23:39 -08:00
snipe
426dae0310
Fixed methods for PHP 7.3 compact()
2018-12-12 18:16:39 -08:00
snipe
86cc1a228d
Fixed typo
2018-12-12 16:45:49 -08:00
snipe
394d265b96
Added XML to uploadable file type - re: #6099
2018-12-12 16:45:09 -08:00
snipe
6a6923b1d8
Fixed parse_url() expects parameter 1 to be string, null given
2018-12-12 16:37:27 -08:00
Steffen
28edf13457
WIP develop ldap fixes (errors, check if disabled, parsing in one place) ( #6500 )
...
* Fix errors and exception when ldap settings are empty (even with ldap disabled)
* Re-add newline at the end of file
2018-12-11 21:01:11 -08:00
snipe
93947b09c5
Small fix for #6484 - corrected LDAP sync command name
2018-12-11 15:18:30 -08:00
snipe
8b8ce256f5
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-12-11 13:07:48 -08:00
snipe
8313a069bf
Temp fix for blank LDAP values when LDAP is disabled
2018-12-11 13:07:14 -08:00
Wes Hulette
b38d07064b
Fixed : #5896 Custom fields of type "CUSTOM REGEX" are always saved as "ANY" ( #6381 )
...
* Fixed missing oauth tables during setup.
* Custom fields of type "CUSTOM REGEX" are always saved as "ANY"
Fixes #5896
* Updated per PR
Fixed spelling
* Fixed logic error
Moved conditional code from view to controller
Added getFromatType function for dropdown
2018-12-06 20:05:04 -08:00
snipe
a874cc32a8
Fixed bonked merge conflict
2018-12-06 14:20:01 -08:00
Wes Hulette
34246ee4ef
[WIP] v5 Develop: New LDAP implementation ( #6352 )
...
* Fixed missing oauth tables during setup.
* WIP New LDAP implementation
* WIP New LDAP implementation
* WIP New LDAP implementation
Merge remote-tracking branch 'origin/WIP_LDAP' into WIP_LDAP
* WIP New LDAP implementation
Added Adldap2 to handle ldap intergration.
* Updated per PR quality review
* Added specific LDAP settings method
* Corrected version number
* Added return documentation
* Added imports
* Changed class to be injected into controller
* Updated with PR suggestions
2018-12-06 14:05:43 -08:00
snipe
3ed2f55696
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-12-05 19:56:18 -08:00
snipe
09c4dd4891
Added ability to upload favicon and email logo
...
todo: refactor the image upload/resize for less copypasta
2018-12-05 19:56:12 -08:00
snipe
fb502df089
Fixed dumb code indenting
2018-12-05 18:36:39 -08:00
Ivan Nieto
f91e340178
Fixes #6341 . Adding condition that checks offset of licenses seats when the user looks other page than the first. ( #6392 )
2018-12-05 18:09:54 -08:00
snipe
f6c0e7cc9c
Fixed #6464 - added company name to searchable field in user search
2018-12-05 17:20:22 -08:00
Wes Hulette
d023f61bc4
Fixed missing importer ( #6413 )
...
Fixed missing manager_id
Fixed missing department_id
2018-12-04 13:06:12 -08:00
Minaev Dmitriy
0bbe499414
Kits checkout. But only with models.
2018-11-13 20:33:32 +03:00
snipe
dd5ca73602
Set support footer and version footer to on when resetting the demo
2018-11-08 12:52:37 -08:00
snipe
2632f730d1
Sets activated to 0 in UserImporter if the activated column isn’t set
2018-11-07 22:36:58 -08:00
snipe
24c158bfe6
Added missing use statement for departments in importer
2018-11-07 18:33:43 -08:00
snipe
3d4a5a8066
More importer tweaks for dept and manager
2018-11-07 18:05:53 -08:00
snipe
db7e0b56f2
Fixed department id on asset import with users
2018-11-07 17:36:34 -08:00
snipe
f2478d813c
Fix manager id if no manager is given in importer
2018-11-07 17:33:27 -08:00
Minaev Dmitriy
79d979f47f
Full kits manipulation without users intagration
2018-11-06 19:27:28 +03:00
snipe
b6daad7573
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-11-02 17:15:08 -07:00
snipe
67d2953080
Fixed #6386 - licenses not searching on category name
2018-11-02 17:15:04 -07:00
snipe
192aa9eb71
Fixed #6386 - licenses not searching on category name
2018-11-02 17:14:08 -07:00
Wes Hulette
0d2eef5894
v5 Develop Fixed: Setup error because setting table does not exist ( #6390 )
...
* Fixed missing oauth tables during setup.
* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop
* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
* Fixed error during setup when settings table is not present
2018-11-02 12:23:41 -07:00
Wes Hulette
88b1da4260
Added: Caching of settings ( #6378 )
...
* Fixed missing oauth tables during setup.
* Cache settings
Cache the setting to reduce unnecessary database calls
2018-11-01 19:59:50 -07:00
Wes Hulette
0730685c29
v5 Develop Fixed: LDAP Settings Password being updated when field is empty ( #6384 )
...
* Fixed missing oauth tables during setup.
* Fixed password saving
Previous Input::has always returned true, even if password was an empty string.
2018-11-01 13:36:30 -07:00
snipe
ea91d59ffc
Use username instead of email address in password reset ( #6382 )
...
* Switch to use username instead of email
* Fixed indenting
* Updated password language
* Updated blades to reflect username instead of email
* Changed password/reset controllers to use username instead of email
* Redirect to login page instead of repeating the password reset form
2018-10-31 18:03:24 -07:00
snipe
65aef11ae3
Fixed #5879 - added user department filter for custom report
2018-10-31 15:19:13 -07:00
snipe
8f22cf7c3c
Added dept update API endpoint
2018-10-31 14:31:57 -07:00
Minaev Dmitriy
9d5cd27575
New save mechanic
2018-10-31 16:06:38 +03:00
snipe
81f8fe34cd
Removed debugging line
2018-10-30 18:11:27 -07:00
snipe
f744696043
Fixed #6375 - lowercase keys on findAndBindUser to address LDAP syncing issue
2018-10-30 13:12:10 -07:00
snipe
29b0780c6c
Added company info to asset maintenances transforrmer
2018-10-30 00:20:16 -07:00
Wes Hulette
6b3b673daa
Changed NULL coalesce from ?? ( #6353 )
...
PHP 5 does not have the double question mark null coalesce support.
2018-10-26 15:53:18 -07:00
snipe
e443a576f7
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-10-19 16:46:53 -07:00
snipe
20b26effdb
Fixed #6349 - add view permission for print all assigned
2018-10-19 16:46:46 -07:00
snipe
1a10aa0dda
Fixed #6349 - add view permission for print all assigned
2018-10-19 16:43:28 -07:00
Minaev Dmitriy
f1f7694835
Merge remote-tracking branch 'remotes/upstream/develop' into develop
2018-10-19 19:00:53 +03:00
Minaev Dmitriy
0e66c3cb56
Predefined kits test
2018-10-19 17:30:25 +03:00
snipe
09a102fea8
Only try to return a department if there is a matching field
2018-10-19 01:44:45 -07:00
snipe
304fce73fc
Null if blank on user import
2018-10-19 01:38:14 -07:00
snipe
295a68bb7a
Try false instead of null
2018-10-19 01:36:15 -07:00
snipe
3aeb521782
Patch PR #6335 to master
2018-10-19 01:30:05 -07:00
snipe
f587d2248b
WIP: Better handle activation column in importer ( #6290 )
...
* Better handle activation column
* Added comments for clarity on importer methods
2018-10-19 00:23:12 -07:00
Wes Hulette
a975117eaf
Fixed : #6325 & #6317 ( #6335 )
...
* Fixed missing oauth tables during setup.
* Fixed missing manager_id and department_id
2018-10-17 13:38:13 -07:00
Wes Hulette
465b69516d
Fixed : #6259 - Remove remote JS/CSS file loading ( #6330 )
...
* Fixed missing oauth tables during setup.
* Remove remote JS/CSS file loading
Updated gravatar to return to default image
* Updated default avatar path to user url
Removed local html5shim & response js files.
Removed copying html5shim & respond js file to public directory
2018-10-17 12:52:01 -07:00
snipe
8579c5a68a
Allow 0 as a consumable min amt
2018-10-15 17:04:51 -07:00
snipe
9797412d23
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-10-15 17:02:39 -07:00
snipe
78b6e84774
Allow min:0 for consumables
2018-10-15 16:52:20 -07:00
Joe Ferguson
704209de9c
Fixed #6301 : Do not allow duplicate asset tags ( #6324 )
...
* Fixed #6301 : Do not allow duplicate asset tags
* Display error message for single asset_tag failure
2018-10-11 17:15:09 -07:00
Ivan Nieto
5516978f2e
#5696 proposed fix ( #6314 )
...
* Another 'or' caught in a blade template
* Added the requireAcceptance() method in LicenseSeat.php. Changed the permission in checkout-license mail to view.
* Getting right the permission in the view checkout-license
2018-10-11 14:08:09 -07:00
Wes Hulette
b8a37a0c73
Fixed Expiring Assets Email ( #6321 )
2018-10-11 14:03:00 -07:00
snipe
c7596e7741
Fixed image not uploading on asset create
2018-10-09 17:31:52 -07:00
snipe
d4fa81301d
Check if user can see assets in statuslabels gate
2018-10-09 16:34:12 -07:00
snipe
a516e4278e
Remove company select option if the user is not an admin and FCS is enabled
2018-10-05 07:30:42 -07:00
snipe
ecb8204c3c
Associate serials with multiple asset creation
2018-10-05 05:30:13 -07:00
snipe
476b58632b
Handle array of asset tags
...
TODO: figure out how to display validation errors more sanely
2018-10-05 04:34:47 -07:00
snipe
de76e8db5f
Re-enable rollbar
2018-10-04 12:11:36 -07:00
snipe
b5211b2dd5
Fixed #6291 - send-welcome argument in cli importer
2018-10-04 04:44:12 -07:00
snipe
4db1dd8afc
Fixed #6291 - send-welcome argument in cli importer
2018-10-04 04:43:06 -07:00
snipe
890b613f71
Temporarily suppress rollbar
2018-10-03 15:47:56 -07:00
snipe
84848fabd7
Fixed #6284 - missing checkout information on Status Labels API assets endpoint
2018-10-03 10:30:24 -07:00
Wes Hulette
4a88e155c4
Fixed : #6263 V5 (develop) - Missing oauth tables when using the setup wizard ( #6268 )
...
* Fixed missing oauth tables during setup.
* Merged develop changes
Removed PHP_CS file
2018-10-03 10:06:24 -07:00
snipe
c8ad45b11e
Port import manager code to develop
2018-10-03 00:52:29 -07:00
snipe
8937edb97e
Better validation for manager_id
2018-10-03 00:26:51 -07:00
snipe
c8bff3ef38
Features/add manager and dept to importer ( #6277 )
...
* Ignore the simlink for public storage
* Added manager and department to user import
* More UI importer tweaks
* Fisxed typos
2018-10-02 15:43:54 -07:00
Djamon Staal
80393d73ae
Public function save() missing array. ( #6276 )
...
The class was missing as a result that the composer was unable to update and the site returned a 500 error
```
$ composer update
Loading composer repositories with package information
Installing dependencies (including require-dev) from lock file
Nothing to install or update
Package guzzle/guzzle is abandoned, you should avoid using it. Use guzzlehttp/guzzle instead.
Generating optimized autoload files
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
> @php artisan package:discover
In Asset.php line 30:
Declaration of App\Models\Asset::save($params = Array) should be compatible
with Illuminate\Database\Eloquent\Model::save(array $options = Array)
Script @php artisan package:discover handling the post-autoload-dump event returned with error code 1
```
2018-10-02 04:40:20 -07:00
snipe
79367642b1
[WIP] Added #5957 - Flysystem support ( #6262 )
...
* Added AWS url to example env
* Upgrader - added check for new storage path and attempt to move
* Ignore symlink
* Updated paths for models
* Moved copy methods
* Added AWS_URL support
For some reasin, Flysystem was generating the wrong AWS url (with a region included)
* Switch to Flysystem for image uploads
* Nicer display of image preview
* Updated image preview on edit blades to use Flysystem
* Twiddled some more paths
* Working filesystems config
* Updated Asset Models and Departments to use Flysystem
* Janky workaround for differing S3/local urls/paths
* Try to smartly use S3 as public disk if S3 is configured
* Use public disk Storage options for public files
* Additional transformer edits for Flysystem
* Removed debugging
* Added missing use Storage directive
* Updated seeders to use Flysystem
* Default logo
* Set a default width
We can potentially override this in settings later
* Use Flysystem for logo upload
* Update downloadFile to use Flysystem
* Updated AssetFilesController to use Flysystem
* Updated acceptance signatures to use Flysystem
* Updated signature view to use Flysystem
This isn’t working 100% yet
* Use Flysystem facade for displaying asset image
* Set assets path
Should clean all these up when we’re done here
* Added Rackspace support for Flysystem
* Added Flysystem migrator console command
* Added use Storage directive for categories
* Added user avatars to Flysystem
* Added profile avatar to Flysystem
* Added the option to delete local files with the migrator
* Added a check to prevent people from trying to move from local to local
* Fixed the selectlists for Flysystem
* Fixed the getImageUrl method to reflect Flysystem
* Fixed AWS copy process
* Fixed models path
* More selectlist updates for Flysystem
* Updated example .envs with updated env variable names
* *sigh*
* Updated non-asset getImageUrl() methods to use Flysystem
* Removed S3 hardcoding
* Use Flysystem in email headers
* Fixed typo
* Removed camera support from asset file upload
We’ll find a way to add this in later (and add that support to all of the other image uploads as well)
* Fixed path for categories
* WIP - Switched to standard handleImages for asset upload.
This is currently broken as I refact the handleImages method. Because the assets store/create methods use their own Form Request, the handleImages method doesn’t exist in that Form Request so it wil error now.
* Fixed css URL error
* Updated Debugbar to latest version (#6265 )
v3.2 adds support for Laravel 5.7
* Fixed: Missing CSS file in basic.blade.php (#6264 )
* Fixed missing CSS file in basic.blade.php
* Added
* Changed stylesheet import for authorize.blade.php
* Updated composer lock
* Added AWS_BUCKET_ROOT as env variable
* Use nicer image preview for logo upload
* Removed AssetRequest form request
* Removed asset form request, moved custom field validation into model
* Added additional help text for logo upload
* Increased the size of the image resize - should make this a setting tho
* Few more formatting tweaks to logo section of branding blade preview
* Use Flysystem for asset/license file uploads
* Use Flysystem for removing images from models that have been deleted
* Enable backups to use Flysystem
This only handles part of the problem. This just makes it so we can ship files to S3 if we want, but does not account for how we backup files that are hosted on S3
* Use Flysystem to download license files
* Updated audits to use Flysystem
2018-09-29 21:33:52 -07:00
snipe
32951bbc90
Make CustomFieldset rules public instead of protected
2018-09-28 15:18:23 -07:00
snipe
eea65a3f26
Fixed manufacturers item count
2018-09-28 12:03:27 -07:00
snipe
68a04c7a23
Fixed #4151 - Undefined index: samaccountname on LDAP import
2018-09-27 16:13:27 -07:00
snipe
75032def9e
Fixed #4151 - Undefined index: samaccountname on LDAP import
2018-09-27 16:11:09 -07:00
snipe
e5d0f74ba7
Fixed #6248 - add free seats to licenses API endpoint
2018-09-27 12:07:13 -07:00
snipe
3a0f738fb0
Added some hepful comments
2018-09-26 19:20:50 -07:00
snipe
55846cc717
Changed LOG:: to Log::
2018-09-26 19:06:31 -07:00
snipe
afac0bc441
Removed old isActive model (unused)
2018-09-26 19:05:42 -07:00
snipe
ffbee77f6f
Patch for 5965 - multiple email recipients no longer working ( #6238 )
2018-09-26 15:47:53 -07:00
Wes Hulette
16e56646b8
Fixed #5965 : Allow multiple alert email addresses ( #6233 )
...
* Fixed #5965 : Allow multiple alert email addresses
* Style changes based on PR feedback.
2018-09-26 14:07:41 -07:00
snipe
bcf9d2f75c
Don’t require statuslabel view to check for deployable status
2018-09-25 13:39:54 -07:00
nix
f85e3edfc7
fixed checking permissions for users with no permissions set ( #6229 )
...
When a user has no permissions set (=NULL) in the database (like after an
LDAP import) but is a member of a group with permissions, those group
permissions would not have be applied, effectively denying every access
regardless of group permissions.
2018-09-25 13:24:50 -07:00
snipe
9108ff8caa
fixed typo
2018-09-24 19:06:12 -07:00
snipe
d5cf0f1fbd
Prevent deleting manufactureres via API if they have items/models
2018-09-24 19:04:00 -07:00
Brady Wetherington
c97db3259f
Merge pull request #5913 from tilldeeke/refactore-checkout-checkin-notification-sending
...
Refactor: Decouple checkin/checkout notifications from logging
2018-09-21 18:18:27 -07:00
snipe
4b2093b485
Added counts to location show() API method
2018-09-21 15:51:26 -07:00
snipe
b69b5fdf84
Added counts to location show() API method
2018-09-21 15:50:14 -07:00
snipe
d84366c6c5
Add empty array to groups if none filled in
2018-09-19 17:24:34 -07:00
Ivan Nieto
b692f67779
Revision of #5471 ( #6148 )
...
* Search functionality in accessories/{accessory} issue #5471 :
From the collection of users displayed just filtered the data with the method where() and concat()
for the user can search for first name or last name. The solution is case sensitive.
* A better fix to issue #5471 . Now using the established relationship to querying for the users. Also Case-insensitive.
* Fixed previous commit that has magic number in the find method parameter of AccessoriesController.
2018-09-12 22:50:45 -07:00
Juho Taipale
05b03df600
Fix for issue #6165 ( #6168 )
...
* Fix problem when using ValidatingTrait
* Checking that email alerts are enabled when trying to send expected check-in alerts (fix for issue #6169 )
2018-09-12 22:49:50 -07:00
Till Deeke
86f49d34c3
Redirects users from old acceptance screen to new overview
2018-09-10 17:13:16 +02:00
Till Deeke
007e8fbdf9
simplified checkout event handling per @uberbrady’s suggestion
...
This generalizes the checkout events into the CheckoutableCheckedOut and CheckoutableCheckedIn events.
2018-09-10 16:40:26 +02:00
snipe
adf6e7d1cd
Added group support for user API
2018-09-07 18:25:58 -07:00
snipe
05ea61421f
Added manager_id to fillable for locations API
2018-09-07 18:11:38 -07:00
snipe
10d19be66c
Added manager ID to validation
2018-09-07 17:27:31 -07:00
snipe
b903ca05f7
Added manager ID to fillable fields in Location model
...
This should enable the API to update manager ID
2018-09-07 17:27:19 -07:00
snipe
ff879e2018
Added the ability to update asset location when auditing - per #5854
2018-09-07 05:39:41 -07:00
snipe
181e75adb4
Apply hotfix for fixed category model scope
2018-09-07 03:56:17 -07:00
snipe
51d3d130e4
Fixed Not unique table/alias: 'models' on custom report triggered when category is selected
2018-09-07 03:19:54 -07:00
snipe
827a86b2ef
Only send inventory report to users if they have things checked out to them
2018-09-07 03:08:32 -07:00
snipe
77cdb2f409
Added console command to send inventory reports to users
2018-09-07 02:24:41 -07:00
snipe
26fd7f7e79
I have no idea why this was necessary suddenly
2018-09-06 14:28:04 -07:00
snipe
b80b91514d
Fixed Laravel 5.7 compatibility issue re: boot() method
...
This was causing the error: Undefined index: App\Models\CustomField (View: /Users/snipe/Sites/snipe-it/snipe-it/resources/views/hardware/index.blade.php)
and pointed to the Eloquent model library method:
```
protected function initializeTraits()
{
foreach (static::$traitInitializers[static::class] as $method) {
$this->{$method}();
}
}
```
Thanks to https://github.com/laravel/framework/issues/25455 for the clue.
2018-09-05 19:27:37 -07:00
Ivan Nieto
0014ef054b
Search functionality in accessories/{accessory} issue #5471 : ( #6070 )
...
From the collection of users displayed just filtered the data with the method where() and concat()
for the user can search for first name or last name. The solution is case sensitive.
2018-08-28 13:25:16 -07:00
Wes Hulette
3831ee9f5a
Fixed #5811 - Non US Characters in user export ( #6132 )
...
* Added Freebsd as vagrant machine for development
* Ran npm audit fix
Manually added peer depenencies
* Added charset=UTF-8 to content-type
Removed reference to throttle model as is is not longer included.
2018-08-28 12:37:58 -07:00
Dmitriy Minaev
bc8fa31eb2
Add depreciation with half-year convention. Fixed #1237 ( #6128 )
...
* Add half-year convention in depreciation for Models/Depreciable.php
* Add a setting for the depreciation method
* Integrate half-year convention inside working output
* fix: add more checks at Depreciable.php
* depreciation value rounding
* Codestyle fix
2018-08-28 12:32:46 -07:00
snipe
5b8cbe29e1
Possible fix for #5054 - OpenLDAP (non-AD) LDAP users being deactivated
2018-08-27 14:51:37 -07:00
snipe
e4f6aefdad
Added self-checkout permission option
2018-08-21 23:26:12 -07:00
snipe
771265113e
Added cookie serialization for Laravel v5.6.30
2018-08-21 22:40:14 -07:00
snipe
db907815ff
Removed check for active in password reset form
2018-08-21 18:40:27 -07:00
snipe
aed769c0be
Honor active status for forgotten password request forms
2018-08-14 20:05:57 -07:00
snipe
ae6abdddad
Check the user is active before displaying password reset
...
This would only come into play if an inactive user already received a password reset email and then the system was upgraded to prevent those emails from being sent to inactive users
2018-08-14 19:04:47 -07:00
snipe
63c9fbe10c
Temporarily disbable notifying users on import
2018-08-14 18:27:46 -07:00
snipe
1543cdbc61
Set activated checkbox to 1 by default on new user
2018-08-14 18:17:37 -07:00
snipe
5db5134ae0
Set activated to default on when new user is created
2018-08-14 18:14:41 -07:00
snipe
05b2b8fb59
Tweaked code/language for password reset
2018-08-14 18:09:33 -07:00
snipe
25097bce31
Only allow activated users to reset their password
2018-08-14 18:04:27 -07:00
snipe
0100c56046
Only allow password reset if user is active
2018-08-14 17:46:29 -07:00
Till Deeke
62195a805a
Adding some comments
2018-08-06 14:47:26 +02:00
Till Deeke
8c96e8fd4b
Updates asset acceptance report to show unaccepted assets
2018-08-06 14:47:26 +02:00
Till Deeke
1bdf71b584
Handle side effects of accepting/declining
...
When declining an asset, it gets checked in.
2018-08-06 14:47:26 +02:00
Till Deeke
8648d53d25
Adds checkout acceptances
...
A checkout acceptance gets generated for every item that needs to be checked out. This resource tracks the user user who can accept the item and their signature
2018-08-06 14:47:26 +02:00
Till Deeke
6b05106dcb
Moves license checkout stuff to the license seat
...
Since we are really checking out a license seat instead of the whole license, we operate the checkin/checkout on the license seat instance.
2018-08-06 14:47:26 +02:00
Till Deeke
43437aac14
Adds acceptable contract to asset
2018-08-06 14:46:10 +02:00
Till Deeke
830a6cf67e
Adds accepting/declining to new controller
2018-08-06 14:46:10 +02:00
Till Deeke
39e6b59335
Fixes some typos
2018-08-06 14:46:10 +02:00
Till Deeke
72b43b6526
Updates checkout notifications to use new routes for accepting
2018-08-06 14:46:10 +02:00
Till Deeke
e0423418d2
Moves logging checkin/checkout to separate listener
2018-08-06 14:46:10 +02:00
Till Deeke
e24f292a1a
Updates checkout events to not depend on log
2018-08-06 14:46:10 +02:00
Till Deeke
17fc59f989
Adds back the checkin/checkout events after #5916
2018-08-06 14:46:10 +02:00
Till Deeke
775e46288e
Cleanup of model attributes
2018-08-06 14:46:10 +02:00
Till Deeke
722f032895
Remove notification sending from loggable trait
2018-08-06 14:46:10 +02:00
Till Deeke
112a532618
Listen for checkout events and send appropriate notifications
2018-08-06 14:46:10 +02:00
Till Deeke
ef76908fce
Listen for checkin events and send the appropriate notifications
2018-08-06 14:46:10 +02:00
Till Deeke
4a71542f23
Cleanup checkin notification constructors
2018-08-06 14:46:10 +02:00
Till Deeke
ea64abc607
Adds checkout events
2018-08-06 14:46:10 +02:00
Till Deeke
f0acf47101
Adds checkin events
2018-08-06 14:46:10 +02:00
Till Deeke
92a2a5ccbc
Adds listeners for checking/checkout events
2018-08-06 14:46:10 +02:00
Daniel Meltzer
2d0df24ef3
Check for an existing username before getting creative. Fixes #6016 ( #6039 )
2018-08-03 16:35:13 -07:00
snipe
1a660911e7
Check for minimum PHP version in setup
2018-08-02 21:36:18 -07:00
Daniel Meltzer
e368a20427
Use filled instead of has. ( #6033 )
...
I think this merged in a weird order and was missed by the global
find/replace. This fixes bulkassets/bulkusers editing.
At some point we should look at refactoring BulkAssetsController@edit to
only run one DB query, rather than one per item.
2018-08-02 09:54:19 -07:00
Daniel Meltzer
2637ce56a1
Allow importcontroller to return 200 for failed delete. ( #6034 )
2018-08-02 09:53:54 -07:00
snipe
f5a5d830a5
Better handling for deleting imports where the files may have been moved
2018-08-01 20:49:55 -07:00
snipe
9168979d9e
Fixed #6027 - added model to asset maintenances listing
2018-08-01 18:24:52 -07:00
snipe
3f394f42c7
Partial fix for better UI on deleting files
...
Still needs Vue stuff
2018-08-01 18:01:16 -07:00
snipe
b2c99c88bb
Fixed #6028 - added supplier url to list view
2018-08-01 17:37:58 -07:00
snipe
694166862e
Added attempted logins admin screen ( #6018 )
...
* Added attempted logins admin screen
* Smaller table spacing
2018-08-01 03:51:59 -07:00
snipe
911c2398ef
Fixed #6004 - set a default next_audit_date if none provided
2018-08-01 03:04:29 -07:00
snipe
2c38036123
Improvement: Better documentation, small refactors ( #6017 )
...
* Better documentation, small refactors
* Small comment fixes
2018-08-01 00:06:41 -07:00
snipe
b1b5eeecba
Fixed #6013 - add accessory checkout notes to detail page
2018-07-31 16:00:38 -07:00
snipe
400913631c
Use language strings for bulk password reset
2018-07-30 20:37:19 -07:00
snipe
006a3adea0
Added ability to trigger forgotten password emails for users
2018-07-30 20:31:02 -07:00
Daniel Meltzer
248fcfa869
Move findLicenseSeatToCheckout back to controller. ( #5970 )
...
* Move findLicenseSeatToCheckout back to controller.
After discussion, move findLicenseSeatToCheckout method back to
controller from form request. Also cleanup one tiny bit more with null
coalesce operator (Yay php 7).
* Revert Earlier change.
$target only exists in the checkoutTo* methods. Need to log the
checkout individually in each of those.
2018-07-27 12:03:04 -07:00
Daniel Meltzer
b58c77c8b8
Feature: Import users department. ( #5987 )
...
Maps to the "Department" header key by default. Bug: #5382
2018-07-27 12:02:18 -07:00
Daniel Meltzer
94c79fa69a
Fixed #5964 - Feature: Group IDs can be passed to User Create. ( #5990 )
...
Also added to update, and adjusted api tests to confirm. Long term it
might be nice to look at support for passing group names instead.
Bug: 5964
2018-07-27 12:01:59 -07:00
Daniel Meltzer
a3811f632d
Licence != License ( #5993 )
2018-07-27 12:01:25 -07:00
snipe
d8f0102204
Merge branch 'features/restore_deleted_cmd' into develop
...
# Conflicts:
# config/version.php
# resources/views/layouts/basic.blade.php
2018-07-27 02:48:13 -07:00
snipe
524c6c502e
Features/restore deleted cmd ( #5982 )
...
* Delete content from login attempts table
* Script to restore deleted users and put their asset assignments back
* Uncomment backup
2018-07-27 02:42:55 -07:00
snipe
6b013724aa
Uncomment backup
2018-07-26 18:11:51 -07:00
snipe
8774f0cf45
Script to restore deleted users and put their asset assignments back
2018-07-26 18:08:49 -07:00
snipe
8762e158c4
Delete content from login attempts table
2018-07-26 18:08:25 -07:00
Daniel Meltzer
49d95892e3
Port asset history importer to league/csv9 ( #5972 )
2018-07-26 12:04:21 -07:00
snipe
9618878023
Restrict users asset listing to just assets checked out to users
2018-07-25 21:40:33 -07:00
snipe
614e858e44
Restrict users asset listing to just assets checked out to users
2018-07-25 21:38:14 -07:00
snipe
373885ebd1
Use Storage for file uploads (not model images)
2018-07-25 11:57:49 -07:00
snipe
a9fd9c9e59
Moved gates to individual controller methods to fix “This action is unauthorized” in route:list
2018-07-25 10:45:32 -07:00
snipe
63bf71b071
Use Storage methods for asset/license files
2018-07-25 09:48:50 -07:00
snipe
7a9a78ec53
Make Codacy happy by reversing the signature params
2018-07-25 07:14:16 -07:00
snipe
91a9e410df
Fixed weird whereNULL
2018-07-25 06:46:06 -07:00
snipe
501f096a2c
Updated spatie backup config file for their latest version
2018-07-25 01:36:30 -07:00
snipe
47ed328f0e
Change fire() to handle() for Laravel 5.5
2018-07-25 01:28:44 -07:00
snipe
7af633177a
Fixed filledFile back to hasFile
2018-07-24 22:52:49 -07:00
snipe
86c1f11bec
Change $request->has to $request->filled unilaterally
2018-07-24 22:51:31 -07:00
snipe
0714ac4248
Update withCounts because Laravel 5.5 :(
2018-07-24 22:40:05 -07:00
snipe
e6dd90e055
Added footer settings to settings reset
2018-07-24 22:21:16 -07:00
snipe
b2968ea6c6
Fixed paths to Aurhorizable/Authenticatable contracts
2018-07-24 21:29:08 -07:00
snipe
3d3ed6ab03
Logging updates for 5.6
2018-07-24 21:13:02 -07:00
snipe
7bb50a61a7
Applying @dmeltzer’s changes from afc8ac5e72
2018-07-24 21:13:02 -07:00
Daniel Meltzer
64d649be7f
Monster: Cleanup/Refactor http controllers. ( #5916 )
...
* Extract a handlesimages trait to centralize logic for parsing/storing images on upload in create/edit methods.
* Use same image upload/layout in accessories as consum+components.
* Monster: Cleanup/Refactor http controllers.
This cleans up docblocks, pulls most non-crudy actions into their own
controllers, and does general cleanup/logic refactoring. There /should/
be no functional changes, but we all know how should works..
Extract checkin/checkout functions to a separate controller for accessories.
Move controllers to subdirectory.
Cleanup AssetModelsController
Extract component checkin/checkout
Assorted cleanups/doc/formatting in controllers.
Refactor LicenseController.
Refactor UsersController
Update viewassetscontroller.
* Codacy cleanups
* More codacy cleanups. Extract a LicenseCheckout Form request as well.
* A bit more refactor/cleaning of the license checkout method.
* Review Related Cleanups
* Fix most of the item_not_found translations. In many cases, the
string being generated did not even use the id parameter. Where it
does, pass it as id instead of as a different value.
* Remove some old $data arrays from when we manually sent emails from
the controllers. This has been superseeded by the notification system
(yay!)
* Bugfix: Only log the checkin of an accessory if the checkin completes sucessfully.
2018-07-24 19:35:26 -07:00
snipe
e320d2ba05
Fixed #5944 - added logo option for print-assets page ( #5950 )
2018-07-24 13:37:02 -07:00
snipe
ed78a4b8a0
Fixed activated issue for strict mode
2018-07-24 13:28:59 -07:00
snipe
376eb52f00
Fixed #5938 - added “self location edit” as permission
2018-07-24 12:42:16 -07:00
