Commit graph

10429 commits

Author SHA1 Message Date
Zachary Fleck af0a0276e0
Merge branch 'snipe:develop' into develop 2023-04-25 14:43:41 -04:00
Zachary Fleck ef07f39ccf
remove space 2023-04-25 14:43:34 -04:00
Zachary Fleck aa223359d4
remove space 2023-04-25 14:42:09 -04:00
snipe efc0929bbc
Merge pull request #12910 from snipe/fixes/finer_permissions_for_bulk_assets
Added more granular permissions on bulk actions for assets
2023-04-25 08:09:30 -07:00
snipe 66ce02fc48 Added permission on restore
Signed-off-by: snipe <snipe@snipe.net>
2023-04-25 08:09:16 -07:00
snipe 6e7f0728fd Added more granular permissions on bulk actions for assets
Signed-off-by: snipe <snipe@snipe.net>
2023-04-25 08:06:45 -07:00
Marcus Moore b4f162f316
Fix operator in where clause 2023-04-24 17:26:06 -07:00
akemidx 9cd2783185 Regex added for link instead 2023-04-24 20:07:21 -04:00
zacharyfleck 63ade327a5
add ARM64 architecture 2023-04-24 16:24:44 -04:00
snipe 7d9062c065
Merge pull request #12877 from joelpittet/patch-1
Allow an environment variable to set the session cookie path
2023-04-21 04:45:17 -07:00
snipe fc721a9388
Merge pull request #12887 from marcusmoore/bug/sc-23158
Fix: Ensure users editing themselves do not deactivate their account
2023-04-21 04:42:04 -07:00
Marcus Moore 2aba8252f3
Ensure users editing themselves do not deactivate their account 2023-04-20 21:59:55 -07:00
akemidx 16a5a883e5 new request, preparing support_url for validation 2023-04-20 16:34:25 -04:00
snipe c3c22fae3c
Merge pull request #12885 from inietov/fixes/error_call_member_function_totalSeatsByLicenseID
Fixed Call to a member function totalSeatsByLicenseID() on null
2023-04-20 10:43:28 -07:00
Ivan Nieto Vivanco 747d6cfdb4 Change the flow of the condition using an early return 2023-04-20 10:37:26 -06:00
Ivan Nieto Vivanco ae53609b1b Declare variables only if license is found 2023-04-20 10:16:11 -06:00
Marcus Moore c357d9f01e
Update data provider name 2023-04-19 18:10:23 -07:00
Marcus Moore 645f6ed692
Remove unneeded doc block 2023-04-19 17:52:44 -07:00
Marcus Moore dd40798c43
Remove unneeded comments 2023-04-19 17:49:31 -07:00
Marcus Moore e92c1e7bea
Minor docblock update 2023-04-19 17:22:56 -07:00
Godfrey M bd212b3108 adds component costs to asset view 2023-04-19 16:35:06 -07:00
Joel Pittet 608c5d037f
Use environment variable and default to PHP's sendmail_path
Use sendmail_path in PHP instead of hardcoded path and options
2023-04-19 15:25:48 -07:00
Joel Pittet 351928adff
Allow an environment variable to set the session cookie path 2023-04-19 15:18:50 -07:00
Marcus Moore 144382e57a
Update docblock types 2023-04-19 12:31:12 -07:00
Marcus Moore 835f8876c4
Move notification sending into try catch block 2023-04-19 12:26:48 -07:00
snipe 4a5426f959
Merge pull request #12875 from Godmartinz/sidebar_undeployable_runaway_parenthesis
Fixed space from un deployable total in sidebar
2023-04-19 11:49:42 -07:00
Marcus Moore 15280c435e
Merge branch 'develop' into bug/sc-15034 2023-04-19 11:45:16 -07:00
Godfrey M 0e1f50c226 adds checkout-range to jquery 2023-04-19 10:11:26 -07:00
Godfrey M d2118ba230 removed space from un deployable total in sidebar 2023-04-19 09:46:15 -07:00
Godfrey M 8a5612d1c9 fixes comment 2023-04-19 09:13:43 -07:00
Godfrey M bdd1045272 adds a checkout range for custom asset reports 2023-04-19 09:11:44 -07:00
snipe fd5cb32dd9 Honor the “update” flag
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 16:34:47 -07:00
snipe 345662c5c2 Rearrange some of the user creation logic
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 16:34:10 -07:00
snipe 003cd372dd New location same CSV
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 16:23:07 -07:00
snipe aedfef78d3
Update app/Importer/LocationImporter.php
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
2023-04-18 13:26:23 -07:00
Marcus Moore bad2eead4c
Remove test method 2023-04-18 13:13:57 -07:00
Marcus Moore 508660b1df
Skip notifications for component checkouts and checkins 2023-04-18 13:07:55 -07:00
snipe a84a9a8dec
Merge pull request #12867 from snipe/fixes/clearer_tooltip_text_for_non_assets_undeployable
Small tooltip improvements for undeployable items in table view
2023-04-18 13:00:11 -07:00
snipe d3bdaf7cd3 Fixed destination name
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 12:59:46 -07:00
snipe 92f516484e Small tooltip improvements for undeployable items
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 12:54:06 -07:00
snipe bfda46276a
Merge pull request #12849 from snipe/features/adds_license_checkin_checkout_to_all_in_gui
Added license checkin/checkout to all in license GUI
2023-04-18 12:32:30 -07:00
snipe 031586495a Small cosmetic tweaks to 2FA reset class, fixed weird layout on 2FA reset button
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 12:09:41 -07:00
snipe d871a14687 Added fa-fw for nicer display
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 11:49:40 -07:00
snipe 00a9591c4c Added autoassign_licenses in view, added fa-fw
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 11:49:29 -07:00
snipe 4d9d75379f Improved translation string
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 11:39:16 -07:00
snipe 41358eba85 Updated label
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 11:29:28 -07:00
snipe 59f4fe67d6 Removed duplicate tooltip
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 11:28:35 -07:00
snipe 2c5c4ab974 Nicer layout
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 04:40:06 -07:00
snipe 95767c46ac Fixed delete modal
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 04:37:13 -07:00
snipe 0eadc00f4d Removed unneeded css class
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 04:37:04 -07:00