2021-09-01 17:33:59 -07:00
|
|
|
<?php
|
|
|
|
namespace App\Presenters;
|
|
|
|
|
|
|
|
use DateTime;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Class DepreciationReportPresenter
|
|
|
|
* @package App\Presenters
|
|
|
|
*/
|
|
|
|
class DepreciationReportPresenter extends Presenter
|
|
|
|
{
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Json Column Layout for bootstrap table
|
|
|
|
* @return string
|
|
|
|
*/
|
|
|
|
public static function dataTableLayout()
|
|
|
|
{
|
|
|
|
$layout = [
|
|
|
|
[
|
|
|
|
"field" => "company",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"switchable" => true,
|
|
|
|
"title" => trans('general.company'),
|
|
|
|
"visible" => false,
|
|
|
|
], [
|
|
|
|
"field" => "category",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"title" => trans('general.category'),
|
|
|
|
"visible" => true,
|
|
|
|
], [
|
|
|
|
"field" => "name",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
2024-03-20 14:25:50 -07:00
|
|
|
'switchable' => false,
|
2021-09-01 17:33:59 -07:00
|
|
|
"title" => trans('admin/hardware/form.name'),
|
|
|
|
"visible" => false,
|
|
|
|
], [
|
|
|
|
"field" => "asset_tag",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"title" => trans('general.asset_tag'),
|
|
|
|
"visible" => true,
|
|
|
|
],[
|
|
|
|
"field" => "model",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"title" => trans('general.asset_model'),
|
|
|
|
"visible" => true,
|
2022-06-30 18:17:30 -07:00
|
|
|
], [
|
2021-09-01 17:33:59 -07:00
|
|
|
"field" => "model_number",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"title" => trans('admin/models/table.modelnumber'),
|
|
|
|
"visible" => false
|
|
|
|
], [
|
|
|
|
"field" => "serial",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"title" => trans('admin/hardware/form.serial'),
|
|
|
|
"visible" => true,
|
|
|
|
], [
|
|
|
|
"field" => "depreciation",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"title" => trans('general.depreciation'),
|
|
|
|
"visible" => true,
|
|
|
|
], [
|
|
|
|
"field" => "number_of_months",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"title" => trans('admin/depreciations/general.number_of_months'),
|
|
|
|
"visible" => true,
|
|
|
|
], [
|
|
|
|
"field" => "status",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"title" => trans('admin/hardware/table.status'),
|
|
|
|
"visible" => true,
|
|
|
|
], [
|
|
|
|
"field" => "checked_out_to",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"title" => trans('admin/hardware/table.checkoutto'),
|
|
|
|
"visible" => false,
|
|
|
|
], [
|
|
|
|
"field" => "location",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"title" => trans('admin/hardware/table.location'),
|
|
|
|
"visible" => true,
|
|
|
|
], [
|
|
|
|
"field" => "manufacturer",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"title" => trans('general.manufacturer'),
|
|
|
|
"visible" => false,
|
|
|
|
],[
|
|
|
|
"field" => "supplier",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"title" => trans('general.supplier'),
|
|
|
|
"visible" => false,
|
|
|
|
], [
|
|
|
|
"field" => "purchase_date",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"visible" => true,
|
|
|
|
"title" => trans('general.purchase_date'),
|
|
|
|
"formatter" => "dateDisplayFormatter"
|
2021-09-21 21:52:18 -07:00
|
|
|
], [
|
|
|
|
"field" => "currency",
|
|
|
|
"searchable" => false,
|
|
|
|
"sortable" => false,
|
|
|
|
"visible" => false,
|
|
|
|
"title" => 'Currency',
|
2021-09-01 17:33:59 -07:00
|
|
|
], [
|
|
|
|
"field" => "purchase_cost",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"visible" => true,
|
|
|
|
"title" => trans('general.purchase_cost'),
|
|
|
|
"footerFormatter" => 'sumFormatter',
|
2021-11-18 15:09:17 -08:00
|
|
|
"class" => "text-right",
|
2021-09-01 17:33:59 -07:00
|
|
|
], [
|
|
|
|
"field" => "order_number",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"visible" => false,
|
|
|
|
"title" => trans('general.order_number'),
|
|
|
|
], [
|
|
|
|
"field" => "eol",
|
|
|
|
"searchable" => false,
|
|
|
|
"sortable" => false,
|
|
|
|
"visible" => false,
|
|
|
|
"title" => trans('general.eol'),
|
|
|
|
"formatter" => "dateDisplayFormatter"
|
|
|
|
], [
|
|
|
|
"field" => "book_value",
|
|
|
|
"searchable" => true,
|
Squashed commit of the following:
commit 6bec573956922013dc19cee4840fcb14bcbb74f1
Merge: b6ad69fac 1fc5bb54e
Author: snipe <snipe@snipe.net>
Date: Mon Nov 11 13:54:09 2024 +0000
Merge pull request #15794 from snipe/check_for_file_on_asset_acceptance
Check that the file exists before trying to download stored EULA
commit 1fc5bb54e1ac036c44e4a6096b958f7e86674248
Author: snipe <snipe@snipe.net>
Date: Mon Nov 11 13:50:53 2024 +0000
Check that the file exists before trying to download
Signed-off-by: snipe <snipe@snipe.net>
commit b6ad69fac248658a964ea60dc8d3e909e32795f6
Merge: 357ef7e37 47b2cdb84
Author: snipe <snipe@snipe.net>
Date: Sun Nov 10 18:05:20 2024 +0000
Merge pull request #15793 from snipe/allow_eol_explicit
Allow user to specify null for calculation or explicit on bulk edit
commit 47b2cdb8469e6d4904f9ad3ffb34bdc6d9a196db
Author: snipe <snipe@snipe.net>
Date: Sun Nov 10 18:04:13 2024 +0000
Allow user to specify null for calculation or explicit on bulk edit
Signed-off-by: snipe <snipe@snipe.net>
commit 357ef7e3757712307417b5533785d839c0fb58a9
Merge: 000f3171e 6928b1b27
Author: snipe <snipe@snipe.net>
Date: Sun Nov 10 17:48:25 2024 +0000
Merge pull request #15792 from snipe/edit_eol_from_bulk
Added EOL date to bulk asset edit
commit 6928b1b273667f1b36c97183e167da0418c39dd6
Author: snipe <snipe@snipe.net>
Date: Sun Nov 10 17:47:10 2024 +0000
Added eol date to bulk asset edit
Signed-off-by: snipe <snipe@snipe.net>
commit 000f3171e39bcdbbb79a12296aa3f6326101d22f
Author: snipe <snipe@snipe.net>
Date: Fri Nov 8 10:28:01 2024 +0000
Upgrade jspdf-autotable from 3.8.3 to 3.8.4 #15786
Signed-off-by: snipe <snipe@snipe.net>
commit 5ef3183a5261bfe74df7e5616bb2d54b9c64f37c
Merge: a41529dbc 050831868
Author: snipe <snipe@snipe.net>
Date: Thu Nov 7 11:44:06 2024 +0000
Merge pull request #15783 from uberbrady/improve_user_and_location_manager_indexes
Improved indexes on manager_id for locations and users, including del…
commit 050831868e96722753ef15228d794f8343da5548
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Thu Nov 7 11:39:27 2024 +0000
Improved indexes on manager_id for locations and users, including deleted_at
commit a41529dbc4798d635739bdb77b8ffb8955049c89
Merge: aa168fcb5 4fcf5ac7d
Author: snipe <snipe@snipe.net>
Date: Wed Nov 6 21:22:45 2024 +0000
Merge pull request #15780 from uberbrady/add_manager_indexes
Add new indexes to locations and users for faster manager lookups
commit 4fcf5ac7dae2819e6b19d1d63d7d865d08d056be
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Nov 6 21:19:41 2024 +0000
Add new indexes to locations and users for faster manager lookups
commit aa168fcb5b7d9c9d0c600ca2d7160985ce1a240f
Author: snipe <snipe@snipe.net>
Date: Wed Nov 6 18:41:52 2024 +0000
Updated BS table to 1.23.5
Signed-off-by: snipe <snipe@snipe.net>
commit 9c1c93ad52112a53c7c1e4d502f04091b118c125
Merge: b96a31253 ad99b8b45
Author: snipe <snipe@snipe.net>
Date: Wed Nov 6 18:40:35 2024 +0000
Merge pull request #15774 from marcusmoore/feature/sc-27350
Added Checkout ID column to user accessory table
commit ad99b8b456968c2385f288b20d20d30d41d847b6
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Nov 6 10:37:31 2024 -0800
Use generic ID translation
commit b96a31253902a4d702de318b381098f66e474fb8
Merge: 654f67b6a bab1e58ea
Author: snipe <snipe@snipe.net>
Date: Wed Nov 6 18:29:22 2024 +0000
Merge pull request #15779 from ubc-cpsc/bugfix/CVE-2024-50345
Fixes CVE-2024-50342, CVE-2024-50345, CVE-2024-51736
commit bab1e58ea4dc0715478e8feef1aa562d1ab9ce82
Author: Joël Pittet <pittet@cs.ubc.ca>
Date: Wed Nov 6 09:46:11 2024 -0800
symfony/http-client CVE-2024-50342, symfony/http-foundation CVE-2024-50345, symfony/process CVE-2024-51736
commit 654f67b6ac4537794ec134fa96ee924075875b5e
Author: snipe <snipe@snipe.net>
Date: Wed Nov 6 14:05:42 2024 +0000
Updated webpack
Signed-off-by: snipe <snipe@snipe.net>
commit 3965bcd7c116bdde2649e38d96531808d811962b
Merge: 287f4addf 2362cb5e5
Author: snipe <snipe@snipe.net>
Date: Wed Nov 6 14:02:44 2024 +0000
Merge pull request #15773 from Godmartinz/Fix_failing_failing_tests
Fixed notifications for licenses and asset to asset checkoutables
commit 2362cb5e5221ecae78c6aaf28bf8380f5ae20de2
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Nov 4 16:32:46 2024 -0800
refactor to getNotifiables
commit e7cb4a75eb5cd0d32524bcae0d53d184415acff5
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Nov 4 15:56:53 2024 -0800
Show accessory checkout id in user accessory table
commit 93494ac55447b062b80918d84a80e38c5dbd2c3d
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Nov 4 15:17:58 2024 -0800
put dataprovider back in for tests
commit 0d707a18512aa8e01c242d6d5486b675754ed5ed
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Nov 4 15:13:10 2024 -0800
fixes notifications for licenses and asset to asset checkouables
commit 287f4addf026f44467376bada0222aa4e489eb0f
Merge: f32ebdc7a 2e96d478f
Author: snipe <snipe@snipe.net>
Date: Mon Nov 4 20:06:24 2024 +0000
Merge pull request #15771 from snipe/revert-15744-chore/action-tests-debugging
Revert "Added the display of logs when tests fail in GitHub Actions"
commit 2e96d478f15c433c5628e3307cd323fcd8a765ac
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Nov 4 11:04:17 2024 -0800
Revert "Added the display of logs when tests fail in GitHub Actions"
commit f32ebdc7acc370ab8d6f0e07a3f8ee59981d1491
Merge: 5897d37fc d6c7dc8e1
Author: snipe <snipe@snipe.net>
Date: Thu Oct 31 22:39:58 2024 +0000
Merge pull request #15765 from marcusmoore/chore/add-missing-livewire-file
Added missing Livewire file
commit d6c7dc8e1c99c5421c149543a22b8cec0784ba7f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 31 15:37:01 2024 -0700
Add missing livewire file
commit 5897d37fcfd3c79afeef72e095d32145e90798bc
Merge: 49de07045 21a27dcac
Author: snipe <snipe@snipe.net>
Date: Thu Oct 31 20:54:01 2024 +0000
Merge pull request #15763 from Godmartinz/no_to_email_check
Fixed emails not being send if target has no email or if not instance of User. Cc_emails will still be sent.
commit 21a27dcac11a696a28d35a20d32e5381faa10e43
Merge: 379138076 49de07045
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 31 12:55:46 2024 -0700
fixed conflicts
commit 3791380764fa0ddffeb94d5c5b14d1ae2357bab6
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 31 12:52:47 2024 -0700
remove unused uses
commit 7a0f79ecd222b23f9e874c354b5881dcaba9d2db
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 31 12:51:22 2024 -0700
remove test route
commit 97a449e80ece3e553ec12064e74eae9e291f30f6
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 31 12:50:13 2024 -0700
removes instanceof User check
commit e65942064e3b555885e575aa22315ff02801bde9
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 31 12:45:29 2024 -0700
send emails even if target has no email
commit 49de07045ad48893daad9ea116b517145a711433
Merge: 7e996c40f 73772a013
Author: snipe <snipe@snipe.net>
Date: Thu Oct 31 17:53:17 2024 +0000
Merge pull request #15731 from Godmartinz/refacto_ms_teams_notifs
Fixed MS Team Notifications to utilize workflows after deprecation
commit 7e996c40f5770b608b36af035c0118c83fd07864
Merge: 73e8f160c 69e74bbdd
Author: snipe <snipe@snipe.net>
Date: Thu Oct 31 02:51:42 2024 +0000
Merge pull request #15758 from snipe/jerm/fix-deprecation-warning
Fix ${var} deprecation warning in License model
commit 69e74bbdd39201fad43216a0520d771a58554021
Author: Jeremy Price <jeremy@grokability.com>
Date: Wed Oct 30 19:43:54 2024 -0700
Fix ${var} deprecation warning in License model
When upgrading to php8.3 i started getting deprecation warning about
using ${var} instead of {$var} in 2 places in License.php
PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 187
PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 219
This simple fix switches the offending statements to {$var} syntax.
commit 73e8f160cf078e3dbc69cf032a899cf6fa8d8739
Merge: f68df1fa0 bd23772fe
Author: snipe <snipe@snipe.net>
Date: Wed Oct 30 19:29:09 2024 +0000
Merge pull request #15756 from Godmartinz/cc-email-array
changes `admin_cc_email` validation to allow an array
commit bd23772fe96dc33db62c0fd286a095d4c99e2067
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 30 11:42:15 2024 -0700
changes cc_email validation to allow array
commit 73772a01381ea654bf7cca48860e61551f363295
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 30 11:12:31 2024 -0700
change button text
commit b26cae372cad814dac2a40467aaa122c58c93787
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 30 10:40:23 2024 -0700
merged in develop
commit d6ba303f39c6b5d00aabfdc61a8aadd74c7ca7bf
Merge: 9a0eee8f0 f68df1fa0
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 30 10:27:45 2024 -0700
Merge branch 'develop' into refacto_ms_teams_notifs
# Conflicts:
# app/Listeners/CheckoutableListener.php
commit f68df1fa063125eb1b3f6e5a44b7e5156148c1e4
Author: snipe <snipe@snipe.net>
Date: Wed Oct 30 13:21:13 2024 +0000
Made type searchable in action logs
Signed-off-by: snipe <snipe@snipe.net>
commit f0813e03bf95f3ab53e650ebb8f7128b7fc90164
Merge: 05875ebd1 58ff641f8
Author: snipe <snipe@snipe.net>
Date: Wed Oct 30 12:18:41 2024 +0000
Merge pull request #15681 from Godmartinz/seperating_notification_n_mail
Separated Notifications and Emails: Check ins and Check outs
commit 05875ebd1fcea7366288de8833adfcedd66a309c
Author: snipe <snipe@snipe.net>
Date: Mon Oct 28 22:04:35 2024 +0000
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
commit 9a0eee8f03fa06ba67476996741faffe5cf248e7
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 15:03:43 2024 -0700
revert testing variables
commit 6128765d1f88215c9aa0e528ae2def74cba9bf4c
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 15:03:03 2024 -0700
change wording on notification button
commit c24f79c025cde958335981252d47285e347aae98
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 14:58:43 2024 -0700
update method comment
commit e7c4343c902961268792bd4951930cec56959384
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 14:56:48 2024 -0700
readd checkin accessory format
commit c0620c27ff74ceb66ce23a75431d8f2184eb91e0
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 14:30:34 2024 -0700
adds back laravels channel formats
commit ed81973fe649355a687dfd5dc70b60d9fdb997c3
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 13:57:42 2024 -0700
adds notifications for deprecation
commit 2d318b394c98954c51e9a6457ccf570487e47ae4
Merge: 86d784bd5 5c4971612
Author: snipe <snipe@snipe.net>
Date: Mon Oct 28 18:41:49 2024 +0000
Merge pull request #15744 from marcusmoore/chore/action-tests-debugging
Added the display of logs when tests fail in GitHub Actions
commit b987b3dc005400e2c5042fc47be7d134e86c4314
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 10:57:48 2024 -0700
adds back the laravel channels package and applies a deprecated check
commit 5c49716129950b19b503c0d05456ea83c2119755
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 28 10:24:35 2024 -0700
Dump logs on test failure
commit 86d784bd598393919a7b60a4845d6e47d1931de0
Author: snipe <snipe@snipe.net>
Date: Mon Oct 28 13:37:59 2024 +0000
Fixed #15740 - use non-translated strings for icons
Signed-off-by: snipe <snipe@snipe.net>
commit 589f9cccdf1f4af8956f527728678e2b2316d723
Author: snipe <snipe@snipe.net>
Date: Mon Oct 28 12:04:10 2024 +0000
Fixed #15732
Signed-off-by: snipe <snipe@snipe.net>
commit 4d848e45e6c58aec7cb3d5fc32b5bdab7ddf1bd0
Author: snipe <snipe@snipe.net>
Date: Mon Oct 28 11:55:24 2024 +0000
Fixed #15736
Signed-off-by: snipe <snipe@snipe.net>
commit 58ff641f822eec54ebd40c9904c26034e215c550
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 22:53:53 2024 -0700
removed unused variables
commit ce68f550d8edf633d01af476fd95f1161b474e44
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 16:01:17 2024 -0700
remove alert emails from cc
commit 6f0c1b12b18901bc335bfdda328777399436386c
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 15:04:54 2024 -0700
this adds check out message for consumables
commit 278bc5e52a133189cfaf5348d709dcf229229e2f
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 14:59:10 2024 -0700
ads check in and checkout message for license seats
commit cce75a81859d3ff36dee19cf7d0278c17b711549
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 14:48:23 2024 -0700
adds check in and checkout messag for accessories
commit e27ff13377f8f783b7230287736eeff63e24c75d
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 14:39:40 2024 -0700
adds check in and checkout message for assets
commit 56365495a1c3b38443772a8ab6d3cc5f9815691c
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 14:26:42 2024 -0700
remove unnecessary fields in accessory checkout mail
commit 18da80e6de14f285f59012c75696f55be617a2d4
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 14:24:00 2024 -0700
fix checkoutable listener for microsoft teams
commit 18760e3fa19d4d37cf16995a4ba5f0b56ba3771a
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 12:21:51 2024 -0700
replaces teams notification package, passes integration test
commit 57107c487cce4f5520b8cfb97408e8c9f02d6547
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 09:40:10 2024 -0700
fixed last test, definetly the last test
commit dfc63641dca2b0a19f632f73733c5bf015517815
Merge: 07a51ec8b b6340532d
Author: snipe <snipe@snipe.net>
Date: Thu Oct 24 11:40:50 2024 +0100
Merge pull request #15550 from uberbrady/fix_multi_create_partial_failure
Fix multi create partial failure (fixes: [RB-18591])
commit 07a51ec8b128aca554b44af9e9b030f284769650
Merge: e0ec6795b 727c0e458
Author: snipe <snipe@snipe.net>
Date: Thu Oct 24 10:03:10 2024 +0100
Merge pull request #15712 from Godmartinz/fix_import-progress-bar
Upgraded `livewire v3.5.9 => v3.5.12`
commit 6329f5b87e9dd2ff852073aa290e2930b2f78c10
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 17:33:23 2024 -0700
removed unused variable from test
commit e0ec6795b57406e100fc80af4b5799eb6b00b757
Author: snipe <snipe@snipe.net>
Date: Thu Oct 24 01:27:50 2024 +0100
Use crucial for seeded data
Signed-off-by: snipe <snipe@snipe.net>
commit 15073a0d3885dc18609158943254317a2394d9d7
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 17:27:37 2024 -0700
last test to fix
commit a80c09c16d256d67592e35fdde2bd165ff7090bb
Merge: ab3b9c451 5509d756b
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 17:23:55 2024 -0700
Merge branch 'develop' into seperating_notification_n_mail
commit 5509d756b7d410f5ec98c599c87ad530003b2cb4
Merge: 55ba6279a b16a978f1
Author: snipe <snipe@snipe.net>
Date: Thu Oct 24 01:12:11 2024 +0100
Merge pull request #15722 from Godmartinz/fix_component_factory
Fixed Component Factory: use manufacturer factory for `manufactuer_id`
commit b16a978f1b5c11c949f9caff4e297628a21d0511
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 16:25:51 2024 -0700
uses manufacturer factory for manufactuer_id
commit ab3b9c45106fb68522f3832863f6e16c8f4856f7
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 16:24:01 2024 -0700
remove unnecessary code from checkinasset notification
commit 2cc2b2b1dfc3c4040a223c052d4cfff0175b3f0c
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 16:06:27 2024 -0700
apply array_filter to cc emails to prevent errors
commit 62d06b44d634155aff0035dd4340a03f86479918
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 15:43:42 2024 -0700
set fallback from email address to service.snipe-it.io
commit f29a3831796ea5b8e73e17bb4a45919701f221bd
Merge: fd74c3510 55ba6279a
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 15:15:14 2024 -0700
Merge branch 'develop' into seperating_notification_n_mail
# Conflicts:
# app/Notifications/CheckoutConsumableNotification.php
commit fd74c35102b19ec99118c84e6e8339003936aa0e
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 15:08:29 2024 -0700
remove old notify by mail from consumable notification
commit c681946b1df9f27242d03ae0dcd2342b1b11fdd3
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 15:05:39 2024 -0700
added component markdown changes
commit 257d25bd9eb1a3114c57c87aad90debc389543b6
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 14:56:54 2024 -0700
removed import notification from test, feature is not present in project
commit 6c34a5c52c8e5391dab246c69a41ad118cfb0cc5
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 14:54:21 2024 -0700
conditionally check cc emails, initiate variables
commit 1b5f4415ae11de482d79f3889db5e71b33e70f99
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 14:44:45 2024 -0700
corrected cc email behavior
commit 55ba6279a4f841d8c3f800bec90b52067e403fc5
Author: snipe <snipe@snipe.net>
Date: Wed Oct 23 19:14:17 2024 +0100
Use trans_choice on alert menu
Signed-off-by: snipe <snipe@snipe.net>
commit a9eea830e30f75a4b46648d3bf99d9aa54f07c99
Author: snipe <snipe@snipe.net>
Date: Wed Oct 23 19:05:34 2024 +0100
Added manufacturer and model number to component seeders
Signed-off-by: snipe <snipe@snipe.net>
commit af564935d5405e545412210a8a9cfb90c1836948
Merge: d58f87862 3ee76be7e
Author: snipe <snipe@snipe.net>
Date: Wed Oct 23 17:56:04 2024 +0100
Merge pull request #15720 from snipe/15695_adds_manufacturer_and_model_number_to_components
Fixed #15695 - Added manufacturer and model_number to components
commit 3ee76be7e37311fc1d835ca8350fbdb8481b6d23
Author: snipe <snipe@snipe.net>
Date: Wed Oct 23 17:50:22 2024 +0100
Added manufacturer and model_number to components
Signed-off-by: snipe <snipe@snipe.net>
commit d58f87862c8b9dedc65b85f9e37601e6aa366a90
Merge: 5da3ce356 0b6859c49
Author: snipe <snipe@snipe.net>
Date: Wed Oct 23 15:09:50 2024 +0100
Merge pull request #15719 from snipe/#15717_adds_qty_to_consumable
Fixed #15717 - Added ability to checkout consumables in variable qty via API
commit 0b6859c49180c0cb76fa9a7fbdb87286d82815b1
Author: snipe <snipe@snipe.net>
Date: Wed Oct 23 15:05:35 2024 +0100
Added ability to checkout consumables in variable qty
Signed-off-by: snipe <snipe@snipe.net>
commit 1e9922a0b08cf2ee0d14a10b734e4c44dd9942c7
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 16:14:36 2024 -0700
fix moar tests
commit ead27accacaefb08f0ed990c7d28843475d757e8
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 15:45:52 2024 -0700
fixed accessory tests and notifiable target
commit 727c0e458ceccc59f62667e28bb80204c219569c
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 14:34:39 2024 -0700
remove translation
commit 870dc747db51fa7e0f0ea7d4fac9d857f10191cd
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 14:27:32 2024 -0700
oops
commit 0fb3d83fac1df5f800da60a6471017010edea78b
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 14:26:54 2024 -0700
revert controller change
commit 0d59ccd6a66cf15a55afc1b92be8ab5e2a3679cb
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 14:23:26 2024 -0700
upgraded livewire v3.5.9 => v3.5.12
commit 5da3ce3564c1ea8860e101ddbebe15c825b6884a
Merge: c3bbca30a 5ecd2b629
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 22:10:20 2024 +0100
Merge pull request #15711 from marcusmoore/fixes/custom-fieldset-checkboxes
Fixed custom field checkboxes on asset edit page
commit c3bbca30adb33ebc15c7d2c27675d338a27928ef
Merge: dccb788a8 37f14fff3
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 22:07:50 2024 +0100
Merge pull request #15710 from snipe/fixes_lightbox_for_avif
Fixes #15701 - load avif files properly in lightbox
commit 37f14fff3b98ab23654706b2087eae2261e2931a
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 22:07:28 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
commit eb6c51fabdf755b488493bff2b1c4d52a3ba8b3f
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 22:04:57 2024 +0100
Fixes #15701 - load avif files properly in lightbox
Signed-off-by: snipe <snipe@snipe.net>
commit 5ecd2b62935489df9f6228d378d42a03cfcb17f0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 22 14:04:05 2024 -0700
Default checkbox elements to an empty array
commit 1e31592c553e49eab175531cf9aa3b02ce738812
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 11:49:06 2024 -0700
messing with the tests
commit dccb788a88497608289fbaf08aec8a106d9a8b49
Merge: 5e1d792bb d10fe77ee
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 17:44:30 2024 +0100
Merge pull request #15691 from marcusmoore/fixes/get-id-for-current-user
Updated `Company::getIdForCurrentUser()` to return null in certain scenarios
commit d10fe77ee7d6445379445024d5f6714159554652
Merge: e1882ee6d 5e1d792bb
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 22 09:38:31 2024 -0700
Merge branch 'develop' into fixes/get-id-for-current-user
commit 5e1d792bbaf5cdc140ecb4c53b054d20949a546b
Merge: 9cf71976f 780ed91a1
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 16:52:28 2024 +0100
Merge pull request #15687 from NebelKreis/fix/dashboard-title-casing
Fixed #15686: Corrected capitalization for dashboard section titles by removing strtolower()
commit 9cf71976f6b2865411f6fa8ae257c10c3e8a7e4c
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 16:51:42 2024 +0100
Fixed #15706 - Removed purchase order number from asset import
Signed-off-by: snipe <snipe@snipe.net>
commit 15745d9737f551ba0f04092c352ce65f5012870a
Merge: bd97955b9 3f74ff25d
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 16:39:44 2024 +0100
Merge pull request #15566 from Godmartinz/status-label-error-message
Fixed Status Labels Error Message
commit bd97955b9e21294aa409cdb9b701bf90261d3863
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 16:38:46 2024 +0100
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
commit 252d99421ca4dd707d456fc424f30316b10cd86d
Merge: 5767a98ad db8170162
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 16:26:48 2024 +0100
Merge pull request #15689 from snipe/better_handle_inline_files
Better handle inline files in file listing
commit 5767a98ad8abe738c4a18a9c33290ac4e3f5ceb1
Merge: 0c820cbc0 524a44272
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 16:26:23 2024 +0100
Merge pull request #15649 from bryanlopezinc/ImproveImporting
Improve import performance
commit 0c820cbc0da0c6bb05ec4f685a7eeeaa5156bf7d
Merge: 147fcfb8e 3153bbb13
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 15:56:12 2024 +0100
Merge pull request #15598 from spencerrlongg/bug/custom_field_validation_issue
Custom Field Existence Validation Issue
commit db8170162174b5688372e50005c5bd18b262508f
Merge: a05c33feb 147fcfb8e
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 15:44:24 2024 +0100
Merge branch 'develop' into better_handle_inline_files
commit a05c33febfb49b6a845e762817dd20e16db71d0e
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 15:43:19 2024 +0100
Squashed commit of the following:
commit 147fcfb8ebc4ceeea96d803d6a455abeba54f45a
Merge: 58a3d09b5 fdcc17ca2
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 15:12:55 2024 +0100
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
Fix user creation with FullMultipleCompanySupport enabled over API
commit 58a3d09b5fd7ffa979bfb9553cacbb24ae452462
Merge: 30a06a594 867fa2f36
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 14:55:42 2024 +0100
Merge pull request #15703 from marcusmoore/bug/sc-27188
Linked accessory files in activity report
commit 30a06a594289571097e2d30901546bc9a17b4bac
Merge: 6c6af78e0 ce3086317
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 11:47:06 2024 +0100
Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing
Removed brianium/paratest
commit 6c6af78e0840fc4f134e5bbb7965f21f4adcc0e1
Merge: 9b06bbb6c 3f79fd7ea
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 11:46:04 2024 +0100
Merge pull request #15705 from marcusmoore/tests/icon-component-test
Added test to ensure icon component does not end in newline
commit 3f79fd7ea744bd18134785c37b87a2f4bcff0347
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 17:07:40 2024 -0700
Add test to ensure icon component does not end in newline
commit 9b06bbb6c37fcea9b6202ad9fb2b4d952210dd01
Merge: 46ad1d072 d7f70146f
Author: snipe <snipe@snipe.net>
Date: Mon Oct 21 22:38:26 2024 +0100
Merge pull request #15704 from marcusmoore/bug/remove-extra-icon
Removed second icon in accessory file list
commit ce30863177e499a29f395c9c88ce9c67bd669a74
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 13:57:04 2024 -0700
Remove brianium/paratest dependency
commit d7f70146f4a886795ddb118cc2f71bbadded72dc
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 13:48:25 2024 -0700
Remove extra icon in accessory file upload list
commit 867fa2f36e02bdfe0ee74ae98b590fd013f6fc7a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 12:40:24 2024 -0700
Display file in activity report for accessories
commit 0933a2d4ea6d5babd6ef3e0e2f8350c2e088648d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 18:01:48 2024 -0700
Remove --parallel flag
commit 46ad1d072f5c45d20c1b078d2b3f84a3a0f36632
Merge: bcb4bd9eb 3cf746d7d
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 15:29:47 2024 +0100
Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions
Bulk checkout to bulk actions
commit bcb4bd9eb4e419e8a125a7dccd3e79c39dc13e21
Merge: 250037540 f50ccbcc4
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 10:20:13 2024 +0100
Merge pull request #15683 from Toreg87/fixes/outdated_comment
Fix outdated comment in CompanyableTrait
commit f50ccbcc492db6c98cabf6dc6752dd99ab82bce7
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Thu Oct 17 11:07:28 2024 +0200
Fix outdated comment in CompanyableTrait
As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment
commit 3cf746d7df83ef3e7cfa45c602fc182ebe8f11e3
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Oct 16 23:13:32 2024 +0100
Rework the bulk checkout to not change how all checkouts work
commit 6b7af802af41c92a36e77605415869c9e72ec192
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Thu Oct 10 13:28:23 2024 +0100
Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar
commit fdcc17ca2c33d38a7af505c99d9547e014f5f783
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Wed Oct 16 11:18:24 2024 +0200
Fix user creation with FullMultipleCompanySupport enabled over API
It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.
Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.
Signed-off-by: snipe <snipe@snipe.net>
commit 147fcfb8ebc4ceeea96d803d6a455abeba54f45a
Merge: 58a3d09b5 fdcc17ca2
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 15:12:55 2024 +0100
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
Fix user creation with FullMultipleCompanySupport enabled over API
commit 58a3d09b5fd7ffa979bfb9553cacbb24ae452462
Merge: 30a06a594 867fa2f36
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 14:55:42 2024 +0100
Merge pull request #15703 from marcusmoore/bug/sc-27188
Linked accessory files in activity report
commit 30a06a594289571097e2d30901546bc9a17b4bac
Merge: 6c6af78e0 ce3086317
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 11:47:06 2024 +0100
Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing
Removed brianium/paratest
commit 6c6af78e0840fc4f134e5bbb7965f21f4adcc0e1
Merge: 9b06bbb6c 3f79fd7ea
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 11:46:04 2024 +0100
Merge pull request #15705 from marcusmoore/tests/icon-component-test
Added test to ensure icon component does not end in newline
commit 3f79fd7ea744bd18134785c37b87a2f4bcff0347
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 17:07:40 2024 -0700
Add test to ensure icon component does not end in newline
commit 9b06bbb6c37fcea9b6202ad9fb2b4d952210dd01
Merge: 46ad1d072 d7f70146f
Author: snipe <snipe@snipe.net>
Date: Mon Oct 21 22:38:26 2024 +0100
Merge pull request #15704 from marcusmoore/bug/remove-extra-icon
Removed second icon in accessory file list
commit ce30863177e499a29f395c9c88ce9c67bd669a74
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 13:57:04 2024 -0700
Remove brianium/paratest dependency
commit d7f70146f4a886795ddb118cc2f71bbadded72dc
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 13:48:25 2024 -0700
Remove extra icon in accessory file upload list
commit 867fa2f36e02bdfe0ee74ae98b590fd013f6fc7a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 12:40:24 2024 -0700
Display file in activity report for accessories
commit e1882ee6d2a78506abfd371ba6e0d592ac487181
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 12:21:45 2024 -0700
Add comment
commit 7eee239378f1b4318557886d1e022540a10977af
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 12:20:28 2024 -0700
use is_numeric instead of is_int
commit 4188849ae17d52dd9befd349b56419eaea9f5287
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 12:19:48 2024 -0700
Add failing test case
commit 787e651778dbc04acf66cd77faf0386f5a137534
Author: snipe <snipe@snipe.net>
Date: Mon Oct 21 16:52:21 2024 +0100
Fixed todos with log message
Signed-off-by: snipe <snipe@snipe.net>
commit ef9b6e3b072f88bfec52c4ec930816d30eb34cb9
Author: snipe <snipe@snipe.net>
Date: Mon Oct 21 16:34:54 2024 +0100
Code cleanup
Signed-off-by: snipe <snipe@snipe.net>
commit 06c599cc17ca8f7a29515564e5cac9be905e338d
Author: snipe <snipe@snipe.net>
Date: Mon Oct 21 16:34:03 2024 +0100
Added method to show or download file
Signed-off-by: snipe <snipe@snipe.net>
commit 61053238777c38579c6188d2380f0cb7b99ae59e
Author: snipe <snipe@snipe.net>
Date: Mon Oct 21 14:11:20 2024 +0100
Use plural class name for src
Signed-off-by: snipe <snipe@snipe.net>
commit 0933a2d4ea6d5babd6ef3e0e2f8350c2e088648d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 18:01:48 2024 -0700
Remove --parallel flag
commit a8d853c44a38b50db05884843c614fe7b7342d60
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 15:26:27 2024 -0700
Remove focus group tags
commit 7e1b47708e7d44a2ad3bc7af93a38fc2dc6e72a9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 15:18:41 2024 -0700
Fix failing test ensuring company id is an integer
commit 979e4502ffbadab5978d38633fe06aa96eed698a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 15:14:39 2024 -0700
Have getIdForCurrentUser method return null if FMCS enabled, user is not super admin, and does not have company
commit ff113ef523f77fb887b939a23de3936f603812a6
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 14:56:58 2024 -0700
typo fix
commit 99dd51a965c7a02f8b24deddd1c233fac05f8465
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 14:53:18 2024 -0700
Improve name
commit 15c2169477e9691216d9f3fc2b8b8ddd2d8ee21a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 14:31:05 2024 -0700
Scaffold additional tests
commit 50fa6ce33588f466e90829fb59e8d91411c8d736
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 14:12:22 2024 -0700
Scaffold tests
commit 7ae76e7db9be7943ca473ab9ef30bda27b166aac
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 13:55:03 2024 -0700
remove viewdata array from 3 tests
commit b98058ca98e02b865fdf1488e83a49d4bf7df9c8
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 13:48:26 2024 -0700
fix tests pt 3
commit 83e8186d9e261efdde81ac56deeb9a799fdaa1e7
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 13:39:56 2024 -0700
fix assertSent to AssertNotSent on some test
commit cdd4fef7df6d49951aaa09ca597995b90a26f2ad
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 13:34:55 2024 -0700
attempt to fix tests p2
commit dceb8e305f55be79f3755a48bc3b4165dc79d43e
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 13:11:39 2024 -0700
attempt to fix tests
commit 123cdeb858a8148cd8210847fcb39e635b7dc2bf
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 12:39:48 2024 -0700
add email check to listener
commit 496b44e887078b6110f4e8e97e2b04bf22240677
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 12:28:57 2024 -0700
merged composer lock from dev
commit a690cc3582237fb6d40f8eaa3e3e83e7822574fc
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 12:26:55 2024 -0700
removing my composer stuff again..for the last time
commit ceb3f5cea629ed68fa4bfc119fefa2166456499c
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 12:19:50 2024 -0700
added mail-gun and http-client to 8.1
commit 65735a31f178c8bd4e1efabc7190a30e3500f5fd
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 12:18:34 2024 -0700
removed symfony/mailgun-mailer symfony/http-client
commit 285d6897cf83d2cac7e791fa50d23ec88f116849
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 12:05:36 2024 -0700
added a coulple test adjustments and moved mail send logic to listener
commit 159a1d3f4356141844767c2c2593252b98df3b11
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 11:48:55 2024 -0700
Be more explicit
commit d1149730be99fdc8e59e91ce3b02c863a08d4aa1
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 16:31:17 2024 +0100
Apply blade component to files views
Signed-off-by: snipe <snipe@snipe.net>
commit 46ad1d072f5c45d20c1b078d2b3f84a3a0f36632
Merge: bcb4bd9eb 3cf746d7d
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 15:29:47 2024 +0100
Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions
Bulk checkout to bulk actions
commit 780ed91a1098ed9af2a5f8f95d6ac87a14e55b20
Author: NebelKreis <leipold.johannes@web.de>
Date: Thu Oct 17 16:09:25 2024 +0200
Fix: Removed strtolower() from dashboard titles
This fix ensures the correct capitalization in different languages.
commit bcb4bd9eb4e419e8a125a7dccd3e79c39dc13e21
Merge: 250037540 f50ccbcc4
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 10:20:13 2024 +0100
Merge pull request #15683 from Toreg87/fixes/outdated_comment
Fix outdated comment in CompanyableTrait
commit f50ccbcc492db6c98cabf6dc6752dd99ab82bce7
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Thu Oct 17 11:07:28 2024 +0200
Fix outdated comment in CompanyableTrait
As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment
commit 9a794833755ff5fb335ab6cf1e118a0d411b021e
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 16:59:18 2024 -0700
removed namespaces from routing
commit ed6034065b34797ba531782a207fe49384e0f465
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 16:47:36 2024 -0700
removed test route
commit a7754c1a7fd6559b5d512fbd520556c9d10b76aa
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 16:46:52 2024 -0700
fixed asset checkout markdown, and notifiable variable
commit 0e9b3c9119e77259ed2f8740ae98e9149936bd51
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:27:39 2024 +0100
Check for existence before trying to get the icon
Signed-off-by: snipe <snipe@snipe.net>
commit 4933aa5784e3a86021136775055d81eed7b3c966
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:27:04 2024 +0100
Add StorageHelper to app config
Signed-off-by: snipe <snipe@snipe.net>
commit d67addc69ee2fde2fdc9d90e1eefa13f1c1e4f26
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:21:43 2024 +0100
Removed filetype column - it’s dumb
Signed-off-by: snipe <snipe@snipe.net>
commit 02c80ff18af48c016433807b4bdc0f384ffde41a
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:18:40 2024 +0100
Added comment
Signed-off-by: snipe <snipe@snipe.net>
commit c01190fac279b38d8ee74a636d8cf9c2fd7a7285
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:18:34 2024 +0100
Conditionally add content-type
Signed-off-by: snipe <snipe@snipe.net>
commit 017884f8432abd3afed7397a7967bb2813df0262
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:09:09 2024 +0100
Added checks and filetype display
Signed-off-by: snipe <snipe@snipe.net>
commit c49921f50fc54785b87d59e6265b29088bba48fe
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:08:54 2024 +0100
Removed unused (maybe?) API endpoint
Signed-off-by: snipe <snipe@snipe.net>
commit c49abb6aeafbfbf43ebcb7e1a9c565288b72b9d9
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:08:38 2024 +0100
Refactor the UserFilesController show method for simpler inlining
Signed-off-by: snipe <snipe@snipe.net>
commit ccd20194484313c6e53bf357687ef8a29a4fffe6
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:08:04 2024 +0100
Removed unusded use statements
Signed-off-by: snipe <snipe@snipe.net>
commit 96191a5e9391e86701095b74fefc9064e4bf74d3
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:07:54 2024 +0100
Added method to decide if the file should be inlinable
Signed-off-by: snipe <snipe@snipe.net>
commit c56affd66345a92f64fb8c7451ced58b5340dd70
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:07:37 2024 +0100
Added SVG icon
Signed-off-by: snipe <snipe@snipe.net>
commit 02bda3cd9598d77ddd2c68f67f589f82e0af37b3
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:53:05 2024 -0700
adds Checkout Consumable mailable and slackwebhook channel to notifs
commit 02ff646da4388422d260ed50d8e93ea7bc57dab0
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:44:45 2024 -0700
adds checkin license mailable
commit 4becdca8aa792957243e5ca9a3dcf04cfa3ee522
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:39:20 2024 -0700
removes toMail from license notificaqtion
commit 2584d603445bb0a82e722cd8b7a3dbf7f1c1d020
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:38:49 2024 -0700
adds Licenses seat checkout Mailable
commit f1d83a3f281a7d17c2b8ca52ccaf8403cac4d246
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:30:53 2024 -0700
forgot to add asset checkout markdown to projet
commit c39df34bdfabb2acde4ab8aaba01cf5c65582675
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:29:50 2024 -0700
forgot to add accessory mail to project
commit dcdf600b785501d960ee6a8f99a46f9a6ba90b9f
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:27:34 2024 -0700
adds Checkin and Checkout mailables and listner logic
commit 3cf746d7df83ef3e7cfa45c602fc182ebe8f11e3
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Oct 16 23:13:32 2024 +0100
Rework the bulk checkout to not change how all checkouts work
commit 6b7af802af41c92a36e77605415869c9e72ec192
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Thu Oct 10 13:28:23 2024 +0100
Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar
commit 9710436d54fc23e79bf96b61430f3f0f3345581a
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 13:12:07 2024 -0700
adds Mailables for asset checkin and out
commit 16cffe9a9dd0cbce4f38d161a2b4cbebeaffde1c
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 12:53:35 2024 -0700
simplified checkout webhook call
commit 9e1b86f586f2942312105b0b37d69ee8ec34ca17
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 12:51:19 2024 -0700
sends checkout notification via webhook
commit 3ab2521cb0b8f61cb42a7b205a7836d7950046a6
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 12:21:33 2024 -0700
email comes through, no picture and html markup appear though.
commit 604a9644624a52cd1aa965d92d36aa936840265d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Oct 16 11:52:24 2024 -0700
Improve scenario descriptions
commit 2f72c66614676efd205585e25d909424b136d869
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Oct 16 11:30:06 2024 -0700
Add additional case
commit fdcc17ca2c33d38a7af505c99d9547e014f5f783
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Wed Oct 16 11:18:24 2024 +0200
Fix user creation with FullMultipleCompanySupport enabled over API
It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.
Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.
commit cba1a560408c821c4112a2548a6df20755536efd
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 15 17:38:11 2024 -0700
Improve readability?
commit d9afde4610dd0527fb19fd52093f2d654ce36430
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 15 17:00:22 2024 -0700
Write failing test
commit 9f06a0e441940606de32279c428b24a8957186fb
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 15 14:01:28 2024 -0700
handle some edge cases, null values clean up variable names
commit 42095c0167b661d0f7a996a3bd17e0c0cfac5750
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 15 13:02:22 2024 -0700
Add reference link
commit f8476f713396027e7149e7306db2bfcc710d5e5c
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 15 12:49:52 2024 -0700
finished the construct and mail call in the listner
commit b29d032bf0250941a2a968c85c227bbee9449c81
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 15 11:28:27 2024 -0700
adds checkoutAssetMail class, and content method
commit 250037540038cb140c12cfe4cbf2aa9a7c0ffbdc
Merge: 16c8264e7 e4e1d0d50
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 17:34:35 2024 +0100
Merge pull request #15672 from uberbrady/ldap_location_fixes
Clean up how we use the '$location' in LDAP sync command
commit e4e1d0d50a4a3e418d1b736dac6221d437d88b66
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Tue Oct 15 17:26:31 2024 +0100
Clean up how we use the '$location' in LDAP sync command
commit 16c8264e766b56e24c33fea740847a48a91d2cc3
Merge: 914a64720 0ae9ce0aa
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 16:42:34 2024 +0100
Merge pull request #15671 from snipe/bug/sc-27147
Bug/sc 27147
commit 0ae9ce0aa9fe06b850183f15a668f366f6128565
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 16:41:45 2024 +0100
Cannot sort by updated at on Users [sc-27147]
Signed-off-by: snipe <snipe@snipe.net>
commit 50b8f180b3d1315e48d8d545c3b9c7153a768bdf
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 16:41:39 2024 +0100
More logical grouping in allow_columns
Signed-off-by: snipe <snipe@snipe.net>
commit 914a647204843f784edeffc358d50bd0175d2d14
Merge: 69b6080bd e9225ff3e
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 12:47:15 2024 +0100
Merge pull request #15669 from snipe/remlove_ou_requirenedess
Fixed #15663 - remove requiredness for OU
commit e9225ff3ea6952f83ec0cbda2749f0756d6f1de7
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 12:43:10 2024 +0100
Switch to regular HTML for input form field
Signed-off-by: snipe <snipe@snipe.net>
commit d0d4159088e4452ff18dcfb80e3746475caedc88
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 12:42:09 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
commit 69b6080bd865c6db78577d256627b894b28550cd
Merge: ddead359d b997d728f
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 10:31:29 2024 +0100
Merge pull request #15666 from snipe/updated_readme_llm
Added LLM note
commit b997d728fb508f00b28d1f5db7bdd7ecd6177c0b
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 10:30:34 2024 +0100
Added LLM note
Signed-off-by: snipe <snipe@snipe.net>
commit ddead359d055f1ebc52b2e3bbcf4004f8233800d
Merge: 0d35335da f3c4e5566
Author: snipe <snipe@snipe.net>
Date: Mon Oct 14 14:29:34 2024 +0100
Merge pull request #15660 from Toreg87/fixes/api_asset_create_fmcs2
Refactor asset creation with API
commit f3c4e556675d7dcd7920807bced18b3416b0b2ec
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Mon Oct 14 15:14:41 2024 +0200
Refactor asset creation with API
Commit fb4fe3004 restored the previous behaviour to check the company_id in case of FullMultipleCompanySupport.
But after rereading the code and the laravel documentation, the check is already there where it belongs in AssetStoreRequest::prepareForValidation()
The bug is the is_int-check of the request input in prepareForValidation(). Is is of type string even if it is a numeric value, so the call to getIdForCurrentUser() never happend.
Fix this by removing the check and the now redundant call to getIdForCurrentUser().
Wrong values will get caught by the model-level validation rules.
commit 0d35335da7df0d601d4221d1c2073478d3ab55b2
Author: snipe <snipe@snipe.net>
Date: Fri Oct 11 16:06:17 2024 +0100
Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
commit feaa71430493b46870203f31d0540a39b2355411
Author: snipe <snipe@snipe.net>
Date: Fri Oct 11 14:23:57 2024 +0100
Nicer disabled button
Signed-off-by: snipe <snipe@snipe.net>
commit e1a70023b167999defc72adf3d837d8ff2679e2a
Merge: de62359c6 fb4fe3004
Author: snipe <snipe@snipe.net>
Date: Fri Oct 11 11:45:48 2024 +0100
Merge pull request #15655 from Toreg87/fixes/api_asset_create_fmcs
Fixes #15654 Fix asset creation with API and FullMultipleCompanySupport
commit de62359c6734bdd01c1d3823b723be671ff0595b
Merge: 12bda8fc7 3dc64cc5e
Author: snipe <snipe@snipe.net>
Date: Fri Oct 11 11:29:34 2024 +0100
Merge pull request #15533 from marcusmoore/testing/fmcs-accessories
Added tests for accessory api controller
commit 12bda8fc7b756e7d930ed1a14b94f130d39f673a
Merge: 8aa298f6b b054017c9
Author: snipe <snipe@snipe.net>
Date: Fri Oct 11 11:27:18 2024 +0100
Merge pull request #15653 from snipe/15651_admin_user_on_maintenances
Fixed #15651 - admin user now displaying on maintenances page
commit fb4fe3004906acfc53a0d26e5e62569cb078d1e8
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Fri Oct 11 12:09:09 2024 +0200
Fix asset creation with API and FullMultipleCompanySupport
It is currently possible to create an asset with arbitrary company without being superuser and FullMultipleCompanySupport enabled.
This bug goes back to 75ac7f80b9 which is part of version 6.3.0.
Fix this by restoring the previous behaviour to check the company_id with getIdForCurrentUser().
commit b054017c9f422d37c32b137b49ce04dc2a4e9533
Author: snipe <snipe@snipe.net>
Date: Fri Oct 11 11:16:24 2024 +0100
Fixed #15651 - admin user now displaying on maintenances page
Signed-off-by: snipe <snipe@snipe.net>
commit 524a44272452d701e9da4d2e77ca10780f019f96
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com>
Date: Thu Oct 10 23:32:07 2024 +0100
Improved import performance
commit 8aa298f6b017c27feb5787a3d58dd9cd5023f419
Merge: 1f3465773 b5b93fdd3
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 12:30:53 2024 +0100
Merge pull request #15644 from snipe/form_requests_for_settings
Form requests for settings
commit 1f34657734f075286e6007c75cfb764637cb708c
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 12:30:35 2024 +0100
Fixed test
Signed-off-by: snipe <snipe@snipe.net>
commit 0856ee648ec8b55cf17cbbf46fddb8fb0cc05a21
Merge: 94a074a19 1dafc970d
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 12:23:14 2024 +0100
Merge pull request #15648 from snipe/update_packages
Updated livewire to 3.5.2
commit 1dafc970dfb517d710b57a39c25470249deeeb6f
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 12:19:57 2024 +0100
Updated livewire to 3.5.2
Signed-off-by: snipe <snipe@snipe.net>
commit 94a074a193cdcba198613906641cba57e3703890
Merge: 2d49e1eff b34a7c8aa
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 01:11:10 2024 +0100
Merge pull request #15601 from snipe/check_db_on_healthcheck
Fixed #15439 - check database on healthcheck
commit 2d49e1eff207dc37662d5a0f1017cf498c6f50c7
Merge: 705bc6f0c c2663ea1e
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 01:09:11 2024 +0100
Merge pull request #15637 from akemidx/bug/sc-26614
FIXED: Badge counter showing deleted assets on User page
commit 705bc6f0c0d5582cb8e3dcaed97561bfd613894f
Merge: 3ee571374 67a605c9a
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 01:08:25 2024 +0100
Merge pull request #15642 from uberbrady/fix_bulk_checkout
Fix bulk checkout to users, assets, and locations
commit b5b93fdd3a75bf72712b927b5c59c1e249c47f16
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 00:27:00 2024 +0100
Make ldap username required
Signed-off-by: snipe <snipe@snipe.net>
commit d9432baf7ad497e6b7104990401a4074b1d6fe80
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 23:51:20 2024 +0100
Mlore ldap style improvements
Signed-off-by: snipe <snipe@snipe.net>
commit 90be2a4498a71d55080663875e29ebd67cfdc433
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 22:26:30 2024 +0100
Use newer naming convention for errors
Signed-off-by: snipe <snipe@snipe.net>
commit 3886da8941b01af7d4f7c63a141ea2bde49854c3
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 22:15:49 2024 +0100
Remove form request from get LDAP method
Signed-off-by: snipe <snipe@snipe.net>
commit 130e0c6242e2590cb44d60437d8b7c0f4e3c7f67
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 22:15:37 2024 +0100
More validation
Signed-off-by: snipe <snipe@snipe.net>
commit 4361a108183b8b1ed473be8bfe8b7c27eda7a84c
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 22:15:30 2024 +0100
Added string
Signed-off-by: snipe <snipe@snipe.net>
commit aa8048ac15fc931825083070099b0ceee550f281
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 22:15:25 2024 +0100
Blade changes for ldap
Signed-off-by: snipe <snipe@snipe.net>
commit 710e738e8ef0d39f0ead49f8dd0604d201a11936
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 22:15:16 2024 +0100
Fixed tests
Signed-off-by: snipe <snipe@snipe.net>
commit 3705b914399054e29d4964371ca638524a427bed
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 20:51:34 2024 +0100
Added more validation
Signed-off-by: snipe <snipe@snipe.net>
commit 707bdad192416c9bd6be3fd221913df282601d55
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 20:33:56 2024 +0100
Updated test
Signed-off-by: snipe <snipe@snipe.net>
commit 242fe33f973131463c5ebb297b4d05aa50974c3c
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 20:33:42 2024 +0100
Switch to regular HTML input
Signed-off-by: snipe <snipe@snipe.net>
commit ded79469c1cdfe7ce8421b872da9945cf9ff569d
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 20:33:29 2024 +0100
Remove unused controller method
Signed-off-by: snipe <snipe@snipe.net>
commit d9fbf330e5302355b4c59d14fec7311e2375fb24
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 20:33:15 2024 +0100
Fixed translations
Signed-off-by: snipe <snipe@snipe.net>
commit 2cb9ac26cd4b5b79fc9c813a76a8a0043ef2fa6c
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:57:04 2024 +0100
Renamed test
Signed-off-by: snipe <snipe@snipe.net>
commit 185bc966e6c699e9ff4930a254c5c79405c0b836
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:46:47 2024 +0100
Cleaned up use statements in tests
Signed-off-by: snipe <snipe@snipe.net>
commit a7f7e4938ffb99217f9cbbc70cdf08a4a9bbf9cd
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:31:56 2024 +0100
Added form action
Signed-off-by: snipe <snipe@snipe.net>
commit 2883e791938812a54ad2e4865cfcabd40bbb5589
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:30:55 2024 +0100
Removed unecessary assets creation
Signed-off-by: snipe <snipe@snipe.net>
commit 9c4191ae0ac4c4d338f77cb6bd3ea71c66f0844d
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:30:42 2024 +0100
Basic tests
Signed-off-by: snipe <snipe@snipe.net>
commit 3a77b83e9c71bf60f52e4900670047764b453e62
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:30:34 2024 +0100
Added space
Signed-off-by: snipe <snipe@snipe.net>
commit d9be2b5a5e5cff6266c0ee54b5d2261885459f69
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:30:25 2024 +0100
Trying to use the email_array translation
Signed-off-by: snipe <snipe@snipe.net>
commit 69c43c610c87babcf3919a8bac8ac73f6533330b
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:30:00 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
commit 4f957bcf7191ce17bbc33b958a5b60968fb3264f
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 18:34:53 2024 +0100
Required flag
Signed-off-by: snipe <snipe@snipe.net>
commit 5cda7cce4830626f594de8cb4d4291c161916351
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 18:21:40 2024 +0100
Only accept a positive number for thresholds
Signed-off-by: snipe <snipe@snipe.net>
commit 41b94e7128c68af71f53e95ddd8bfbc242cde198
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 18:19:26 2024 +0100
Fixed form input group
Signed-off-by: snipe <snipe@snipe.net>
commit aa55fa6ff496d279ca271b4614a5f778e73ae808
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 18:16:34 2024 +0100
Switch to form requests for settings
Signed-off-by: snipe <snipe@snipe.net>
commit 67a605c9a5cf01f6028bf981a35664a399b43347
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Oct 9 17:01:26 2024 +0100
Fix bulk checkout to users, assets, and locations
commit c2663ea1e090c089ef58db872f9f2676891611e9
Author: akemidx <kojotek.dx@gmail.com>
Date: Tue Oct 8 16:38:33 2024 -0400
withouttrashed
commit 3ee5713740c9944dbcd1233c7f35bf51c0b5ca36
Merge: ab8a22f77 56e7ea667
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 23:13:15 2024 +0100
Merge pull request #15631 from snipe/test/importer-tests
Add importer tests
commit ab8a22f77e13ad86c4964787cfe9bf12d57c7a6f
Merge: 26d7572bc 8c9132aff
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 22:56:23 2024 +0100
Merge pull request #15630 from marcusmoore/bug/sc-27028
Only show EULA when available on print users page
commit 56e7ea6677ee9372a19adb30f8338995d9a245f3
Merge: 32551d55d 803532667
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 22:29:35 2024 +0100
Merge pull request #15616 from marcusmoore/test/importer-test-updates
Improve importer tests
commit 26d7572bcc36030f5d0b62d432a4f6bfd965d962
Merge: 382ebef8c ee046a868
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 22:28:53 2024 +0100
Merge pull request #15603 from marcusmoore/fixes/add-reguard
Added `Model::reguard()` to importer
commit 8c9132aff9be01a90ac53b16d87303bd912b24b0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 7 14:22:49 2024 -0700
Hide EULA text and button when nothing will be displayed
commit 382ebef8ca069767d9e340c7def62ca920537a91
Merge: 2be88cb95 f76da4844
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 21:26:21 2024 +0100
Merge pull request #15621 from sniff122/develop
Docker Env: Change trusted proxies to RFC1918
commit 2be88cb95517c09cb962069fd41d19ee76fead33
Merge: 7fc498a59 3f36d5f9b
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 11:14:24 2024 +0100
Merge pull request #15624 from snipe/fixed_line_break_on_print_all_for_users
Removed duplicate JS and removed line break before user section
commit 3f36d5f9b38d9adae796f01b930bccbe1b6406ed
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 11:08:02 2024 +0100
Removed duplicate CSS and removed line break before user section
Signed-off-by: snipe <snipe@snipe.net>
commit f76da48448e06a6008751bcf9b7148b15722b1b8
Author: Lewis Foster <lewis@sniff122.tech>
Date: Sat Oct 5 18:27:42 2024 +0100
Docker Env: Change trusted proxies to RFC1918
commit 8035326675e9a479c030687dc5a8079fd43e34f5
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 16:53:19 2024 -0700
Add test
commit dfdd85abb17422380499d20fe4596a759ff56e4c
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 15:14:07 2024 -0700
Remove unused imports
commit 063ea1892b3fecdd52ad8cd353c39038a8087de7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 15:02:03 2024 -0700
Add trait to clean up files after test runs
commit e21305377549886099d21b67f49d2abbccc42d91
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 13:59:58 2024 -0700
Swap factory syntax
commit 88d549e7c5ee8fd385d897be557dbbac60a66f73
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 13:40:37 2024 -0700
Remove unused data provider method
commit 983a25aa5f9004e05f27713fbef6e8f9302bb772
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 13:39:54 2024 -0700
Simplify permission tests
commit bde05d6ed9840d6e712e0f4a785f9c9166f352fd
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 13:15:49 2024 -0700
Use new() instead of times()
commit b5ffe54bd07bd6a14216e993142e9086fbdee9e7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 13:15:02 2024 -0700
Swap assertEquals parameter order
commit 863c0a8b609d9c407bf7ed038bcb7db0e40dd4df
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 11:43:02 2024 -0700
Fix import_type for accessory state
commit 32551d55d730271d6ab24b566b111d7e80a1e3b9
Merge: 7fc498a59 e807cfab8
Author: Marcus Moore <mmoore@grokability.com>
Date: Thu Oct 3 11:39:21 2024 -0700
Merge pull request #15579 from bryanlopezinc/ImportTests
Add Import data tests
commit 7fc498a5977d975d0e349cf3d09e473369c5881b
Merge: 78ca1026f cb281c640
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 17:39:18 2024 +0100
Merge pull request #15613 from snipe/css_fixes_for_long_values
Smarter word-wrapping on long text
commit cb281c6408bb81dd0fbcb8f65e0ad6fea090c154
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 17:33:46 2024 +0100
Tweaked line height
Signed-off-by: snipe <snipe@snipe.net>
commit f483cd448fdcf3dc75482a0e9029f0569fc3916d
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 17:27:37 2024 +0100
Smarter work-wrapping on long text
Signed-off-by: snipe <snipe@snipe.net>
commit 78ca1026fd4a02e949ac500cacd48ed2dd0b4ceb
Merge: 3699d7936 722d5a58e
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 16:24:32 2024 +0100
Merge pull request #15612 from snipe/fixes_print_assigned_in_profile
Fixes print assigned in profile
commit 722d5a58e719886282f908a11420fa88f9fed4fc
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 16:19:38 2024 +0100
Added isset on users
Signed-off-by: snipe <snipe@snipe.net>
commit 7461c3e0ca2af18ed989a5905c84c5710213f1fb
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 16:19:27 2024 +0100
Change controller to assume a collection. (This is dumb, but whatever)
Signed-off-by: snipe <snipe@snipe.net>
commit 3c0f4181ae994e6e33c4c15adbb6704be921c99f
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 16:19:06 2024 +0100
Use the newer button style
Signed-off-by: snipe <snipe@snipe.net>
commit 3699d79363cb578ba0689f66cc512a84f8d143eb
Merge: 54fbd0540 350b627ce
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 14:34:00 2024 +0100
Merge pull request #15610 from uberbrady/fix_numeric_sort_bug
Fix numeric sort 'ambiguous order clause' error
commit 350b627ce1a247b248845b8b85d2a802c8fb8f74
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Thu Oct 3 14:23:40 2024 +0100
Fix numeric sort 'ambiguous order clause' error
commit ee046a86885deecf15601acd65ee97fac1f6b54e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Oct 2 10:50:40 2024 -0700
Add matching Model::reguard()
commit b34a7c8aad07ce285e09cfcd4fb779c8c4295d3f
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 15:48:35 2024 +0100
Removed die()
Signed-off-by: snipe <snipe@snipe.net>
commit f92bf5dc2067cae2b533090f0c3a947d16fb4d50
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 15:39:27 2024 +0100
Updated language for failure
Signed-off-by: snipe <snipe@snipe.net>
commit 4d9e85026aa814bd5cba426c339f931cacdafd67
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 15:36:01 2024 +0100
Fixed #15439 - check database on healthcheck
Signed-off-by: snipe <snipe@snipe.net>
commit 54fbd0540d8600ba8f49681f158d4db4fea4e9cf
Merge: b483bb163 4db735808
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 12:40:49 2024 +0100
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
commit b483bb1633af5933fd8ac56a489bb8717fd14a5e
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 12:40:45 2024 +0100
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
commit 4db73580869fd4d05475f68152fb6f83304c83fc
Merge: 0dd6f41f6 b9cfdf2e5
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 12:38:46 2024 +0100
Merge pull request #15593 from Godmartinz/Fixed-divide-by-zero-bug
Fixed divide by zero bug in depreciation transformer
commit 0dd6f41f66c0e41ca8ac3561162f818b1af88540
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 11:04:55 2024 +0100
Simplified 2fa if/else
Signed-off-by: snipe <snipe@snipe.net>
commit 684c20ae393cc524821137fe442ce1f0b7a8873d
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 11:00:49 2024 +0100
Fixed parenthasis
Signed-off-by: snipe <snipe@snipe.net>
commit 3153bbb13fb2244a457135e7550f656a51a6ea20
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Oct 1 17:04:18 2024 -0500
dumb fix
commit 3dc64cc5e0465e60116e2afd9e04a865d8781199
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 1 13:35:39 2024 -0700
Reference accessory checkout and not the accessory
commit c32f4e34b4a233bdd2f812b0ff6ff1e2ba3a8523
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 20:35:49 2024 +0100
Minor formatting fix
Signed-off-by: snipe <snipe@snipe.net>
commit ca1886cebcc107b4ca4e31739cb556ad7a806caf
Merge: 45ab49eea a79dfea40
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 20:31:38 2024 +0100
Merge pull request #15594 from snipe/localizations/update-2024-10-01
Updated strings
commit a79dfea40a2a4776b9f7e6ae64453ef072e0870d
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 20:30:58 2024 +0100
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
commit 45ab49eeab1e995999337f060ac76c33ddb2dcc3
Merge: 97d00e5aa 8232618a9
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 20:26:42 2024 +0100
Merge pull request #15592 from spencerrlongg/bug/catch_request_notify_errors
Catch Errors Around Request Notifications
commit 8232618a9f8868cd1c5495fe301544fd3461a2d5
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Oct 1 14:26:32 2024 -0500
change the other one too
commit 9a651b567d0c3c463f781b8e5b87609113b0fdd0
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Oct 1 14:24:03 2024 -0500
change error to warning
commit 97d00e5aa87fb1581aa44829e8cbb5410e021ebd
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 20:08:54 2024 +0100
Fixed erroneous form tag on anchor
Signed-off-by: snipe <snipe@snipe.net>
commit 5b90d79494215f27f8d1f8b02e1d14c787f44a6a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 1 11:50:48 2024 -0700
Use created_by
commit b9cfdf2e54bdc3571e64e3ddd9dcfdec68b98222
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 1 11:41:59 2024 -0700
reworked monthly depreciation variable value
commit 1139acd9f3e026a648e3d00b7cbf4036c17518c9
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Oct 1 13:36:47 2024 -0500
catch errors around request notifications
commit b7ad80bd319ad787990aee24dbcbb50bb175fa21
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 1 11:24:24 2024 -0700
fix monthly depreciation value
commit 5ffd1b8daaa06865119fe0913f41dfcdfaaa8c62
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 1 11:02:39 2024 -0700
fixes if statement in transformer
commit 9a2117466e04c68e8d9e813c494d248ec44b4951
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 18:23:40 2024 +0100
Removed placeholder
Signed-off-by: snipe <snipe@snipe.net>
commit 7e3a0629844446c23f2a215305764a30f32eba53
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 18:23:07 2024 +0100
Use <th> for table header in bulk interstitial
Signed-off-by: snipe <snipe@snipe.net>
commit d274fb696357f78dd107a38abcfdb0029f594899
Merge: cfc04a1d1 27ba641aa
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 14:32:48 2024 +0100
Merge pull request #15589 from snipe/adds_checkin_action_on_asset_delete
Adds checkin action on asset delete via View UI
commit 27ba641aa512c1ab869f8b62bb62c36c07efe12f
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 14:30:34 2024 +0100
Added checkin on delete to API
Signed-off-by: snipe <snipe@snipe.net>
commit 5823197e6fe2ec09448e41300d4b129e5435cf96
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 14:29:02 2024 +0100
Added checkin action on delete for checked out assets
Signed-off-by: snipe <snipe@snipe.net>
commit cfc04a1d12825245594a3da2df03367ccf7dd3e3
Merge: 12da43303 cae8aa784
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 14:08:58 2024 +0100
Merge pull request #15588 from snipe/added_more_maxlengths
Added maxlengths to additional fields
commit cae8aa78406c28d8b6c1cc40d79c05a42f38d988
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 14:02:54 2024 +0100
Added maxlengths to additional fields
Signed-off-by: snipe <snipe@snipe.net>
commit 12da43303f162feed2c68bfd9b181760ff1a5d8c
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 01:44:05 2024 +0100
Fixed #15584 - regression with required css change
Signed-off-by: snipe <snipe@snipe.net>
commit fdfea390fbdc619888c9f97cacc2a13fcffd3d29
Merge: d609ed50a 5689e940b
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 30 12:59:27 2024 -0700
Merge branch 'develop' into testing/fmcs-accessories
commit b04afbbc855927f491a9eeb5efbb9df520c01bf9
Merge: b964ce102 3f311ba2f
Author: snipe <snipe@snipe.net>
Date: Mon Sep 30 19:26:08 2024 +0100
Merge pull request #15564 from uberbrady/improve_autoclose
Get us better debugging output for new Github Stale Action
commit b964ce102556d3ec9c15b4d4301aaf7121d078e9
Merge: 6217cba20 68e3f375f
Author: snipe <snipe@snipe.net>
Date: Mon Sep 30 19:25:05 2024 +0100
Merge pull request #15583 from Godmartinz/remove-sortable-from-depreciations
Removed sortablity for current value column in depreciations report
commit 6217cba2017ef231cadd4b9b6554fb504d0e3dd3
Merge: 5689e940b b32ab6a06
Author: snipe <snipe@snipe.net>
Date: Mon Sep 30 19:24:19 2024 +0100
Merge pull request #15524 from Godmartinz/double-notif-bug
Fixed double webhook notifications // Separated email and webhook notifications.
commit 68e3f375fc1fecd0baf0e4a5346b05717e332749
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Sep 30 11:15:49 2024 -0700
removes sortablity from current value column
commit 5689e940b85e767fe109de28fd264bc632b6c8b5
Author: snipe <snipe@snipe.net>
Date: Mon Sep 30 18:23:12 2024 +0100
Fixed #15581 - missing bracker
Signed-off-by: snipe <snipe@snipe.net>
commit e807cfab869b558c4ee6f2bb72fb78b6e496d2b1
Merge: 0b3f45856 001348c63
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com>
Date: Mon Sep 30 12:47:52 2024 +0100
Merge branch 'develop' into importTests
commit 0b3f458561370fd6c825cc756c2de633c77326df
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com>
Date: Mon Sep 30 12:42:41 2024 +0100
Added tests for Import feature
commit 001348c6388b8daa05a5f4ed4e248639c06b4d67
Author: snipe <snipe@snipe.net>
Date: Sun Sep 29 14:33:42 2024 +0100
Unset required on checkout select :(
Related to the discussion at #15552
Signed-off-by: snipe <snipe@snipe.net>
commit 1b041af8625ce3a0107de6f68246308050f54800
Merge: 260b15368 d120585f9
Author: snipe <snipe@snipe.net>
Date: Sun Sep 29 11:25:01 2024 +0100
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 260b153689368a2936e55959d83621f1e4ae5c37
Merge: 36b27fcda 05d74f7a9
Author: snipe <snipe@snipe.net>
Date: Sat Sep 28 16:09:51 2024 +0100
Merge pull request #15573 from snipe/fixed_requiredness_indicator
Fixes for requiredness indicator in UI
commit 05d74f7a92c0afaa00e1a520983b90545c7f79d9
Author: snipe <snipe@snipe.net>
Date: Sat Sep 28 15:42:03 2024 +0100
Covered setup pages too
Signed-off-by: snipe <snipe@snipe.net>
commit dc85588d7f9cd3f0e485ea148eb491e10154909d
Author: snipe <snipe@snipe.net>
Date: Sat Sep 28 15:31:44 2024 +0100
Don’t show password as required if editing
Signed-off-by: snipe <snipe@snipe.net>
commit 585f998cae3bf8d812509fba7937cd28b9b4a5d0
Author: snipe <snipe@snipe.net>
Date: Sat Sep 28 15:28:06 2024 +0100
Fixes for requiredness display
Signed-off-by: snipe <snipe@snipe.net>
commit d120585f94f22e03692b86dd1a0d3ebed4bb1f82
Author: snipe <snipe@snipe.net>
Date: Fri Sep 27 14:07:30 2024 +0100
Check for valid eula for license, consumable
Signed-off-by: snipe <snipe@snipe.net>
commit 166a700342eddf283370bc15b72d7f9e3d681431
Merge: 6c85ba349 36b27fcda
Author: snipe <snipe@snipe.net>
Date: Fri Sep 27 13:37:28 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 36b27fcda3b3fc0978a951a78f88f6e62796fb87
Author: snipe <snipe@snipe.net>
Date: Fri Sep 27 13:37:14 2024 +0100
Check for valid category before getting the eula
Signed-off-by: snipe <snipe@snipe.net>
commit a44490e44868ba992c784af12d516172e89c2ecd
Author: snipe <snipe@snipe.net>
Date: Fri Sep 27 13:07:24 2024 +0100
Nowrap on files column
Signed-off-by: snipe <snipe@snipe.net>
commit 9aada2ec701cadbe6eeb8ec77d0f2954511cf3a2
Merge: ac6411743 ef82f954e
Author: snipe <snipe@snipe.net>
Date: Thu Sep 26 09:09:35 2024 +0100
Merge pull request #15498 from Godmartinz/Modal_fix
Refactoring modals with partials and fixing misalignments
commit 3f74ff25d2e0ddc259c6d397150ff6d5ac42d6ed
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 25 16:19:09 2024 -0700
fixed error message
commit ef82f954e538d8afb6e765aadcffe79b914c276a
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 25 15:47:57 2024 -0700
fixed required css, and user input lengths
commit 3f311ba2fb37c19a4f728720b06a5bfee9ded63d
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 25 21:27:45 2024 +0100
Get us better debugging output for new Github Stale Action
commit 96953aa2edeacd13a05da471cf03f5608b561d96
Merge: e609b3976 b797c37ac
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Sep 25 12:50:01 2024 -0700
Merge pull request #23 from Godmartinz/Modal_fix_p3
replace duplicate code with partials
commit b797c37acba1801e52945202620fdb12e20e0796
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 25 12:48:05 2024 -0700
replace duplicate code with partials
commit 6c85ba3495a005be6a413e014c51b25a820db31a
Merge: 9f8473e25 ac6411743
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 20:45:02 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ac6411743bab13cb5b6a63c0b5312bdc494acba0
Merge: 9b03f4649 3f0245f88
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 20:35:58 2024 +0100
Merge pull request #15563 from snipe/refined_gates_on_user_bulk
Update for #15534 - Refined gates on user bulk
commit 3f0245f88f03b7e7ec3e7903a6b88027c5e5c01d
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 20:33:00 2024 +0100
Make controller gate match dropdown gate
Signed-off-by: snipe <snipe@snipe.net>
commit c02647a0fa025d9807b242a4707a2525e578000c
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 20:32:03 2024 +0100
Moved merge into delete gate, since they do technically delete
Signed-off-by: snipe <snipe@snipe.net>
commit edca3f432ce1384e0b087d8209787e60beac1219
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 20:30:58 2024 +0100
Removed gate for delete
Signed-off-by: snipe <snipe@snipe.net>
commit 2218c94aa30fe83c460239cfdb4044c49e79baf6
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 20:29:23 2024 +0100
Gates the dropdown based on user permissions
Signed-off-by: snipe <snipe@snipe.net>
commit e609b39760ff48e2b5b7d51a4e31d47a7d57f272
Merge: 0bc98e971 12522a379
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Sep 25 12:09:26 2024 -0700
Merge pull request #22 from Godmartinz/Modal_fix_p2
Modal fix p2
commit 12522a3791a0705340f999b7a665d0ea45aa5918
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 25 12:07:15 2024 -0700
fix spacing issues
commit f6d7ea19e4df08cb80c3875060d5b51333e9f025
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 19:44:39 2024 +0100
Set view as base permission, drill down for more intrusive actions
Signed-off-by: snipe <snipe@snipe.net>
commit 18ddffe8f96deeecd84b1098f3f83d034c923e5d
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 25 11:42:16 2024 -0700
fix partial variable intialization, fix width of input fields
commit 9b03f4649051998b95feb0a54b83a0f00c483c8b
Merge: cb6e5042d fac4833b5
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 19:32:01 2024 +0100
Merge pull request #15534 from marcusmoore/bulk-print-users
Added the ability to bulk print users
commit 926a319552eff366f68081d828362fa1e6977a05
Merge: 0bc98e971 cb6e5042d
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 25 11:10:24 2024 -0700
Merge branch 'develop' into Modal_fix_p2
commit 9f8473e254b858042fb0ec1c89edb57fc3f93707
Merge: 0e61d0b19 cb6e5042d
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 18:36:40 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit cb6e5042d91b4dd6711964377bd328ca7088194f
Merge: c1a887b48 ba69259f2
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 18:32:59 2024 +0100
Merge pull request #15547 from snipe/disallow_checkout_with_nondeployable_status
Fixed #13396 - do not allow checkout to undeployable status types
commit c1a887b48b9f6d8c482ebe93e940cfc3d76d7d49
Merge: ba1220484 658c94ad8
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 18:32:21 2024 +0100
Merge pull request #15561 from snipe/fixes/adds_action_date_to_sorting
Changed `action_date` to `created_at` in activity report
commit 658c94ad8b31495c37ec100b39e1daaab1f253b2
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 17:25:15 2024 +0100
Changed action_date to created_at
Signed-off-by: snipe <snipe@snipe.net>
commit 0e61d0b195557e88fb698d16b5ee9a51625f4262
Merge: abdddbec4 ba1220484
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 15:51:38 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ba12204842b68a5fa57aa1e24f9084d38e897890
Merge: eeabc8dc9 1c3babaca
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 15:51:14 2024 +0100
Merge pull request #15555 from snipe/fixes/user_file_upload
Fixed case on `$logAction` for user file upload
commit 1c3babacaf9401c4559e24623722d81b44c6e2b4
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 15:46:57 2024 +0100
Fixed case on logAction for usewr file upload
Signed-off-by: snipe <snipe@snipe.net>
commit abdddbec448c4912a2c0fbcd2c769953b491bc5d
Merge: a425c2b76 eeabc8dc9
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 11:58:25 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit eeabc8dc9d0adf5d2069c3b152fca2a6eb33bd2a
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 11:33:45 2024 +0100
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
commit 21f8ac8e52205777dc8775604a8592b9a41c23a7
Merge: c38222e95 2a2666be0
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 11:31:23 2024 +0100
Merge pull request #15552 from Godmartinz/ragged-form-inputs
Fixed input field misalignments
commit a425c2b765f893789be1f624518a8ea3ae711547
Merge: 34eb10ff7 c38222e95
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 10:52:19 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 2a2666be0b4210075ac1786ffb9e8cbfa6dbd632
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Sep 24 13:24:50 2024 -0700
makes required a pseudo field
commit c38222e9569548d0981e576156bd58f4b778452c
Merge: 8cf1e4dce 0ce5832b6
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 18:10:53 2024 +0100
Merge pull request #15549 from snipe/fixes/#15548_unify_audit_api_endpoints
Fixes #15548 - unify audit api endpoints
commit 0ce5832b6cbed103433664fd9aa08cef2c1fd796
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 17:29:40 2024 +0100
Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
commit b6340532d7e34c31d65999e55440241935c6db60
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Tue Sep 24 17:15:39 2024 +0100
Improve the error and success messages and linking
commit 5fb43dd159b1af02c82f2b3a3f3530c9ca6612ec
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 16:55:56 2024 +0100
Handle `audit` *and* `audits` for urls
Signed-off-by: snipe <snipe@snipe.net>
commit de57d71bf12dc48bef933e6c64e23e8724996297
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 16:30:24 2024 +0100
Fixed #15548 - unify audit due/overdue APIs
Signed-off-by: snipe <snipe@snipe.net>
commit ba69259f2d2181d9bad2f9fb33d2e46c5137a8f8
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 15:35:00 2024 +0100
Fixed #13396 - do not allow checkout to undeployable status types
Signed-off-by: snipe <snipe@snipe.net>
commit c71411465a03499caf98937857e95ec489e865b4
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Tue Sep 24 15:17:35 2024 +0100
First pass at better-handling those annoying Rollbars we keep getting
commit 8cf1e4dceb7682b196592d09cf56817d6caa4295
Merge: ab0c009c0 66249a37e
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 11:10:20 2024 +0100
Merge pull request #15544 from snipe/bug/sc-26855
Fixed app settings view on mobile
commit 66249a37ed6ea5982d4aca91a2d4d77f5e61488b
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 11:08:31 2024 +0100
Tweaked styles
Signed-off-by: snipe <snipe@snipe.net>
commit 96712cb398d5d4142068166daddc5ce983a67041
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 10:55:26 2024 +0100
Fixed app settings view on mobile
Signed-off-by: snipe <snipe@snipe.net>
commit fac4833b58a8d5102fa97b365d753fb91447d848
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 17:15:16 2024 -0700
Remove unused import
commit a12c9d053ff6fc399e30287c246f24b392e0209a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 16:44:25 2024 -0700
Hide label when printing
commit 8b3b68b308b55d35894f25abdfa3421ad8f9d64e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 16:43:14 2024 -0700
Show or hide all eulas at once when printing multiple users
commit 4b02db5031cb4e8f850a9ea942e99efe449c8895
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 16:26:22 2024 -0700
Add authorization check in bulk users controller
commit ab90c0cf05c36796e69641f1ee6c8120df2a2c56
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 16:10:40 2024 -0700
Add missing eager load in bulk users controller
commit cef7ddc719a7f6fdc63b341038aa28b89cd2ead2
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 16:10:21 2024 -0700
Add eager loads to userscontroller
commit 3870095a28784d7b776b4647b0bbe325cadea8aa
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 15:50:24 2024 -0700
Fix Cannot read properties of undefined error by removing snipe-table class from eula table
commit a02e250b22538e440ff0b25578c62540a316c029
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 15:26:15 2024 -0700
Add page breaks for each user
commit 8ac5c0e471867163beae248ae5cb81891e8c2d9e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 14:05:47 2024 -0700
Re-combine layout and view
commit a2d4dcf6e82df284602990bf9465129e0997a27b
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 12:49:36 2024 -0700
Use bulk actions menu
commit 54044bfa5e4752c3ac0dc907bb40734154520f31
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 10:57:57 2024 -0700
Add eager loads
commit e493cc964daf88a8e4f0ddf5d397f6092d6f745e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 10:48:07 2024 -0700
Remove AssetCountForSidebar middleware from print view
commit 29af210f4fc7351fa319139e5b7022aae82b2a28
Merge: 5128fd49e ab0c009c0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 10:26:20 2024 -0700
Merge branch 'develop' into bulk-print-users
commit 34eb10ff73e50cf9617779c085fc7f529a436b89
Merge: 7d7d58769 ab0c009c0
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 19:45:20 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ab0c009c0db3cabfed8401b3754aa2addfbc111c
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 19:45:10 2024 +0100
Fixed seeder
Signed-off-by: snipe <snipe@snipe.net>
commit 7d7d58769c637e70d993b585273f2c65e6322346
Merge: 245d5dc46 b68805cf8
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 19:13:00 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit b68805cf83aeff549346e68013d2c5e017a7fabb
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 19:11:52 2024 +0100
Small fix for notifications checkout
Signed-off-by: snipe <snipe@snipe.net>
commit 245d5dc469c7d68b2601d02dfa307060f0af5a1f
Merge: 4ab478bb9 7d858129d
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 17:28:15 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
commit 7d858129d9b42dda78f82ef2501461070d22fb85
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:44:19 2024 +0100
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
commit 65ce63bc9b530daa8b652371d929e9709a4086c6
Merge: 5eea9d195 54fba2f54
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:42:07 2024 +0100
Merge pull request #15537 from snipe/snyk/updated_jspdf_autotable
Updated jspdf autotable
commit 54fba2f547c61b4dee28722faa334b529b82452b
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:40:41 2024 +0100
Update jspdf autotable
Signed-off-by: snipe <snipe@snipe.net>
commit 5eea9d1950ab673df373733bba248e50e83d0539
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:33:56 2024 +0100
Corrected text warning translation
Signed-off-by: snipe <snipe@snipe.net>
commit b84a634ec78e72f489d4c19b95becea5b9316228
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:33:35 2024 +0100
Corrected comment
Signed-off-by: snipe <snipe@snipe.net>
commit 2fc88a0e081ddd17672a68fa59513b6ecd992124
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:33:26 2024 +0100
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net>
commit bc540b6564a7e08720339de708299c04979c7024
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:02:28 2024 +0100
Requestable status not saving with manual [sc-26848]
Signed-off-by: snipe <snipe@snipe.net>
commit f53b852dffef85dce789bd620b65b5f0ca0aae3d
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 13:53:52 2024 +0100
Make created_by equal one in the seeder
Signed-off-by: snipe <snipe@snipe.net>
commit b83d1a043f49a484acea8b38d184120d6d16fa68
Merge: cdb7ccb8f b21c303e5
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 13:47:31 2024 +0100
Merge pull request #15519 from snipe/features/add_created_at_created_by
Change `user_id` to `created_by`
commit 4ab478bb97206aaf6265c6a86c578a079ee7d067
Merge: d96c5e1ba cdb7ccb8f
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 13:44:45 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit b21c303e5652992c49b3b73c5a1c7bd1eeb8b95a
Merge: b88f2054d cdb7ccb8f
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 13:43:50 2024 +0100
Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by
commit 5128fd49e6f7705c8b9b4b095a2423544439ff94
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 17:27:25 2024 -0700
Allow printing all users
commit 2d2d5bdc7ea37174da7069471eac03d002584698
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 17:23:47 2024 -0700
Pass user in array
commit 8364d26c9be3bafd6ab918f124a99bfa99e0aaa5
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 17:18:26 2024 -0700
Extract parent layout
commit efd6d7625fa7e99719e483625a474a2c39061b21
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 17:16:05 2024 -0700
Remove bad closing tag
commit bdf5708bfcf4b9c95a8d8edf7544db74f8e69ffb
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 17:10:43 2024 -0700
Remove accidental line
commit e95703cb181b273b0fdbc5016ab585408c7636c0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 17:10:07 2024 -0700
Use eager load
commit 7ad4a2997094f9302e4858e4ca61453758fbf3cc
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 16:54:39 2024 -0700
Add eager loading
commit cdb7ccb8f3910ab8783cdcb4fe5d41866988b594
Merge: 8270947ed d446773fd
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 21:54:03 2024 +0100
Merge pull request #15532 from spencerrlongg/bug/15253
Catch Exceptions on Checkout Notification
commit 8270947ed29dffcfac20dff105068516449467f6
Merge: 4f7c8e0c3 8e1111c68
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 21:49:27 2024 +0100
Merge pull request #13291 from akemidx/eol_date_range_for_reports
Added date range for EOL in custom reports
commit 4f7c8e0c3d27b0d77994cdb73cbfb625f0e3859e
Merge: d7bde3784 3ea5d4ee4
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 21:36:09 2024 +0100
Merge pull request #14671 from Robert-Azelis/patch-6
[FIX] Update EOL date when used bulk update of purchase date
commit d609ed50a42641ed8a5003d5013b13e447bbfca2
Merge: d639d6fbc d7bde3784
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 13:20:55 2024 -0700
Merge branch 'develop' into testing/fmcs-accessories
commit b88f2054dd771ed7678022d1ec97b378d015e553
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 20:38:34 2024 +0100
Refactor isDeletable on companies
Signed-off-by: snipe <snipe@snipe.net>
commit d7914e238d8a6c4db5eac92cf52ec2485b384536
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 20:34:54 2024 +0100
Added created by to company on save
Signed-off-by: snipe <snipe@snipe.net>
commit d7bde37842dbfa03cbbe1910c9fae5ef897f4b4a
Merge: 454796e52 4facc4007
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 20:33:10 2024 +0100
Merge pull request #15507 from setpill/setpill/feat/use_explicit_attributes_in_ldap_sync
Added #15506: Explicitly request used LDAP attributes
commit 454796e52a99ac8631d7bb0cce45f220a4993419
Merge: eef487d61 7c85ad54e
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 20:32:03 2024 +0100
Merge pull request #15518 from snipe/sort_by_numeric_custom_fields
Fixed #11634 - Sort by numeric columns for numeric custom fields
commit eef487d61b74b61858b953a9eb3e871c9ca330d6
Merge: dddbf27d7 71dbc7abb
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 20:31:02 2024 +0100
Merge pull request #15531 from Godmartinz/status-doesnt-update-in-email
Fixed mail notification field `status label` not updating
commit 71dbc7abb0ab43d0887449a185236c12ccd591d8
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Sep 19 12:23:07 2024 -0700
refreshed the assetstatus relationship
commit d639d6fbc1467ce8f231c73507ec371f4c705fc5
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 12:21:54 2024 -0700
Add tests for accessory select list endpoint
commit 74088ea5813b0ccdb4b6c58e375f41bb19ecae29
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 20:13:38 2024 +0100
Optimize isDeletable counts
Signed-off-by: snipe <snipe@snipe.net>
commit fff069824b91753a5b0bbd042f7fe0e9d9240aac
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 12:11:03 2024 -0700
Add tests for update accessory endpoint
commit d446773fdd0a6782583a9e7fd384888996fdc5e5
Author: spencerrlongg <spencer@spencerlong.com>
Date: Thu Sep 19 14:05:48 2024 -0500
catch exceptions on notification
commit f283b5fbe88b3f582b8f13c52532bb8de80548da
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 19:56:39 2024 +0100
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net>
commit a5be18bb14242da7d503fe8b6e1c5d31ad1a07e8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 11:55:15 2024 -0700
Add test for limit and offset
commit eb6f05faf7f2f6c94a56d93ee95fd48c44f60a9f
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 19:41:46 2024 +0100
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net>
commit 118183ff58b3d136a1abcad75fc399ff6622e825
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 19:41:39 2024 +0100
Removed footer
Signed-off-by: snipe <snipe@snipe.net>
commit 21378904969e0ad166355cd8a92b2bcc74978510
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 11:33:20 2024 -0700
Remove dead code
commit ebf6ce69809b30178aa09d43ed45669cc886ed73
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 19:27:10 2024 +0100
Refactor for fewer queries
Signed-off-by: snipe <snipe@snipe.net>
commit 9b22d6d493734e2ff55b6b2e80f682b98f92e6e4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 11:24:01 2024 -0700
Add tests for accessory checkouts endpoint
commit 5ebf0ed2b2a0793d241b982bb293779cf4851939
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 19:19:14 2024 +0100
Updated variable
Signed-off-by: snipe <snipe@snipe.net>
commit 836893cba527149e25804b5767c35d08d313dd0b
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 18:35:00 2024 +0100
Added id to report
Signed-off-by: snipe <snipe@snipe.net>
commit cd98b3817d53ace3a1345e30d8ce6d15af6decb5
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 18:26:08 2024 +0100
Removed duplicate line
Signed-off-by: snipe <snipe@snipe.net>
commit 727806372c66a9945be301c597d5f9182b626b22
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 18:22:11 2024 +0100
Added created_by to status label
Signed-off-by: snipe <snipe@snipe.net>
commit 5e1c736d4982b1e7c9bf15f848210d5e2fcedb2d
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 18:04:50 2024 +0100
Added created_by for manufacturers
Signed-off-by: snipe <snipe@snipe.net>
commit 6579fa72dae9eb31b24ff4944cab61ab49c463bd
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:56:05 2024 +0100
Added scoping for categories and companies
Signed-off-by: snipe <snipe@snipe.net>
commit 82d6e1510f6a8472e9cbfb70342113497a6a692d
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:41:05 2024 +0100
Order by created_by for depreciations
Signed-off-by: snipe <snipe@snipe.net>
commit 822ea96dfd4d77ca33ed4860cc4e318930b4d836
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:31:46 2024 +0100
Use auth()->id() instead of Auth::id()
Signed-off-by: snipe <snipe@snipe.net>
commit b247fc33b9de9f4395481ab8498df73eb97cf999
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:28:01 2024 +0100
Added legacy comment
Signed-off-by: snipe <snipe@snipe.net>
commit 2dcae780c0d5b1cb572a70ebc268e39dca124b4f
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:26:21 2024 +0100
Reapply deleted code
Signed-off-by: snipe <snipe@snipe.net>
commit 5c3180ffa074c3ade9647e958ea3d0bbbe099f16
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:25:09 2024 +0100
Removed duplicate code
Signed-off-by: snipe <snipe@snipe.net>
commit 65eba30038ddebd2bdfac8b11c26d4ee55e2dd49
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:23:34 2024 +0100
Fixed markdown in acceptance reminder
Signed-off-by: snipe <snipe@snipe.net>
commit bbce7b40ca27d1d01ae75a63237832c945255454
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:20:56 2024 +0100
Additional consistencies
Signed-off-by: snipe <snipe@snipe.net>
commit 02a29c71efa32eb4cde7358d19cc09f15d6aa60e
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:01:48 2024 +0100
Added created_by
Signed-off-by: snipe <snipe@snipe.net>
commit 66999959725e204448ffa56fc829378440d10a8a
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:01:36 2024 +0100
Added created_by to components
Signed-off-by: snipe <snipe@snipe.net>
commit 951f03094a27f94f9120e05648bdbe911cb2c4a9
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:01:17 2024 +0100
Added created_by to kits
Signed-off-by: snipe <snipe@snipe.net>
commit 354b00ef15db3de303a1908afd2e76d091cff29a
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:45:51 2024 +0100
Made method name consistent
Signed-off-by: snipe <snipe@snipe.net>
commit c93229179b6b3e67e81a995c645563cd05bcf8f7
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:45:39 2024 +0100
Added order by created_by to accessories
Signed-off-by: snipe <snipe@snipe.net>
commit a77a7065d7d09a986147e4ee825073f8a2f4958f
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:34:10 2024 +0100
Added order by admin to assets
Signed-off-by: snipe <snipe@snipe.net>
commit 4363e8b34c2b94d94543a6988fd026449a01e04a
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:20:42 2024 +0100
Updated importer
Signed-off-by: snipe <snipe@snipe.net>
commit 9adb2c24f3a26a846f870494d2e27cc699deaf50
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:06:36 2024 +0100
Squashed commit of the following:
commit dddbf27d780be4871ddbc401740f35a4561039a4
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 14:18:52 2024 +0100
Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
commit fcefcc8184b615bc9cdea9888e1f595f8fbc69b8
Merge: 04bb3eec8 3519a82dd
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:44:44 2024 +0100
Merge pull request #15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec8308556c8e26166dfcae7ac7ec3aa446
Merge: 154d5d8d9 f963b9a19
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:41:37 2024 +0100
Merge pull request #15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f7b135a9141da34b1af0104a02ca5b3
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 18 13:24:26 2024 +0100
Fix selected-index of Countries drop-down
commit 154d5d8d913fcea2bfc18ddff26ec874a21b5640
Merge: 6c996b775 9e5f6d656
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 23:40:25 2024 +0100
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 3519a82dddedebfd518cbff61ddc1e1c979859fe
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:55:20 2024 -0700
Fix name: TestsFullMultipleCompaniesSupport
commit a629df07bfc25da2e71a158a09cee9f5e3b1a612
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:49:08 2024 -0700
Implement interfaces on existing test classes
commit 9a13fcab23f76a7336ffe58e38f269bfd3cea4cd
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:38:38 2024 -0700
Pluralize
commit f5705a1dde7a736e167e27ec156f72351cfb47ec
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:34:55 2024 -0700
More unification
commit f325c4afdb234ab4ba820caac45bdf599a550c2f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:32:38 2024 -0700
Unify assertion method
commit 1fddacd7d0440db2598c1d0e4aa0373de204bf53
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:25:11 2024 -0700
Re-order test methods
commit 4af893df6189423edeb73d5239a12d4c7d5a68d0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:20:24 2024 -0700
Improve assertions
commit b8b3f91ce49e5d1829bcb2a84f4d145dc1701b29
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:55:18 2024 -0700
Formatting
commit 7f40f55343fe7e801c6de0cd0d1fa63f442b8349
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:52:02 2024 -0700
Add tests for delete supplier endpoint
commit b06e8d442d81b40e82ba70aaacf277eb5b5e075f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:37:08 2024 -0700
Add tests for delete status label endpoint
commit c269184c60e69b7aa319fedc5b4bbcb122677cb8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:29:41 2024 -0700
Add tests for delete predefined kit endpoint
commit 53c673dee21e9f8cb00904950ec66cb05bde6c55
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:13:12 2024 -0700
Add tests for delete manufacturer endpoint
commit 50730fc4fba2519fb13799bc93ab682c10092c25
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:37:18 2024 -0700
Add tests for delete location endpoint
commit 60a54cee797aa86e80c5abfe57699f263a85e841
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:33:30 2024 -0700
Add tests for delete license endpoint
commit 446e962a503078e0c5fabef90aac7ada21ecb6e2
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:38:51 2024 -0700
Add tests for delete group endpoint
commit 79a4bb73169445bb7a1e1e6bef4aff8a25dc1a12
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:35:44 2024 -0700
Add tests for delete depreciation endpoint
commit 2f76c1bc5b5259cbb069356da8e8249a18910011
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:33:21 2024 -0700
Add assertion
commit 38b9f4a43893f8c86e75d141a2ec41a7c2f90758
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:29:20 2024 -0700
Add tests for delete departments endpoint
commit 3105f53afffdd78311314e970f6fe893e1162f8e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:54:29 2024 -0700
Add tests for delete custom fieldsets endpoint
commit 2047cfed09a231a90f1958ab0ce650808e05985d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:20:32 2024 -0700
Add tests for delete custom fields endpoint
commit e3268d32df495ed23e60c4c0587bd53fbb6d7485
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:00:02 2024 -0700
Add tests for delete consumable endpoint
commit 6df8b0ac0e6936833bd93512c6a7e50c1f34091f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:52:07 2024 -0700
Add tests for delete component endpoint
commit 910f13c1f78fd2761c2c54ef8a560f80fdf611c6
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:38:30 2024 -0700
Add tests for delete companies endpoint
commit 8ce2512f55a6c293c0d744932453a12cf48f7d6d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:54:44 2024 -0700
Add tests for delete category endpoint
commit 0ec415d4d018c0dfb5cd51f9abf01eaf62c4f0d3
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:46:22 2024 -0700
Clean up
commit 2044570e95789a92ef705d02ca241216eb19d1e3
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:39:36 2024 -0700
Add tests for delete asset model endpoint
commit b336c6273d57d6ca3181877ba844377cad5c6963
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:32:42 2024 -0700
Pluralize test classes
commit 5299b3e9f066e1779312798ecb150786152cf254
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:44 2024 -0700
Remove code handled by CompanyableChildTrait
commit 872b76b45fbdd41cb6e5ae149b158c83a97a6865
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:10 2024 -0700
Add tests for delete asset maintenance endpoint
commit 275cf4630e6461ba2b22c846118ac1e2f352e989
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:16:37 2024 -0700
Add tests for delete asset endpoint
commit 5c2660bd34873b3b9e7ef89990ea450f92ded381
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:02:32 2024 -0700
Introduce interface
commit c7ae9d9dfa76b0efadf47695492761a8120439bf
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 12:58:47 2024 -0700
Add tests for delete accessory endpoint
commit 9e5f6d656a5df14edae5e99be6b375b70b778950
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 11 15:45:01 2024 +0100
Improve multi-asset create when using numeric prefixes to asset_tags
Signed-off-by: snipe <snipe@snipe.net>
commit 634a4afa7581591a8f7eaa902009fd9a5c3e4d09
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:04:54 2024 +0100
Fixed 1001 query on license
Signed-off-by: snipe <snipe@snipe.net>
commit 7650628d30646d51d1f4aa650e786f406c600350
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:00:59 2024 +0100
Removed free seat count from fillable
Signed-off-by: snipe <snipe@snipe.net>
commit 7f690a6238d61ea145e00e602ff9dccf43bb4341
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 15:58:32 2024 +0100
Fixed variable name
Signed-off-by: snipe <snipe@snipe.net>
commit b32ab6a06ce226562add8a8654dd9307efe6abea
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 18 16:36:24 2024 -0700
import User model
commit 4ff5fc1ff9528e10218106db85902c644afedc4c
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 18 16:19:35 2024 -0700
clean up variables
commit 86f13a9735358ce0ce51205a439ce8fc7df5197c
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 16:13:34 2024 -0700
Add index test
commit c40209f5000aaf9c6ec3449cec6463d956dd19bb
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 18 15:23:44 2024 -0700
seperates emails and webhook notifications
commit a071fff954b8f90b7a5e5a4df3f8a5a7d45598c1
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 12:32:14 2024 -0700
Implement tests
commit 8b50ef077dc52c09bddd4743336aeea2d2d9de98
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:58:33 2024 -0700
Implement test
commit 607f29030f13f82b40ccacefeec5f329f250b887
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:53:27 2024 -0700
Stub out test
commit a6bcd3c0c2b03c81b45ece70d453e767d277acc0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:47:59 2024 -0700
Add validation test
commit 9b293afaac70370ad7741c306e7b14c47eecf3ce
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:28:29 2024 -0700
Remove more dead code
commit 636c776620a012937c7f79cd67dde9cf7c6a92cf
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:27:37 2024 -0700
Remove dead code
commit d5f659024c06a8dc3a6573f1b2d7eddf25b698c4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:27:09 2024 -0700
Add test for logging
commit 832e50a71ebcda26451f090042cb072bae05c4f3
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:19:41 2024 -0700
Implement test
commit fa1968624885e51b71f4a77215cec01beaae01e5
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:18:21 2024 -0700
Implement test
commit c021609c136a7fc01ba860bf476aefb81d9c0452
Merge: 7b31df7c1 dddbf27d7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 10:42:58 2024 -0700
Merge branch 'develop' into testing/fmcs-accessories
commit 655abe8be5491531656de70242b21d22acfd280f
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 14:32:59 2024 +0100
Fixed requestable user_id
Signed-off-by: snipe <snipe@snipe.net>
commit d96c5e1ba4ff80f77da2d467109fde22e08a73a2
Merge: a807646d3 dddbf27d7
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 14:20:55 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit dddbf27d780be4871ddbc401740f35a4561039a4
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 14:18:52 2024 +0100
Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
commit bae99828333b608e029250925730388671070aea
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 14:18:14 2024 +0100
Updated request methods
Signed-off-by: snipe <snipe@snipe.net>
commit a807646d39575f851fa57b0be22dd67daf26f7db
Merge: 83b4bf9cf fcefcc818
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:48:09 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit abe79df6dca919512419318acb8381daefb5c990
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:47:30 2024 +0100
Added translation
Signed-off-by: snipe <snipe@snipe.net>
commit fcefcc8184b615bc9cdea9888e1f595f8fbc69b8
Merge: 04bb3eec8 3519a82dd
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:44:44 2024 +0100
Merge pull request #15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec8308556c8e26166dfcae7ac7ec3aa446
Merge: 154d5d8d9 f963b9a19
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:41:37 2024 +0100
Merge pull request #15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f7b135a9141da34b1af0104a02ca5b3
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 18 13:24:26 2024 +0100
Fix selected-index of Countries drop-down
commit 154d5d8d913fcea2bfc18ddff26ec874a21b5640
Merge: 6c996b775 9e5f6d656
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 23:40:25 2024 +0100
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 1582d81e5bf3c408cddf50cd716d63e54028109d
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 22:16:41 2024 +0100
Change `user_id` to `created_by`
Signed-off-by: snipe <snipe@snipe.net>
commit 7c85ad54eb742f063936423d1c8b21d4f9f57079
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 19:44:03 2024 +0100
Sort by numeric columns for numeric custom fields
Signed-off-by: snipe <snipe@snipe.net>
commit 7b31df7c148566274527317bb5bf006e5764fda8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Sep 17 09:11:58 2024 -0700
Begin additional test case
commit 83b4bf9cf8a36324a5e0e87bbcc00b44cc9a0cb8
Merge: 9ff211105 6c996b775
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 15:54:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 6c996b7759384d96b581e3e61633a6bbbb6e8c10
Merge: fe5fc6e0c 9e957baeb
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 15:54:11 2024 +0100
Merge pull request #15516 from snipe/fixes/fmcs_edit_user
Fixed check for outside assets on user update validation
commit 9e957baeb53e49abe4440bc30100b8629b065ae8
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 15:46:45 2024 +0100
Fixed check for outside assets on user update validation
Signed-off-by: snipe <snipe@snipe.net>
commit 12fd9cd97a30ca1ab715fd923c40d3558706e88e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 17:00:08 2024 -0700
Update interface name
commit 9e03c4ba6f6c99a93881d3bd262e4d1809d8cf55
Merge: 8eb1c487b 3519a82dd
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:58:46 2024 -0700
Merge branch 'testing/fmcs' into testing/fmcs-accessories
commit 3519a82dddedebfd518cbff61ddc1e1c979859fe
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:55:20 2024 -0700
Fix name: TestsFullMultipleCompaniesSupport
commit 8eb1c487bcaa1fb6ec71d85985226d49c01e3cea
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:52:10 2024 -0700
implement FMCS test for accessory index
commit e835637ef0120a96012951a965848ecb8465e69f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:40:10 2024 -0700
Add accessory checkin test
commit eb35608bb59a3fc72c7fc55c5431462aef04b040
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:35:33 2024 -0700
Remove call handled by form request
commit 3f07f682defd228dc51d01b962353978e6e5eed8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:35:21 2024 -0700
Migrate existing tests to TestsPermissionsRequirement
commit a629df07bfc25da2e71a158a09cee9f5e3b1a612
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:49:08 2024 -0700
Implement interfaces on existing test classes
commit 9a13fcab23f76a7336ffe58e38f269bfd3cea4cd
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:38:38 2024 -0700
Pluralize
commit f5705a1dde7a736e167e27ec156f72351cfb47ec
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:34:55 2024 -0700
More unification
commit f325c4afdb234ab4ba820caac45bdf599a550c2f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:32:38 2024 -0700
Unify assertion method
commit 1fddacd7d0440db2598c1d0e4aa0373de204bf53
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:25:11 2024 -0700
Re-order test methods
commit 4af893df6189423edeb73d5239a12d4c7d5a68d0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:20:24 2024 -0700
Improve assertions
commit b8b3f91ce49e5d1829bcb2a84f4d145dc1701b29
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:55:18 2024 -0700
Formatting
commit 7f40f55343fe7e801c6de0cd0d1fa63f442b8349
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:52:02 2024 -0700
Add tests for delete supplier endpoint
commit b06e8d442d81b40e82ba70aaacf277eb5b5e075f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:37:08 2024 -0700
Add tests for delete status label endpoint
commit c269184c60e69b7aa319fedc5b4bbcb122677cb8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:29:41 2024 -0700
Add tests for delete predefined kit endpoint
commit 53c673dee21e9f8cb00904950ec66cb05bde6c55
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:13:12 2024 -0700
Add tests for delete manufacturer endpoint
commit 50730fc4fba2519fb13799bc93ab682c10092c25
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:37:18 2024 -0700
Add tests for delete location endpoint
commit 60a54cee797aa86e80c5abfe57699f263a85e841
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:33:30 2024 -0700
Add tests for delete license endpoint
commit 446e962a503078e0c5fabef90aac7ada21ecb6e2
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:38:51 2024 -0700
Add tests for delete group endpoint
commit 79a4bb73169445bb7a1e1e6bef4aff8a25dc1a12
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:35:44 2024 -0700
Add tests for delete depreciation endpoint
commit 2f76c1bc5b5259cbb069356da8e8249a18910011
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:33:21 2024 -0700
Add assertion
commit 38b9f4a43893f8c86e75d141a2ec41a7c2f90758
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:29:20 2024 -0700
Add tests for delete departments endpoint
commit fe5fc6e0ce8374a3304dc3f44ea985e73c7ca2fb
Merge: 62747a009 15183c482
Author: snipe <snipe@snipe.net>
Date: Mon Sep 16 15:56:31 2024 +0100
Merge pull request #15471 from Godmartinz/Edit_side-panel
Fixes margin for the sidebar menus while using rtl languages
commit 62747a00902e415ef7b207a68c6cbabc5ef2f527
Merge: b465cc98d c6c5cb73c
Author: snipe <snipe@snipe.net>
Date: Mon Sep 16 15:02:55 2024 +0100
Merge pull request #15493 from Godmartinz/fix_consumables_media_sizing
Fixed misalignment of consumables with smaller media
commit 9ff211105544fff678c5355e90fdb8319e0806ce
Merge: 1328366a4 b465cc98d
Author: snipe <snipe@snipe.net>
Date: Mon Sep 16 14:52:48 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit b465cc98d8cb2310f5dea14ed2f22448a27bff59
Merge: 8774da392 4debaaea3
Author: snipe <snipe@snipe.net>
Date: Mon Sep 16 14:45:06 2024 +0100
Merge pull request #15510 from snipe/bulk_users_locale_fix
Fixed #15504 - allow nulling/not changing locale in user bulk edit
commit 4debaaea39667d86fdc710c14706b90d25d08617
Author: snipe <snipe@snipe.net>
Date: Mon Sep 16 14:31:10 2024 +0100
Fixed #15504 - allow nulling/not changing locale in user bulk edit
Signed-off-by: snipe <snipe@snipe.net>
commit 1328366a486e91bd6c94bf308a3c2ad8a5171bb0
Merge: 7e14f8c6d 8774da392
Author: snipe <snipe@snipe.net>
Date: Mon Sep 16 12:38:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4facc4007e56924429097b0840ea0acd0bbcd1fa
Author: setpill <37372069+setpill@users.noreply.github.com>
Date: Fri Sep 13 17:05:48 2024 +0200
feat: Explicitly request LDAP attributes during sync
commit 31da47e04676e32cf213fff49174615b6501d394
Author: setpill <37372069+setpill@users.noreply.github.com>
Date: Fri Sep 13 17:05:28 2024 +0200
refactor: Put LDAP attribute mapping in array
commit 3105f53afffdd78311314e970f6fe893e1162f8e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:54:29 2024 -0700
Add tests for delete custom fieldsets endpoint
commit 2047cfed09a231a90f1958ab0ce650808e05985d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:20:32 2024 -0700
Add tests for delete custom fields endpoint
commit e3268d32df495ed23e60c4c0587bd53fbb6d7485
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:00:02 2024 -0700
Add tests for delete consumable endpoint
commit 6df8b0ac0e6936833bd93512c6a7e50c1f34091f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:52:07 2024 -0700
Add tests for delete component endpoint
commit 910f13c1f78fd2761c2c54ef8a560f80fdf611c6
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:38:30 2024 -0700
Add tests for delete companies endpoint
commit 8ce2512f55a6c293c0d744932453a12cf48f7d6d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:54:44 2024 -0700
Add tests for delete category endpoint
commit 0ec415d4d018c0dfb5cd51f9abf01eaf62c4f0d3
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:46:22 2024 -0700
Clean up
commit 2044570e95789a92ef705d02ca241216eb19d1e3
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:39:36 2024 -0700
Add tests for delete asset model endpoint
commit b336c6273d57d6ca3181877ba844377cad5c6963
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:32:42 2024 -0700
Pluralize test classes
commit 5299b3e9f066e1779312798ecb150786152cf254
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:44 2024 -0700
Remove code handled by CompanyableChildTrait
commit 872b76b45fbdd41cb6e5ae149b158c83a97a6865
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:10 2024 -0700
Add tests for delete asset maintenance endpoint
commit 275cf4630e6461ba2b22c846118ac1e2f352e989
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:16:37 2024 -0700
Add tests for delete asset endpoint
commit 5c2660bd34873b3b9e7ef89990ea450f92ded381
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:02:32 2024 -0700
Introduce interface
commit c7ae9d9dfa76b0efadf47695492761a8120439bf
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 12:58:47 2024 -0700
Add tests for delete accessory endpoint
commit 0bc98e971fd9c5e0c0eb596daed799dab54f6ec4
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Sep 12 12:26:19 2024 -0700
refactoring modals with partials and fixing misalignments
commit 8774da3921eb6ed28494521a42305437b4158f6b
Merge: ab3b65531 a97530367
Author: snipe <snipe@snipe.net>
Date: Thu Sep 12 16:08:44 2024 +0100
Merge pull request #15492 from snipe/fixes/edit_to_archived_warning
Fix - warn user on changing status to undeployable when editing
commit c6c5cb73cf4b5c553a1fa0996f7ac27534b52505
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 11 10:49:27 2024 -0700
fixes consumables positioning with smaller media
commit a97530367d6013a05c5a99341087dd2f8002343b
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 17:29:22 2024 +0100
Fixed tests again
Signed-off-by: snipe <snipe@snipe.net>
commit 43250ae88142d3168a009457c54d4eb01bbe261a
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 17:04:09 2024 +0100
Updated tests
Signed-off-by: snipe <snipe@snipe.net>
commit 04e96b8f20095568aa37dad8eca2d0b1effff07e
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 16:43:41 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net>
commit 98323185de298a32df9f545ea5ebacc6a7bc42cd
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 16:43:33 2024 +0100
Null and warn if editing asset to a non-deployabe state
Signed-off-by: snipe <snipe@snipe.net>
commit 9e5f6d656a5df14edae5e99be6b375b70b778950
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 11 15:45:01 2024 +0100
Improve multi-asset create when using numeric prefixes to asset_tags
commit 7e14f8c6d69bebeb46242dda75ac519f2fb4f174
Merge: fddbdafb9 ab3b65531
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 12:25:28 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ab3b655312f674142735f1a2c2ef61e17f477185
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 12:25:09 2024 +0100
Fixed #15483 - show EOL by default
Signed-off-by: snipe <snipe@snipe.net>
commit 601d8d7e5fa5f4d266c0dcdd8daa1b3244404821
Merge: 4f0f72b29 ca01261c1
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 09:46:58 2024 +0100
Merge pull request #15486 from marcusmoore/fixes/custom-field-values
Fixed a couple bugs in CustomFieldSetDefaultValuesForModel component
commit ca01261c1f309b7dd616210aab1854774158cf2d
Merge: 6423df213 4f0f72b29
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Sep 10 16:05:39 2024 -0700
Merge branch 'develop' into fixes/custom-field-values
commit 15183c48220f85948527cbc2ef34986f645dfa06
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Sep 10 11:05:03 2024 -0700
rephrased the ternary <-correctly spelled
commit fddbdafb99cf739b435220a7a4e259a27040f03a
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 19:03:56 2024 +0100
Fixed conflict
Signed-off-by: snipe <snipe@snipe.net>
commit a5dbece1a96e54f851e177596e2de62f52f2afd0
Merge: 713bb104e 4f0f72b29
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 19:00:05 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 4f0f72b29e2e49284e72eb89d103c333a1be48bf
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 18:15:12 2024 +0100
Fixed version
Signed-off-by: snipe <snipe@snipe.net>
commit 4183d1834f6ba8a691525b9f28e1ec09e7b1580f
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 18:14:03 2024 +0100
Pre-release assets
Signed-off-by: snipe <snipe@snipe.net>
commit 713bb104ecaf0ad68204efa1f3cab191e99da3e9
Merge: 7f2cae4f2 4998d60f3
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 14:46:15 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4998d60f39d723277e3496ea8fdf1bddc86d02c7
Merge: f6bf2d03c 7cf30003b
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 14:43:27 2024 +0100
Merge pull request #15481 from snipe/localizations/2024-09-10
Updated translations
commit 7cf30003b61b040a9b191aa85a7efb51fba7379f
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 14:41:08 2024 +0100
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
commit f6bf2d03c403f29f3ef31246ecba82b079cb96b0
Merge: 6f44441a8 7c8955b12
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 11:04:58 2024 +0100
Merge pull request #15445 from Godmartinz/eula_confusion
Fixed priority for category eula vs default eula
commit 6f44441a8b66f391e7ee3c6ac4fb224c537d713c
Merge: e7e5dfbdf 76c9015aa
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 11:04:23 2024 +0100
Merge pull request #15469 from marcusmoore/accessory_tests
Added UI tests for creating accessories
commit e7e5dfbdfabd3184d5008190eaddd4310d117e29
Merge: d62315fbe 5d5f42129
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 11:04:08 2024 +0100
Merge pull request #15470 from marcusmoore/company_tests
Added UI tests for creating companies
commit d62315fbe4152de0cf5769a3bd9a5f32b885ff46
Merge: 7f3f77dec 22a2cc025
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 11:03:55 2024 +0100
Merge pull request #15472 from marcusmoore/testing/dashboard_counts
Added test for dashboard counts
commit 7f3f77dec803ff98467d7ea743e0adf73d03dba8
Merge: 82e56c683 0820dd9da
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 11:03:46 2024 +0100
Merge pull request #15473 from marcusmoore/testing/accessory_api_tests
Added some permission tests for accessory api endpoints
commit 82e56c68325457f8fb903b7e02e1b7e666c3e5b9
Merge: 549dec9f9 dc6a5bf99
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 09:37:02 2024 +0100
Merge pull request #15474 from marcusmoore/bug/sc-26730
Fixed login success message not being displayed
commit 76c9015aa9c6988127d5c749b5ffdb5ba04e7d54
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 16:51:40 2024 -0700
Add test case
commit 5d5f421294195c4a88db5c4f8cf87fe47ef2c326
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 16:49:43 2024 -0700
Add test case
commit 367f02af8642c23674afbfefedc456e7cedb6785
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Sep 9 16:34:04 2024 -0700
more partials and includes
commit 7a1c721eca13c8e270c55b41fa8249e6da40a918
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Sep 9 16:22:56 2024 -0700
making modal partials for reuse
commit 6423df213344c0d958baa9ac2d90e5bc47809f5f
Merge: 51d63d57c 549dec9f9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 16:07:37 2024 -0700
Merge branch 'develop' into fixes/custom-field-values
# Conflicts:
# resources/views/livewire/custom-field-set-default-values-for-model.blade.php
commit dc6a5bf998060d5ac26446bb0b6c6191a4cc4e20
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 14:54:19 2024 -0700
Reflash session so login message is displayed
commit 0820dd9da457554d1d577cb785ea94c3be5972e4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 14:36:32 2024 -0700
Update test names
commit aa6ab2df60be0c1904edf265763993ae0c1576ed
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 14:35:38 2024 -0700
Add permission tests for some accessory api endpoints
commit 22a2cc025671811f4d5925274a2b960cdfdb84d9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 13:21:10 2024 -0700
Add test for dashboard counts
commit 57fab0268b5ace5cad8a2df7db3a7d9305815ca8
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Sep 9 13:02:25 2024 -0700
made it a terenary
commit ad5768d8b2c719d10e1915f7f9b3b26902701a22
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Sep 9 12:45:11 2024 -0700
fixes margin for the sidebar using rtl languages
commit 35533c39d5e92df6f7a001c6987d255ce01985f0
Merge: d4426e468 549dec9f9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 12:18:02 2024 -0700
Merge branch 'develop' into company_tests
commit de403f6e0758e10f8c049cb152eb9bbfbadbd07d
Merge: 010f66f4c 549dec9f9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 12:17:53 2024 -0700
Merge branch 'develop' into accessory_tests
commit 549dec9f9efa8a8b2cb3a9f748f61407121aed47
Merge: b2a634924 0e9f7153c
Author: snipe <snipe@snipe.net>
Date: Mon Sep 9 20:13:01 2024 +0100
Merge pull request #15468 from marcusmoore/coverage
Added coverage commands for Herd users
commit d4426e4686dd6106de39660cbede793be5f1c504
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 11:03:00 2024 -0700
Add simple tests for company creation via UI
commit b2a6349243e6de65226bcc898cafad89af655a3f
Merge: ce97e2a30 c5dbc5f6b
Author: snipe <snipe@snipe.net>
Date: Mon Sep 9 10:06:42 2024 +0100
Merge pull request #15465 from snipe/update_city_on_bulk_user_edit
Correctly save user’s city on bulk edit
commit c5dbc5f6b887d866a4dfb9800cb001b26593a89b
Author: snipe <snipe@snipe.net>
Date: Mon Sep 9 10:01:07 2024 +0100
Correctly save user’s city on bulk edit
Signed-off-by: snipe <snipe@snipe.net>
commit 7f2cae4f26c90f0c5195f76871f48ececea49bca
Merge: e34f549e4 ce97e2a30
Author: snipe <snipe@snipe.net>
Date: Mon Sep 9 03:56:05 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ce97e2a30f88b0911cc906d738df1a975f1ac35e
Merge: e1fcfc8dc 7d9a0eba0
Author: snipe <snipe@snipe.net>
Date: Mon Sep 9 03:54:28 2024 +0100
Merge pull request #15463 from snipe/consumables_order_by_remaining
Added ability to sort on qty and remaining for consumables
commit 7d9a0eba04d6607adffa93b0a2117c2c22dd3d2a
Author: snipe <snipe@snipe.net>
Date: Mon Sep 9 03:49:58 2024 +0100
Added ability to sort on qty and remaining for consumables
Signed-off-by: snipe <snipe@snipe.net>
commit 010f66f4c9f79eb8199a5baa15e557218398f047
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 4 15:48:11 2024 -0700
Add validation test
commit 9c6718b459ea2d10ff2f0f34a7f566068118549e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 4 15:46:35 2024 -0700
Organize
commit 9f832a93c948dc62c3374224d2804a4e6c8124b9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 4 15:44:52 2024 -0700
Ensure user is stored
commit 487d88c0128a04a8e0f15cbbc73426416b36ed7d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 4 15:43:01 2024 -0700
Add some ui tests for accessories
commit 0e9f7153c05ebeda1650455ce1bd96dae3d04291
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 4 15:13:45 2024 -0700
Add composer commands for generating coverage reports via Herd
commit 7c8955b12620208281c449bff2ecbfe29103d466
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 4 12:38:35 2024 -0700
revert changes to label view
commit 20fa4c39f90394ae1aaf381374e242b2035bb36d
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 4 12:26:44 2024 -0700
adds setEula to support\settings
commit f04a4a3cf51564269352cfd2b0ba4baeb99ac3fe
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 4 12:21:49 2024 -0700
adds test
commit cf07186ae8704d609c65c7f91db67af9a2963c76
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Sep 3 12:23:23 2024 -0700
gives priority to default eula being checked vs catregory eula
commit 51d63d57c65ec3ab5da48c1a3481f18ca680b596
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Sep 3 12:22:43 2024 -0700
Hide the "Add default values" checkbox if no fieldset selected
commit e34f549e4cddb695d01fb304d7472fcdafada27d
Merge: a8813cca9 e1fcfc8dc
Author: snipe <snipe@snipe.net>
Date: Mon Sep 2 19:16:23 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit e1fcfc8dc13329b752532970f256c1fcaa5f1935
Merge: 13dbf9ee7 9fe8a866e
Author: snipe <snipe@snipe.net>
Date: Mon Sep 2 19:14:49 2024 +0100
Merge pull request #15440 from snipe/fixes/user_api_put_patch
Fixes #15435 - user api put patch API route regression
commit 9fe8a866e0164140db8c92f8c956173a9d5398ae
Author: snipe <snipe@snipe.net>
Date: Mon Sep 2 19:07:21 2024 +0100
Updated test
Signed-off-by: snipe <snipe@snipe.net>
commit e8e3060a7561caaf7a92fe475af680c7f98c9079
Author: snipe <snipe@snipe.net>
Date: Mon Sep 2 18:51:22 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net>
commit 6aaf2f623feabdbb13a0878fdd4050e4e2e7ff52
Author: snipe <snipe@snipe.net>
Date: Mon Sep 2 18:49:55 2024 +0100
Removed extra route
Signed-off-by: snipe <snipe@snipe.net>
commit dfbccf50e8aaa2f0135002d08f304d4bb802d2a1
Author: snipe <snipe@snipe.net>
Date: Mon Sep 2 18:48:09 2024 +0100
Added patch/put back into resource routes
Signed-off-by: snipe <snipe@snipe.net>
commit a8813cca9458fcbf20e5fdad763285ec15db1a99
Merge: 9fef27a44 13dbf9ee7
Author: snipe <snipe@snipe.net>
Date: Sat Aug 31 13:48:59 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 13dbf9ee747832fbececfc1618b0abd64cac4f22
Author: snipe <snipe@snipe.net>
Date: Sat Aug 31 13:48:42 2024 +0100
Added icon for dept
Signed-off-by: snipe <snipe@snipe.net>
commit f8bbb7ad9b0455ed3d30c9a4c4949865313812c3
Merge: 12fa50597 3c7d455ee
Author: snipe <snipe@snipe.net>
Date: Sat Aug 31 13:47:25 2024 +0100
Merge pull request #15431 from snipe/add_employee_num_to_asset_overview
Added employee number to asset view
commit 3c7d455ee31a13862f1dab0ff2b236188c1128e9
Author: snipe <snipe@snipe.net>
Date: Sat Aug 31 13:38:38 2024 +0100
Added employee number to asset view
Signed-off-by: snipe <snipe@snipe.net>
commit 9fef27a448a13c1cb6c94d737702fd51e78257a5
Merge: d2b88a510 12fa50597
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 21:07:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 12fa505972693d0983b1bc2e3e8472ad1e6ef91d
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 21:07:30 2024 +0100
Disabmiguate licenses company_id
Signed-off-by: snipe <snipe@snipe.net>
commit d2b88a51076df62982926a91af97568ac3b98034
Merge: 4e35f389d 4e4930ba6
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 21:02:21 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4e4930ba62355bee219eb837a39ae3c6d3c622f9
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 21:01:48 2024 +0100
Check for array
Signed-off-by: snipe <snipe@snipe.net>
commit 4e35f389df0308bbe6571afc850f70870e6bd3b0
Merge: e5b9d9a28 76301bc30
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 20:07:03 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 76301bc30d5b6e55cc894200dff5ab074993013e
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 20:05:03 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
commit 964e105cf998ae91f778d78aa4de0c2273dbeca1
Merge: 6fd24c7e1 abb422153
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 19:20:03 2024 +0100
Merge pull request #15415 from snipe/rules/prevent_company_switch
Validation rules to prevent switching user companies if items are assigned to them
commit 6fd24c7e1443caef18aa787538d723d9e4f888ac
Merge: e4ebabdab 231bc1e2d
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 18:55:11 2024 +0100
Merge pull request #15418 from snipe/added_multiple_for_custom_report
Fixed #15416 - Added multiple selects for custom report
commit 231bc1e2de18568b760da1fcd6391e57ebfaabd1
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 18:31:34 2024 +0100
Updated blade selectors
Signed-off-by: snipe <snipe@snipe.net>
commit 37d04b717683d15a91d6ee2801df89cb7cecd038
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 17:52:01 2024 +0100
Some CSS tweaks for select2
Signed-off-by: snipe <snipe@snipe.net>
commit e62a8029266ed6ca5625d9ee8d1c1616bea5e3c2
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 17:51:44 2024 +0100
Use whereIn instead of where =
Signed-off-by: snipe <snipe@snipe.net>
commit 69e981364aee151aa1b448082971099859b38f5a
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 17:51:20 2024 +0100
Made multiple select
Signed-off-by: snipe <snipe@snipe.net>
commit e5b9d9a28b33b9a52101ea7005a4aba834d3a78b
Merge: 4111ef0d7 e4ebabdab
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 15:04:32 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
commit abb422153903939d2e3b1bc103d27eb30a52fe9e
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 14:55:18 2024 +0100
Validation rules to prevent switchng user companies if assets are assigned
Signed-off-by: snipe <snipe@snipe.net>
commit e4ebabdaba22f89d6f8b0c85530e5d824bf522c8
Merge: b64ed254e da1e38329
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 14:19:51 2024 +0100
Merge pull request #15414 from uberbrady/fix_create_user
Use the null-safe property accessor for new-user creation
commit da1e383295d6ee3940d6842979a73c1f14e6ff9a
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Thu Aug 29 14:09:23 2024 +0100
Use the null-safe property accessor for new-user creation
commit b64ed254e022cb4fd363b7ffd5c99cfc46567d5d
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 13:49:09 2024 +0100
Fixed tests
Signed-off-by: snipe <snipe@snipe.net>
commit ba291edc42bf30199727d98138b1e667a0658fa8
Merge: c197644ba ec2ea955d
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 13:18:52 2024 +0100
Merge pull request #15412 from uberbrady/ImprovePatchPurchasePrice
Fix [FD-43836] PATCH of purchase_cost for assets for comma as decimal separator
commit ec2ea955d895b979d8285b2b5c497ef9c085b983
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Thu Aug 29 12:35:14 2024 +0100
Fix PATCH of purchase_cost for assets for comma as decimal separator
commit c197644ba7554404ce6f68fbadeadd9bb9266c97
Merge: 29b30cc5d a8cd1027f
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:38:15 2024 +0100
Merge pull request #15284 from spencerrlongg/bug/sc-26584
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
commit 29b30cc5d3236aa94340160ecfc3f14d84856287
Merge: a89f17a14 6af27516d
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:29:44 2024 +0100
Merge pull request #15411 from snipe/snyk/upgrade-webpack
Upgraded webpack
commit 6af27516dc348fcf135c348c118ca0c49e8056ea
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:29:00 2024 +0100
Upgraded webpack
Signed-off-by: snipe <snipe@snipe.net>
commit a89f17a145216d0d4f75bbb44a4b0703f4137bfa
Merge: 68c708bde de0565f5b
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:25:56 2024 +0100
Merge pull request #15410 from snipe/snyk/upgrade-jquery-ui
Updated jquery UI
commit de0565f5b35ec85cc39a9302637329bba3d4c83a
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:24:06 2024 +0100
Updated jquery UI
Signed-off-by: snipe <snipe@snipe.net>
commit 4111ef0d78f40086a549c1516bec32f2a0435ca4
Merge: cfa56e221 68c708bde
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:20:21 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 68c708bdef3e732123dfe16bb0a5c34a4381cc9f
Merge: 58e366a06 5581950fe
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:18:34 2024 +0100
Merge pull request #15409 from snipe/fixes-string
Corrected language string
commit 5581950fee50d7a260ad9aa1908373607c586e1c
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:17:17 2024 +0100
Corrected language string
Signed-off-by: snipe <snipe@snipe.net>
commit cfa56e2219e4948d5eaba2a6bb43d49f5859e790
Merge: 7f1dfcc93 58e366a06
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:08:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 58e366a063dcb015f148e7d00dc91f43bb4b98c9
Merge: 26f28a862 b06c52776
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:08:02 2024 +0100
Merge pull request #15408 from snipe/redirect-on-print-if-user-invalid
Check that the user exists before trying to print
commit b06c5277674842267aed27d1cd3913dba6998be3
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:06:30 2024 +0100
Check that the user exists before trying to print
Signed-off-by: snipe <snipe@snipe.net>
commit 7f1dfcc935002fd804dc6d8e94587392a107b967
Merge: 6f3fb21fe 26f28a862
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 14:29:06 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 26f28a862a23818f39a03442dd3a59f6e67acfbb
Merge: e8da7e2df 94c981e22
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 14:26:03 2024 +0100
Merge pull request #15404 from snipe/bug/sc-26717-model-delete
Set image to null if model is deleted
commit 94c981e22c275c453369ba709e2996d847112f73
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 14:23:49 2024 +0100
Set image to null if model is deleted
Signed-off-by: snipe <snipe@snipe.net>
commit 6f3fb21fef34cb61b5bf831f094c5fdfccbd18a9
Merge: a48e79a1f e8da7e2df
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:50:19 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit e8da7e2df2c9ed364896a2e30dfec97544e5dc51
Merge: 7b5b559ba d635c86e0
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:46:48 2024 +0100
Merge pull request #15403 from snipe/clean_up_depreciations
Fixed #15392 - filter by depreciation when showing models
commit d635c86e0096825f46993310facfba8b05a47822
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:46:30 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net>
commit 406ff6984b7b0c41aff78f2534e76edbbe30b4b5
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:42:23 2024 +0100
Added click to select on models table
Signed-off-by: snipe <snipe@snipe.net>
commit c6ddc501c5b6f674c36363ccf301b584be817564
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:40:12 2024 +0100
Filter by depreciation_id
Signed-off-by: snipe <snipe@snipe.net>
commit 4839181beb926bbed2ef357078ba0892340384c2
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:40:01 2024 +0100
Added counts to API
Signed-off-by: snipe <snipe@snipe.net>
commit 63a05c89a72bb45d05c16350b9d710480fb1516f
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:39:52 2024 +0100
Added counts to show method
Signed-off-by: snipe <snipe@snipe.net>
commit 385c4f69f7225a76bbd548ee8f34aaaf0908a4f5
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:39:43 2024 +0100
Added counts to depreciation transformer
Signed-off-by: snipe <snipe@snipe.net>
commit 486cd8c8c98d4fb83f28d7f8ab32894bde93f68f
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:39:09 2024 +0100
Nicer formatting for searchableAttributes
Signed-off-by: snipe <snipe@snipe.net>
commit eb5d93b3c2bf22d11063830771675c4f081eb516
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:38:55 2024 +0100
Added assets relationship
Signed-off-by: snipe <snipe@snipe.net>
commit a5ff623484d066e7c29c0982a8e2df389142138c
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:38:43 2024 +0100
Added asset, license, model count to API
Signed-off-by: snipe <snipe@snipe.net>
commit b5a4389815cb133e645cd0efe68a2f14df110202
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:38:31 2024 +0100
Added badge count, fixed model bulk edit menu
Signed-off-by: snipe <snipe@snipe.net>
commit 7b5b559baa83a51235119440dddc3c133e51f585
Merge: 64c4433b9 67a992974
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 11:57:29 2024 +0100
Merge pull request #15401 from snipe/fixes-15397-new-window-for-label
Opens label new window
commit 67a9929745e11371a12b169a8b2317eac581961b
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 11:56:54 2024 +0100
Opens label new window
Signed-off-by: snipe <snipe@snipe.net>
commit a48e79a1fc0d84a00f0e72bb59d89b5036f204b2
Merge: c207d4843 64c4433b9
Author: snipe <snipe@snipe.net>
Date: Tue Aug 27 07:37:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 64c4433b984676b487eb969c2990edcda1cadceb
Merge: d3e8e0663 22bc088f6
Author: snipe <snipe@snipe.net>
Date: Tue Aug 27 07:36:37 2024 +0100
Merge pull request #15396 from snipe/add_start_end_date_to_users_edit
Added `start_date` and `end_date` to user bulk edit
commit 22bc088f6f9f91407cd74530ffed94b88d316c72
Author: snipe <snipe@snipe.net>
Date: Tue Aug 27 07:21:19 2024 +0100
Added start_date and end_date to user bulk edit
Signed-off-by: snipe <snipe@snipe.net>
commit d3e8e066381a41de7974507469d0838ab36a9f43
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 14:07:06 2024 +0100
Add @swift2512 as a contributor
commit c207d48430356fd4cc55a5e8bbca299294901b69
Merge: 991e48696 1b933f7ad
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 14:01:38 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 1b933f7add1d8e27d7cc04ab817b933273cc60c0
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 13:47:17 2024 +0100
Added s to fa icons
Signed-off-by: snipe <snipe@snipe.net>
commit 991e48696ae4659dcd02069bf70da4888beb293f
Merge: 797488504 3fe891a05
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 10:26:06 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 3fe891a05babb7dc843a2b93cb29be76e86d7992
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 10:25:27 2024 +0100
Removed a few more commas
Signed-off-by: snipe <snipe@snipe.net>
commit 7974885041b6e81b8c54ccad3ec674f955c08663
Merge: 4ef85bd52 f4c5b712f
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 10:24:19 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit f4c5b712f4e45d4029496fa326fb80693739d89f
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 10:24:07 2024 +0100
Removed colons
Signed-off-by: snipe <snipe@snipe.net>
commit 4ef85bd529bffeeb83fbf89f66956f5be9e3b568
Merge: 6eab83a85 4c8dc7818
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 17:58:08 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4c8dc7818dee1988ee3bbc31b980bdcdef8f6e2c
Merge: aa86e07cd 5c43a1f87
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 17:57:00 2024 +0100
Merge pull request #15389 from snipe/added_generate_label_to_button_stack
Fixed #15388 - Moved generate label button
commit 5c43a1f87cfbd7558df08314e4212b6524f7f7dd
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 17:54:49 2024 +0100
Use proper style for buttons
Signed-off-by: snipe <snipe@snipe.net>
commit d3b265de8e44131610a003affe46918130c929e7
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 17:48:36 2024 +0100
Moved button on hardware
Signed-off-by: snipe <snipe@snipe.net>
commit 263151658fd7bc6f527388ff0f5b9533cb516567
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 17:44:09 2024 +0100
Moved general label button
Signed-off-by: snipe <snipe@snipe.net>
commit 6eab83a85a220b0dbcc35c70942b26d7901634e4
Merge: cce1f87da aa86e07cd
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 15:22:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit aa86e07cd2341ad4877a053d10aa55759be940b4
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 15:22:39 2024 +0100
Fixed #15385 - small icon tweaks
Signed-off-by: snipe <snipe@snipe.net>
commit cce1f87da653aa4a4547e585b5befb54fd9f0af9
Merge: b460e8dc8 d92fa5de6
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 15:18:30 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit d92fa5de6518e787790b5f0f82b4ad9da00af506
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 15:17:25 2024 +0100
fa-fw on settings icon
Signed-off-by: snipe <snipe@snipe.net>
commit b460e8dc831bb6ff96b15fbdff4628bf6d9cd18e
Merge: 50cb7e65c c589140ea
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 08:42:32 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit c589140ea0fe8320b60529ba3fcfe699000e9144
Merge: cc2c8f76d 52894615c
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 08:42:04 2024 +0100
Merge pull request #15383 from snipe/re-adds-checkout-button
Fixed #15378 - Corrected gate on checkin button on asset view
commit 52894615ce962beef3f1eff89f1ee916fbe0a878
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 08:40:41 2024 +0100
More specific gate for checkin
Signed-off-by: snipe <snipe@snipe.net>
commit 8546bbdd65c9eb71fbe227df8b26014a894092c1
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 08:38:47 2024 +0100
Fixed gate for checkout button
Signed-off-by: snipe <snipe@snipe.net>
commit 50cb7e65c9439879ad552fa787c4139e1636dec3
Merge: 821dd158d cc2c8f76d
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:32:39 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit cc2c8f76d0fd55f7b33110dfa8125679e31b85f4
Merge: 1ffa69c43 3957d670d
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:31:29 2024 +0100
Merge pull request #15375 from Godmartinz/fix-acceptance-reminder-command
Fixes the `acceptance-reminder` command
commit 1ffa69c43c8369d31bceafc0b537a675f6d4ba80
Merge: 78d355f13 f85ebd7ff
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:28:20 2024 +0100
Merge pull request #15380 from snipe/fixed/fixed_nav_bracket
Added pull-right to angle bracket
commit f85ebd7ffd30b334593724cc04dec607afe75ea0
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:27:39 2024 +0100
Added pull-right to angle bracket
Signed-off-by: snipe <snipe@snipe.net>
commit 78d355f136e4cd05d8c7cea66d2619cdfd903062
Merge: ec0346e4a af0a95be1
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:20:23 2024 +0100
Merge pull request #15377 from marcusmoore/fixes/custom-field-values-on-validation-error
Fixed custom field defaults being prematurely updated
commit ec0346e4a89635871f1a0f432ed2aa9fea6200c7
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:19:08 2024 +0100
Add @setpill as a contributor
commit fc5eb377766c9ff076214f2eb3f441577a6480fb
Merge: 833dace2b 1d7853cbf
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:18:41 2024 +0100
Merge pull request #15379 from setpill/fix/load-trustproxies-middleware
fixed #15374: load TrustProxies middleware in Kernel.php
commit 9a73311a992773956bd311cc2577572b74ba4cee
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 17:04:04 2024 -0700
Fix nested checkboxes being updated as a group
commit aec781e7dfeca89ab441d2c294d407ae018c502e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 16:03:30 2024 -0700
Be a little more explicit
commit 1d7853cbfe7ec5def3b8124133379355e133525d
Author: setpill <37372069+setpill@users.noreply.github.com>
Date: Thu Aug 22 19:45:53 2024 +0200
fixed #15374: load TrustProxies middleware in Kernel.php
commit 7f3c86165b21ee10081604deeae23bc261ef0faa
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 13:58:31 2024 -0700
Conditionally disable Add default values checkbox
commit 10b45812c4733e69de83ff78889bce8519557b5a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 13:38:01 2024 -0700
Improve id for checkboxes and radio buttons
commit c3165717ed43ed7bd4561b1b893a53ffb450ea9f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 13:20:04 2024 -0700
Handle old input
commit d0a351a132e5be9ee0b86df314bdf0c73a2f12ce
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 12:59:03 2024 -0700
Add comment
commit 68749e7e878fdcece52a0927255b4ae62f221aae
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 12:58:35 2024 -0700
Simplify logic
commit 0abb5637e08551fa06611741212ffa51f258386f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 12:54:54 2024 -0700
WIP: handle old input
commit af0a95be12fbe3b12ec710e95935fa1dcb54bc74
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 17:00:32 2024 -0700
Simplify assertions
commit d67975cb62f1f5ddb5bc3fa7c5297cb71e3388ea
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:59:44 2024 -0700
Implement fix
commit 663b2fd844aa6461b5336f10f66d7ea49cf3ecdf
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:59:38 2024 -0700
Add test case
commit bcace9d019b08048a954a9b89df9e09f8cbfa67e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:54:16 2024 -0700
Point test to correct endpoint
commit b59bf3e7dc803b24159744c8bf2819a95a7df8ab
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:49:29 2024 -0700
Add failing test
commit 3957d670d0b38505ab233ee42f66382392f5a389
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Aug 22 10:04:46 2024 -0700
fixes send acceptance reminder query
commit 821dd158d1cf4d9eaef21a594754e863ddb96a5d
Merge: 6c9a40268 833dace2b
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 15:50:20 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
commit 833dace2b4490fd3510ae3494743cd0cf321231c
Merge: ec365b080 56e31d230
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 15:00:16 2024 +0100
Merge pull request #15373 from snipe/fixes/#15366_custom_fields
Fixed #15366 use the non-admin edit encrypted custom fields permissions
commit 56e31d23036db2c26900fb46b77fc9786041017a
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 14:58:09 2024 +0100
Fixed #15366 - use permission for encrypted custom fields
Signed-off-by: snipe <snipe@snipe.net>
commit ec365b0804237e9eb17d414c4837d81a1089ce02
Merge: ca8864c06 aef0ac68c
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 14:49:13 2024 +0100
Merge pull request #15372 from StarlessNights/update-docker-compose-files
Fixed #15371: docker-compose files updated.
commit aef0ac68c36a7b2be1dece41f515df2bdae40ca4
Author: Iisakki Jaakkola <iihaja@utu.fi>
Date: Thu Aug 22 16:10:00 2024 +0300
Need to use the long format for redis too in docker-compose file.
commit f12f9a816f6776395788cec8e7b0bfddad3de26c
Author: Iisakki Jaakkola <iihaja@utu.fi>
Date: Thu Aug 22 15:47:12 2024 +0300
Update the official docker-compose file too while at it.
commit a000d6454f23c0681c8abb1913479e528a463cb5
Author: Iisakki Jaakkola <iihaja@utu.fi>
Date: Thu Aug 22 15:46:40 2024 +0300
Fix non-functional development docker-compose file.
commit ca8864c061adbb2022ce81e5942ee0c243102191
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 13:28:52 2024 +0100
Fixed small layout quirks in asset view
Signed-off-by: snipe <snipe@snipe.net>
commit 423f4f9126f1a91f7a2a47d8cfaae6eab2f43853
Merge: 456c7d8d9 5fa0c87ab
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 13:25:41 2024 +0100
Merge pull request #14667 from Godmartinz/add_location_to_create_user_via_asset
Adds location select to the create new user via asset checkout
commit 456c7d8d919963687c8c0c325453a313263acad7
Merge: 54cfe3f6e d4d19569e
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 13:20:56 2024 +0100
Merge pull request #15065 from Godmartinz/explicit_eol_removal_command
Adds `snipeit:remove-explicit-eols` command
commit 54cfe3f6e6ed6c019362d4827ab54ffcdee7c559
Merge: 5e0b18104 bb465dbfa
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 13:20:10 2024 +0100
Merge pull request #15156 from uberbrady/re-add-stalebot
Re-add stalebot-esque github Action
commit 5e0b18104d9ccabb27ab34d42e13d5f2f2d59fe4
Merge: ec0b9b198 8b5d3f7fb
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 12:59:20 2024 +0100
Merge pull request #15369 from snipe/fixes/checkbox_on_restore
Fixed checkbox layout on modal from #15296
commit 8b5d3f7fbd082621abb222565b9268e254ae694c
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 12:56:32 2024 +0100
Fixed extra closing p tag
Signed-off-by: snipe <snipe@snipe.net>
commit 744f43676d51ee8b8cb06f2f690305dacd350563
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 12:53:16 2024 +0100
Fixed checkbox layout on modal from #15296
Signed-off-by: snipe <snipe@snipe.net>
commit ec0b9b198f54a72fe757252339e38f4bc8348ae5
Merge: 94300d81d 738ef442f
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 12:43:07 2024 +0100
Merge pull request #15296 from uberbrady/expose_restore_sanitize
Expose the 'sanitize' system for backup restores to the web GUI
commit 6c9a402685f3faffd4cd5df0df296568f6705f9e
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:20:52 2024 +0100
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
commit 1b310f3a247fc6279182ad3fe364e180478f80c3
Merge: c54bff0f8 94300d81d
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:20:42 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 94300d81d618d4b50c127e6094f78453412746b9
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:19:32 2024 +0100
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
commit bc9ea5a2eced12c84493819d9c58b232171ee3e5
Merge: 4635a6efc 963911f2e
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:18:06 2024 +0100
Merge pull request #15352 from Godmartinz/mobile_breakpoint
Fixed Mobile misalignment of info on Assets and Users view pages
commit 4635a6efc38c4763153b944ebe766f7e023ea892
Merge: 9608414ea d29b3bfb9
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:17:49 2024 +0100
Merge pull request #15360 from snipe/more_print_fixes
More print fixes for asset view
commit 9608414eaedf3fd1b99a5ea70e508e01f09a507b
Merge: 47d8e2f8b 5efddf6f5
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:06:13 2024 +0100
Merge pull request #15367 from snipe/fixes/15344_added_freeform_to_country_select2
Fixed #15344 - make select2 for countries freeform-ish
commit 5efddf6f5b287f83295e5bde066e7a5a707215e6
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:01:39 2024 +0100
Allow clear on country dropdown
Signed-off-by: snipe <snipe@snipe.net>
commit 305dc049a498c913caacdd6f2c21f4320b9c9e52
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:01:28 2024 +0100
Added asterisk help text
Signed-off-by: snipe <snipe@snipe.net>
commit 3ac07020945751505b06d4acc358575e92860e0e
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 10:13:22 2024 +0100
Fixed #15344 - make select2 for countries freeform-ish
Signed-off-by: snipe <snipe@snipe.net>
commit 47d8e2f8b91f82768a9399c5d4de73d63974eb82
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 09:42:05 2024 +0100
Add @Scarzy as a contributor
commit a2246b96451c81aab3243a67c2df1ed4ae7eb841
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 17:00:32 2024 -0700
Simplify assertions
commit 1d897597062351b6fb8fac736cd34cc58b71b2ac
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:59:44 2024 -0700
Implement fix
commit 206f8fe605e18deab216a3f61026321b57a8b118
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:59:38 2024 -0700
Add test case
commit 21d2217619d95434ab1fea3f9e2720e73ad51fb9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:54:16 2024 -0700
Point test to correct endpoint
commit 833bcb282f4516cc12e0edf7efd0f7f82e25eba8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:49:29 2024 -0700
Add failing test
commit 83dd9ce20e8b000b2ed96ead370cebbfa7f53427
Merge: 6fdce3c53 a8eb76fd8
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 23:15:24 2024 +0100
Merge pull request #15362 from r-xyz/model-files-api
Added #9413: AssetModel files endpoints to API
commit a8eb76fd8dae5f2ad6b716307b32ba477d31ed32
Author: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed Aug 21 22:25:41 2024 +0200
Fixed model files API routes.
commit cd7db5c4a8448239b632507ea53a25545b41d972
Author: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed Aug 21 22:24:08 2024 +0200
Fix some typos in models file handler.
commit da7313bc9d2ee8614967abaf601782fe85e35113
Author: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed Aug 21 20:24:22 2024 +0200
Fix models files API routes.
commit 4ec361c7183547cd90e67c8c86e87055e55605be
Author: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed Aug 21 19:49:51 2024 +0200
Add AssetModel files endpoints to API
commit 738ef442fdd87887b1ad26ccadf7e78217ffa52e
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Aug 21 13:16:51 2024 +0100
Rename .env var to have DB_ prefix for sanitize-by-default setting
commit d29b3bfb9ae71dc66bf3f49ee6f3453aa2847da9
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 13:06:16 2024 +0100
Few more hidden-print classes
Signed-off-by: snipe <snipe@snipe.net>
commit 6fdce3c536a41168c22141589f4a5dd72ff33fbb
Merge: 01c4fe611 1ab29ec3a
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 13:02:50 2024 +0100
Merge pull request #15358 from r-xyz/rename-docker-startup
Renamed docker startup scripts coherently.
commit 912bbf0e32ad362bb1055eb6d8c62e7ecdce4510
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 13:02:21 2024 +0100
More print fixes
Signed-off-by: snipe <snipe@snipe.net>
commit c54bff0f83baba2e89e7e20c6af92d9e71c50d63
Merge: d3f30ced9 01c4fe611
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 12:24:13 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 01c4fe61139bb3f259e4d4511537590a7e3fc8c6
Merge: 7e475a078 0fa9f5797
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 12:12:23 2024 +0100
Merge pull request #15359 from uberbrady/improve_windows_upgrade
Fixed #15190 - Improvements to upgrade.php script to improve Windows experience
commit 0fa9f57971391d0c24c3585d8bf8fcdafa2731a9
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Aug 21 11:53:38 2024 +0100
Improvements to upgrade.php script to improve Windows experience
commit 1ab29ec3a4c7ad902aa95cd35105105eb2ec567d
Author: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed Aug 21 11:52:09 2024 +0200
Rename docker startup scripts coherently.
commit 7e475a07863c5f4ead90871ef018544b9dcd4205
Merge: d0acf5b8a 26b3c62ab
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 10:41:17 2024 +0100
Merge pull request #15357 from snipe/tighten_category_view_translations
Fixed #15330 - Cleaned up category title
commit 26b3c62ab804d0ee03815e772ba02e22274bc89c
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 10:29:51 2024 +0100
Cleaned up category title
Signed-off-by: snipe <snipe@snipe.net>
commit d3f30ced94465ead29280f83e57b5f38073bc465
Merge: 973e2e575 d0acf5b8a
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 10:13:57 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit d0acf5b8a6c032e2864b95b3f8c7bcbf0c7bf731
Merge: 09033b19a 74fbc2382
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 10:12:58 2024 +0100
Merge pull request #15356 from snipe/validate_location_parent
Fixed #15341 - validate parent ID
commit 74fbc238230cabc1c44ab1933c65fe48effda13f
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 10:09:35 2024 +0100
Updated tests
Signed-off-by: snipe <snipe@snipe.net>
commit a23dee52f27aa4c54578308eef78f3d875b34c65
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 09:58:47 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net>
commit 4d03f1e110b02e5a75bf931a6674b67c269c12de
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 09:46:18 2024 +0100
Fixed #15341 - validate parent ID
Signed-off-by: snipe <snipe@snipe.net>
commit 963911f2e19b04656b470d00da76cedfe5b3d068
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Aug 21 00:23:10 2024 -0700
changed order of info stgack
commit 59832126cbf9a3d86265f03deedc2267ca32a706
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 20 16:52:51 2024 -0700
Improve comment
commit 680cce3ee2d47357aa9daf5878b87a2016e35410
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 20 16:42:29 2024 -0700
Align indents
commit 6c5ec6a16c3eeccf9391083dc988345d41602a95
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 20 16:41:24 2024 -0700
Get datepicker working
commit 5d1f98bf93fedc77c08740f06d77590283baa24e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 20 15:38:43 2024 -0700
Simplify by directly wire:modeling
commit 9d484077ae030020e3b1cd585783d8db03c5c0f5
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Aug 20 14:24:37 2024 -0700
missed a file
commit 9858b0f37f2f27c43c47e6f437b36e8a72985690
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Aug 20 14:23:55 2024 -0700
fixes info tab for users and assets
commit 973e2e5756b72e939f046d561fd91f2a344ca5cb
Merge: 46ed07642 09033b19a
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 19:45:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
commit 09033b19a7be28ea35e0bd4fe9f94c0e4f8c1a70
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 19:44:13 2024 +0100
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
commit 46ed0764288efc767a14069ed8a1edbf5963e539
Merge: d3a555ce9 5fdeb9c41
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 19:42:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 5fdeb9c4131e7fb3653f359419500d9b130c2443
Merge: 22d373407 6c450d133
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 19:42:08 2024 +0100
Merge pull request #15351 from snipe/localizations/new_translations_2024-08-20
Updated languages
commit 22d3734075becd0d9604ddc18cc0403d9cdfb025
Merge: d99b306ae eca6b03f4
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 19:34:38 2024 +0100
Merge pull request #15350 from marcusmoore/icon-component-updates
Fixed icon not rotated and simplified component
commit eca6b03f44a0f4c51c650afa45bf9833021a8314
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 20 11:08:53 2024 -0700
Allow id to be rendered
commit bbdbec71976b0abd2c1ac8e6c999d6321098b37b
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 20 11:00:39 2024 -0700
Rely on $attributes behavior rendering passed attributes
commit 6c450d1338225ae459abaf23d5662d40d03ca512
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 18:18:17 2024 +0100
Updated languages
Signed-off-by: snipe <snipe@snipe.net>
commit a8cd1027f3cc1716b76461f9db7dbc17b8a130b4
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Aug 20 11:40:15 2024 -0500
rm commented code
commit d3a555ce91fd838e625d0bcdb75f31a79439936b
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 11:49:39 2024 +0100
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
commit 0f8e041809f151f45a26c2f1b6cd131e4fd224a6
Merge: e8a22f3c5 d99b306ae
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 11:49:32 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
commit d99b306ae96d636504323b0c92a879d9df5fa993
Merge: f597d6433 74136761d
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 11:46:55 2024 +0100
Merge pull request #15345 from snipe/add_trim_strings_middleware
Added TrimStrings middleware
commit 74136761dfdbeb9486f07d8ef7658a47402f5b18
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 11:45:13 2024 +0100
Added TrimStrings middleware
Signed-off-by: snipe <snipe@snipe.net>
commit f597d64339bec6e1a7bf06e9ecf1e78c7b2f08fb
Merge: 64bed01a9 0072f1500
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 10:17:26 2024 +0100
Merge pull request #15342 from snipe/snyk/bs-tables
[Snyk] Upgrade bootstrap-table from 1.23.0 to 1.23.2
commit 0072f1500ea60a7660f995fa100ddb46600d1ec6
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 10:16:27 2024 +0100
[Snyk] Upgrade bootstrap-table from 1.23.0 to 1.23.2
Signed-off-by: snipe <snipe@snipe.net>
commit 64bed01a9168e8b9e57100db06653cda678be3b5
Merge: f8c72fb0a f6319e11e
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 10:13:43 2024 +0100
Merge pull request #15327 from snipe/update_button_style
Update icons to use blade components, standardize button colors and format
commit f6319e11e7103231ffb9c34093560e319c1d0859
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 10:11:27 2024 +0100
Added fa-fw to sidebar elements
Signed-off-by: snipe <snipe@snipe.net>
commit 5d9f988df3110286d342aa2a4f069abb437a2f69
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 10:01:49 2024 +0100
Added fw class to topnav icons
Signed-off-by: snipe <snipe@snipe.net>
commit f8c72fb0ac4c44b32fa3ad8d886da82a603c7d72
Merge: 886514a25 fa765667f
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 09:57:03 2024 +0100
Merge pull request #15112 from marcusmoore/livewire-importer-improvements
Improved handling attempted access of deleted files in importer
commit 8e1111c681df1a7f7ef88c5ce3a91585cbb243d0
Merge: 697595d96 886514a25
Author: akemidx <kojotek.dx@gmail.com>
Date: Mon Aug 19 19:33:44 2024 -0400
Merge remote-tracking branch 'upstream/develop' into eol_date_range_for_reports
commit 886514a25f3a45525366d8520a3cfc89eadc237d
Merge: cb40a82e7 434bdcd6d
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 22:46:08 2024 +0100
Merge pull request #15336 from marcusmoore/fixes/remove-displayed-parentheses
Fixed `)` being added to expected asset checkin report email header
commit fa765667f261205853300a0bde11d719fbbec5e1
Merge: 94d8a547b cb40a82e7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Aug 19 14:41:58 2024 -0700
Merge branch 'develop' into livewire-importer-improvements
commit 434bdcd6d4f3f1ffccdd9d3eb52af5c74d4b24f0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Aug 19 14:31:47 2024 -0700
Add missing parentheses to conditional
commit be5f3f38f802a5aaf290cb9d9151cf2725e10688
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 14:48:12 2024 +0100
Settings pages
Signed-off-by: snipe <snipe@snipe.net>
commit 08c3a25b39a8ff8465d5445bf30e575c6918c5a7
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 14:16:57 2024 +0100
Little more padding
Signed-off-by: snipe <snipe@snipe.net>
commit 34cd4b624404cd12464ede49d2be58ba6a7a0f7e
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 14:15:36 2024 +0100
Added links to apple/google maps
Signed-off-by: snipe <snipe@snipe.net>
commit d89c8682beb4c30bebebf1b28fdd84b18a612477
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:46:31 2024 +0100
Reversed location button ordering
Signed-off-by: snipe <snipe@snipe.net>
commit 6f024849e9949121ec9459383a1510d026daeea8
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:39:24 2024 +0100
Few more
Signed-off-by: snipe <snipe@snipe.net>
commit e048f0955f007b83ad023257b6b65830b22f0b72
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:27:21 2024 +0100
More icons
Signed-off-by: snipe <snipe@snipe.net>
commit 479b2b4fd3e813d56301ec76e112b1997d31cd07
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:23:08 2024 +0100
More icons
Signed-off-by: snipe <snipe@snipe.net>
commit 84f14a05bd09d0e85fcce5aa933e598893266a96
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:20:19 2024 +0100
Fixed logging for asset model restore
Signed-off-by: snipe <snipe@snipe.net>
commit 8d52fa51b16a978ddfdadd49c321956277cdcbb2
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:20:06 2024 +0100
Fixed suppliers buttons
Signed-off-by: snipe <snipe@snipe.net>
commit 229d8b9bf573f0a20ade55bdd1f90f8ea507b84a
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:19:59 2024 +0100
Added location restore
Signed-off-by: snipe <snipe@snipe.net>
commit eb8d43a8049cc470e605e7faec493fa7fef396a1
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 12:32:44 2024 +0100
Updated buttons on models
Signed-off-by: snipe <snipe@snipe.net>
commit f82266fadec3524f4ee0304a18a1ec8a4ba642a5
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 11:58:31 2024 +0100
Cleaned up presenters
Signed-off-by: snipe <snipe@snipe.net>
commit b4b6f7a35f8060b5bec460d537816b72e8b0fd1b
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 11:58:21 2024 +0100
Added css-consumable to overrides for table headers
Signed-off-by: snipe <snipe@snipe.net>
commit 0bc995b87f6dc5db5523ed099cafd6ea396c642a
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 11:58:05 2024 +0100
Updated more icons
Signed-off-by: snipe <snipe@snipe.net>
commit 59725f203173f5eb9536d052d1356f8be2ca5df4
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 11:57:40 2024 +0100
Removed extra debugging in test
Signed-off-by: snipe <snipe@snipe.net>
commit 00bc9ac8065f4a960d508c4883ba01b77b1eb2b4
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 22:39:14 2024 +0100
Fixed spacing
Signed-off-by: snipe <snipe@snipe.net>
commit f200960a5756e306d4230b70b702c8c772505597
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 22:26:57 2024 +0100
Aaaand more
Signed-off-by: snipe <snipe@snipe.net>
commit c700127f1ae3db8cd2d4585476ac27b1c146fe43
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 22:09:00 2024 +0100
Updated user view
Signed-off-by: snipe <snipe@snipe.net>
commit ae2f9571b43665eee44b7e9ed48e0358b65eff04
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 21:57:37 2024 +0100
And still more
Signed-off-by: snipe <snipe@snipe.net>
commit a77dcad33654a960f117ba993ba78a78c5c76aab
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 20:30:53 2024 +0100
More links
Signed-off-by: snipe <snipe@snipe.net>
commit 7ace9324b4450ef0da8fa2c2dd9d21cc96a32175
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 20:30:22 2024 +0100
Added padlock sound
Signed-off-by: snipe <snipe@snipe.net>
commit d2e889e927a1b88aca3564d140093f146e7bfb71
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 19:21:59 2024 +0100
Still more
Signed-off-by: snipe <snipe@snipe.net>
commit 803bdb457c12f186c75e7d837d301aeb6b8ad217
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 18:48:19 2024 +0100
Added calendar
Signed-off-by: snipe <snipe@snipe.net>
commit 7c9b1f6e38b56305a2f6f59c7bb28df9cc3c599d
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 18:39:22 2024 +0100
Added the plus icon
Signed-off-by: snipe <snipe@snipe.net>
commit d545537a431942b3b1b0d0e625c2daa8ab95853f
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 18:34:13 2024 +0100
More icons
Signed-off-by: snipe <snipe@snipe.net>
commit 4d8904938dfa80487a37b72171a5a692f5dbcdb0
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 18:24:26 2024 +0100
Added calendar icon for datepickers
Signed-off-by: snipe <snipe@snipe.net>
commit 0c09f2b2c0e935c93f66088552589a6c7950ec61
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 18:13:49 2024 +0100
Moar icon replacement
Signed-off-by: snipe <snipe@snipe.net>
commit bffba025113c5f95cf140802f41ea03c49db4030
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 17:26:44 2024 +0100
Updated icons
Signed-off-by: snipe <snipe@snipe.net>
commit 901f4df7eef6a814e9274dd9addc56c715363c3e
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 17:03:36 2024 +0100
Added more icons
Signed-off-by: snipe <snipe@snipe.net>
commit 9337cba34030be17c2fd8ccc50d42d8b5cc081e9
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 15:53:58 2024 +0100
Added download
Signed-off-by: snipe <snipe@snipe.net>
commit 2b0c67c26381a55ade9104438386fef646b5c17e
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 15:51:00 2024 +0100
Load the icon helper
Signed-off-by: snipe <snipe@snipe.net>
commit da71f031f5b66662ec5c64f913f3be76e349e23d
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 15:48:24 2024 +0100
Use icon in hardware view
Signed-off-by: snipe <snipe@snipe.net>
commit d2e585baa76991037b82cfa9b610a279b744ad00
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 15:47:45 2024 +0100
Added icon blade
Signed-off-by: snipe <snipe@snipe.net>
commit a102c085dfb36ecc64f7056720418fd00e268310
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 15:47:37 2024 +0100
Added icon helper
Signed-off-by: snipe <snipe@snipe.net>
commit e8a22f3c5bf0fc22602a1373cf91090d40e9d734
Merge: d843cf8dc cb40a82e7
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 04:55:04 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit cb40a82e796dbffb2fe237c290d44bdb9fdd1bcc
Merge: 7e6ff3cbe 4253acad4
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 04:54:23 2024 +0100
Merge pull request #15324 from snipe/jerk_prevention
Prevent passing an array as login
commit 4253acad4c9bdabdbc42ea3ea46885fde8ebf706
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 04:51:36 2024 +0100
Prevent passing an array as login
Signed-off-by: snipe <snipe@snipe.net>
commit d843cf8dcc94e50c36958e4180ec76f9e351d7ad
Merge: 1013dcae6 7e6ff3cbe
Author: snipe <snipe@snipe.net>
Date: Sat Aug 17 00:52:10 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 1013dcae618b77bc96df9c52298f912d3d756684
Merge: c30c649aa e7ef3bf51
Author: snipe <snipe@snipe.net>
Date: Sat Aug 17 00:38:44 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 70e5e0f9df91c10d94568c98168be1f5fdc5686a
Author: spencerrlongg <spencer@spencerlong.com>
Date: Fri Aug 16 12:52:06 2024 -0500
get rid of dd
commit dec4691c73b28bab35ed8fdb1ff83578ad517bb0
Author: spencerrlongg <spencer@spencerlong.com>
Date: Fri Aug 16 12:50:09 2024 -0500
should be good to go now
commit c30c649aaae21ab6dad1e077155cc0bc4e09e2af
Merge: bb1385369 ad6d09b6a
Author: snipe <snipe@snipe.net>
Date: Fri Aug 16 16:44:02 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit bb1385369c65ac2eab73ba626ab8b2bad7439270
Merge: c1caf6088 43b338d61
Author: snipe <snipe@snipe.net>
Date: Fri Aug 16 16:18:00 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit c1caf6088eeb0474dd90a66b12d592541084fc89
Author: snipe <snipe@snipe.net>
Date: Fri Aug 16 13:12:13 2024 +0100
Prod assets
Signed-off-by: snipe <snipe@snipe.net>
commit 12dfe71ea840bf5b54365be22f432278630537fa
Merge: ca8926871 ea2b1b074
Author: snipe <snipe@snipe.net>
Date: Fri Aug 16 12:48:42 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ca89268716df8d706182aba2a780c05a5a1afe30
Merge: ec5731353 3167ee91d
Author: snipe <snipe@snipe.net>
Date: Fri Aug 16 11:02:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 94d8a547b88a4ee77caf0b3de85d382d07a74840
Merge: 6521c0252 b39a7c6f0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 15 13:47:49 2024 -0700
Merge branch 'develop' into livewire-importer-improvements
commit 43b109fac07f5b5725c094ff1f671b61db42fb16
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 15 13:20:22 2024 -0700
Use cached values for textarea and radio input
commit 75c1e7658fe6303ca6decc82fcdb91a2aad995ab
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 15 10:43:41 2024 -0700
Improve method name
commit e7c9c799bbd90320ada1da9343cb8539bc23ecf1
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 15 10:40:23 2024 -0700
Add wire:keys
commit 6ab976f353b67b03824ed2b29ea78155dd294b4b
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 15 10:32:33 2024 -0700
Use cached values for text input
commit ec5731353a5ce6921eff8faa5579c9a185d9eeb6
Merge: 3283704fe b39a7c6f0
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 15:53:52 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 3283704fe855ff1dabff53454b3248de8e3c05cb
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 12:25:08 2024 +0100
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
commit 540df3204628a030027e138e8b24fdfa03088582
Merge: 85486fa58 594f50664
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 12:24:59 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
commit 85486fa58c5598e6178abe48203f84f3e0b2931a
Merge: 3618df2ec 10dc1f136
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 10:53:54 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 3618df2ec5c81efd3634f74ec18346f91f6b3cc4
Merge: a201f22fd 8f7bce7aa
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 10:44:39 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit a201f22fdb85ce2f7f0961b6f19ef842163fa8a3
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 10:36:12 2024 +0100
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
commit 6070d530cf95d5666fcee4349754efe8f36842ee
Merge: 6c0cf9447 4d66f7c93
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 10:35:33 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 6c0cf944738bc6b5813f83a7165be2500ae2f218
Merge: bf4b91516 381003eea
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 10:28:08 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 9622e05cf5b545bac1f506af085e6c7e27259848
Author: spencerrlongg <spencer@spencerlong.com>
Date: Wed Aug 14 18:41:06 2024 -0500
correct api test
commit afaf53cdfc37d49ba1afbbe178cd974fbb83920f
Author: spencerrlongg <spencer@spencerlong.com>
Date: Wed Aug 14 18:14:21 2024 -0500
failing ui test
commit f031309f8ffce5747c29e24d467b93cf61ace657
Author: spencerrlongg <spencer@spencerlong.com>
Date: Wed Aug 14 16:09:15 2024 -0500
set up api controller for route/model binding
commit 20ec420ba3a51638f7934e5a3820907760fc544c
Author: spencerrlongg <spencer@spencerlong.com>
Date: Wed Aug 14 13:53:29 2024 -0500
not quite done, api side needs some work
commit ab63a19affed7fe30f2ba13db4e17b391342414a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 14 11:01:51 2024 -0700
Initialize concept of cached values
commit a70b94e707a66c1666d2ba5a1d85eff6f1cd461f
Merge: 120cfd13c 3e2945709
Author: spencerrlongg <spencer@spencerlong.com>
Date: Wed Aug 14 11:36:19 2024 -0500
Merge branch 'refs/heads/develop' into bug/sc-26584
commit 008bf036b5159cf086e3b4e7af2f27774de8461c
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Aug 14 16:09:34 2024 +0100
Got rid of weird namespace declaration and commented-out data-toggle line
commit cc5ad456e6b65c3e0d8d1ad9d7bd7ab4b31d2249
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Aug 14 15:59:21 2024 +0100
Expose the 'sanitize' system for backup restores to the web GUI
commit bf4b915168d19668f9653fb0bbbf66204cec3239
Merge: 0a9c2e354 0f1e5181a
Author: snipe <snipe@snipe.net>
Date: Wed Aug 14 10:45:13 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 0a9c2e354f44469972da3ecc063f4f7a1c1d1331
Merge: 47f1b3b14 e54400718
Author: snipe <snipe@snipe.net>
Date: Wed Aug 14 10:02:43 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 038e86954b10fda8100d3a6cf5c87f48880e69e4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 13 17:30:53 2024 -0700
Improve property name
commit f6c1642bf231ca69fa7a2b328957050dcf39af18
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 13 17:01:35 2024 -0700
Use computed fields in CustomFieldSetDefaultValuesForModel component
commit 120cfd13c544fb79e69f5f59aa44f908b4a39947
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Aug 13 14:07:40 2024 -0500
translation
commit 09f2739298933ea8150a6dfda4aa19b3c5baa94f
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Aug 13 13:45:41 2024 -0500
works, un-reassignable licenses are an issue
commit 47f1b3b14e291a46b66d028e259425dd8e017f5b
Merge: 198b76ebc 3044af941
Author: snipe <snipe@snipe.net>
Date: Tue Aug 13 16:48:06 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 198b76ebc2c7099aed211e812ac85f1f3db49060
Merge: 5546f9676 6e84c29ce
Author: snipe <snipe@snipe.net>
Date: Tue Aug 13 15:47:00 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 5546f9676a9795d17cfd6c518f8f8bc78e80b1a0
Merge: 46caa478d 9e73eaf95
Author: snipe <snipe@snipe.net>
Date: Tue Aug 13 13:51:33 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ec863df0074ce785aa3ac80f4871accb8eb2145b
Author: spencerrlongg <spencer@spencerlong.com>
Date: Mon Aug 12 16:58:53 2024 -0500
rm conditional that might be unnecessary
commit cc3b8e0681f74276958c988d986de07cff3e798d
Author: spencerrlongg <spencer@spencerlong.com>
Date: Mon Aug 12 16:58:21 2024 -0500
this should more or less work, but i need to determine if this is the best way
commit ff145abbe720f36604585005b26cf62873169f56
Author: spencerrlongg <spencer@spencerlong.com>
Date: Mon Aug 12 16:13:03 2024 -0500
use array for eager loading, makes ide prettier
commit 46caa478d2eb120f3a1acec3b04dc4c9866e6116
Merge: 4d8569e75 e6106aa7c
Author: snipe <snipe@snipe.net>
Date: Mon Aug 12 20:47:45 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4d8569e7548aedc9121f2a03f78736247a849744
Merge: 4dc57f95e c9f8a84d4
Author: snipe <snipe@snipe.net>
Date: Mon Aug 12 18:01:21 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4dc57f95e2bbd997deed5cc2e81717e04b5522f0
Merge: 316ee6f81 9d354ca65
Author: snipe <snipe@snipe.net>
Date: Mon Aug 12 16:38:23 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 316ee6f81092d419a95da198ad118590de134648
Merge: 509cc812e 3f2139349
Author: snipe <snipe@snipe.net>
Date: Mon Aug 12 16:30:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 509cc812ea1ef38b17bc3f4f21d9b98c92a3448e
Merge: d5f66bc0d e7fb29fce
Author: snipe <snipe@snipe.net>
Date: Mon Aug 12 15:58:40 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit d5f66bc0dd2092bc4f36812eff5016b0d41b6561
Merge: 1e213c31e ce5be8ac2
Author: snipe <snipe@snipe.net>
Date: Mon Aug 12 10:10:59 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 1e213c31ef6af0d9c420d74a1da5e2bd9e6c606c
Merge: 91874dfe0 1777bb4b9
Author: snipe <snipe@snipe.net>
Date: Sun Aug 11 10:26:16 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 91874dfe0b5191daf5438d7ca5f2a64acf4d80f4
Merge: 0e6eda5e8 5c6c655cd
Author: snipe <snipe@snipe.net>
Date: Sat Aug 10 19:37:37 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 0e6eda5e8afbed2448dc671e2a72aad6e882b4b3
Merge: 24560b936 60eb60215
Author: snipe <snipe@snipe.net>
Date: Sat Aug 10 18:29:41 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 24560b93626946d9b74c0b262356fa81c5e27bd7
Author: snipe <snipe@snipe.net>
Date: Sat Aug 10 18:24:49 2024 +0100
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
commit 6521c025264979fa57e788c1cf223e862912d8c9
Merge: 8d1cc22c5 9350a2018
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 7 15:20:39 2024 -0700
Merge branch 'develop' into livewire-importer-improvements
# Conflicts:
# resources/views/livewire/importer.blade.php
commit bb465dbfaafeb6d42a4ee277d1cfe6d7067dfa34
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Jul 24 15:09:23 2024 +0100
Cut down run number to 100 from 1000
commit 8cbcc237c0c587f05dd5e6e96bb900507c249d84
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Jul 24 13:27:31 2024 +0100
Cleanup of Stale workflow for GH - set to debug-mode to start
commit 97e3af8fc989f0b03db39e984c45ba540f7f8ed7
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Sat Jun 29 00:59:47 2024 +0100
WIP on new GitHub-backed stalebot settings
commit 914e29210ae746ed78c240b3f037611e0e8bd149
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Jun 26 18:53:01 2024 +0100
Initial rough stab at re-implementing stalebot
commit 8d1cc22c5818baa8673e24cb402090acfbb73a10
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Jul 18 12:00:01 2024 -0700
Turn on legacy binding since other components still use it
commit 7685de45f255979cbf1799dd8c6936a2c874419c
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 17:12:14 2024 -0700
Turn off legacy binding
commit 199e68ff2929e4f13d6fdd35ec71751b71cf82e5
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 17:10:12 2024 -0700
Simplify computed propery
commit 81bffccf0144dce331cabe57b7c5993fba13a6b2
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 16:28:26 2024 -0700
Use better error message
commit cfca1514c00e7ce1eab506b110f93f59a1b2eaf8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 16:22:44 2024 -0700
Swap file_id for activeFileId
commit b4ed01243bbac083ddd66d912207bd865098c30a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 13:40:41 2024 -0700
Add more details
commit 3772a21a517c9805929f66e38122cbe7bf6f06f8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 13:37:24 2024 -0700
Move comment up
commit 04b6cb763f1cad48da45e4b2c2a491e95430728e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 10:58:48 2024 -0700
Add todo
commit dd32341502c94f5dbcac64196a4e3acdc7e95462
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 17:21:18 2024 -0700
Display message if attempting to delete non-existent file
commit f58e3114a23435331536000d04ee3090ad4fb9f4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 17:17:45 2024 -0700
Simplify destroy method and update list
commit eba494ad8c5a9441fdf348507f8332ba1efa4142
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 17:03:42 2024 -0700
Make $activeFile a computed property
commit 7e89b58746d5e18863fb2097fd6727aabaeeb04c
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 16:08:42 2024 -0700
Move files to computed property
commit b7744105a09e87a673f50eff32c1a7516d91c5ec
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 14:20:41 2024 -0700
Migrate import type to component
commit 69263f0e5b2d5e600e4368a766104691a6e65e3f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 13:30:29 2024 -0700
Migrate header row to component
commit 017530ba4ba45f96d77cb27dd85e724b0d3783e7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 12:02:50 2024 -0700
Make updating hook more specific
commit c8dad528a8d5244cf01111523dfcadd58eb5ada1
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Jul 15 16:15:58 2024 -0700
Migrate a couple items out of mount
commit 256e989ba113650fbe5624bc00735e9329a2795d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Jul 15 15:49:18 2024 -0700
Add test for importer
commit 9793016603cb35524e3e421edf0fe4044e6a42e3
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Jul 11 13:32:16 2024 -0700
Remove unneeded AuthorizesRequests
commit 9e06f2d17fdcdb709a9feada88f2ab7088459f08
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Jul 11 13:22:10 2024 -0700
Remove commented code
commit d4d19569eeecb16e9064e47f47ca503afba469a5
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Jul 11 10:52:47 2024 -0700
adds execution timer
commit 43c7504f899d560e70d033fc8a2ac9823e1fabde
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Jul 11 10:03:51 2024 -0700
adds an all option, adds help context for all, seperates logic
commit 1fa6a763bcfd2c543f58073fdfe40eca927ad636
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 10 11:09:57 2024 -0700
updated description
commit 726308bfd58a1ba4a99174fcd47c052b6404821f
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 10 10:58:45 2024 -0700
removed typo
commit 22ddb695f2cfe9306b75d7d53eb201cb4a64595b
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 10 10:57:47 2024 -0700
better description
commit 09b2feac5401694cdb8a4f306a7418895bd4ec37
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 10 10:56:44 2024 -0700
updates assets with selected model to inherit asset model eol
commit 57e1df86c8041b0efe6dbbfbcc5c92195dd15fb5
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 10 10:21:24 2024 -0700
finds model and collects assets with such model
commit 3ea5d4ee4067b236af345416666faa8c6e976669
Author: Robert-Azelis <82208283+Robert-Azelis@users.noreply.github.com>
Date: Thu May 2 12:55:17 2024 +0200
Update BulkAssetsController.php
Fix for bulk updarte of purchase date to calculate new EOL
commit 5fa0c87ab0554e7c6455d7cd4922ae82cd6657f1
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Apr 30 12:02:11 2024 -0700
null debugbar
commit 75aa01791a2fe64da98f29a942923ab028a92586
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Apr 30 11:54:33 2024 -0700
adds location select to the create new user vice asset checkout
commit 697595d96377ac41bf1525d363f093621ff50102
Merge: 0bdd8a591 9502525a4
Author: akemidx <116301219+akemidx@users.noreply.github.com>
Date: Tue Nov 21 16:07:26 2023 -0500
Merge branch 'develop' into eol_date_range_for_reports
commit 0bdd8a59175a846c70ac122dd4b2124d67cbd6b8
Author: akemidx <kojotek.dx@gmail.com>
Date: Wed Aug 2 16:40:38 2023 -0400
fixing key names
commit e35dd2daa16c61c01bd666411ad93ea5503de601
Author: akemidx <kojotek.dx@gmail.com>
Date: Wed Jul 26 17:45:18 2023 -0400
asset_eol_date stuff
commit f71b69a739c8437c4ef2c6065ba80f8e08102d29
Author: akemidx <kojotek.dx@gmail.com>
Date: Wed Jul 26 17:31:06 2023 -0400
adding eol fields
commit 499a3debcdd1e996ac05fa8dc28d2e39e2bdcb2a
Author: akemidx <kojotek.dx@gmail.com>
Date: Tue Jul 11 14:08:55 2023 -0400
this WILL break. i'm back to site not found which is something missing. otherwise the columns are either blank or another value like expected checkin i was using to test a bit
Signed-off-by: snipe <snipe@snipe.net>
2024-11-12 07:39:22 -08:00
|
|
|
"sortable" => false,
|
2021-09-01 17:33:59 -07:00
|
|
|
"visible" => true,
|
2021-09-21 21:52:18 -07:00
|
|
|
"title" => trans('admin/hardware/table.book_value'),
|
|
|
|
"footerFormatter" => 'sumFormatter',
|
2021-11-18 15:09:17 -08:00
|
|
|
"class" => "text-right",
|
2021-09-01 17:33:59 -07:00
|
|
|
], [
|
|
|
|
"field" => "monthly_depreciation",
|
|
|
|
"searchable" => true,
|
|
|
|
"sortable" => true,
|
|
|
|
"visible" => true,
|
|
|
|
"title" => trans('admin/hardware/table.monthly_depreciation')
|
|
|
|
],[
|
|
|
|
"field" => "diff",
|
|
|
|
"searchable" => false,
|
|
|
|
"sortable" => false,
|
|
|
|
"visible" => true,
|
2021-09-21 21:52:18 -07:00
|
|
|
"title" => trans('admin/hardware/table.diff'),
|
|
|
|
"footerFormatter" => 'sumFormatter',
|
2021-11-18 15:09:17 -08:00
|
|
|
"class" => "text-right",
|
2021-09-01 17:33:59 -07:00
|
|
|
],[
|
|
|
|
"field" => "warranty_expires",
|
|
|
|
"searchable" => false,
|
|
|
|
"sortable" => false,
|
|
|
|
"visible" => false,
|
|
|
|
"title" => trans('admin/hardware/form.warranty_expires'),
|
|
|
|
"formatter" => "dateDisplayFormatter"
|
|
|
|
],
|
|
|
|
];
|
|
|
|
|
|
|
|
return json_encode($layout);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Generate html link to this items name.
|
|
|
|
* @return string
|
|
|
|
*/
|
|
|
|
public function nameUrl()
|
|
|
|
{
|
|
|
|
return (string) link_to_route('hardware.show', e($this->name), $this->id);
|
|
|
|
}
|
|
|
|
|
|
|
|
public function modelUrl()
|
|
|
|
{
|
|
|
|
if ($this->model->model) {
|
|
|
|
return $this->model->model->present()->nameUrl();
|
|
|
|
}
|
|
|
|
return '';
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Generate img tag to this items image.
|
|
|
|
* @return mixed|string
|
|
|
|
*/
|
|
|
|
public function imageUrl()
|
|
|
|
{
|
|
|
|
$imagePath = '';
|
|
|
|
if ($this->image && !empty($this->image)) {
|
|
|
|
$imagePath = $this->image;
|
|
|
|
$imageAlt = $this->name;
|
|
|
|
} elseif ($this->model && !empty($this->model->image)) {
|
|
|
|
$imagePath = $this->model->image;
|
|
|
|
$imageAlt = $this->model->name;
|
|
|
|
}
|
|
|
|
$url = config('app.url');
|
|
|
|
if (!empty($imagePath)) {
|
|
|
|
$imagePath = '<img src="'.$url.'/uploads/assets/'.$imagePath.' height="50" width="50" alt="'.$imageAlt.'">';
|
|
|
|
}
|
|
|
|
return $imagePath;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Generate img tag to this items image.
|
|
|
|
* @return mixed|string
|
|
|
|
*/
|
|
|
|
public function imageSrc()
|
|
|
|
{
|
|
|
|
$imagePath = '';
|
|
|
|
if ($this->image && !empty($this->image)) {
|
|
|
|
$imagePath = $this->image;
|
|
|
|
} elseif ($this->model && !empty($this->model->image)) {
|
|
|
|
$imagePath = $this->model->image;
|
|
|
|
}
|
|
|
|
if (!empty($imagePath)) {
|
|
|
|
return config('app.url').'/uploads/assets/'.$imagePath;
|
|
|
|
}
|
|
|
|
return $imagePath;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Get Displayable Name
|
|
|
|
* @return string
|
|
|
|
*
|
|
|
|
* @todo this should be factored out - it should be subsumed by fullName (below)
|
|
|
|
*
|
|
|
|
**/
|
|
|
|
public function name()
|
|
|
|
{
|
|
|
|
return $this->fullName;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Helper for notification polymorphism.
|
|
|
|
* @return mixed
|
|
|
|
*/
|
|
|
|
public function fullName()
|
|
|
|
{
|
|
|
|
$str = '';
|
|
|
|
|
|
|
|
// Asset name
|
|
|
|
if ($this->model->name) {
|
|
|
|
$str .= $this->model->name;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Asset tag
|
|
|
|
if ($this->asset_tag) {
|
|
|
|
$str .= ' ('.$this->model->asset_tag.')';
|
|
|
|
}
|
|
|
|
|
|
|
|
// Asset Model name
|
|
|
|
if ($this->model->model) {
|
|
|
|
$str .= ' - '.$this->model->model->name;
|
|
|
|
}
|
|
|
|
return $str;
|
|
|
|
}
|
|
|
|
/**
|
|
|
|
* Returns the date this item hits EOL.
|
|
|
|
* @return false|string
|
|
|
|
*/
|
|
|
|
public function eol_date()
|
|
|
|
{
|
|
|
|
|
|
|
|
if (( $this->purchase_date ) && ( $this->model->model ) && ($this->model->model->eol) ) {
|
|
|
|
$date = date_create($this->purchase_date);
|
|
|
|
date_add($date, date_interval_create_from_date_string($this->model->model->eol . ' months'));
|
|
|
|
return date_format($date, 'Y-m-d');
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* How many months until this asset hits EOL.
|
|
|
|
* @return null
|
|
|
|
*/
|
|
|
|
public function months_until_eol()
|
|
|
|
{
|
|
|
|
|
|
|
|
$today = date("Y-m-d");
|
|
|
|
$d1 = new DateTime($today);
|
|
|
|
$d2 = new DateTime($this->eol_date());
|
|
|
|
|
|
|
|
if ($this->eol_date() > $today) {
|
|
|
|
$interval = $d2->diff($d1);
|
|
|
|
} else {
|
|
|
|
$interval = null;
|
|
|
|
}
|
|
|
|
|
|
|
|
return $interval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @return string
|
|
|
|
* This handles the status label "meta" status of "deployed" if
|
|
|
|
* it's assigned. Should maybe deprecate.
|
|
|
|
*/
|
|
|
|
public function statusMeta()
|
|
|
|
{
|
|
|
|
if ($this->model->assigned) {
|
|
|
|
return 'deployed';
|
|
|
|
}
|
|
|
|
return $this->model->assetstatus->getStatuslabelType();
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @return string
|
|
|
|
* This handles the status label "meta" status of "deployed" if
|
|
|
|
* it's assigned. Should maybe deprecate.
|
|
|
|
*/
|
|
|
|
public function statusText()
|
|
|
|
{
|
|
|
|
if ($this->model->assigned) {
|
|
|
|
return trans('general.deployed');
|
|
|
|
}
|
|
|
|
return $this->model->assetstatus->name;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @return string
|
|
|
|
* This handles the status label "meta" status of "deployed" if
|
|
|
|
* it's assigned. Results look like:
|
|
|
|
*
|
|
|
|
* (if assigned and the status label is "Ready to Deploy"):
|
|
|
|
* (Deployed)
|
|
|
|
*
|
|
|
|
* (f assigned and status label is not "Ready to Deploy":)
|
|
|
|
* Deployed (Another Status Label)
|
|
|
|
*
|
|
|
|
* (if not deployed:)
|
|
|
|
* Another Status Label
|
|
|
|
*/
|
|
|
|
public function fullStatusText() {
|
|
|
|
// Make sure the status is valid
|
|
|
|
if ($this->assetstatus) {
|
|
|
|
|
|
|
|
// If the status is assigned to someone or something...
|
|
|
|
if ($this->model->assigned) {
|
|
|
|
|
|
|
|
// If it's assigned and not set to the default "ready to deploy" status
|
|
|
|
if ($this->assetstatus->name != trans('general.ready_to_deploy')) {
|
|
|
|
return trans('general.deployed'). ' (' . $this->model->assetstatus->name.')';
|
|
|
|
}
|
|
|
|
|
|
|
|
// If it's assigned to the default "ready to deploy" status, just
|
|
|
|
// say it's deployed - otherwise it's confusing to have a status that is
|
|
|
|
// both "ready to deploy" and deployed at the same time.
|
|
|
|
return trans('general.deployed');
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return just the status name
|
|
|
|
return $this->model->assetstatus->name;
|
|
|
|
}
|
|
|
|
|
|
|
|
// This status doesn't seem valid - either data has been manually edited or
|
|
|
|
// the status label was deleted.
|
|
|
|
return 'Invalid status';
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Date the warantee expires.
|
|
|
|
* @return false|string
|
|
|
|
*/
|
2022-08-02 19:12:28 -07:00
|
|
|
public function warranty_expires()
|
2021-09-01 17:33:59 -07:00
|
|
|
{
|
|
|
|
if (($this->purchase_date) && ($this->warranty_months)) {
|
|
|
|
$date = date_create($this->purchase_date);
|
|
|
|
date_add($date, date_interval_create_from_date_string($this->warranty_months . ' months'));
|
|
|
|
return date_format($date, 'Y-m-d');
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Url to view this item.
|
|
|
|
* @return string
|
|
|
|
*/
|
|
|
|
public function viewUrl()
|
|
|
|
{
|
|
|
|
return route('hardware.show', $this->id);
|
|
|
|
}
|
|
|
|
|
|
|
|
public function glyph()
|
|
|
|
{
|
Squashed commit of the following:
commit 6bec573956922013dc19cee4840fcb14bcbb74f1
Merge: b6ad69fac 1fc5bb54e
Author: snipe <snipe@snipe.net>
Date: Mon Nov 11 13:54:09 2024 +0000
Merge pull request #15794 from snipe/check_for_file_on_asset_acceptance
Check that the file exists before trying to download stored EULA
commit 1fc5bb54e1ac036c44e4a6096b958f7e86674248
Author: snipe <snipe@snipe.net>
Date: Mon Nov 11 13:50:53 2024 +0000
Check that the file exists before trying to download
Signed-off-by: snipe <snipe@snipe.net>
commit b6ad69fac248658a964ea60dc8d3e909e32795f6
Merge: 357ef7e37 47b2cdb84
Author: snipe <snipe@snipe.net>
Date: Sun Nov 10 18:05:20 2024 +0000
Merge pull request #15793 from snipe/allow_eol_explicit
Allow user to specify null for calculation or explicit on bulk edit
commit 47b2cdb8469e6d4904f9ad3ffb34bdc6d9a196db
Author: snipe <snipe@snipe.net>
Date: Sun Nov 10 18:04:13 2024 +0000
Allow user to specify null for calculation or explicit on bulk edit
Signed-off-by: snipe <snipe@snipe.net>
commit 357ef7e3757712307417b5533785d839c0fb58a9
Merge: 000f3171e 6928b1b27
Author: snipe <snipe@snipe.net>
Date: Sun Nov 10 17:48:25 2024 +0000
Merge pull request #15792 from snipe/edit_eol_from_bulk
Added EOL date to bulk asset edit
commit 6928b1b273667f1b36c97183e167da0418c39dd6
Author: snipe <snipe@snipe.net>
Date: Sun Nov 10 17:47:10 2024 +0000
Added eol date to bulk asset edit
Signed-off-by: snipe <snipe@snipe.net>
commit 000f3171e39bcdbbb79a12296aa3f6326101d22f
Author: snipe <snipe@snipe.net>
Date: Fri Nov 8 10:28:01 2024 +0000
Upgrade jspdf-autotable from 3.8.3 to 3.8.4 #15786
Signed-off-by: snipe <snipe@snipe.net>
commit 5ef3183a5261bfe74df7e5616bb2d54b9c64f37c
Merge: a41529dbc 050831868
Author: snipe <snipe@snipe.net>
Date: Thu Nov 7 11:44:06 2024 +0000
Merge pull request #15783 from uberbrady/improve_user_and_location_manager_indexes
Improved indexes on manager_id for locations and users, including del…
commit 050831868e96722753ef15228d794f8343da5548
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Thu Nov 7 11:39:27 2024 +0000
Improved indexes on manager_id for locations and users, including deleted_at
commit a41529dbc4798d635739bdb77b8ffb8955049c89
Merge: aa168fcb5 4fcf5ac7d
Author: snipe <snipe@snipe.net>
Date: Wed Nov 6 21:22:45 2024 +0000
Merge pull request #15780 from uberbrady/add_manager_indexes
Add new indexes to locations and users for faster manager lookups
commit 4fcf5ac7dae2819e6b19d1d63d7d865d08d056be
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Nov 6 21:19:41 2024 +0000
Add new indexes to locations and users for faster manager lookups
commit aa168fcb5b7d9c9d0c600ca2d7160985ce1a240f
Author: snipe <snipe@snipe.net>
Date: Wed Nov 6 18:41:52 2024 +0000
Updated BS table to 1.23.5
Signed-off-by: snipe <snipe@snipe.net>
commit 9c1c93ad52112a53c7c1e4d502f04091b118c125
Merge: b96a31253 ad99b8b45
Author: snipe <snipe@snipe.net>
Date: Wed Nov 6 18:40:35 2024 +0000
Merge pull request #15774 from marcusmoore/feature/sc-27350
Added Checkout ID column to user accessory table
commit ad99b8b456968c2385f288b20d20d30d41d847b6
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Nov 6 10:37:31 2024 -0800
Use generic ID translation
commit b96a31253902a4d702de318b381098f66e474fb8
Merge: 654f67b6a bab1e58ea
Author: snipe <snipe@snipe.net>
Date: Wed Nov 6 18:29:22 2024 +0000
Merge pull request #15779 from ubc-cpsc/bugfix/CVE-2024-50345
Fixes CVE-2024-50342, CVE-2024-50345, CVE-2024-51736
commit bab1e58ea4dc0715478e8feef1aa562d1ab9ce82
Author: Joël Pittet <pittet@cs.ubc.ca>
Date: Wed Nov 6 09:46:11 2024 -0800
symfony/http-client CVE-2024-50342, symfony/http-foundation CVE-2024-50345, symfony/process CVE-2024-51736
commit 654f67b6ac4537794ec134fa96ee924075875b5e
Author: snipe <snipe@snipe.net>
Date: Wed Nov 6 14:05:42 2024 +0000
Updated webpack
Signed-off-by: snipe <snipe@snipe.net>
commit 3965bcd7c116bdde2649e38d96531808d811962b
Merge: 287f4addf 2362cb5e5
Author: snipe <snipe@snipe.net>
Date: Wed Nov 6 14:02:44 2024 +0000
Merge pull request #15773 from Godmartinz/Fix_failing_failing_tests
Fixed notifications for licenses and asset to asset checkoutables
commit 2362cb5e5221ecae78c6aaf28bf8380f5ae20de2
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Nov 4 16:32:46 2024 -0800
refactor to getNotifiables
commit e7cb4a75eb5cd0d32524bcae0d53d184415acff5
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Nov 4 15:56:53 2024 -0800
Show accessory checkout id in user accessory table
commit 93494ac55447b062b80918d84a80e38c5dbd2c3d
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Nov 4 15:17:58 2024 -0800
put dataprovider back in for tests
commit 0d707a18512aa8e01c242d6d5486b675754ed5ed
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Nov 4 15:13:10 2024 -0800
fixes notifications for licenses and asset to asset checkouables
commit 287f4addf026f44467376bada0222aa4e489eb0f
Merge: f32ebdc7a 2e96d478f
Author: snipe <snipe@snipe.net>
Date: Mon Nov 4 20:06:24 2024 +0000
Merge pull request #15771 from snipe/revert-15744-chore/action-tests-debugging
Revert "Added the display of logs when tests fail in GitHub Actions"
commit 2e96d478f15c433c5628e3307cd323fcd8a765ac
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Nov 4 11:04:17 2024 -0800
Revert "Added the display of logs when tests fail in GitHub Actions"
commit f32ebdc7acc370ab8d6f0e07a3f8ee59981d1491
Merge: 5897d37fc d6c7dc8e1
Author: snipe <snipe@snipe.net>
Date: Thu Oct 31 22:39:58 2024 +0000
Merge pull request #15765 from marcusmoore/chore/add-missing-livewire-file
Added missing Livewire file
commit d6c7dc8e1c99c5421c149543a22b8cec0784ba7f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 31 15:37:01 2024 -0700
Add missing livewire file
commit 5897d37fcfd3c79afeef72e095d32145e90798bc
Merge: 49de07045 21a27dcac
Author: snipe <snipe@snipe.net>
Date: Thu Oct 31 20:54:01 2024 +0000
Merge pull request #15763 from Godmartinz/no_to_email_check
Fixed emails not being send if target has no email or if not instance of User. Cc_emails will still be sent.
commit 21a27dcac11a696a28d35a20d32e5381faa10e43
Merge: 379138076 49de07045
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 31 12:55:46 2024 -0700
fixed conflicts
commit 3791380764fa0ddffeb94d5c5b14d1ae2357bab6
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 31 12:52:47 2024 -0700
remove unused uses
commit 7a0f79ecd222b23f9e874c354b5881dcaba9d2db
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 31 12:51:22 2024 -0700
remove test route
commit 97a449e80ece3e553ec12064e74eae9e291f30f6
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 31 12:50:13 2024 -0700
removes instanceof User check
commit e65942064e3b555885e575aa22315ff02801bde9
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 31 12:45:29 2024 -0700
send emails even if target has no email
commit 49de07045ad48893daad9ea116b517145a711433
Merge: 7e996c40f 73772a013
Author: snipe <snipe@snipe.net>
Date: Thu Oct 31 17:53:17 2024 +0000
Merge pull request #15731 from Godmartinz/refacto_ms_teams_notifs
Fixed MS Team Notifications to utilize workflows after deprecation
commit 7e996c40f5770b608b36af035c0118c83fd07864
Merge: 73e8f160c 69e74bbdd
Author: snipe <snipe@snipe.net>
Date: Thu Oct 31 02:51:42 2024 +0000
Merge pull request #15758 from snipe/jerm/fix-deprecation-warning
Fix ${var} deprecation warning in License model
commit 69e74bbdd39201fad43216a0520d771a58554021
Author: Jeremy Price <jeremy@grokability.com>
Date: Wed Oct 30 19:43:54 2024 -0700
Fix ${var} deprecation warning in License model
When upgrading to php8.3 i started getting deprecation warning about
using ${var} instead of {$var} in 2 places in License.php
PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 187
PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 219
This simple fix switches the offending statements to {$var} syntax.
commit 73e8f160cf078e3dbc69cf032a899cf6fa8d8739
Merge: f68df1fa0 bd23772fe
Author: snipe <snipe@snipe.net>
Date: Wed Oct 30 19:29:09 2024 +0000
Merge pull request #15756 from Godmartinz/cc-email-array
changes `admin_cc_email` validation to allow an array
commit bd23772fe96dc33db62c0fd286a095d4c99e2067
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 30 11:42:15 2024 -0700
changes cc_email validation to allow array
commit 73772a01381ea654bf7cca48860e61551f363295
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 30 11:12:31 2024 -0700
change button text
commit b26cae372cad814dac2a40467aaa122c58c93787
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 30 10:40:23 2024 -0700
merged in develop
commit d6ba303f39c6b5d00aabfdc61a8aadd74c7ca7bf
Merge: 9a0eee8f0 f68df1fa0
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 30 10:27:45 2024 -0700
Merge branch 'develop' into refacto_ms_teams_notifs
# Conflicts:
# app/Listeners/CheckoutableListener.php
commit f68df1fa063125eb1b3f6e5a44b7e5156148c1e4
Author: snipe <snipe@snipe.net>
Date: Wed Oct 30 13:21:13 2024 +0000
Made type searchable in action logs
Signed-off-by: snipe <snipe@snipe.net>
commit f0813e03bf95f3ab53e650ebb8f7128b7fc90164
Merge: 05875ebd1 58ff641f8
Author: snipe <snipe@snipe.net>
Date: Wed Oct 30 12:18:41 2024 +0000
Merge pull request #15681 from Godmartinz/seperating_notification_n_mail
Separated Notifications and Emails: Check ins and Check outs
commit 05875ebd1fcea7366288de8833adfcedd66a309c
Author: snipe <snipe@snipe.net>
Date: Mon Oct 28 22:04:35 2024 +0000
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
commit 9a0eee8f03fa06ba67476996741faffe5cf248e7
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 15:03:43 2024 -0700
revert testing variables
commit 6128765d1f88215c9aa0e528ae2def74cba9bf4c
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 15:03:03 2024 -0700
change wording on notification button
commit c24f79c025cde958335981252d47285e347aae98
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 14:58:43 2024 -0700
update method comment
commit e7c4343c902961268792bd4951930cec56959384
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 14:56:48 2024 -0700
readd checkin accessory format
commit c0620c27ff74ceb66ce23a75431d8f2184eb91e0
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 14:30:34 2024 -0700
adds back laravels channel formats
commit ed81973fe649355a687dfd5dc70b60d9fdb997c3
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 13:57:42 2024 -0700
adds notifications for deprecation
commit 2d318b394c98954c51e9a6457ccf570487e47ae4
Merge: 86d784bd5 5c4971612
Author: snipe <snipe@snipe.net>
Date: Mon Oct 28 18:41:49 2024 +0000
Merge pull request #15744 from marcusmoore/chore/action-tests-debugging
Added the display of logs when tests fail in GitHub Actions
commit b987b3dc005400e2c5042fc47be7d134e86c4314
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Oct 28 10:57:48 2024 -0700
adds back the laravel channels package and applies a deprecated check
commit 5c49716129950b19b503c0d05456ea83c2119755
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 28 10:24:35 2024 -0700
Dump logs on test failure
commit 86d784bd598393919a7b60a4845d6e47d1931de0
Author: snipe <snipe@snipe.net>
Date: Mon Oct 28 13:37:59 2024 +0000
Fixed #15740 - use non-translated strings for icons
Signed-off-by: snipe <snipe@snipe.net>
commit 589f9cccdf1f4af8956f527728678e2b2316d723
Author: snipe <snipe@snipe.net>
Date: Mon Oct 28 12:04:10 2024 +0000
Fixed #15732
Signed-off-by: snipe <snipe@snipe.net>
commit 4d848e45e6c58aec7cb3d5fc32b5bdab7ddf1bd0
Author: snipe <snipe@snipe.net>
Date: Mon Oct 28 11:55:24 2024 +0000
Fixed #15736
Signed-off-by: snipe <snipe@snipe.net>
commit 58ff641f822eec54ebd40c9904c26034e215c550
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 22:53:53 2024 -0700
removed unused variables
commit ce68f550d8edf633d01af476fd95f1161b474e44
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 16:01:17 2024 -0700
remove alert emails from cc
commit 6f0c1b12b18901bc335bfdda328777399436386c
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 15:04:54 2024 -0700
this adds check out message for consumables
commit 278bc5e52a133189cfaf5348d709dcf229229e2f
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 14:59:10 2024 -0700
ads check in and checkout message for license seats
commit cce75a81859d3ff36dee19cf7d0278c17b711549
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 14:48:23 2024 -0700
adds check in and checkout messag for accessories
commit e27ff13377f8f783b7230287736eeff63e24c75d
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 14:39:40 2024 -0700
adds check in and checkout message for assets
commit 56365495a1c3b38443772a8ab6d3cc5f9815691c
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 14:26:42 2024 -0700
remove unnecessary fields in accessory checkout mail
commit 18da80e6de14f285f59012c75696f55be617a2d4
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 14:24:00 2024 -0700
fix checkoutable listener for microsoft teams
commit 18760e3fa19d4d37cf16995a4ba5f0b56ba3771a
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 12:21:51 2024 -0700
replaces teams notification package, passes integration test
commit 57107c487cce4f5520b8cfb97408e8c9f02d6547
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 24 09:40:10 2024 -0700
fixed last test, definetly the last test
commit dfc63641dca2b0a19f632f73733c5bf015517815
Merge: 07a51ec8b b6340532d
Author: snipe <snipe@snipe.net>
Date: Thu Oct 24 11:40:50 2024 +0100
Merge pull request #15550 from uberbrady/fix_multi_create_partial_failure
Fix multi create partial failure (fixes: [RB-18591])
commit 07a51ec8b128aca554b44af9e9b030f284769650
Merge: e0ec6795b 727c0e458
Author: snipe <snipe@snipe.net>
Date: Thu Oct 24 10:03:10 2024 +0100
Merge pull request #15712 from Godmartinz/fix_import-progress-bar
Upgraded `livewire v3.5.9 => v3.5.12`
commit 6329f5b87e9dd2ff852073aa290e2930b2f78c10
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 17:33:23 2024 -0700
removed unused variable from test
commit e0ec6795b57406e100fc80af4b5799eb6b00b757
Author: snipe <snipe@snipe.net>
Date: Thu Oct 24 01:27:50 2024 +0100
Use crucial for seeded data
Signed-off-by: snipe <snipe@snipe.net>
commit 15073a0d3885dc18609158943254317a2394d9d7
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 17:27:37 2024 -0700
last test to fix
commit a80c09c16d256d67592e35fdde2bd165ff7090bb
Merge: ab3b9c451 5509d756b
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 17:23:55 2024 -0700
Merge branch 'develop' into seperating_notification_n_mail
commit 5509d756b7d410f5ec98c599c87ad530003b2cb4
Merge: 55ba6279a b16a978f1
Author: snipe <snipe@snipe.net>
Date: Thu Oct 24 01:12:11 2024 +0100
Merge pull request #15722 from Godmartinz/fix_component_factory
Fixed Component Factory: use manufacturer factory for `manufactuer_id`
commit b16a978f1b5c11c949f9caff4e297628a21d0511
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 16:25:51 2024 -0700
uses manufacturer factory for manufactuer_id
commit ab3b9c45106fb68522f3832863f6e16c8f4856f7
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 16:24:01 2024 -0700
remove unnecessary code from checkinasset notification
commit 2cc2b2b1dfc3c4040a223c052d4cfff0175b3f0c
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 16:06:27 2024 -0700
apply array_filter to cc emails to prevent errors
commit 62d06b44d634155aff0035dd4340a03f86479918
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 15:43:42 2024 -0700
set fallback from email address to service.snipe-it.io
commit f29a3831796ea5b8e73e17bb4a45919701f221bd
Merge: fd74c3510 55ba6279a
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 15:15:14 2024 -0700
Merge branch 'develop' into seperating_notification_n_mail
# Conflicts:
# app/Notifications/CheckoutConsumableNotification.php
commit fd74c35102b19ec99118c84e6e8339003936aa0e
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 15:08:29 2024 -0700
remove old notify by mail from consumable notification
commit c681946b1df9f27242d03ae0dcd2342b1b11fdd3
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 15:05:39 2024 -0700
added component markdown changes
commit 257d25bd9eb1a3114c57c87aad90debc389543b6
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 14:56:54 2024 -0700
removed import notification from test, feature is not present in project
commit 6c34a5c52c8e5391dab246c69a41ad118cfb0cc5
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 14:54:21 2024 -0700
conditionally check cc emails, initiate variables
commit 1b5f4415ae11de482d79f3889db5e71b33e70f99
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 23 14:44:45 2024 -0700
corrected cc email behavior
commit 55ba6279a4f841d8c3f800bec90b52067e403fc5
Author: snipe <snipe@snipe.net>
Date: Wed Oct 23 19:14:17 2024 +0100
Use trans_choice on alert menu
Signed-off-by: snipe <snipe@snipe.net>
commit a9eea830e30f75a4b46648d3bf99d9aa54f07c99
Author: snipe <snipe@snipe.net>
Date: Wed Oct 23 19:05:34 2024 +0100
Added manufacturer and model number to component seeders
Signed-off-by: snipe <snipe@snipe.net>
commit af564935d5405e545412210a8a9cfb90c1836948
Merge: d58f87862 3ee76be7e
Author: snipe <snipe@snipe.net>
Date: Wed Oct 23 17:56:04 2024 +0100
Merge pull request #15720 from snipe/15695_adds_manufacturer_and_model_number_to_components
Fixed #15695 - Added manufacturer and model_number to components
commit 3ee76be7e37311fc1d835ca8350fbdb8481b6d23
Author: snipe <snipe@snipe.net>
Date: Wed Oct 23 17:50:22 2024 +0100
Added manufacturer and model_number to components
Signed-off-by: snipe <snipe@snipe.net>
commit d58f87862c8b9dedc65b85f9e37601e6aa366a90
Merge: 5da3ce356 0b6859c49
Author: snipe <snipe@snipe.net>
Date: Wed Oct 23 15:09:50 2024 +0100
Merge pull request #15719 from snipe/#15717_adds_qty_to_consumable
Fixed #15717 - Added ability to checkout consumables in variable qty via API
commit 0b6859c49180c0cb76fa9a7fbdb87286d82815b1
Author: snipe <snipe@snipe.net>
Date: Wed Oct 23 15:05:35 2024 +0100
Added ability to checkout consumables in variable qty
Signed-off-by: snipe <snipe@snipe.net>
commit 1e9922a0b08cf2ee0d14a10b734e4c44dd9942c7
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 16:14:36 2024 -0700
fix moar tests
commit ead27accacaefb08f0ed990c7d28843475d757e8
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 15:45:52 2024 -0700
fixed accessory tests and notifiable target
commit 727c0e458ceccc59f62667e28bb80204c219569c
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 14:34:39 2024 -0700
remove translation
commit 870dc747db51fa7e0f0ea7d4fac9d857f10191cd
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 14:27:32 2024 -0700
oops
commit 0fb3d83fac1df5f800da60a6471017010edea78b
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 14:26:54 2024 -0700
revert controller change
commit 0d59ccd6a66cf15a55afc1b92be8ab5e2a3679cb
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 14:23:26 2024 -0700
upgraded livewire v3.5.9 => v3.5.12
commit 5da3ce3564c1ea8860e101ddbebe15c825b6884a
Merge: c3bbca30a 5ecd2b629
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 22:10:20 2024 +0100
Merge pull request #15711 from marcusmoore/fixes/custom-fieldset-checkboxes
Fixed custom field checkboxes on asset edit page
commit c3bbca30adb33ebc15c7d2c27675d338a27928ef
Merge: dccb788a8 37f14fff3
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 22:07:50 2024 +0100
Merge pull request #15710 from snipe/fixes_lightbox_for_avif
Fixes #15701 - load avif files properly in lightbox
commit 37f14fff3b98ab23654706b2087eae2261e2931a
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 22:07:28 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
commit eb6c51fabdf755b488493bff2b1c4d52a3ba8b3f
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 22:04:57 2024 +0100
Fixes #15701 - load avif files properly in lightbox
Signed-off-by: snipe <snipe@snipe.net>
commit 5ecd2b62935489df9f6228d378d42a03cfcb17f0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 22 14:04:05 2024 -0700
Default checkbox elements to an empty array
commit 1e31592c553e49eab175531cf9aa3b02ce738812
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 22 11:49:06 2024 -0700
messing with the tests
commit dccb788a88497608289fbaf08aec8a106d9a8b49
Merge: 5e1d792bb d10fe77ee
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 17:44:30 2024 +0100
Merge pull request #15691 from marcusmoore/fixes/get-id-for-current-user
Updated `Company::getIdForCurrentUser()` to return null in certain scenarios
commit d10fe77ee7d6445379445024d5f6714159554652
Merge: e1882ee6d 5e1d792bb
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 22 09:38:31 2024 -0700
Merge branch 'develop' into fixes/get-id-for-current-user
commit 5e1d792bbaf5cdc140ecb4c53b054d20949a546b
Merge: 9cf71976f 780ed91a1
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 16:52:28 2024 +0100
Merge pull request #15687 from NebelKreis/fix/dashboard-title-casing
Fixed #15686: Corrected capitalization for dashboard section titles by removing strtolower()
commit 9cf71976f6b2865411f6fa8ae257c10c3e8a7e4c
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 16:51:42 2024 +0100
Fixed #15706 - Removed purchase order number from asset import
Signed-off-by: snipe <snipe@snipe.net>
commit 15745d9737f551ba0f04092c352ce65f5012870a
Merge: bd97955b9 3f74ff25d
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 16:39:44 2024 +0100
Merge pull request #15566 from Godmartinz/status-label-error-message
Fixed Status Labels Error Message
commit bd97955b9e21294aa409cdb9b701bf90261d3863
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 16:38:46 2024 +0100
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
commit 252d99421ca4dd707d456fc424f30316b10cd86d
Merge: 5767a98ad db8170162
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 16:26:48 2024 +0100
Merge pull request #15689 from snipe/better_handle_inline_files
Better handle inline files in file listing
commit 5767a98ad8abe738c4a18a9c33290ac4e3f5ceb1
Merge: 0c820cbc0 524a44272
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 16:26:23 2024 +0100
Merge pull request #15649 from bryanlopezinc/ImproveImporting
Improve import performance
commit 0c820cbc0da0c6bb05ec4f685a7eeeaa5156bf7d
Merge: 147fcfb8e 3153bbb13
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 15:56:12 2024 +0100
Merge pull request #15598 from spencerrlongg/bug/custom_field_validation_issue
Custom Field Existence Validation Issue
commit db8170162174b5688372e50005c5bd18b262508f
Merge: a05c33feb 147fcfb8e
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 15:44:24 2024 +0100
Merge branch 'develop' into better_handle_inline_files
commit a05c33febfb49b6a845e762817dd20e16db71d0e
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 15:43:19 2024 +0100
Squashed commit of the following:
commit 147fcfb8ebc4ceeea96d803d6a455abeba54f45a
Merge: 58a3d09b5 fdcc17ca2
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 15:12:55 2024 +0100
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
Fix user creation with FullMultipleCompanySupport enabled over API
commit 58a3d09b5fd7ffa979bfb9553cacbb24ae452462
Merge: 30a06a594 867fa2f36
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 14:55:42 2024 +0100
Merge pull request #15703 from marcusmoore/bug/sc-27188
Linked accessory files in activity report
commit 30a06a594289571097e2d30901546bc9a17b4bac
Merge: 6c6af78e0 ce3086317
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 11:47:06 2024 +0100
Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing
Removed brianium/paratest
commit 6c6af78e0840fc4f134e5bbb7965f21f4adcc0e1
Merge: 9b06bbb6c 3f79fd7ea
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 11:46:04 2024 +0100
Merge pull request #15705 from marcusmoore/tests/icon-component-test
Added test to ensure icon component does not end in newline
commit 3f79fd7ea744bd18134785c37b87a2f4bcff0347
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 17:07:40 2024 -0700
Add test to ensure icon component does not end in newline
commit 9b06bbb6c37fcea9b6202ad9fb2b4d952210dd01
Merge: 46ad1d072 d7f70146f
Author: snipe <snipe@snipe.net>
Date: Mon Oct 21 22:38:26 2024 +0100
Merge pull request #15704 from marcusmoore/bug/remove-extra-icon
Removed second icon in accessory file list
commit ce30863177e499a29f395c9c88ce9c67bd669a74
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 13:57:04 2024 -0700
Remove brianium/paratest dependency
commit d7f70146f4a886795ddb118cc2f71bbadded72dc
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 13:48:25 2024 -0700
Remove extra icon in accessory file upload list
commit 867fa2f36e02bdfe0ee74ae98b590fd013f6fc7a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 12:40:24 2024 -0700
Display file in activity report for accessories
commit 0933a2d4ea6d5babd6ef3e0e2f8350c2e088648d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 18:01:48 2024 -0700
Remove --parallel flag
commit 46ad1d072f5c45d20c1b078d2b3f84a3a0f36632
Merge: bcb4bd9eb 3cf746d7d
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 15:29:47 2024 +0100
Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions
Bulk checkout to bulk actions
commit bcb4bd9eb4e419e8a125a7dccd3e79c39dc13e21
Merge: 250037540 f50ccbcc4
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 10:20:13 2024 +0100
Merge pull request #15683 from Toreg87/fixes/outdated_comment
Fix outdated comment in CompanyableTrait
commit f50ccbcc492db6c98cabf6dc6752dd99ab82bce7
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Thu Oct 17 11:07:28 2024 +0200
Fix outdated comment in CompanyableTrait
As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment
commit 3cf746d7df83ef3e7cfa45c602fc182ebe8f11e3
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Oct 16 23:13:32 2024 +0100
Rework the bulk checkout to not change how all checkouts work
commit 6b7af802af41c92a36e77605415869c9e72ec192
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Thu Oct 10 13:28:23 2024 +0100
Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar
commit fdcc17ca2c33d38a7af505c99d9547e014f5f783
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Wed Oct 16 11:18:24 2024 +0200
Fix user creation with FullMultipleCompanySupport enabled over API
It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.
Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.
Signed-off-by: snipe <snipe@snipe.net>
commit 147fcfb8ebc4ceeea96d803d6a455abeba54f45a
Merge: 58a3d09b5 fdcc17ca2
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 15:12:55 2024 +0100
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
Fix user creation with FullMultipleCompanySupport enabled over API
commit 58a3d09b5fd7ffa979bfb9553cacbb24ae452462
Merge: 30a06a594 867fa2f36
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 14:55:42 2024 +0100
Merge pull request #15703 from marcusmoore/bug/sc-27188
Linked accessory files in activity report
commit 30a06a594289571097e2d30901546bc9a17b4bac
Merge: 6c6af78e0 ce3086317
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 11:47:06 2024 +0100
Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing
Removed brianium/paratest
commit 6c6af78e0840fc4f134e5bbb7965f21f4adcc0e1
Merge: 9b06bbb6c 3f79fd7ea
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 11:46:04 2024 +0100
Merge pull request #15705 from marcusmoore/tests/icon-component-test
Added test to ensure icon component does not end in newline
commit 3f79fd7ea744bd18134785c37b87a2f4bcff0347
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 17:07:40 2024 -0700
Add test to ensure icon component does not end in newline
commit 9b06bbb6c37fcea9b6202ad9fb2b4d952210dd01
Merge: 46ad1d072 d7f70146f
Author: snipe <snipe@snipe.net>
Date: Mon Oct 21 22:38:26 2024 +0100
Merge pull request #15704 from marcusmoore/bug/remove-extra-icon
Removed second icon in accessory file list
commit ce30863177e499a29f395c9c88ce9c67bd669a74
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 13:57:04 2024 -0700
Remove brianium/paratest dependency
commit d7f70146f4a886795ddb118cc2f71bbadded72dc
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 13:48:25 2024 -0700
Remove extra icon in accessory file upload list
commit 867fa2f36e02bdfe0ee74ae98b590fd013f6fc7a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 12:40:24 2024 -0700
Display file in activity report for accessories
commit e1882ee6d2a78506abfd371ba6e0d592ac487181
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 12:21:45 2024 -0700
Add comment
commit 7eee239378f1b4318557886d1e022540a10977af
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 12:20:28 2024 -0700
use is_numeric instead of is_int
commit 4188849ae17d52dd9befd349b56419eaea9f5287
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 12:19:48 2024 -0700
Add failing test case
commit 787e651778dbc04acf66cd77faf0386f5a137534
Author: snipe <snipe@snipe.net>
Date: Mon Oct 21 16:52:21 2024 +0100
Fixed todos with log message
Signed-off-by: snipe <snipe@snipe.net>
commit ef9b6e3b072f88bfec52c4ec930816d30eb34cb9
Author: snipe <snipe@snipe.net>
Date: Mon Oct 21 16:34:54 2024 +0100
Code cleanup
Signed-off-by: snipe <snipe@snipe.net>
commit 06c599cc17ca8f7a29515564e5cac9be905e338d
Author: snipe <snipe@snipe.net>
Date: Mon Oct 21 16:34:03 2024 +0100
Added method to show or download file
Signed-off-by: snipe <snipe@snipe.net>
commit 61053238777c38579c6188d2380f0cb7b99ae59e
Author: snipe <snipe@snipe.net>
Date: Mon Oct 21 14:11:20 2024 +0100
Use plural class name for src
Signed-off-by: snipe <snipe@snipe.net>
commit 0933a2d4ea6d5babd6ef3e0e2f8350c2e088648d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 18:01:48 2024 -0700
Remove --parallel flag
commit a8d853c44a38b50db05884843c614fe7b7342d60
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 15:26:27 2024 -0700
Remove focus group tags
commit 7e1b47708e7d44a2ad3bc7af93a38fc2dc6e72a9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 15:18:41 2024 -0700
Fix failing test ensuring company id is an integer
commit 979e4502ffbadab5978d38633fe06aa96eed698a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 15:14:39 2024 -0700
Have getIdForCurrentUser method return null if FMCS enabled, user is not super admin, and does not have company
commit ff113ef523f77fb887b939a23de3936f603812a6
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 14:56:58 2024 -0700
typo fix
commit 99dd51a965c7a02f8b24deddd1c233fac05f8465
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 14:53:18 2024 -0700
Improve name
commit 15c2169477e9691216d9f3fc2b8b8ddd2d8ee21a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 14:31:05 2024 -0700
Scaffold additional tests
commit 50fa6ce33588f466e90829fb59e8d91411c8d736
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 14:12:22 2024 -0700
Scaffold tests
commit 7ae76e7db9be7943ca473ab9ef30bda27b166aac
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 13:55:03 2024 -0700
remove viewdata array from 3 tests
commit b98058ca98e02b865fdf1488e83a49d4bf7df9c8
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 13:48:26 2024 -0700
fix tests pt 3
commit 83e8186d9e261efdde81ac56deeb9a799fdaa1e7
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 13:39:56 2024 -0700
fix assertSent to AssertNotSent on some test
commit cdd4fef7df6d49951aaa09ca597995b90a26f2ad
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 13:34:55 2024 -0700
attempt to fix tests p2
commit dceb8e305f55be79f3755a48bc3b4165dc79d43e
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 13:11:39 2024 -0700
attempt to fix tests
commit 123cdeb858a8148cd8210847fcb39e635b7dc2bf
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 12:39:48 2024 -0700
add email check to listener
commit 496b44e887078b6110f4e8e97e2b04bf22240677
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 12:28:57 2024 -0700
merged composer lock from dev
commit a690cc3582237fb6d40f8eaa3e3e83e7822574fc
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 12:26:55 2024 -0700
removing my composer stuff again..for the last time
commit ceb3f5cea629ed68fa4bfc119fefa2166456499c
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 12:19:50 2024 -0700
added mail-gun and http-client to 8.1
commit 65735a31f178c8bd4e1efabc7190a30e3500f5fd
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 12:18:34 2024 -0700
removed symfony/mailgun-mailer symfony/http-client
commit 285d6897cf83d2cac7e791fa50d23ec88f116849
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Oct 17 12:05:36 2024 -0700
added a coulple test adjustments and moved mail send logic to listener
commit 159a1d3f4356141844767c2c2593252b98df3b11
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 11:48:55 2024 -0700
Be more explicit
commit d1149730be99fdc8e59e91ce3b02c863a08d4aa1
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 16:31:17 2024 +0100
Apply blade component to files views
Signed-off-by: snipe <snipe@snipe.net>
commit 46ad1d072f5c45d20c1b078d2b3f84a3a0f36632
Merge: bcb4bd9eb 3cf746d7d
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 15:29:47 2024 +0100
Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions
Bulk checkout to bulk actions
commit 780ed91a1098ed9af2a5f8f95d6ac87a14e55b20
Author: NebelKreis <leipold.johannes@web.de>
Date: Thu Oct 17 16:09:25 2024 +0200
Fix: Removed strtolower() from dashboard titles
This fix ensures the correct capitalization in different languages.
commit bcb4bd9eb4e419e8a125a7dccd3e79c39dc13e21
Merge: 250037540 f50ccbcc4
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 10:20:13 2024 +0100
Merge pull request #15683 from Toreg87/fixes/outdated_comment
Fix outdated comment in CompanyableTrait
commit f50ccbcc492db6c98cabf6dc6752dd99ab82bce7
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Thu Oct 17 11:07:28 2024 +0200
Fix outdated comment in CompanyableTrait
As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment
commit 9a794833755ff5fb335ab6cf1e118a0d411b021e
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 16:59:18 2024 -0700
removed namespaces from routing
commit ed6034065b34797ba531782a207fe49384e0f465
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 16:47:36 2024 -0700
removed test route
commit a7754c1a7fd6559b5d512fbd520556c9d10b76aa
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 16:46:52 2024 -0700
fixed asset checkout markdown, and notifiable variable
commit 0e9b3c9119e77259ed2f8740ae98e9149936bd51
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:27:39 2024 +0100
Check for existence before trying to get the icon
Signed-off-by: snipe <snipe@snipe.net>
commit 4933aa5784e3a86021136775055d81eed7b3c966
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:27:04 2024 +0100
Add StorageHelper to app config
Signed-off-by: snipe <snipe@snipe.net>
commit d67addc69ee2fde2fdc9d90e1eefa13f1c1e4f26
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:21:43 2024 +0100
Removed filetype column - it’s dumb
Signed-off-by: snipe <snipe@snipe.net>
commit 02c80ff18af48c016433807b4bdc0f384ffde41a
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:18:40 2024 +0100
Added comment
Signed-off-by: snipe <snipe@snipe.net>
commit c01190fac279b38d8ee74a636d8cf9c2fd7a7285
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:18:34 2024 +0100
Conditionally add content-type
Signed-off-by: snipe <snipe@snipe.net>
commit 017884f8432abd3afed7397a7967bb2813df0262
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:09:09 2024 +0100
Added checks and filetype display
Signed-off-by: snipe <snipe@snipe.net>
commit c49921f50fc54785b87d59e6265b29088bba48fe
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:08:54 2024 +0100
Removed unused (maybe?) API endpoint
Signed-off-by: snipe <snipe@snipe.net>
commit c49abb6aeafbfbf43ebcb7e1a9c565288b72b9d9
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:08:38 2024 +0100
Refactor the UserFilesController show method for simpler inlining
Signed-off-by: snipe <snipe@snipe.net>
commit ccd20194484313c6e53bf357687ef8a29a4fffe6
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:08:04 2024 +0100
Removed unusded use statements
Signed-off-by: snipe <snipe@snipe.net>
commit 96191a5e9391e86701095b74fefc9064e4bf74d3
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:07:54 2024 +0100
Added method to decide if the file should be inlinable
Signed-off-by: snipe <snipe@snipe.net>
commit c56affd66345a92f64fb8c7451ced58b5340dd70
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 00:07:37 2024 +0100
Added SVG icon
Signed-off-by: snipe <snipe@snipe.net>
commit 02bda3cd9598d77ddd2c68f67f589f82e0af37b3
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:53:05 2024 -0700
adds Checkout Consumable mailable and slackwebhook channel to notifs
commit 02ff646da4388422d260ed50d8e93ea7bc57dab0
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:44:45 2024 -0700
adds checkin license mailable
commit 4becdca8aa792957243e5ca9a3dcf04cfa3ee522
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:39:20 2024 -0700
removes toMail from license notificaqtion
commit 2584d603445bb0a82e722cd8b7a3dbf7f1c1d020
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:38:49 2024 -0700
adds Licenses seat checkout Mailable
commit f1d83a3f281a7d17c2b8ca52ccaf8403cac4d246
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:30:53 2024 -0700
forgot to add asset checkout markdown to projet
commit c39df34bdfabb2acde4ab8aaba01cf5c65582675
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:29:50 2024 -0700
forgot to add accessory mail to project
commit dcdf600b785501d960ee6a8f99a46f9a6ba90b9f
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 15:27:34 2024 -0700
adds Checkin and Checkout mailables and listner logic
commit 3cf746d7df83ef3e7cfa45c602fc182ebe8f11e3
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Oct 16 23:13:32 2024 +0100
Rework the bulk checkout to not change how all checkouts work
commit 6b7af802af41c92a36e77605415869c9e72ec192
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Thu Oct 10 13:28:23 2024 +0100
Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar
commit 9710436d54fc23e79bf96b61430f3f0f3345581a
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 13:12:07 2024 -0700
adds Mailables for asset checkin and out
commit 16cffe9a9dd0cbce4f38d161a2b4cbebeaffde1c
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 12:53:35 2024 -0700
simplified checkout webhook call
commit 9e1b86f586f2942312105b0b37d69ee8ec34ca17
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 12:51:19 2024 -0700
sends checkout notification via webhook
commit 3ab2521cb0b8f61cb42a7b205a7836d7950046a6
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Oct 16 12:21:33 2024 -0700
email comes through, no picture and html markup appear though.
commit 604a9644624a52cd1aa965d92d36aa936840265d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Oct 16 11:52:24 2024 -0700
Improve scenario descriptions
commit 2f72c66614676efd205585e25d909424b136d869
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Oct 16 11:30:06 2024 -0700
Add additional case
commit fdcc17ca2c33d38a7af505c99d9547e014f5f783
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Wed Oct 16 11:18:24 2024 +0200
Fix user creation with FullMultipleCompanySupport enabled over API
It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.
Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.
commit cba1a560408c821c4112a2548a6df20755536efd
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 15 17:38:11 2024 -0700
Improve readability?
commit d9afde4610dd0527fb19fd52093f2d654ce36430
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 15 17:00:22 2024 -0700
Write failing test
commit 9f06a0e441940606de32279c428b24a8957186fb
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 15 14:01:28 2024 -0700
handle some edge cases, null values clean up variable names
commit 42095c0167b661d0f7a996a3bd17e0c0cfac5750
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 15 13:02:22 2024 -0700
Add reference link
commit f8476f713396027e7149e7306db2bfcc710d5e5c
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 15 12:49:52 2024 -0700
finished the construct and mail call in the listner
commit b29d032bf0250941a2a968c85c227bbee9449c81
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 15 11:28:27 2024 -0700
adds checkoutAssetMail class, and content method
commit 250037540038cb140c12cfe4cbf2aa9a7c0ffbdc
Merge: 16c8264e7 e4e1d0d50
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 17:34:35 2024 +0100
Merge pull request #15672 from uberbrady/ldap_location_fixes
Clean up how we use the '$location' in LDAP sync command
commit e4e1d0d50a4a3e418d1b736dac6221d437d88b66
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Tue Oct 15 17:26:31 2024 +0100
Clean up how we use the '$location' in LDAP sync command
commit 16c8264e766b56e24c33fea740847a48a91d2cc3
Merge: 914a64720 0ae9ce0aa
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 16:42:34 2024 +0100
Merge pull request #15671 from snipe/bug/sc-27147
Bug/sc 27147
commit 0ae9ce0aa9fe06b850183f15a668f366f6128565
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 16:41:45 2024 +0100
Cannot sort by updated at on Users [sc-27147]
Signed-off-by: snipe <snipe@snipe.net>
commit 50b8f180b3d1315e48d8d545c3b9c7153a768bdf
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 16:41:39 2024 +0100
More logical grouping in allow_columns
Signed-off-by: snipe <snipe@snipe.net>
commit 914a647204843f784edeffc358d50bd0175d2d14
Merge: 69b6080bd e9225ff3e
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 12:47:15 2024 +0100
Merge pull request #15669 from snipe/remlove_ou_requirenedess
Fixed #15663 - remove requiredness for OU
commit e9225ff3ea6952f83ec0cbda2749f0756d6f1de7
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 12:43:10 2024 +0100
Switch to regular HTML for input form field
Signed-off-by: snipe <snipe@snipe.net>
commit d0d4159088e4452ff18dcfb80e3746475caedc88
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 12:42:09 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
commit 69b6080bd865c6db78577d256627b894b28550cd
Merge: ddead359d b997d728f
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 10:31:29 2024 +0100
Merge pull request #15666 from snipe/updated_readme_llm
Added LLM note
commit b997d728fb508f00b28d1f5db7bdd7ecd6177c0b
Author: snipe <snipe@snipe.net>
Date: Tue Oct 15 10:30:34 2024 +0100
Added LLM note
Signed-off-by: snipe <snipe@snipe.net>
commit ddead359d055f1ebc52b2e3bbcf4004f8233800d
Merge: 0d35335da f3c4e5566
Author: snipe <snipe@snipe.net>
Date: Mon Oct 14 14:29:34 2024 +0100
Merge pull request #15660 from Toreg87/fixes/api_asset_create_fmcs2
Refactor asset creation with API
commit f3c4e556675d7dcd7920807bced18b3416b0b2ec
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Mon Oct 14 15:14:41 2024 +0200
Refactor asset creation with API
Commit fb4fe3004 restored the previous behaviour to check the company_id in case of FullMultipleCompanySupport.
But after rereading the code and the laravel documentation, the check is already there where it belongs in AssetStoreRequest::prepareForValidation()
The bug is the is_int-check of the request input in prepareForValidation(). Is is of type string even if it is a numeric value, so the call to getIdForCurrentUser() never happend.
Fix this by removing the check and the now redundant call to getIdForCurrentUser().
Wrong values will get caught by the model-level validation rules.
commit 0d35335da7df0d601d4221d1c2073478d3ab55b2
Author: snipe <snipe@snipe.net>
Date: Fri Oct 11 16:06:17 2024 +0100
Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
commit feaa71430493b46870203f31d0540a39b2355411
Author: snipe <snipe@snipe.net>
Date: Fri Oct 11 14:23:57 2024 +0100
Nicer disabled button
Signed-off-by: snipe <snipe@snipe.net>
commit e1a70023b167999defc72adf3d837d8ff2679e2a
Merge: de62359c6 fb4fe3004
Author: snipe <snipe@snipe.net>
Date: Fri Oct 11 11:45:48 2024 +0100
Merge pull request #15655 from Toreg87/fixes/api_asset_create_fmcs
Fixes #15654 Fix asset creation with API and FullMultipleCompanySupport
commit de62359c6734bdd01c1d3823b723be671ff0595b
Merge: 12bda8fc7 3dc64cc5e
Author: snipe <snipe@snipe.net>
Date: Fri Oct 11 11:29:34 2024 +0100
Merge pull request #15533 from marcusmoore/testing/fmcs-accessories
Added tests for accessory api controller
commit 12bda8fc7b756e7d930ed1a14b94f130d39f673a
Merge: 8aa298f6b b054017c9
Author: snipe <snipe@snipe.net>
Date: Fri Oct 11 11:27:18 2024 +0100
Merge pull request #15653 from snipe/15651_admin_user_on_maintenances
Fixed #15651 - admin user now displaying on maintenances page
commit fb4fe3004906acfc53a0d26e5e62569cb078d1e8
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Fri Oct 11 12:09:09 2024 +0200
Fix asset creation with API and FullMultipleCompanySupport
It is currently possible to create an asset with arbitrary company without being superuser and FullMultipleCompanySupport enabled.
This bug goes back to 75ac7f80b9 which is part of version 6.3.0.
Fix this by restoring the previous behaviour to check the company_id with getIdForCurrentUser().
commit b054017c9f422d37c32b137b49ce04dc2a4e9533
Author: snipe <snipe@snipe.net>
Date: Fri Oct 11 11:16:24 2024 +0100
Fixed #15651 - admin user now displaying on maintenances page
Signed-off-by: snipe <snipe@snipe.net>
commit 524a44272452d701e9da4d2e77ca10780f019f96
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com>
Date: Thu Oct 10 23:32:07 2024 +0100
Improved import performance
commit 8aa298f6b017c27feb5787a3d58dd9cd5023f419
Merge: 1f3465773 b5b93fdd3
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 12:30:53 2024 +0100
Merge pull request #15644 from snipe/form_requests_for_settings
Form requests for settings
commit 1f34657734f075286e6007c75cfb764637cb708c
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 12:30:35 2024 +0100
Fixed test
Signed-off-by: snipe <snipe@snipe.net>
commit 0856ee648ec8b55cf17cbbf46fddb8fb0cc05a21
Merge: 94a074a19 1dafc970d
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 12:23:14 2024 +0100
Merge pull request #15648 from snipe/update_packages
Updated livewire to 3.5.2
commit 1dafc970dfb517d710b57a39c25470249deeeb6f
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 12:19:57 2024 +0100
Updated livewire to 3.5.2
Signed-off-by: snipe <snipe@snipe.net>
commit 94a074a193cdcba198613906641cba57e3703890
Merge: 2d49e1eff b34a7c8aa
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 01:11:10 2024 +0100
Merge pull request #15601 from snipe/check_db_on_healthcheck
Fixed #15439 - check database on healthcheck
commit 2d49e1eff207dc37662d5a0f1017cf498c6f50c7
Merge: 705bc6f0c c2663ea1e
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 01:09:11 2024 +0100
Merge pull request #15637 from akemidx/bug/sc-26614
FIXED: Badge counter showing deleted assets on User page
commit 705bc6f0c0d5582cb8e3dcaed97561bfd613894f
Merge: 3ee571374 67a605c9a
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 01:08:25 2024 +0100
Merge pull request #15642 from uberbrady/fix_bulk_checkout
Fix bulk checkout to users, assets, and locations
commit b5b93fdd3a75bf72712b927b5c59c1e249c47f16
Author: snipe <snipe@snipe.net>
Date: Thu Oct 10 00:27:00 2024 +0100
Make ldap username required
Signed-off-by: snipe <snipe@snipe.net>
commit d9432baf7ad497e6b7104990401a4074b1d6fe80
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 23:51:20 2024 +0100
Mlore ldap style improvements
Signed-off-by: snipe <snipe@snipe.net>
commit 90be2a4498a71d55080663875e29ebd67cfdc433
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 22:26:30 2024 +0100
Use newer naming convention for errors
Signed-off-by: snipe <snipe@snipe.net>
commit 3886da8941b01af7d4f7c63a141ea2bde49854c3
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 22:15:49 2024 +0100
Remove form request from get LDAP method
Signed-off-by: snipe <snipe@snipe.net>
commit 130e0c6242e2590cb44d60437d8b7c0f4e3c7f67
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 22:15:37 2024 +0100
More validation
Signed-off-by: snipe <snipe@snipe.net>
commit 4361a108183b8b1ed473be8bfe8b7c27eda7a84c
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 22:15:30 2024 +0100
Added string
Signed-off-by: snipe <snipe@snipe.net>
commit aa8048ac15fc931825083070099b0ceee550f281
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 22:15:25 2024 +0100
Blade changes for ldap
Signed-off-by: snipe <snipe@snipe.net>
commit 710e738e8ef0d39f0ead49f8dd0604d201a11936
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 22:15:16 2024 +0100
Fixed tests
Signed-off-by: snipe <snipe@snipe.net>
commit 3705b914399054e29d4964371ca638524a427bed
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 20:51:34 2024 +0100
Added more validation
Signed-off-by: snipe <snipe@snipe.net>
commit 707bdad192416c9bd6be3fd221913df282601d55
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 20:33:56 2024 +0100
Updated test
Signed-off-by: snipe <snipe@snipe.net>
commit 242fe33f973131463c5ebb297b4d05aa50974c3c
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 20:33:42 2024 +0100
Switch to regular HTML input
Signed-off-by: snipe <snipe@snipe.net>
commit ded79469c1cdfe7ce8421b872da9945cf9ff569d
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 20:33:29 2024 +0100
Remove unused controller method
Signed-off-by: snipe <snipe@snipe.net>
commit d9fbf330e5302355b4c59d14fec7311e2375fb24
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 20:33:15 2024 +0100
Fixed translations
Signed-off-by: snipe <snipe@snipe.net>
commit 2cb9ac26cd4b5b79fc9c813a76a8a0043ef2fa6c
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:57:04 2024 +0100
Renamed test
Signed-off-by: snipe <snipe@snipe.net>
commit 185bc966e6c699e9ff4930a254c5c79405c0b836
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:46:47 2024 +0100
Cleaned up use statements in tests
Signed-off-by: snipe <snipe@snipe.net>
commit a7f7e4938ffb99217f9cbbc70cdf08a4a9bbf9cd
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:31:56 2024 +0100
Added form action
Signed-off-by: snipe <snipe@snipe.net>
commit 2883e791938812a54ad2e4865cfcabd40bbb5589
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:30:55 2024 +0100
Removed unecessary assets creation
Signed-off-by: snipe <snipe@snipe.net>
commit 9c4191ae0ac4c4d338f77cb6bd3ea71c66f0844d
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:30:42 2024 +0100
Basic tests
Signed-off-by: snipe <snipe@snipe.net>
commit 3a77b83e9c71bf60f52e4900670047764b453e62
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:30:34 2024 +0100
Added space
Signed-off-by: snipe <snipe@snipe.net>
commit d9be2b5a5e5cff6266c0ee54b5d2261885459f69
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:30:25 2024 +0100
Trying to use the email_array translation
Signed-off-by: snipe <snipe@snipe.net>
commit 69c43c610c87babcf3919a8bac8ac73f6533330b
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 19:30:00 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
commit 4f957bcf7191ce17bbc33b958a5b60968fb3264f
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 18:34:53 2024 +0100
Required flag
Signed-off-by: snipe <snipe@snipe.net>
commit 5cda7cce4830626f594de8cb4d4291c161916351
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 18:21:40 2024 +0100
Only accept a positive number for thresholds
Signed-off-by: snipe <snipe@snipe.net>
commit 41b94e7128c68af71f53e95ddd8bfbc242cde198
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 18:19:26 2024 +0100
Fixed form input group
Signed-off-by: snipe <snipe@snipe.net>
commit aa55fa6ff496d279ca271b4614a5f778e73ae808
Author: snipe <snipe@snipe.net>
Date: Wed Oct 9 18:16:34 2024 +0100
Switch to form requests for settings
Signed-off-by: snipe <snipe@snipe.net>
commit 67a605c9a5cf01f6028bf981a35664a399b43347
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Oct 9 17:01:26 2024 +0100
Fix bulk checkout to users, assets, and locations
commit c2663ea1e090c089ef58db872f9f2676891611e9
Author: akemidx <kojotek.dx@gmail.com>
Date: Tue Oct 8 16:38:33 2024 -0400
withouttrashed
commit 3ee5713740c9944dbcd1233c7f35bf51c0b5ca36
Merge: ab8a22f77 56e7ea667
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 23:13:15 2024 +0100
Merge pull request #15631 from snipe/test/importer-tests
Add importer tests
commit ab8a22f77e13ad86c4964787cfe9bf12d57c7a6f
Merge: 26d7572bc 8c9132aff
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 22:56:23 2024 +0100
Merge pull request #15630 from marcusmoore/bug/sc-27028
Only show EULA when available on print users page
commit 56e7ea6677ee9372a19adb30f8338995d9a245f3
Merge: 32551d55d 803532667
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 22:29:35 2024 +0100
Merge pull request #15616 from marcusmoore/test/importer-test-updates
Improve importer tests
commit 26d7572bcc36030f5d0b62d432a4f6bfd965d962
Merge: 382ebef8c ee046a868
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 22:28:53 2024 +0100
Merge pull request #15603 from marcusmoore/fixes/add-reguard
Added `Model::reguard()` to importer
commit 8c9132aff9be01a90ac53b16d87303bd912b24b0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 7 14:22:49 2024 -0700
Hide EULA text and button when nothing will be displayed
commit 382ebef8ca069767d9e340c7def62ca920537a91
Merge: 2be88cb95 f76da4844
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 21:26:21 2024 +0100
Merge pull request #15621 from sniff122/develop
Docker Env: Change trusted proxies to RFC1918
commit 2be88cb95517c09cb962069fd41d19ee76fead33
Merge: 7fc498a59 3f36d5f9b
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 11:14:24 2024 +0100
Merge pull request #15624 from snipe/fixed_line_break_on_print_all_for_users
Removed duplicate JS and removed line break before user section
commit 3f36d5f9b38d9adae796f01b930bccbe1b6406ed
Author: snipe <snipe@snipe.net>
Date: Mon Oct 7 11:08:02 2024 +0100
Removed duplicate CSS and removed line break before user section
Signed-off-by: snipe <snipe@snipe.net>
commit f76da48448e06a6008751bcf9b7148b15722b1b8
Author: Lewis Foster <lewis@sniff122.tech>
Date: Sat Oct 5 18:27:42 2024 +0100
Docker Env: Change trusted proxies to RFC1918
commit 8035326675e9a479c030687dc5a8079fd43e34f5
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 16:53:19 2024 -0700
Add test
commit dfdd85abb17422380499d20fe4596a759ff56e4c
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 15:14:07 2024 -0700
Remove unused imports
commit 063ea1892b3fecdd52ad8cd353c39038a8087de7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 15:02:03 2024 -0700
Add trait to clean up files after test runs
commit e21305377549886099d21b67f49d2abbccc42d91
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 13:59:58 2024 -0700
Swap factory syntax
commit 88d549e7c5ee8fd385d897be557dbbac60a66f73
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 13:40:37 2024 -0700
Remove unused data provider method
commit 983a25aa5f9004e05f27713fbef6e8f9302bb772
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 13:39:54 2024 -0700
Simplify permission tests
commit bde05d6ed9840d6e712e0f4a785f9c9166f352fd
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 13:15:49 2024 -0700
Use new() instead of times()
commit b5ffe54bd07bd6a14216e993142e9086fbdee9e7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 13:15:02 2024 -0700
Swap assertEquals parameter order
commit 863c0a8b609d9c407bf7ed038bcb7db0e40dd4df
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 3 11:43:02 2024 -0700
Fix import_type for accessory state
commit 32551d55d730271d6ab24b566b111d7e80a1e3b9
Merge: 7fc498a59 e807cfab8
Author: Marcus Moore <mmoore@grokability.com>
Date: Thu Oct 3 11:39:21 2024 -0700
Merge pull request #15579 from bryanlopezinc/ImportTests
Add Import data tests
commit 7fc498a5977d975d0e349cf3d09e473369c5881b
Merge: 78ca1026f cb281c640
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 17:39:18 2024 +0100
Merge pull request #15613 from snipe/css_fixes_for_long_values
Smarter word-wrapping on long text
commit cb281c6408bb81dd0fbcb8f65e0ad6fea090c154
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 17:33:46 2024 +0100
Tweaked line height
Signed-off-by: snipe <snipe@snipe.net>
commit f483cd448fdcf3dc75482a0e9029f0569fc3916d
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 17:27:37 2024 +0100
Smarter work-wrapping on long text
Signed-off-by: snipe <snipe@snipe.net>
commit 78ca1026fd4a02e949ac500cacd48ed2dd0b4ceb
Merge: 3699d7936 722d5a58e
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 16:24:32 2024 +0100
Merge pull request #15612 from snipe/fixes_print_assigned_in_profile
Fixes print assigned in profile
commit 722d5a58e719886282f908a11420fa88f9fed4fc
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 16:19:38 2024 +0100
Added isset on users
Signed-off-by: snipe <snipe@snipe.net>
commit 7461c3e0ca2af18ed989a5905c84c5710213f1fb
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 16:19:27 2024 +0100
Change controller to assume a collection. (This is dumb, but whatever)
Signed-off-by: snipe <snipe@snipe.net>
commit 3c0f4181ae994e6e33c4c15adbb6704be921c99f
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 16:19:06 2024 +0100
Use the newer button style
Signed-off-by: snipe <snipe@snipe.net>
commit 3699d79363cb578ba0689f66cc512a84f8d143eb
Merge: 54fbd0540 350b627ce
Author: snipe <snipe@snipe.net>
Date: Thu Oct 3 14:34:00 2024 +0100
Merge pull request #15610 from uberbrady/fix_numeric_sort_bug
Fix numeric sort 'ambiguous order clause' error
commit 350b627ce1a247b248845b8b85d2a802c8fb8f74
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Thu Oct 3 14:23:40 2024 +0100
Fix numeric sort 'ambiguous order clause' error
commit ee046a86885deecf15601acd65ee97fac1f6b54e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Oct 2 10:50:40 2024 -0700
Add matching Model::reguard()
commit b34a7c8aad07ce285e09cfcd4fb779c8c4295d3f
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 15:48:35 2024 +0100
Removed die()
Signed-off-by: snipe <snipe@snipe.net>
commit f92bf5dc2067cae2b533090f0c3a947d16fb4d50
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 15:39:27 2024 +0100
Updated language for failure
Signed-off-by: snipe <snipe@snipe.net>
commit 4d9e85026aa814bd5cba426c339f931cacdafd67
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 15:36:01 2024 +0100
Fixed #15439 - check database on healthcheck
Signed-off-by: snipe <snipe@snipe.net>
commit 54fbd0540d8600ba8f49681f158d4db4fea4e9cf
Merge: b483bb163 4db735808
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 12:40:49 2024 +0100
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
commit b483bb1633af5933fd8ac56a489bb8717fd14a5e
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 12:40:45 2024 +0100
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
commit 4db73580869fd4d05475f68152fb6f83304c83fc
Merge: 0dd6f41f6 b9cfdf2e5
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 12:38:46 2024 +0100
Merge pull request #15593 from Godmartinz/Fixed-divide-by-zero-bug
Fixed divide by zero bug in depreciation transformer
commit 0dd6f41f66c0e41ca8ac3561162f818b1af88540
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 11:04:55 2024 +0100
Simplified 2fa if/else
Signed-off-by: snipe <snipe@snipe.net>
commit 684c20ae393cc524821137fe442ce1f0b7a8873d
Author: snipe <snipe@snipe.net>
Date: Wed Oct 2 11:00:49 2024 +0100
Fixed parenthasis
Signed-off-by: snipe <snipe@snipe.net>
commit 3153bbb13fb2244a457135e7550f656a51a6ea20
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Oct 1 17:04:18 2024 -0500
dumb fix
commit 3dc64cc5e0465e60116e2afd9e04a865d8781199
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 1 13:35:39 2024 -0700
Reference accessory checkout and not the accessory
commit c32f4e34b4a233bdd2f812b0ff6ff1e2ba3a8523
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 20:35:49 2024 +0100
Minor formatting fix
Signed-off-by: snipe <snipe@snipe.net>
commit ca1886cebcc107b4ca4e31739cb556ad7a806caf
Merge: 45ab49eea a79dfea40
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 20:31:38 2024 +0100
Merge pull request #15594 from snipe/localizations/update-2024-10-01
Updated strings
commit a79dfea40a2a4776b9f7e6ae64453ef072e0870d
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 20:30:58 2024 +0100
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
commit 45ab49eeab1e995999337f060ac76c33ddb2dcc3
Merge: 97d00e5aa 8232618a9
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 20:26:42 2024 +0100
Merge pull request #15592 from spencerrlongg/bug/catch_request_notify_errors
Catch Errors Around Request Notifications
commit 8232618a9f8868cd1c5495fe301544fd3461a2d5
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Oct 1 14:26:32 2024 -0500
change the other one too
commit 9a651b567d0c3c463f781b8e5b87609113b0fdd0
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Oct 1 14:24:03 2024 -0500
change error to warning
commit 97d00e5aa87fb1581aa44829e8cbb5410e021ebd
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 20:08:54 2024 +0100
Fixed erroneous form tag on anchor
Signed-off-by: snipe <snipe@snipe.net>
commit 5b90d79494215f27f8d1f8b02e1d14c787f44a6a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Oct 1 11:50:48 2024 -0700
Use created_by
commit b9cfdf2e54bdc3571e64e3ddd9dcfdec68b98222
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 1 11:41:59 2024 -0700
reworked monthly depreciation variable value
commit 1139acd9f3e026a648e3d00b7cbf4036c17518c9
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Oct 1 13:36:47 2024 -0500
catch errors around request notifications
commit b7ad80bd319ad787990aee24dbcbb50bb175fa21
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 1 11:24:24 2024 -0700
fix monthly depreciation value
commit 5ffd1b8daaa06865119fe0913f41dfcdfaaa8c62
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 1 11:02:39 2024 -0700
fixes if statement in transformer
commit 9a2117466e04c68e8d9e813c494d248ec44b4951
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 18:23:40 2024 +0100
Removed placeholder
Signed-off-by: snipe <snipe@snipe.net>
commit 7e3a0629844446c23f2a215305764a30f32eba53
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 18:23:07 2024 +0100
Use <th> for table header in bulk interstitial
Signed-off-by: snipe <snipe@snipe.net>
commit d274fb696357f78dd107a38abcfdb0029f594899
Merge: cfc04a1d1 27ba641aa
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 14:32:48 2024 +0100
Merge pull request #15589 from snipe/adds_checkin_action_on_asset_delete
Adds checkin action on asset delete via View UI
commit 27ba641aa512c1ab869f8b62bb62c36c07efe12f
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 14:30:34 2024 +0100
Added checkin on delete to API
Signed-off-by: snipe <snipe@snipe.net>
commit 5823197e6fe2ec09448e41300d4b129e5435cf96
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 14:29:02 2024 +0100
Added checkin action on delete for checked out assets
Signed-off-by: snipe <snipe@snipe.net>
commit cfc04a1d12825245594a3da2df03367ccf7dd3e3
Merge: 12da43303 cae8aa784
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 14:08:58 2024 +0100
Merge pull request #15588 from snipe/added_more_maxlengths
Added maxlengths to additional fields
commit cae8aa78406c28d8b6c1cc40d79c05a42f38d988
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 14:02:54 2024 +0100
Added maxlengths to additional fields
Signed-off-by: snipe <snipe@snipe.net>
commit 12da43303f162feed2c68bfd9b181760ff1a5d8c
Author: snipe <snipe@snipe.net>
Date: Tue Oct 1 01:44:05 2024 +0100
Fixed #15584 - regression with required css change
Signed-off-by: snipe <snipe@snipe.net>
commit fdfea390fbdc619888c9f97cacc2a13fcffd3d29
Merge: d609ed50a 5689e940b
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 30 12:59:27 2024 -0700
Merge branch 'develop' into testing/fmcs-accessories
commit b04afbbc855927f491a9eeb5efbb9df520c01bf9
Merge: b964ce102 3f311ba2f
Author: snipe <snipe@snipe.net>
Date: Mon Sep 30 19:26:08 2024 +0100
Merge pull request #15564 from uberbrady/improve_autoclose
Get us better debugging output for new Github Stale Action
commit b964ce102556d3ec9c15b4d4301aaf7121d078e9
Merge: 6217cba20 68e3f375f
Author: snipe <snipe@snipe.net>
Date: Mon Sep 30 19:25:05 2024 +0100
Merge pull request #15583 from Godmartinz/remove-sortable-from-depreciations
Removed sortablity for current value column in depreciations report
commit 6217cba2017ef231cadd4b9b6554fb504d0e3dd3
Merge: 5689e940b b32ab6a06
Author: snipe <snipe@snipe.net>
Date: Mon Sep 30 19:24:19 2024 +0100
Merge pull request #15524 from Godmartinz/double-notif-bug
Fixed double webhook notifications // Separated email and webhook notifications.
commit 68e3f375fc1fecd0baf0e4a5346b05717e332749
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Sep 30 11:15:49 2024 -0700
removes sortablity from current value column
commit 5689e940b85e767fe109de28fd264bc632b6c8b5
Author: snipe <snipe@snipe.net>
Date: Mon Sep 30 18:23:12 2024 +0100
Fixed #15581 - missing bracker
Signed-off-by: snipe <snipe@snipe.net>
commit e807cfab869b558c4ee6f2bb72fb78b6e496d2b1
Merge: 0b3f45856 001348c63
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com>
Date: Mon Sep 30 12:47:52 2024 +0100
Merge branch 'develop' into importTests
commit 0b3f458561370fd6c825cc756c2de633c77326df
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com>
Date: Mon Sep 30 12:42:41 2024 +0100
Added tests for Import feature
commit 001348c6388b8daa05a5f4ed4e248639c06b4d67
Author: snipe <snipe@snipe.net>
Date: Sun Sep 29 14:33:42 2024 +0100
Unset required on checkout select :(
Related to the discussion at #15552
Signed-off-by: snipe <snipe@snipe.net>
commit 1b041af8625ce3a0107de6f68246308050f54800
Merge: 260b15368 d120585f9
Author: snipe <snipe@snipe.net>
Date: Sun Sep 29 11:25:01 2024 +0100
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 260b153689368a2936e55959d83621f1e4ae5c37
Merge: 36b27fcda 05d74f7a9
Author: snipe <snipe@snipe.net>
Date: Sat Sep 28 16:09:51 2024 +0100
Merge pull request #15573 from snipe/fixed_requiredness_indicator
Fixes for requiredness indicator in UI
commit 05d74f7a92c0afaa00e1a520983b90545c7f79d9
Author: snipe <snipe@snipe.net>
Date: Sat Sep 28 15:42:03 2024 +0100
Covered setup pages too
Signed-off-by: snipe <snipe@snipe.net>
commit dc85588d7f9cd3f0e485ea148eb491e10154909d
Author: snipe <snipe@snipe.net>
Date: Sat Sep 28 15:31:44 2024 +0100
Don’t show password as required if editing
Signed-off-by: snipe <snipe@snipe.net>
commit 585f998cae3bf8d812509fba7937cd28b9b4a5d0
Author: snipe <snipe@snipe.net>
Date: Sat Sep 28 15:28:06 2024 +0100
Fixes for requiredness display
Signed-off-by: snipe <snipe@snipe.net>
commit d120585f94f22e03692b86dd1a0d3ebed4bb1f82
Author: snipe <snipe@snipe.net>
Date: Fri Sep 27 14:07:30 2024 +0100
Check for valid eula for license, consumable
Signed-off-by: snipe <snipe@snipe.net>
commit 166a700342eddf283370bc15b72d7f9e3d681431
Merge: 6c85ba349 36b27fcda
Author: snipe <snipe@snipe.net>
Date: Fri Sep 27 13:37:28 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 36b27fcda3b3fc0978a951a78f88f6e62796fb87
Author: snipe <snipe@snipe.net>
Date: Fri Sep 27 13:37:14 2024 +0100
Check for valid category before getting the eula
Signed-off-by: snipe <snipe@snipe.net>
commit a44490e44868ba992c784af12d516172e89c2ecd
Author: snipe <snipe@snipe.net>
Date: Fri Sep 27 13:07:24 2024 +0100
Nowrap on files column
Signed-off-by: snipe <snipe@snipe.net>
commit 9aada2ec701cadbe6eeb8ec77d0f2954511cf3a2
Merge: ac6411743 ef82f954e
Author: snipe <snipe@snipe.net>
Date: Thu Sep 26 09:09:35 2024 +0100
Merge pull request #15498 from Godmartinz/Modal_fix
Refactoring modals with partials and fixing misalignments
commit 3f74ff25d2e0ddc259c6d397150ff6d5ac42d6ed
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 25 16:19:09 2024 -0700
fixed error message
commit ef82f954e538d8afb6e765aadcffe79b914c276a
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 25 15:47:57 2024 -0700
fixed required css, and user input lengths
commit 3f311ba2fb37c19a4f728720b06a5bfee9ded63d
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 25 21:27:45 2024 +0100
Get us better debugging output for new Github Stale Action
commit 96953aa2edeacd13a05da471cf03f5608b561d96
Merge: e609b3976 b797c37ac
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Sep 25 12:50:01 2024 -0700
Merge pull request #23 from Godmartinz/Modal_fix_p3
replace duplicate code with partials
commit b797c37acba1801e52945202620fdb12e20e0796
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 25 12:48:05 2024 -0700
replace duplicate code with partials
commit 6c85ba3495a005be6a413e014c51b25a820db31a
Merge: 9f8473e25 ac6411743
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 20:45:02 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ac6411743bab13cb5b6a63c0b5312bdc494acba0
Merge: 9b03f4649 3f0245f88
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 20:35:58 2024 +0100
Merge pull request #15563 from snipe/refined_gates_on_user_bulk
Update for #15534 - Refined gates on user bulk
commit 3f0245f88f03b7e7ec3e7903a6b88027c5e5c01d
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 20:33:00 2024 +0100
Make controller gate match dropdown gate
Signed-off-by: snipe <snipe@snipe.net>
commit c02647a0fa025d9807b242a4707a2525e578000c
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 20:32:03 2024 +0100
Moved merge into delete gate, since they do technically delete
Signed-off-by: snipe <snipe@snipe.net>
commit edca3f432ce1384e0b087d8209787e60beac1219
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 20:30:58 2024 +0100
Removed gate for delete
Signed-off-by: snipe <snipe@snipe.net>
commit 2218c94aa30fe83c460239cfdb4044c49e79baf6
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 20:29:23 2024 +0100
Gates the dropdown based on user permissions
Signed-off-by: snipe <snipe@snipe.net>
commit e609b39760ff48e2b5b7d51a4e31d47a7d57f272
Merge: 0bc98e971 12522a379
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Sep 25 12:09:26 2024 -0700
Merge pull request #22 from Godmartinz/Modal_fix_p2
Modal fix p2
commit 12522a3791a0705340f999b7a665d0ea45aa5918
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 25 12:07:15 2024 -0700
fix spacing issues
commit f6d7ea19e4df08cb80c3875060d5b51333e9f025
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 19:44:39 2024 +0100
Set view as base permission, drill down for more intrusive actions
Signed-off-by: snipe <snipe@snipe.net>
commit 18ddffe8f96deeecd84b1098f3f83d034c923e5d
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 25 11:42:16 2024 -0700
fix partial variable intialization, fix width of input fields
commit 9b03f4649051998b95feb0a54b83a0f00c483c8b
Merge: cb6e5042d fac4833b5
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 19:32:01 2024 +0100
Merge pull request #15534 from marcusmoore/bulk-print-users
Added the ability to bulk print users
commit 926a319552eff366f68081d828362fa1e6977a05
Merge: 0bc98e971 cb6e5042d
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 25 11:10:24 2024 -0700
Merge branch 'develop' into Modal_fix_p2
commit 9f8473e254b858042fb0ec1c89edb57fc3f93707
Merge: 0e61d0b19 cb6e5042d
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 18:36:40 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit cb6e5042d91b4dd6711964377bd328ca7088194f
Merge: c1a887b48 ba69259f2
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 18:32:59 2024 +0100
Merge pull request #15547 from snipe/disallow_checkout_with_nondeployable_status
Fixed #13396 - do not allow checkout to undeployable status types
commit c1a887b48b9f6d8c482ebe93e940cfc3d76d7d49
Merge: ba1220484 658c94ad8
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 18:32:21 2024 +0100
Merge pull request #15561 from snipe/fixes/adds_action_date_to_sorting
Changed `action_date` to `created_at` in activity report
commit 658c94ad8b31495c37ec100b39e1daaab1f253b2
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 17:25:15 2024 +0100
Changed action_date to created_at
Signed-off-by: snipe <snipe@snipe.net>
commit 0e61d0b195557e88fb698d16b5ee9a51625f4262
Merge: abdddbec4 ba1220484
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 15:51:38 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ba12204842b68a5fa57aa1e24f9084d38e897890
Merge: eeabc8dc9 1c3babaca
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 15:51:14 2024 +0100
Merge pull request #15555 from snipe/fixes/user_file_upload
Fixed case on `$logAction` for user file upload
commit 1c3babacaf9401c4559e24623722d81b44c6e2b4
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 15:46:57 2024 +0100
Fixed case on logAction for usewr file upload
Signed-off-by: snipe <snipe@snipe.net>
commit abdddbec448c4912a2c0fbcd2c769953b491bc5d
Merge: a425c2b76 eeabc8dc9
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 11:58:25 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit eeabc8dc9d0adf5d2069c3b152fca2a6eb33bd2a
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 11:33:45 2024 +0100
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
commit 21f8ac8e52205777dc8775604a8592b9a41c23a7
Merge: c38222e95 2a2666be0
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 11:31:23 2024 +0100
Merge pull request #15552 from Godmartinz/ragged-form-inputs
Fixed input field misalignments
commit a425c2b765f893789be1f624518a8ea3ae711547
Merge: 34eb10ff7 c38222e95
Author: snipe <snipe@snipe.net>
Date: Wed Sep 25 10:52:19 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 2a2666be0b4210075ac1786ffb9e8cbfa6dbd632
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Sep 24 13:24:50 2024 -0700
makes required a pseudo field
commit c38222e9569548d0981e576156bd58f4b778452c
Merge: 8cf1e4dce 0ce5832b6
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 18:10:53 2024 +0100
Merge pull request #15549 from snipe/fixes/#15548_unify_audit_api_endpoints
Fixes #15548 - unify audit api endpoints
commit 0ce5832b6cbed103433664fd9aa08cef2c1fd796
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 17:29:40 2024 +0100
Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
commit b6340532d7e34c31d65999e55440241935c6db60
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Tue Sep 24 17:15:39 2024 +0100
Improve the error and success messages and linking
commit 5fb43dd159b1af02c82f2b3a3f3530c9ca6612ec
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 16:55:56 2024 +0100
Handle `audit` *and* `audits` for urls
Signed-off-by: snipe <snipe@snipe.net>
commit de57d71bf12dc48bef933e6c64e23e8724996297
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 16:30:24 2024 +0100
Fixed #15548 - unify audit due/overdue APIs
Signed-off-by: snipe <snipe@snipe.net>
commit ba69259f2d2181d9bad2f9fb33d2e46c5137a8f8
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 15:35:00 2024 +0100
Fixed #13396 - do not allow checkout to undeployable status types
Signed-off-by: snipe <snipe@snipe.net>
commit c71411465a03499caf98937857e95ec489e865b4
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Tue Sep 24 15:17:35 2024 +0100
First pass at better-handling those annoying Rollbars we keep getting
commit 8cf1e4dceb7682b196592d09cf56817d6caa4295
Merge: ab0c009c0 66249a37e
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 11:10:20 2024 +0100
Merge pull request #15544 from snipe/bug/sc-26855
Fixed app settings view on mobile
commit 66249a37ed6ea5982d4aca91a2d4d77f5e61488b
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 11:08:31 2024 +0100
Tweaked styles
Signed-off-by: snipe <snipe@snipe.net>
commit 96712cb398d5d4142068166daddc5ce983a67041
Author: snipe <snipe@snipe.net>
Date: Tue Sep 24 10:55:26 2024 +0100
Fixed app settings view on mobile
Signed-off-by: snipe <snipe@snipe.net>
commit fac4833b58a8d5102fa97b365d753fb91447d848
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 17:15:16 2024 -0700
Remove unused import
commit a12c9d053ff6fc399e30287c246f24b392e0209a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 16:44:25 2024 -0700
Hide label when printing
commit 8b3b68b308b55d35894f25abdfa3421ad8f9d64e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 16:43:14 2024 -0700
Show or hide all eulas at once when printing multiple users
commit 4b02db5031cb4e8f850a9ea942e99efe449c8895
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 16:26:22 2024 -0700
Add authorization check in bulk users controller
commit ab90c0cf05c36796e69641f1ee6c8120df2a2c56
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 16:10:40 2024 -0700
Add missing eager load in bulk users controller
commit cef7ddc719a7f6fdc63b341038aa28b89cd2ead2
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 16:10:21 2024 -0700
Add eager loads to userscontroller
commit 3870095a28784d7b776b4647b0bbe325cadea8aa
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 15:50:24 2024 -0700
Fix Cannot read properties of undefined error by removing snipe-table class from eula table
commit a02e250b22538e440ff0b25578c62540a316c029
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 15:26:15 2024 -0700
Add page breaks for each user
commit 8ac5c0e471867163beae248ae5cb81891e8c2d9e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 14:05:47 2024 -0700
Re-combine layout and view
commit a2d4dcf6e82df284602990bf9465129e0997a27b
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 12:49:36 2024 -0700
Use bulk actions menu
commit 54044bfa5e4752c3ac0dc907bb40734154520f31
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 10:57:57 2024 -0700
Add eager loads
commit e493cc964daf88a8e4f0ddf5d397f6092d6f745e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 10:48:07 2024 -0700
Remove AssetCountForSidebar middleware from print view
commit 29af210f4fc7351fa319139e5b7022aae82b2a28
Merge: 5128fd49e ab0c009c0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 23 10:26:20 2024 -0700
Merge branch 'develop' into bulk-print-users
commit 34eb10ff73e50cf9617779c085fc7f529a436b89
Merge: 7d7d58769 ab0c009c0
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 19:45:20 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ab0c009c0db3cabfed8401b3754aa2addfbc111c
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 19:45:10 2024 +0100
Fixed seeder
Signed-off-by: snipe <snipe@snipe.net>
commit 7d7d58769c637e70d993b585273f2c65e6322346
Merge: 245d5dc46 b68805cf8
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 19:13:00 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit b68805cf83aeff549346e68013d2c5e017a7fabb
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 19:11:52 2024 +0100
Small fix for notifications checkout
Signed-off-by: snipe <snipe@snipe.net>
commit 245d5dc469c7d68b2601d02dfa307060f0af5a1f
Merge: 4ab478bb9 7d858129d
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 17:28:15 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
commit 7d858129d9b42dda78f82ef2501461070d22fb85
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:44:19 2024 +0100
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
commit 65ce63bc9b530daa8b652371d929e9709a4086c6
Merge: 5eea9d195 54fba2f54
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:42:07 2024 +0100
Merge pull request #15537 from snipe/snyk/updated_jspdf_autotable
Updated jspdf autotable
commit 54fba2f547c61b4dee28722faa334b529b82452b
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:40:41 2024 +0100
Update jspdf autotable
Signed-off-by: snipe <snipe@snipe.net>
commit 5eea9d1950ab673df373733bba248e50e83d0539
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:33:56 2024 +0100
Corrected text warning translation
Signed-off-by: snipe <snipe@snipe.net>
commit b84a634ec78e72f489d4c19b95becea5b9316228
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:33:35 2024 +0100
Corrected comment
Signed-off-by: snipe <snipe@snipe.net>
commit 2fc88a0e081ddd17672a68fa59513b6ecd992124
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:33:26 2024 +0100
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net>
commit bc540b6564a7e08720339de708299c04979c7024
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 14:02:28 2024 +0100
Requestable status not saving with manual [sc-26848]
Signed-off-by: snipe <snipe@snipe.net>
commit f53b852dffef85dce789bd620b65b5f0ca0aae3d
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 13:53:52 2024 +0100
Make created_by equal one in the seeder
Signed-off-by: snipe <snipe@snipe.net>
commit b83d1a043f49a484acea8b38d184120d6d16fa68
Merge: cdb7ccb8f b21c303e5
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 13:47:31 2024 +0100
Merge pull request #15519 from snipe/features/add_created_at_created_by
Change `user_id` to `created_by`
commit 4ab478bb97206aaf6265c6a86c578a079ee7d067
Merge: d96c5e1ba cdb7ccb8f
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 13:44:45 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit b21c303e5652992c49b3b73c5a1c7bd1eeb8b95a
Merge: b88f2054d cdb7ccb8f
Author: snipe <snipe@snipe.net>
Date: Fri Sep 20 13:43:50 2024 +0100
Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by
commit 5128fd49e6f7705c8b9b4b095a2423544439ff94
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 17:27:25 2024 -0700
Allow printing all users
commit 2d2d5bdc7ea37174da7069471eac03d002584698
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 17:23:47 2024 -0700
Pass user in array
commit 8364d26c9be3bafd6ab918f124a99bfa99e0aaa5
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 17:18:26 2024 -0700
Extract parent layout
commit efd6d7625fa7e99719e483625a474a2c39061b21
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 17:16:05 2024 -0700
Remove bad closing tag
commit bdf5708bfcf4b9c95a8d8edf7544db74f8e69ffb
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 17:10:43 2024 -0700
Remove accidental line
commit e95703cb181b273b0fdbc5016ab585408c7636c0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 17:10:07 2024 -0700
Use eager load
commit 7ad4a2997094f9302e4858e4ca61453758fbf3cc
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 16:54:39 2024 -0700
Add eager loading
commit cdb7ccb8f3910ab8783cdcb4fe5d41866988b594
Merge: 8270947ed d446773fd
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 21:54:03 2024 +0100
Merge pull request #15532 from spencerrlongg/bug/15253
Catch Exceptions on Checkout Notification
commit 8270947ed29dffcfac20dff105068516449467f6
Merge: 4f7c8e0c3 8e1111c68
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 21:49:27 2024 +0100
Merge pull request #13291 from akemidx/eol_date_range_for_reports
Added date range for EOL in custom reports
commit 4f7c8e0c3d27b0d77994cdb73cbfb625f0e3859e
Merge: d7bde3784 3ea5d4ee4
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 21:36:09 2024 +0100
Merge pull request #14671 from Robert-Azelis/patch-6
[FIX] Update EOL date when used bulk update of purchase date
commit d609ed50a42641ed8a5003d5013b13e447bbfca2
Merge: d639d6fbc d7bde3784
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 13:20:55 2024 -0700
Merge branch 'develop' into testing/fmcs-accessories
commit b88f2054dd771ed7678022d1ec97b378d015e553
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 20:38:34 2024 +0100
Refactor isDeletable on companies
Signed-off-by: snipe <snipe@snipe.net>
commit d7914e238d8a6c4db5eac92cf52ec2485b384536
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 20:34:54 2024 +0100
Added created by to company on save
Signed-off-by: snipe <snipe@snipe.net>
commit d7bde37842dbfa03cbbe1910c9fae5ef897f4b4a
Merge: 454796e52 4facc4007
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 20:33:10 2024 +0100
Merge pull request #15507 from setpill/setpill/feat/use_explicit_attributes_in_ldap_sync
Added #15506: Explicitly request used LDAP attributes
commit 454796e52a99ac8631d7bb0cce45f220a4993419
Merge: eef487d61 7c85ad54e
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 20:32:03 2024 +0100
Merge pull request #15518 from snipe/sort_by_numeric_custom_fields
Fixed #11634 - Sort by numeric columns for numeric custom fields
commit eef487d61b74b61858b953a9eb3e871c9ca330d6
Merge: dddbf27d7 71dbc7abb
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 20:31:02 2024 +0100
Merge pull request #15531 from Godmartinz/status-doesnt-update-in-email
Fixed mail notification field `status label` not updating
commit 71dbc7abb0ab43d0887449a185236c12ccd591d8
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Sep 19 12:23:07 2024 -0700
refreshed the assetstatus relationship
commit d639d6fbc1467ce8f231c73507ec371f4c705fc5
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 12:21:54 2024 -0700
Add tests for accessory select list endpoint
commit 74088ea5813b0ccdb4b6c58e375f41bb19ecae29
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 20:13:38 2024 +0100
Optimize isDeletable counts
Signed-off-by: snipe <snipe@snipe.net>
commit fff069824b91753a5b0bbd042f7fe0e9d9240aac
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 12:11:03 2024 -0700
Add tests for update accessory endpoint
commit d446773fdd0a6782583a9e7fd384888996fdc5e5
Author: spencerrlongg <spencer@spencerlong.com>
Date: Thu Sep 19 14:05:48 2024 -0500
catch exceptions on notification
commit f283b5fbe88b3f582b8f13c52532bb8de80548da
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 19:56:39 2024 +0100
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net>
commit a5be18bb14242da7d503fe8b6e1c5d31ad1a07e8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 11:55:15 2024 -0700
Add test for limit and offset
commit eb6f05faf7f2f6c94a56d93ee95fd48c44f60a9f
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 19:41:46 2024 +0100
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net>
commit 118183ff58b3d136a1abcad75fc399ff6622e825
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 19:41:39 2024 +0100
Removed footer
Signed-off-by: snipe <snipe@snipe.net>
commit 21378904969e0ad166355cd8a92b2bcc74978510
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 11:33:20 2024 -0700
Remove dead code
commit ebf6ce69809b30178aa09d43ed45669cc886ed73
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 19:27:10 2024 +0100
Refactor for fewer queries
Signed-off-by: snipe <snipe@snipe.net>
commit 9b22d6d493734e2ff55b6b2e80f682b98f92e6e4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 19 11:24:01 2024 -0700
Add tests for accessory checkouts endpoint
commit 5ebf0ed2b2a0793d241b982bb293779cf4851939
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 19:19:14 2024 +0100
Updated variable
Signed-off-by: snipe <snipe@snipe.net>
commit 836893cba527149e25804b5767c35d08d313dd0b
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 18:35:00 2024 +0100
Added id to report
Signed-off-by: snipe <snipe@snipe.net>
commit cd98b3817d53ace3a1345e30d8ce6d15af6decb5
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 18:26:08 2024 +0100
Removed duplicate line
Signed-off-by: snipe <snipe@snipe.net>
commit 727806372c66a9945be301c597d5f9182b626b22
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 18:22:11 2024 +0100
Added created_by to status label
Signed-off-by: snipe <snipe@snipe.net>
commit 5e1c736d4982b1e7c9bf15f848210d5e2fcedb2d
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 18:04:50 2024 +0100
Added created_by for manufacturers
Signed-off-by: snipe <snipe@snipe.net>
commit 6579fa72dae9eb31b24ff4944cab61ab49c463bd
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:56:05 2024 +0100
Added scoping for categories and companies
Signed-off-by: snipe <snipe@snipe.net>
commit 82d6e1510f6a8472e9cbfb70342113497a6a692d
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:41:05 2024 +0100
Order by created_by for depreciations
Signed-off-by: snipe <snipe@snipe.net>
commit 822ea96dfd4d77ca33ed4860cc4e318930b4d836
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:31:46 2024 +0100
Use auth()->id() instead of Auth::id()
Signed-off-by: snipe <snipe@snipe.net>
commit b247fc33b9de9f4395481ab8498df73eb97cf999
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:28:01 2024 +0100
Added legacy comment
Signed-off-by: snipe <snipe@snipe.net>
commit 2dcae780c0d5b1cb572a70ebc268e39dca124b4f
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:26:21 2024 +0100
Reapply deleted code
Signed-off-by: snipe <snipe@snipe.net>
commit 5c3180ffa074c3ade9647e958ea3d0bbbe099f16
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:25:09 2024 +0100
Removed duplicate code
Signed-off-by: snipe <snipe@snipe.net>
commit 65eba30038ddebd2bdfac8b11c26d4ee55e2dd49
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:23:34 2024 +0100
Fixed markdown in acceptance reminder
Signed-off-by: snipe <snipe@snipe.net>
commit bbce7b40ca27d1d01ae75a63237832c945255454
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:20:56 2024 +0100
Additional consistencies
Signed-off-by: snipe <snipe@snipe.net>
commit 02a29c71efa32eb4cde7358d19cc09f15d6aa60e
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:01:48 2024 +0100
Added created_by
Signed-off-by: snipe <snipe@snipe.net>
commit 66999959725e204448ffa56fc829378440d10a8a
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:01:36 2024 +0100
Added created_by to components
Signed-off-by: snipe <snipe@snipe.net>
commit 951f03094a27f94f9120e05648bdbe911cb2c4a9
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 17:01:17 2024 +0100
Added created_by to kits
Signed-off-by: snipe <snipe@snipe.net>
commit 354b00ef15db3de303a1908afd2e76d091cff29a
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:45:51 2024 +0100
Made method name consistent
Signed-off-by: snipe <snipe@snipe.net>
commit c93229179b6b3e67e81a995c645563cd05bcf8f7
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:45:39 2024 +0100
Added order by created_by to accessories
Signed-off-by: snipe <snipe@snipe.net>
commit a77a7065d7d09a986147e4ee825073f8a2f4958f
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:34:10 2024 +0100
Added order by admin to assets
Signed-off-by: snipe <snipe@snipe.net>
commit 4363e8b34c2b94d94543a6988fd026449a01e04a
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:20:42 2024 +0100
Updated importer
Signed-off-by: snipe <snipe@snipe.net>
commit 9adb2c24f3a26a846f870494d2e27cc699deaf50
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:06:36 2024 +0100
Squashed commit of the following:
commit dddbf27d780be4871ddbc401740f35a4561039a4
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 14:18:52 2024 +0100
Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
commit fcefcc8184b615bc9cdea9888e1f595f8fbc69b8
Merge: 04bb3eec8 3519a82dd
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:44:44 2024 +0100
Merge pull request #15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec8308556c8e26166dfcae7ac7ec3aa446
Merge: 154d5d8d9 f963b9a19
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:41:37 2024 +0100
Merge pull request #15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f7b135a9141da34b1af0104a02ca5b3
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 18 13:24:26 2024 +0100
Fix selected-index of Countries drop-down
commit 154d5d8d913fcea2bfc18ddff26ec874a21b5640
Merge: 6c996b775 9e5f6d656
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 23:40:25 2024 +0100
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 3519a82dddedebfd518cbff61ddc1e1c979859fe
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:55:20 2024 -0700
Fix name: TestsFullMultipleCompaniesSupport
commit a629df07bfc25da2e71a158a09cee9f5e3b1a612
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:49:08 2024 -0700
Implement interfaces on existing test classes
commit 9a13fcab23f76a7336ffe58e38f269bfd3cea4cd
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:38:38 2024 -0700
Pluralize
commit f5705a1dde7a736e167e27ec156f72351cfb47ec
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:34:55 2024 -0700
More unification
commit f325c4afdb234ab4ba820caac45bdf599a550c2f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:32:38 2024 -0700
Unify assertion method
commit 1fddacd7d0440db2598c1d0e4aa0373de204bf53
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:25:11 2024 -0700
Re-order test methods
commit 4af893df6189423edeb73d5239a12d4c7d5a68d0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:20:24 2024 -0700
Improve assertions
commit b8b3f91ce49e5d1829bcb2a84f4d145dc1701b29
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:55:18 2024 -0700
Formatting
commit 7f40f55343fe7e801c6de0cd0d1fa63f442b8349
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:52:02 2024 -0700
Add tests for delete supplier endpoint
commit b06e8d442d81b40e82ba70aaacf277eb5b5e075f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:37:08 2024 -0700
Add tests for delete status label endpoint
commit c269184c60e69b7aa319fedc5b4bbcb122677cb8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:29:41 2024 -0700
Add tests for delete predefined kit endpoint
commit 53c673dee21e9f8cb00904950ec66cb05bde6c55
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:13:12 2024 -0700
Add tests for delete manufacturer endpoint
commit 50730fc4fba2519fb13799bc93ab682c10092c25
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:37:18 2024 -0700
Add tests for delete location endpoint
commit 60a54cee797aa86e80c5abfe57699f263a85e841
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:33:30 2024 -0700
Add tests for delete license endpoint
commit 446e962a503078e0c5fabef90aac7ada21ecb6e2
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:38:51 2024 -0700
Add tests for delete group endpoint
commit 79a4bb73169445bb7a1e1e6bef4aff8a25dc1a12
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:35:44 2024 -0700
Add tests for delete depreciation endpoint
commit 2f76c1bc5b5259cbb069356da8e8249a18910011
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:33:21 2024 -0700
Add assertion
commit 38b9f4a43893f8c86e75d141a2ec41a7c2f90758
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:29:20 2024 -0700
Add tests for delete departments endpoint
commit 3105f53afffdd78311314e970f6fe893e1162f8e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:54:29 2024 -0700
Add tests for delete custom fieldsets endpoint
commit 2047cfed09a231a90f1958ab0ce650808e05985d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:20:32 2024 -0700
Add tests for delete custom fields endpoint
commit e3268d32df495ed23e60c4c0587bd53fbb6d7485
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:00:02 2024 -0700
Add tests for delete consumable endpoint
commit 6df8b0ac0e6936833bd93512c6a7e50c1f34091f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:52:07 2024 -0700
Add tests for delete component endpoint
commit 910f13c1f78fd2761c2c54ef8a560f80fdf611c6
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:38:30 2024 -0700
Add tests for delete companies endpoint
commit 8ce2512f55a6c293c0d744932453a12cf48f7d6d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:54:44 2024 -0700
Add tests for delete category endpoint
commit 0ec415d4d018c0dfb5cd51f9abf01eaf62c4f0d3
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:46:22 2024 -0700
Clean up
commit 2044570e95789a92ef705d02ca241216eb19d1e3
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:39:36 2024 -0700
Add tests for delete asset model endpoint
commit b336c6273d57d6ca3181877ba844377cad5c6963
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:32:42 2024 -0700
Pluralize test classes
commit 5299b3e9f066e1779312798ecb150786152cf254
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:44 2024 -0700
Remove code handled by CompanyableChildTrait
commit 872b76b45fbdd41cb6e5ae149b158c83a97a6865
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:10 2024 -0700
Add tests for delete asset maintenance endpoint
commit 275cf4630e6461ba2b22c846118ac1e2f352e989
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:16:37 2024 -0700
Add tests for delete asset endpoint
commit 5c2660bd34873b3b9e7ef89990ea450f92ded381
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:02:32 2024 -0700
Introduce interface
commit c7ae9d9dfa76b0efadf47695492761a8120439bf
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 12:58:47 2024 -0700
Add tests for delete accessory endpoint
commit 9e5f6d656a5df14edae5e99be6b375b70b778950
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 11 15:45:01 2024 +0100
Improve multi-asset create when using numeric prefixes to asset_tags
Signed-off-by: snipe <snipe@snipe.net>
commit 634a4afa7581591a8f7eaa902009fd9a5c3e4d09
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:04:54 2024 +0100
Fixed 1001 query on license
Signed-off-by: snipe <snipe@snipe.net>
commit 7650628d30646d51d1f4aa650e786f406c600350
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 16:00:59 2024 +0100
Removed free seat count from fillable
Signed-off-by: snipe <snipe@snipe.net>
commit 7f690a6238d61ea145e00e602ff9dccf43bb4341
Author: snipe <snipe@snipe.net>
Date: Thu Sep 19 15:58:32 2024 +0100
Fixed variable name
Signed-off-by: snipe <snipe@snipe.net>
commit b32ab6a06ce226562add8a8654dd9307efe6abea
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 18 16:36:24 2024 -0700
import User model
commit 4ff5fc1ff9528e10218106db85902c644afedc4c
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 18 16:19:35 2024 -0700
clean up variables
commit 86f13a9735358ce0ce51205a439ce8fc7df5197c
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 16:13:34 2024 -0700
Add index test
commit c40209f5000aaf9c6ec3449cec6463d956dd19bb
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 18 15:23:44 2024 -0700
seperates emails and webhook notifications
commit a071fff954b8f90b7a5e5a4df3f8a5a7d45598c1
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 12:32:14 2024 -0700
Implement tests
commit 8b50ef077dc52c09bddd4743336aeea2d2d9de98
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:58:33 2024 -0700
Implement test
commit 607f29030f13f82b40ccacefeec5f329f250b887
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:53:27 2024 -0700
Stub out test
commit a6bcd3c0c2b03c81b45ece70d453e767d277acc0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:47:59 2024 -0700
Add validation test
commit 9b293afaac70370ad7741c306e7b14c47eecf3ce
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:28:29 2024 -0700
Remove more dead code
commit 636c776620a012937c7f79cd67dde9cf7c6a92cf
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:27:37 2024 -0700
Remove dead code
commit d5f659024c06a8dc3a6573f1b2d7eddf25b698c4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:27:09 2024 -0700
Add test for logging
commit 832e50a71ebcda26451f090042cb072bae05c4f3
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:19:41 2024 -0700
Implement test
commit fa1968624885e51b71f4a77215cec01beaae01e5
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 11:18:21 2024 -0700
Implement test
commit c021609c136a7fc01ba860bf476aefb81d9c0452
Merge: 7b31df7c1 dddbf27d7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 18 10:42:58 2024 -0700
Merge branch 'develop' into testing/fmcs-accessories
commit 655abe8be5491531656de70242b21d22acfd280f
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 14:32:59 2024 +0100
Fixed requestable user_id
Signed-off-by: snipe <snipe@snipe.net>
commit d96c5e1ba4ff80f77da2d467109fde22e08a73a2
Merge: a807646d3 dddbf27d7
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 14:20:55 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit dddbf27d780be4871ddbc401740f35a4561039a4
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 14:18:52 2024 +0100
Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
commit bae99828333b608e029250925730388671070aea
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 14:18:14 2024 +0100
Updated request methods
Signed-off-by: snipe <snipe@snipe.net>
commit a807646d39575f851fa57b0be22dd67daf26f7db
Merge: 83b4bf9cf fcefcc818
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:48:09 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit abe79df6dca919512419318acb8381daefb5c990
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:47:30 2024 +0100
Added translation
Signed-off-by: snipe <snipe@snipe.net>
commit fcefcc8184b615bc9cdea9888e1f595f8fbc69b8
Merge: 04bb3eec8 3519a82dd
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:44:44 2024 +0100
Merge pull request #15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec8308556c8e26166dfcae7ac7ec3aa446
Merge: 154d5d8d9 f963b9a19
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:41:37 2024 +0100
Merge pull request #15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f7b135a9141da34b1af0104a02ca5b3
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 18 13:24:26 2024 +0100
Fix selected-index of Countries drop-down
commit 154d5d8d913fcea2bfc18ddff26ec874a21b5640
Merge: 6c996b775 9e5f6d656
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 23:40:25 2024 +0100
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 1582d81e5bf3c408cddf50cd716d63e54028109d
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 22:16:41 2024 +0100
Change `user_id` to `created_by`
Signed-off-by: snipe <snipe@snipe.net>
commit 7c85ad54eb742f063936423d1c8b21d4f9f57079
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 19:44:03 2024 +0100
Sort by numeric columns for numeric custom fields
Signed-off-by: snipe <snipe@snipe.net>
commit 7b31df7c148566274527317bb5bf006e5764fda8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Sep 17 09:11:58 2024 -0700
Begin additional test case
commit 83b4bf9cf8a36324a5e0e87bbcc00b44cc9a0cb8
Merge: 9ff211105 6c996b775
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 15:54:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 6c996b7759384d96b581e3e61633a6bbbb6e8c10
Merge: fe5fc6e0c 9e957baeb
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 15:54:11 2024 +0100
Merge pull request #15516 from snipe/fixes/fmcs_edit_user
Fixed check for outside assets on user update validation
commit 9e957baeb53e49abe4440bc30100b8629b065ae8
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 15:46:45 2024 +0100
Fixed check for outside assets on user update validation
Signed-off-by: snipe <snipe@snipe.net>
commit 12fd9cd97a30ca1ab715fd923c40d3558706e88e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 17:00:08 2024 -0700
Update interface name
commit 9e03c4ba6f6c99a93881d3bd262e4d1809d8cf55
Merge: 8eb1c487b 3519a82dd
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:58:46 2024 -0700
Merge branch 'testing/fmcs' into testing/fmcs-accessories
commit 3519a82dddedebfd518cbff61ddc1e1c979859fe
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:55:20 2024 -0700
Fix name: TestsFullMultipleCompaniesSupport
commit 8eb1c487bcaa1fb6ec71d85985226d49c01e3cea
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:52:10 2024 -0700
implement FMCS test for accessory index
commit e835637ef0120a96012951a965848ecb8465e69f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:40:10 2024 -0700
Add accessory checkin test
commit eb35608bb59a3fc72c7fc55c5431462aef04b040
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:35:33 2024 -0700
Remove call handled by form request
commit 3f07f682defd228dc51d01b962353978e6e5eed8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:35:21 2024 -0700
Migrate existing tests to TestsPermissionsRequirement
commit a629df07bfc25da2e71a158a09cee9f5e3b1a612
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:49:08 2024 -0700
Implement interfaces on existing test classes
commit 9a13fcab23f76a7336ffe58e38f269bfd3cea4cd
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:38:38 2024 -0700
Pluralize
commit f5705a1dde7a736e167e27ec156f72351cfb47ec
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:34:55 2024 -0700
More unification
commit f325c4afdb234ab4ba820caac45bdf599a550c2f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:32:38 2024 -0700
Unify assertion method
commit 1fddacd7d0440db2598c1d0e4aa0373de204bf53
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:25:11 2024 -0700
Re-order test methods
commit 4af893df6189423edeb73d5239a12d4c7d5a68d0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:20:24 2024 -0700
Improve assertions
commit b8b3f91ce49e5d1829bcb2a84f4d145dc1701b29
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:55:18 2024 -0700
Formatting
commit 7f40f55343fe7e801c6de0cd0d1fa63f442b8349
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:52:02 2024 -0700
Add tests for delete supplier endpoint
commit b06e8d442d81b40e82ba70aaacf277eb5b5e075f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:37:08 2024 -0700
Add tests for delete status label endpoint
commit c269184c60e69b7aa319fedc5b4bbcb122677cb8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:29:41 2024 -0700
Add tests for delete predefined kit endpoint
commit 53c673dee21e9f8cb00904950ec66cb05bde6c55
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:13:12 2024 -0700
Add tests for delete manufacturer endpoint
commit 50730fc4fba2519fb13799bc93ab682c10092c25
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:37:18 2024 -0700
Add tests for delete location endpoint
commit 60a54cee797aa86e80c5abfe57699f263a85e841
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:33:30 2024 -0700
Add tests for delete license endpoint
commit 446e962a503078e0c5fabef90aac7ada21ecb6e2
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:38:51 2024 -0700
Add tests for delete group endpoint
commit 79a4bb73169445bb7a1e1e6bef4aff8a25dc1a12
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:35:44 2024 -0700
Add tests for delete depreciation endpoint
commit 2f76c1bc5b5259cbb069356da8e8249a18910011
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:33:21 2024 -0700
Add assertion
commit 38b9f4a43893f8c86e75d141a2ec41a7c2f90758
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:29:20 2024 -0700
Add tests for delete departments endpoint
commit fe5fc6e0ce8374a3304dc3f44ea985e73c7ca2fb
Merge: 62747a009 15183c482
Author: snipe <snipe@snipe.net>
Date: Mon Sep 16 15:56:31 2024 +0100
Merge pull request #15471 from Godmartinz/Edit_side-panel
Fixes margin for the sidebar menus while using rtl languages
commit 62747a00902e415ef7b207a68c6cbabc5ef2f527
Merge: b465cc98d c6c5cb73c
Author: snipe <snipe@snipe.net>
Date: Mon Sep 16 15:02:55 2024 +0100
Merge pull request #15493 from Godmartinz/fix_consumables_media_sizing
Fixed misalignment of consumables with smaller media
commit 9ff211105544fff678c5355e90fdb8319e0806ce
Merge: 1328366a4 b465cc98d
Author: snipe <snipe@snipe.net>
Date: Mon Sep 16 14:52:48 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit b465cc98d8cb2310f5dea14ed2f22448a27bff59
Merge: 8774da392 4debaaea3
Author: snipe <snipe@snipe.net>
Date: Mon Sep 16 14:45:06 2024 +0100
Merge pull request #15510 from snipe/bulk_users_locale_fix
Fixed #15504 - allow nulling/not changing locale in user bulk edit
commit 4debaaea39667d86fdc710c14706b90d25d08617
Author: snipe <snipe@snipe.net>
Date: Mon Sep 16 14:31:10 2024 +0100
Fixed #15504 - allow nulling/not changing locale in user bulk edit
Signed-off-by: snipe <snipe@snipe.net>
commit 1328366a486e91bd6c94bf308a3c2ad8a5171bb0
Merge: 7e14f8c6d 8774da392
Author: snipe <snipe@snipe.net>
Date: Mon Sep 16 12:38:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4facc4007e56924429097b0840ea0acd0bbcd1fa
Author: setpill <37372069+setpill@users.noreply.github.com>
Date: Fri Sep 13 17:05:48 2024 +0200
feat: Explicitly request LDAP attributes during sync
commit 31da47e04676e32cf213fff49174615b6501d394
Author: setpill <37372069+setpill@users.noreply.github.com>
Date: Fri Sep 13 17:05:28 2024 +0200
refactor: Put LDAP attribute mapping in array
commit 3105f53afffdd78311314e970f6fe893e1162f8e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:54:29 2024 -0700
Add tests for delete custom fieldsets endpoint
commit 2047cfed09a231a90f1958ab0ce650808e05985d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:20:32 2024 -0700
Add tests for delete custom fields endpoint
commit e3268d32df495ed23e60c4c0587bd53fbb6d7485
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:00:02 2024 -0700
Add tests for delete consumable endpoint
commit 6df8b0ac0e6936833bd93512c6a7e50c1f34091f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:52:07 2024 -0700
Add tests for delete component endpoint
commit 910f13c1f78fd2761c2c54ef8a560f80fdf611c6
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:38:30 2024 -0700
Add tests for delete companies endpoint
commit 8ce2512f55a6c293c0d744932453a12cf48f7d6d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:54:44 2024 -0700
Add tests for delete category endpoint
commit 0ec415d4d018c0dfb5cd51f9abf01eaf62c4f0d3
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:46:22 2024 -0700
Clean up
commit 2044570e95789a92ef705d02ca241216eb19d1e3
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:39:36 2024 -0700
Add tests for delete asset model endpoint
commit b336c6273d57d6ca3181877ba844377cad5c6963
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:32:42 2024 -0700
Pluralize test classes
commit 5299b3e9f066e1779312798ecb150786152cf254
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:44 2024 -0700
Remove code handled by CompanyableChildTrait
commit 872b76b45fbdd41cb6e5ae149b158c83a97a6865
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:10 2024 -0700
Add tests for delete asset maintenance endpoint
commit 275cf4630e6461ba2b22c846118ac1e2f352e989
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:16:37 2024 -0700
Add tests for delete asset endpoint
commit 5c2660bd34873b3b9e7ef89990ea450f92ded381
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:02:32 2024 -0700
Introduce interface
commit c7ae9d9dfa76b0efadf47695492761a8120439bf
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 12:58:47 2024 -0700
Add tests for delete accessory endpoint
commit 0bc98e971fd9c5e0c0eb596daed799dab54f6ec4
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Sep 12 12:26:19 2024 -0700
refactoring modals with partials and fixing misalignments
commit 8774da3921eb6ed28494521a42305437b4158f6b
Merge: ab3b65531 a97530367
Author: snipe <snipe@snipe.net>
Date: Thu Sep 12 16:08:44 2024 +0100
Merge pull request #15492 from snipe/fixes/edit_to_archived_warning
Fix - warn user on changing status to undeployable when editing
commit c6c5cb73cf4b5c553a1fa0996f7ac27534b52505
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 11 10:49:27 2024 -0700
fixes consumables positioning with smaller media
commit a97530367d6013a05c5a99341087dd2f8002343b
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 17:29:22 2024 +0100
Fixed tests again
Signed-off-by: snipe <snipe@snipe.net>
commit 43250ae88142d3168a009457c54d4eb01bbe261a
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 17:04:09 2024 +0100
Updated tests
Signed-off-by: snipe <snipe@snipe.net>
commit 04e96b8f20095568aa37dad8eca2d0b1effff07e
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 16:43:41 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net>
commit 98323185de298a32df9f545ea5ebacc6a7bc42cd
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 16:43:33 2024 +0100
Null and warn if editing asset to a non-deployabe state
Signed-off-by: snipe <snipe@snipe.net>
commit 9e5f6d656a5df14edae5e99be6b375b70b778950
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 11 15:45:01 2024 +0100
Improve multi-asset create when using numeric prefixes to asset_tags
commit 7e14f8c6d69bebeb46242dda75ac519f2fb4f174
Merge: fddbdafb9 ab3b65531
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 12:25:28 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ab3b655312f674142735f1a2c2ef61e17f477185
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 12:25:09 2024 +0100
Fixed #15483 - show EOL by default
Signed-off-by: snipe <snipe@snipe.net>
commit 601d8d7e5fa5f4d266c0dcdd8daa1b3244404821
Merge: 4f0f72b29 ca01261c1
Author: snipe <snipe@snipe.net>
Date: Wed Sep 11 09:46:58 2024 +0100
Merge pull request #15486 from marcusmoore/fixes/custom-field-values
Fixed a couple bugs in CustomFieldSetDefaultValuesForModel component
commit ca01261c1f309b7dd616210aab1854774158cf2d
Merge: 6423df213 4f0f72b29
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Sep 10 16:05:39 2024 -0700
Merge branch 'develop' into fixes/custom-field-values
commit 15183c48220f85948527cbc2ef34986f645dfa06
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Sep 10 11:05:03 2024 -0700
rephrased the ternary <-correctly spelled
commit fddbdafb99cf739b435220a7a4e259a27040f03a
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 19:03:56 2024 +0100
Fixed conflict
Signed-off-by: snipe <snipe@snipe.net>
commit a5dbece1a96e54f851e177596e2de62f52f2afd0
Merge: 713bb104e 4f0f72b29
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 19:00:05 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 4f0f72b29e2e49284e72eb89d103c333a1be48bf
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 18:15:12 2024 +0100
Fixed version
Signed-off-by: snipe <snipe@snipe.net>
commit 4183d1834f6ba8a691525b9f28e1ec09e7b1580f
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 18:14:03 2024 +0100
Pre-release assets
Signed-off-by: snipe <snipe@snipe.net>
commit 713bb104ecaf0ad68204efa1f3cab191e99da3e9
Merge: 7f2cae4f2 4998d60f3
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 14:46:15 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4998d60f39d723277e3496ea8fdf1bddc86d02c7
Merge: f6bf2d03c 7cf30003b
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 14:43:27 2024 +0100
Merge pull request #15481 from snipe/localizations/2024-09-10
Updated translations
commit 7cf30003b61b040a9b191aa85a7efb51fba7379f
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 14:41:08 2024 +0100
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
commit f6bf2d03c403f29f3ef31246ecba82b079cb96b0
Merge: 6f44441a8 7c8955b12
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 11:04:58 2024 +0100
Merge pull request #15445 from Godmartinz/eula_confusion
Fixed priority for category eula vs default eula
commit 6f44441a8b66f391e7ee3c6ac4fb224c537d713c
Merge: e7e5dfbdf 76c9015aa
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 11:04:23 2024 +0100
Merge pull request #15469 from marcusmoore/accessory_tests
Added UI tests for creating accessories
commit e7e5dfbdfabd3184d5008190eaddd4310d117e29
Merge: d62315fbe 5d5f42129
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 11:04:08 2024 +0100
Merge pull request #15470 from marcusmoore/company_tests
Added UI tests for creating companies
commit d62315fbe4152de0cf5769a3bd9a5f32b885ff46
Merge: 7f3f77dec 22a2cc025
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 11:03:55 2024 +0100
Merge pull request #15472 from marcusmoore/testing/dashboard_counts
Added test for dashboard counts
commit 7f3f77dec803ff98467d7ea743e0adf73d03dba8
Merge: 82e56c683 0820dd9da
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 11:03:46 2024 +0100
Merge pull request #15473 from marcusmoore/testing/accessory_api_tests
Added some permission tests for accessory api endpoints
commit 82e56c68325457f8fb903b7e02e1b7e666c3e5b9
Merge: 549dec9f9 dc6a5bf99
Author: snipe <snipe@snipe.net>
Date: Tue Sep 10 09:37:02 2024 +0100
Merge pull request #15474 from marcusmoore/bug/sc-26730
Fixed login success message not being displayed
commit 76c9015aa9c6988127d5c749b5ffdb5ba04e7d54
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 16:51:40 2024 -0700
Add test case
commit 5d5f421294195c4a88db5c4f8cf87fe47ef2c326
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 16:49:43 2024 -0700
Add test case
commit 367f02af8642c23674afbfefedc456e7cedb6785
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Sep 9 16:34:04 2024 -0700
more partials and includes
commit 7a1c721eca13c8e270c55b41fa8249e6da40a918
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Sep 9 16:22:56 2024 -0700
making modal partials for reuse
commit 6423df213344c0d958baa9ac2d90e5bc47809f5f
Merge: 51d63d57c 549dec9f9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 16:07:37 2024 -0700
Merge branch 'develop' into fixes/custom-field-values
# Conflicts:
# resources/views/livewire/custom-field-set-default-values-for-model.blade.php
commit dc6a5bf998060d5ac26446bb0b6c6191a4cc4e20
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 14:54:19 2024 -0700
Reflash session so login message is displayed
commit 0820dd9da457554d1d577cb785ea94c3be5972e4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 14:36:32 2024 -0700
Update test names
commit aa6ab2df60be0c1904edf265763993ae0c1576ed
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 14:35:38 2024 -0700
Add permission tests for some accessory api endpoints
commit 22a2cc025671811f4d5925274a2b960cdfdb84d9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 13:21:10 2024 -0700
Add test for dashboard counts
commit 57fab0268b5ace5cad8a2df7db3a7d9305815ca8
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Sep 9 13:02:25 2024 -0700
made it a terenary
commit ad5768d8b2c719d10e1915f7f9b3b26902701a22
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Sep 9 12:45:11 2024 -0700
fixes margin for the sidebar using rtl languages
commit 35533c39d5e92df6f7a001c6987d255ce01985f0
Merge: d4426e468 549dec9f9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 12:18:02 2024 -0700
Merge branch 'develop' into company_tests
commit de403f6e0758e10f8c049cb152eb9bbfbadbd07d
Merge: 010f66f4c 549dec9f9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 12:17:53 2024 -0700
Merge branch 'develop' into accessory_tests
commit 549dec9f9efa8a8b2cb3a9f748f61407121aed47
Merge: b2a634924 0e9f7153c
Author: snipe <snipe@snipe.net>
Date: Mon Sep 9 20:13:01 2024 +0100
Merge pull request #15468 from marcusmoore/coverage
Added coverage commands for Herd users
commit d4426e4686dd6106de39660cbede793be5f1c504
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 9 11:03:00 2024 -0700
Add simple tests for company creation via UI
commit b2a6349243e6de65226bcc898cafad89af655a3f
Merge: ce97e2a30 c5dbc5f6b
Author: snipe <snipe@snipe.net>
Date: Mon Sep 9 10:06:42 2024 +0100
Merge pull request #15465 from snipe/update_city_on_bulk_user_edit
Correctly save user’s city on bulk edit
commit c5dbc5f6b887d866a4dfb9800cb001b26593a89b
Author: snipe <snipe@snipe.net>
Date: Mon Sep 9 10:01:07 2024 +0100
Correctly save user’s city on bulk edit
Signed-off-by: snipe <snipe@snipe.net>
commit 7f2cae4f26c90f0c5195f76871f48ececea49bca
Merge: e34f549e4 ce97e2a30
Author: snipe <snipe@snipe.net>
Date: Mon Sep 9 03:56:05 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ce97e2a30f88b0911cc906d738df1a975f1ac35e
Merge: e1fcfc8dc 7d9a0eba0
Author: snipe <snipe@snipe.net>
Date: Mon Sep 9 03:54:28 2024 +0100
Merge pull request #15463 from snipe/consumables_order_by_remaining
Added ability to sort on qty and remaining for consumables
commit 7d9a0eba04d6607adffa93b0a2117c2c22dd3d2a
Author: snipe <snipe@snipe.net>
Date: Mon Sep 9 03:49:58 2024 +0100
Added ability to sort on qty and remaining for consumables
Signed-off-by: snipe <snipe@snipe.net>
commit 010f66f4c9f79eb8199a5baa15e557218398f047
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 4 15:48:11 2024 -0700
Add validation test
commit 9c6718b459ea2d10ff2f0f34a7f566068118549e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 4 15:46:35 2024 -0700
Organize
commit 9f832a93c948dc62c3374224d2804a4e6c8124b9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 4 15:44:52 2024 -0700
Ensure user is stored
commit 487d88c0128a04a8e0f15cbbc73426416b36ed7d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 4 15:43:01 2024 -0700
Add some ui tests for accessories
commit 0e9f7153c05ebeda1650455ce1bd96dae3d04291
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Sep 4 15:13:45 2024 -0700
Add composer commands for generating coverage reports via Herd
commit 7c8955b12620208281c449bff2ecbfe29103d466
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 4 12:38:35 2024 -0700
revert changes to label view
commit 20fa4c39f90394ae1aaf381374e242b2035bb36d
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 4 12:26:44 2024 -0700
adds setEula to support\settings
commit f04a4a3cf51564269352cfd2b0ba4baeb99ac3fe
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Sep 4 12:21:49 2024 -0700
adds test
commit cf07186ae8704d609c65c7f91db67af9a2963c76
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Sep 3 12:23:23 2024 -0700
gives priority to default eula being checked vs catregory eula
commit 51d63d57c65ec3ab5da48c1a3481f18ca680b596
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Sep 3 12:22:43 2024 -0700
Hide the "Add default values" checkbox if no fieldset selected
commit e34f549e4cddb695d01fb304d7472fcdafada27d
Merge: a8813cca9 e1fcfc8dc
Author: snipe <snipe@snipe.net>
Date: Mon Sep 2 19:16:23 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit e1fcfc8dc13329b752532970f256c1fcaa5f1935
Merge: 13dbf9ee7 9fe8a866e
Author: snipe <snipe@snipe.net>
Date: Mon Sep 2 19:14:49 2024 +0100
Merge pull request #15440 from snipe/fixes/user_api_put_patch
Fixes #15435 - user api put patch API route regression
commit 9fe8a866e0164140db8c92f8c956173a9d5398ae
Author: snipe <snipe@snipe.net>
Date: Mon Sep 2 19:07:21 2024 +0100
Updated test
Signed-off-by: snipe <snipe@snipe.net>
commit e8e3060a7561caaf7a92fe475af680c7f98c9079
Author: snipe <snipe@snipe.net>
Date: Mon Sep 2 18:51:22 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net>
commit 6aaf2f623feabdbb13a0878fdd4050e4e2e7ff52
Author: snipe <snipe@snipe.net>
Date: Mon Sep 2 18:49:55 2024 +0100
Removed extra route
Signed-off-by: snipe <snipe@snipe.net>
commit dfbccf50e8aaa2f0135002d08f304d4bb802d2a1
Author: snipe <snipe@snipe.net>
Date: Mon Sep 2 18:48:09 2024 +0100
Added patch/put back into resource routes
Signed-off-by: snipe <snipe@snipe.net>
commit a8813cca9458fcbf20e5fdad763285ec15db1a99
Merge: 9fef27a44 13dbf9ee7
Author: snipe <snipe@snipe.net>
Date: Sat Aug 31 13:48:59 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 13dbf9ee747832fbececfc1618b0abd64cac4f22
Author: snipe <snipe@snipe.net>
Date: Sat Aug 31 13:48:42 2024 +0100
Added icon for dept
Signed-off-by: snipe <snipe@snipe.net>
commit f8bbb7ad9b0455ed3d30c9a4c4949865313812c3
Merge: 12fa50597 3c7d455ee
Author: snipe <snipe@snipe.net>
Date: Sat Aug 31 13:47:25 2024 +0100
Merge pull request #15431 from snipe/add_employee_num_to_asset_overview
Added employee number to asset view
commit 3c7d455ee31a13862f1dab0ff2b236188c1128e9
Author: snipe <snipe@snipe.net>
Date: Sat Aug 31 13:38:38 2024 +0100
Added employee number to asset view
Signed-off-by: snipe <snipe@snipe.net>
commit 9fef27a448a13c1cb6c94d737702fd51e78257a5
Merge: d2b88a510 12fa50597
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 21:07:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 12fa505972693d0983b1bc2e3e8472ad1e6ef91d
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 21:07:30 2024 +0100
Disabmiguate licenses company_id
Signed-off-by: snipe <snipe@snipe.net>
commit d2b88a51076df62982926a91af97568ac3b98034
Merge: 4e35f389d 4e4930ba6
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 21:02:21 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4e4930ba62355bee219eb837a39ae3c6d3c622f9
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 21:01:48 2024 +0100
Check for array
Signed-off-by: snipe <snipe@snipe.net>
commit 4e35f389df0308bbe6571afc850f70870e6bd3b0
Merge: e5b9d9a28 76301bc30
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 20:07:03 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 76301bc30d5b6e55cc894200dff5ab074993013e
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 20:05:03 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
commit 964e105cf998ae91f778d78aa4de0c2273dbeca1
Merge: 6fd24c7e1 abb422153
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 19:20:03 2024 +0100
Merge pull request #15415 from snipe/rules/prevent_company_switch
Validation rules to prevent switching user companies if items are assigned to them
commit 6fd24c7e1443caef18aa787538d723d9e4f888ac
Merge: e4ebabdab 231bc1e2d
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 18:55:11 2024 +0100
Merge pull request #15418 from snipe/added_multiple_for_custom_report
Fixed #15416 - Added multiple selects for custom report
commit 231bc1e2de18568b760da1fcd6391e57ebfaabd1
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 18:31:34 2024 +0100
Updated blade selectors
Signed-off-by: snipe <snipe@snipe.net>
commit 37d04b717683d15a91d6ee2801df89cb7cecd038
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 17:52:01 2024 +0100
Some CSS tweaks for select2
Signed-off-by: snipe <snipe@snipe.net>
commit e62a8029266ed6ca5625d9ee8d1c1616bea5e3c2
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 17:51:44 2024 +0100
Use whereIn instead of where =
Signed-off-by: snipe <snipe@snipe.net>
commit 69e981364aee151aa1b448082971099859b38f5a
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 17:51:20 2024 +0100
Made multiple select
Signed-off-by: snipe <snipe@snipe.net>
commit e5b9d9a28b33b9a52101ea7005a4aba834d3a78b
Merge: 4111ef0d7 e4ebabdab
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 15:04:32 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
commit abb422153903939d2e3b1bc103d27eb30a52fe9e
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 14:55:18 2024 +0100
Validation rules to prevent switchng user companies if assets are assigned
Signed-off-by: snipe <snipe@snipe.net>
commit e4ebabdaba22f89d6f8b0c85530e5d824bf522c8
Merge: b64ed254e da1e38329
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 14:19:51 2024 +0100
Merge pull request #15414 from uberbrady/fix_create_user
Use the null-safe property accessor for new-user creation
commit da1e383295d6ee3940d6842979a73c1f14e6ff9a
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Thu Aug 29 14:09:23 2024 +0100
Use the null-safe property accessor for new-user creation
commit b64ed254e022cb4fd363b7ffd5c99cfc46567d5d
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 13:49:09 2024 +0100
Fixed tests
Signed-off-by: snipe <snipe@snipe.net>
commit ba291edc42bf30199727d98138b1e667a0658fa8
Merge: c197644ba ec2ea955d
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 13:18:52 2024 +0100
Merge pull request #15412 from uberbrady/ImprovePatchPurchasePrice
Fix [FD-43836] PATCH of purchase_cost for assets for comma as decimal separator
commit ec2ea955d895b979d8285b2b5c497ef9c085b983
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Thu Aug 29 12:35:14 2024 +0100
Fix PATCH of purchase_cost for assets for comma as decimal separator
commit c197644ba7554404ce6f68fbadeadd9bb9266c97
Merge: 29b30cc5d a8cd1027f
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:38:15 2024 +0100
Merge pull request #15284 from spencerrlongg/bug/sc-26584
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
commit 29b30cc5d3236aa94340160ecfc3f14d84856287
Merge: a89f17a14 6af27516d
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:29:44 2024 +0100
Merge pull request #15411 from snipe/snyk/upgrade-webpack
Upgraded webpack
commit 6af27516dc348fcf135c348c118ca0c49e8056ea
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:29:00 2024 +0100
Upgraded webpack
Signed-off-by: snipe <snipe@snipe.net>
commit a89f17a145216d0d4f75bbb44a4b0703f4137bfa
Merge: 68c708bde de0565f5b
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:25:56 2024 +0100
Merge pull request #15410 from snipe/snyk/upgrade-jquery-ui
Updated jquery UI
commit de0565f5b35ec85cc39a9302637329bba3d4c83a
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:24:06 2024 +0100
Updated jquery UI
Signed-off-by: snipe <snipe@snipe.net>
commit 4111ef0d78f40086a549c1516bec32f2a0435ca4
Merge: cfa56e221 68c708bde
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:20:21 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 68c708bdef3e732123dfe16bb0a5c34a4381cc9f
Merge: 58e366a06 5581950fe
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:18:34 2024 +0100
Merge pull request #15409 from snipe/fixes-string
Corrected language string
commit 5581950fee50d7a260ad9aa1908373607c586e1c
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:17:17 2024 +0100
Corrected language string
Signed-off-by: snipe <snipe@snipe.net>
commit cfa56e2219e4948d5eaba2a6bb43d49f5859e790
Merge: 7f1dfcc93 58e366a06
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:08:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 58e366a063dcb015f148e7d00dc91f43bb4b98c9
Merge: 26f28a862 b06c52776
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:08:02 2024 +0100
Merge pull request #15408 from snipe/redirect-on-print-if-user-invalid
Check that the user exists before trying to print
commit b06c5277674842267aed27d1cd3913dba6998be3
Author: snipe <snipe@snipe.net>
Date: Thu Aug 29 11:06:30 2024 +0100
Check that the user exists before trying to print
Signed-off-by: snipe <snipe@snipe.net>
commit 7f1dfcc935002fd804dc6d8e94587392a107b967
Merge: 6f3fb21fe 26f28a862
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 14:29:06 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 26f28a862a23818f39a03442dd3a59f6e67acfbb
Merge: e8da7e2df 94c981e22
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 14:26:03 2024 +0100
Merge pull request #15404 from snipe/bug/sc-26717-model-delete
Set image to null if model is deleted
commit 94c981e22c275c453369ba709e2996d847112f73
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 14:23:49 2024 +0100
Set image to null if model is deleted
Signed-off-by: snipe <snipe@snipe.net>
commit 6f3fb21fef34cb61b5bf831f094c5fdfccbd18a9
Merge: a48e79a1f e8da7e2df
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:50:19 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit e8da7e2df2c9ed364896a2e30dfec97544e5dc51
Merge: 7b5b559ba d635c86e0
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:46:48 2024 +0100
Merge pull request #15403 from snipe/clean_up_depreciations
Fixed #15392 - filter by depreciation when showing models
commit d635c86e0096825f46993310facfba8b05a47822
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:46:30 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net>
commit 406ff6984b7b0c41aff78f2534e76edbbe30b4b5
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:42:23 2024 +0100
Added click to select on models table
Signed-off-by: snipe <snipe@snipe.net>
commit c6ddc501c5b6f674c36363ccf301b584be817564
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:40:12 2024 +0100
Filter by depreciation_id
Signed-off-by: snipe <snipe@snipe.net>
commit 4839181beb926bbed2ef357078ba0892340384c2
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:40:01 2024 +0100
Added counts to API
Signed-off-by: snipe <snipe@snipe.net>
commit 63a05c89a72bb45d05c16350b9d710480fb1516f
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:39:52 2024 +0100
Added counts to show method
Signed-off-by: snipe <snipe@snipe.net>
commit 385c4f69f7225a76bbd548ee8f34aaaf0908a4f5
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:39:43 2024 +0100
Added counts to depreciation transformer
Signed-off-by: snipe <snipe@snipe.net>
commit 486cd8c8c98d4fb83f28d7f8ab32894bde93f68f
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:39:09 2024 +0100
Nicer formatting for searchableAttributes
Signed-off-by: snipe <snipe@snipe.net>
commit eb5d93b3c2bf22d11063830771675c4f081eb516
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:38:55 2024 +0100
Added assets relationship
Signed-off-by: snipe <snipe@snipe.net>
commit a5ff623484d066e7c29c0982a8e2df389142138c
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:38:43 2024 +0100
Added asset, license, model count to API
Signed-off-by: snipe <snipe@snipe.net>
commit b5a4389815cb133e645cd0efe68a2f14df110202
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 12:38:31 2024 +0100
Added badge count, fixed model bulk edit menu
Signed-off-by: snipe <snipe@snipe.net>
commit 7b5b559baa83a51235119440dddc3c133e51f585
Merge: 64c4433b9 67a992974
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 11:57:29 2024 +0100
Merge pull request #15401 from snipe/fixes-15397-new-window-for-label
Opens label new window
commit 67a9929745e11371a12b169a8b2317eac581961b
Author: snipe <snipe@snipe.net>
Date: Wed Aug 28 11:56:54 2024 +0100
Opens label new window
Signed-off-by: snipe <snipe@snipe.net>
commit a48e79a1fc0d84a00f0e72bb59d89b5036f204b2
Merge: c207d4843 64c4433b9
Author: snipe <snipe@snipe.net>
Date: Tue Aug 27 07:37:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 64c4433b984676b487eb969c2990edcda1cadceb
Merge: d3e8e0663 22bc088f6
Author: snipe <snipe@snipe.net>
Date: Tue Aug 27 07:36:37 2024 +0100
Merge pull request #15396 from snipe/add_start_end_date_to_users_edit
Added `start_date` and `end_date` to user bulk edit
commit 22bc088f6f9f91407cd74530ffed94b88d316c72
Author: snipe <snipe@snipe.net>
Date: Tue Aug 27 07:21:19 2024 +0100
Added start_date and end_date to user bulk edit
Signed-off-by: snipe <snipe@snipe.net>
commit d3e8e066381a41de7974507469d0838ab36a9f43
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 14:07:06 2024 +0100
Add @swift2512 as a contributor
commit c207d48430356fd4cc55a5e8bbca299294901b69
Merge: 991e48696 1b933f7ad
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 14:01:38 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 1b933f7add1d8e27d7cc04ab817b933273cc60c0
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 13:47:17 2024 +0100
Added s to fa icons
Signed-off-by: snipe <snipe@snipe.net>
commit 991e48696ae4659dcd02069bf70da4888beb293f
Merge: 797488504 3fe891a05
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 10:26:06 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 3fe891a05babb7dc843a2b93cb29be76e86d7992
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 10:25:27 2024 +0100
Removed a few more commas
Signed-off-by: snipe <snipe@snipe.net>
commit 7974885041b6e81b8c54ccad3ec674f955c08663
Merge: 4ef85bd52 f4c5b712f
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 10:24:19 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit f4c5b712f4e45d4029496fa326fb80693739d89f
Author: snipe <snipe@snipe.net>
Date: Mon Aug 26 10:24:07 2024 +0100
Removed colons
Signed-off-by: snipe <snipe@snipe.net>
commit 4ef85bd529bffeeb83fbf89f66956f5be9e3b568
Merge: 6eab83a85 4c8dc7818
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 17:58:08 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4c8dc7818dee1988ee3bbc31b980bdcdef8f6e2c
Merge: aa86e07cd 5c43a1f87
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 17:57:00 2024 +0100
Merge pull request #15389 from snipe/added_generate_label_to_button_stack
Fixed #15388 - Moved generate label button
commit 5c43a1f87cfbd7558df08314e4212b6524f7f7dd
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 17:54:49 2024 +0100
Use proper style for buttons
Signed-off-by: snipe <snipe@snipe.net>
commit d3b265de8e44131610a003affe46918130c929e7
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 17:48:36 2024 +0100
Moved button on hardware
Signed-off-by: snipe <snipe@snipe.net>
commit 263151658fd7bc6f527388ff0f5b9533cb516567
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 17:44:09 2024 +0100
Moved general label button
Signed-off-by: snipe <snipe@snipe.net>
commit 6eab83a85a220b0dbcc35c70942b26d7901634e4
Merge: cce1f87da aa86e07cd
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 15:22:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit aa86e07cd2341ad4877a053d10aa55759be940b4
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 15:22:39 2024 +0100
Fixed #15385 - small icon tweaks
Signed-off-by: snipe <snipe@snipe.net>
commit cce1f87da653aa4a4547e585b5befb54fd9f0af9
Merge: b460e8dc8 d92fa5de6
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 15:18:30 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit d92fa5de6518e787790b5f0f82b4ad9da00af506
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 15:17:25 2024 +0100
fa-fw on settings icon
Signed-off-by: snipe <snipe@snipe.net>
commit b460e8dc831bb6ff96b15fbdff4628bf6d9cd18e
Merge: 50cb7e65c c589140ea
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 08:42:32 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit c589140ea0fe8320b60529ba3fcfe699000e9144
Merge: cc2c8f76d 52894615c
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 08:42:04 2024 +0100
Merge pull request #15383 from snipe/re-adds-checkout-button
Fixed #15378 - Corrected gate on checkin button on asset view
commit 52894615ce962beef3f1eff89f1ee916fbe0a878
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 08:40:41 2024 +0100
More specific gate for checkin
Signed-off-by: snipe <snipe@snipe.net>
commit 8546bbdd65c9eb71fbe227df8b26014a894092c1
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 08:38:47 2024 +0100
Fixed gate for checkout button
Signed-off-by: snipe <snipe@snipe.net>
commit 50cb7e65c9439879ad552fa787c4139e1636dec3
Merge: 821dd158d cc2c8f76d
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:32:39 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit cc2c8f76d0fd55f7b33110dfa8125679e31b85f4
Merge: 1ffa69c43 3957d670d
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:31:29 2024 +0100
Merge pull request #15375 from Godmartinz/fix-acceptance-reminder-command
Fixes the `acceptance-reminder` command
commit 1ffa69c43c8369d31bceafc0b537a675f6d4ba80
Merge: 78d355f13 f85ebd7ff
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:28:20 2024 +0100
Merge pull request #15380 from snipe/fixed/fixed_nav_bracket
Added pull-right to angle bracket
commit f85ebd7ffd30b334593724cc04dec607afe75ea0
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:27:39 2024 +0100
Added pull-right to angle bracket
Signed-off-by: snipe <snipe@snipe.net>
commit 78d355f136e4cd05d8c7cea66d2619cdfd903062
Merge: ec0346e4a af0a95be1
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:20:23 2024 +0100
Merge pull request #15377 from marcusmoore/fixes/custom-field-values-on-validation-error
Fixed custom field defaults being prematurely updated
commit ec0346e4a89635871f1a0f432ed2aa9fea6200c7
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:19:08 2024 +0100
Add @setpill as a contributor
commit fc5eb377766c9ff076214f2eb3f441577a6480fb
Merge: 833dace2b 1d7853cbf
Author: snipe <snipe@snipe.net>
Date: Fri Aug 23 07:18:41 2024 +0100
Merge pull request #15379 from setpill/fix/load-trustproxies-middleware
fixed #15374: load TrustProxies middleware in Kernel.php
commit 9a73311a992773956bd311cc2577572b74ba4cee
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 17:04:04 2024 -0700
Fix nested checkboxes being updated as a group
commit aec781e7dfeca89ab441d2c294d407ae018c502e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 16:03:30 2024 -0700
Be a little more explicit
commit 1d7853cbfe7ec5def3b8124133379355e133525d
Author: setpill <37372069+setpill@users.noreply.github.com>
Date: Thu Aug 22 19:45:53 2024 +0200
fixed #15374: load TrustProxies middleware in Kernel.php
commit 7f3c86165b21ee10081604deeae23bc261ef0faa
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 13:58:31 2024 -0700
Conditionally disable Add default values checkbox
commit 10b45812c4733e69de83ff78889bce8519557b5a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 13:38:01 2024 -0700
Improve id for checkboxes and radio buttons
commit c3165717ed43ed7bd4561b1b893a53ffb450ea9f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 13:20:04 2024 -0700
Handle old input
commit d0a351a132e5be9ee0b86df314bdf0c73a2f12ce
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 12:59:03 2024 -0700
Add comment
commit 68749e7e878fdcece52a0927255b4ae62f221aae
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 12:58:35 2024 -0700
Simplify logic
commit 0abb5637e08551fa06611741212ffa51f258386f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 22 12:54:54 2024 -0700
WIP: handle old input
commit af0a95be12fbe3b12ec710e95935fa1dcb54bc74
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 17:00:32 2024 -0700
Simplify assertions
commit d67975cb62f1f5ddb5bc3fa7c5297cb71e3388ea
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:59:44 2024 -0700
Implement fix
commit 663b2fd844aa6461b5336f10f66d7ea49cf3ecdf
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:59:38 2024 -0700
Add test case
commit bcace9d019b08048a954a9b89df9e09f8cbfa67e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:54:16 2024 -0700
Point test to correct endpoint
commit b59bf3e7dc803b24159744c8bf2819a95a7df8ab
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:49:29 2024 -0700
Add failing test
commit 3957d670d0b38505ab233ee42f66382392f5a389
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Aug 22 10:04:46 2024 -0700
fixes send acceptance reminder query
commit 821dd158d1cf4d9eaef21a594754e863ddb96a5d
Merge: 6c9a40268 833dace2b
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 15:50:20 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
commit 833dace2b4490fd3510ae3494743cd0cf321231c
Merge: ec365b080 56e31d230
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 15:00:16 2024 +0100
Merge pull request #15373 from snipe/fixes/#15366_custom_fields
Fixed #15366 use the non-admin edit encrypted custom fields permissions
commit 56e31d23036db2c26900fb46b77fc9786041017a
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 14:58:09 2024 +0100
Fixed #15366 - use permission for encrypted custom fields
Signed-off-by: snipe <snipe@snipe.net>
commit ec365b0804237e9eb17d414c4837d81a1089ce02
Merge: ca8864c06 aef0ac68c
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 14:49:13 2024 +0100
Merge pull request #15372 from StarlessNights/update-docker-compose-files
Fixed #15371: docker-compose files updated.
commit aef0ac68c36a7b2be1dece41f515df2bdae40ca4
Author: Iisakki Jaakkola <iihaja@utu.fi>
Date: Thu Aug 22 16:10:00 2024 +0300
Need to use the long format for redis too in docker-compose file.
commit f12f9a816f6776395788cec8e7b0bfddad3de26c
Author: Iisakki Jaakkola <iihaja@utu.fi>
Date: Thu Aug 22 15:47:12 2024 +0300
Update the official docker-compose file too while at it.
commit a000d6454f23c0681c8abb1913479e528a463cb5
Author: Iisakki Jaakkola <iihaja@utu.fi>
Date: Thu Aug 22 15:46:40 2024 +0300
Fix non-functional development docker-compose file.
commit ca8864c061adbb2022ce81e5942ee0c243102191
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 13:28:52 2024 +0100
Fixed small layout quirks in asset view
Signed-off-by: snipe <snipe@snipe.net>
commit 423f4f9126f1a91f7a2a47d8cfaae6eab2f43853
Merge: 456c7d8d9 5fa0c87ab
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 13:25:41 2024 +0100
Merge pull request #14667 from Godmartinz/add_location_to_create_user_via_asset
Adds location select to the create new user via asset checkout
commit 456c7d8d919963687c8c0c325453a313263acad7
Merge: 54cfe3f6e d4d19569e
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 13:20:56 2024 +0100
Merge pull request #15065 from Godmartinz/explicit_eol_removal_command
Adds `snipeit:remove-explicit-eols` command
commit 54cfe3f6e6ed6c019362d4827ab54ffcdee7c559
Merge: 5e0b18104 bb465dbfa
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 13:20:10 2024 +0100
Merge pull request #15156 from uberbrady/re-add-stalebot
Re-add stalebot-esque github Action
commit 5e0b18104d9ccabb27ab34d42e13d5f2f2d59fe4
Merge: ec0b9b198 8b5d3f7fb
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 12:59:20 2024 +0100
Merge pull request #15369 from snipe/fixes/checkbox_on_restore
Fixed checkbox layout on modal from #15296
commit 8b5d3f7fbd082621abb222565b9268e254ae694c
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 12:56:32 2024 +0100
Fixed extra closing p tag
Signed-off-by: snipe <snipe@snipe.net>
commit 744f43676d51ee8b8cb06f2f690305dacd350563
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 12:53:16 2024 +0100
Fixed checkbox layout on modal from #15296
Signed-off-by: snipe <snipe@snipe.net>
commit ec0b9b198f54a72fe757252339e38f4bc8348ae5
Merge: 94300d81d 738ef442f
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 12:43:07 2024 +0100
Merge pull request #15296 from uberbrady/expose_restore_sanitize
Expose the 'sanitize' system for backup restores to the web GUI
commit 6c9a402685f3faffd4cd5df0df296568f6705f9e
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:20:52 2024 +0100
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
commit 1b310f3a247fc6279182ad3fe364e180478f80c3
Merge: c54bff0f8 94300d81d
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:20:42 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 94300d81d618d4b50c127e6094f78453412746b9
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:19:32 2024 +0100
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
commit bc9ea5a2eced12c84493819d9c58b232171ee3e5
Merge: 4635a6efc 963911f2e
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:18:06 2024 +0100
Merge pull request #15352 from Godmartinz/mobile_breakpoint
Fixed Mobile misalignment of info on Assets and Users view pages
commit 4635a6efc38c4763153b944ebe766f7e023ea892
Merge: 9608414ea d29b3bfb9
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:17:49 2024 +0100
Merge pull request #15360 from snipe/more_print_fixes
More print fixes for asset view
commit 9608414eaedf3fd1b99a5ea70e508e01f09a507b
Merge: 47d8e2f8b 5efddf6f5
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:06:13 2024 +0100
Merge pull request #15367 from snipe/fixes/15344_added_freeform_to_country_select2
Fixed #15344 - make select2 for countries freeform-ish
commit 5efddf6f5b287f83295e5bde066e7a5a707215e6
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:01:39 2024 +0100
Allow clear on country dropdown
Signed-off-by: snipe <snipe@snipe.net>
commit 305dc049a498c913caacdd6f2c21f4320b9c9e52
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 11:01:28 2024 +0100
Added asterisk help text
Signed-off-by: snipe <snipe@snipe.net>
commit 3ac07020945751505b06d4acc358575e92860e0e
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 10:13:22 2024 +0100
Fixed #15344 - make select2 for countries freeform-ish
Signed-off-by: snipe <snipe@snipe.net>
commit 47d8e2f8b91f82768a9399c5d4de73d63974eb82
Author: snipe <snipe@snipe.net>
Date: Thu Aug 22 09:42:05 2024 +0100
Add @Scarzy as a contributor
commit a2246b96451c81aab3243a67c2df1ed4ae7eb841
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 17:00:32 2024 -0700
Simplify assertions
commit 1d897597062351b6fb8fac736cd34cc58b71b2ac
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:59:44 2024 -0700
Implement fix
commit 206f8fe605e18deab216a3f61026321b57a8b118
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:59:38 2024 -0700
Add test case
commit 21d2217619d95434ab1fea3f9e2720e73ad51fb9
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:54:16 2024 -0700
Point test to correct endpoint
commit 833bcb282f4516cc12e0edf7efd0f7f82e25eba8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 21 16:49:29 2024 -0700
Add failing test
commit 83dd9ce20e8b000b2ed96ead370cebbfa7f53427
Merge: 6fdce3c53 a8eb76fd8
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 23:15:24 2024 +0100
Merge pull request #15362 from r-xyz/model-files-api
Added #9413: AssetModel files endpoints to API
commit a8eb76fd8dae5f2ad6b716307b32ba477d31ed32
Author: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed Aug 21 22:25:41 2024 +0200
Fixed model files API routes.
commit cd7db5c4a8448239b632507ea53a25545b41d972
Author: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed Aug 21 22:24:08 2024 +0200
Fix some typos in models file handler.
commit da7313bc9d2ee8614967abaf601782fe85e35113
Author: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed Aug 21 20:24:22 2024 +0200
Fix models files API routes.
commit 4ec361c7183547cd90e67c8c86e87055e55605be
Author: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed Aug 21 19:49:51 2024 +0200
Add AssetModel files endpoints to API
commit 738ef442fdd87887b1ad26ccadf7e78217ffa52e
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Aug 21 13:16:51 2024 +0100
Rename .env var to have DB_ prefix for sanitize-by-default setting
commit d29b3bfb9ae71dc66bf3f49ee6f3453aa2847da9
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 13:06:16 2024 +0100
Few more hidden-print classes
Signed-off-by: snipe <snipe@snipe.net>
commit 6fdce3c536a41168c22141589f4a5dd72ff33fbb
Merge: 01c4fe611 1ab29ec3a
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 13:02:50 2024 +0100
Merge pull request #15358 from r-xyz/rename-docker-startup
Renamed docker startup scripts coherently.
commit 912bbf0e32ad362bb1055eb6d8c62e7ecdce4510
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 13:02:21 2024 +0100
More print fixes
Signed-off-by: snipe <snipe@snipe.net>
commit c54bff0f83baba2e89e7e20c6af92d9e71c50d63
Merge: d3f30ced9 01c4fe611
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 12:24:13 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 01c4fe61139bb3f259e4d4511537590a7e3fc8c6
Merge: 7e475a078 0fa9f5797
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 12:12:23 2024 +0100
Merge pull request #15359 from uberbrady/improve_windows_upgrade
Fixed #15190 - Improvements to upgrade.php script to improve Windows experience
commit 0fa9f57971391d0c24c3585d8bf8fcdafa2731a9
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Aug 21 11:53:38 2024 +0100
Improvements to upgrade.php script to improve Windows experience
commit 1ab29ec3a4c7ad902aa95cd35105105eb2ec567d
Author: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed Aug 21 11:52:09 2024 +0200
Rename docker startup scripts coherently.
commit 7e475a07863c5f4ead90871ef018544b9dcd4205
Merge: d0acf5b8a 26b3c62ab
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 10:41:17 2024 +0100
Merge pull request #15357 from snipe/tighten_category_view_translations
Fixed #15330 - Cleaned up category title
commit 26b3c62ab804d0ee03815e772ba02e22274bc89c
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 10:29:51 2024 +0100
Cleaned up category title
Signed-off-by: snipe <snipe@snipe.net>
commit d3f30ced94465ead29280f83e57b5f38073bc465
Merge: 973e2e575 d0acf5b8a
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 10:13:57 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit d0acf5b8a6c032e2864b95b3f8c7bcbf0c7bf731
Merge: 09033b19a 74fbc2382
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 10:12:58 2024 +0100
Merge pull request #15356 from snipe/validate_location_parent
Fixed #15341 - validate parent ID
commit 74fbc238230cabc1c44ab1933c65fe48effda13f
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 10:09:35 2024 +0100
Updated tests
Signed-off-by: snipe <snipe@snipe.net>
commit a23dee52f27aa4c54578308eef78f3d875b34c65
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 09:58:47 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net>
commit 4d03f1e110b02e5a75bf931a6674b67c269c12de
Author: snipe <snipe@snipe.net>
Date: Wed Aug 21 09:46:18 2024 +0100
Fixed #15341 - validate parent ID
Signed-off-by: snipe <snipe@snipe.net>
commit 963911f2e19b04656b470d00da76cedfe5b3d068
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Aug 21 00:23:10 2024 -0700
changed order of info stgack
commit 59832126cbf9a3d86265f03deedc2267ca32a706
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 20 16:52:51 2024 -0700
Improve comment
commit 680cce3ee2d47357aa9daf5878b87a2016e35410
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 20 16:42:29 2024 -0700
Align indents
commit 6c5ec6a16c3eeccf9391083dc988345d41602a95
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 20 16:41:24 2024 -0700
Get datepicker working
commit 5d1f98bf93fedc77c08740f06d77590283baa24e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 20 15:38:43 2024 -0700
Simplify by directly wire:modeling
commit 9d484077ae030020e3b1cd585783d8db03c5c0f5
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Aug 20 14:24:37 2024 -0700
missed a file
commit 9858b0f37f2f27c43c47e6f437b36e8a72985690
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Aug 20 14:23:55 2024 -0700
fixes info tab for users and assets
commit 973e2e5756b72e939f046d561fd91f2a344ca5cb
Merge: 46ed07642 09033b19a
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 19:45:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
commit 09033b19a7be28ea35e0bd4fe9f94c0e4f8c1a70
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 19:44:13 2024 +0100
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
commit 46ed0764288efc767a14069ed8a1edbf5963e539
Merge: d3a555ce9 5fdeb9c41
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 19:42:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 5fdeb9c4131e7fb3653f359419500d9b130c2443
Merge: 22d373407 6c450d133
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 19:42:08 2024 +0100
Merge pull request #15351 from snipe/localizations/new_translations_2024-08-20
Updated languages
commit 22d3734075becd0d9604ddc18cc0403d9cdfb025
Merge: d99b306ae eca6b03f4
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 19:34:38 2024 +0100
Merge pull request #15350 from marcusmoore/icon-component-updates
Fixed icon not rotated and simplified component
commit eca6b03f44a0f4c51c650afa45bf9833021a8314
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 20 11:08:53 2024 -0700
Allow id to be rendered
commit bbdbec71976b0abd2c1ac8e6c999d6321098b37b
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 20 11:00:39 2024 -0700
Rely on $attributes behavior rendering passed attributes
commit 6c450d1338225ae459abaf23d5662d40d03ca512
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 18:18:17 2024 +0100
Updated languages
Signed-off-by: snipe <snipe@snipe.net>
commit a8cd1027f3cc1716b76461f9db7dbc17b8a130b4
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Aug 20 11:40:15 2024 -0500
rm commented code
commit d3a555ce91fd838e625d0bcdb75f31a79439936b
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 11:49:39 2024 +0100
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
commit 0f8e041809f151f45a26c2f1b6cd131e4fd224a6
Merge: e8a22f3c5 d99b306ae
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 11:49:32 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
commit d99b306ae96d636504323b0c92a879d9df5fa993
Merge: f597d6433 74136761d
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 11:46:55 2024 +0100
Merge pull request #15345 from snipe/add_trim_strings_middleware
Added TrimStrings middleware
commit 74136761dfdbeb9486f07d8ef7658a47402f5b18
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 11:45:13 2024 +0100
Added TrimStrings middleware
Signed-off-by: snipe <snipe@snipe.net>
commit f597d64339bec6e1a7bf06e9ecf1e78c7b2f08fb
Merge: 64bed01a9 0072f1500
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 10:17:26 2024 +0100
Merge pull request #15342 from snipe/snyk/bs-tables
[Snyk] Upgrade bootstrap-table from 1.23.0 to 1.23.2
commit 0072f1500ea60a7660f995fa100ddb46600d1ec6
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 10:16:27 2024 +0100
[Snyk] Upgrade bootstrap-table from 1.23.0 to 1.23.2
Signed-off-by: snipe <snipe@snipe.net>
commit 64bed01a9168e8b9e57100db06653cda678be3b5
Merge: f8c72fb0a f6319e11e
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 10:13:43 2024 +0100
Merge pull request #15327 from snipe/update_button_style
Update icons to use blade components, standardize button colors and format
commit f6319e11e7103231ffb9c34093560e319c1d0859
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 10:11:27 2024 +0100
Added fa-fw to sidebar elements
Signed-off-by: snipe <snipe@snipe.net>
commit 5d9f988df3110286d342aa2a4f069abb437a2f69
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 10:01:49 2024 +0100
Added fw class to topnav icons
Signed-off-by: snipe <snipe@snipe.net>
commit f8c72fb0ac4c44b32fa3ad8d886da82a603c7d72
Merge: 886514a25 fa765667f
Author: snipe <snipe@snipe.net>
Date: Tue Aug 20 09:57:03 2024 +0100
Merge pull request #15112 from marcusmoore/livewire-importer-improvements
Improved handling attempted access of deleted files in importer
commit 8e1111c681df1a7f7ef88c5ce3a91585cbb243d0
Merge: 697595d96 886514a25
Author: akemidx <kojotek.dx@gmail.com>
Date: Mon Aug 19 19:33:44 2024 -0400
Merge remote-tracking branch 'upstream/develop' into eol_date_range_for_reports
commit 886514a25f3a45525366d8520a3cfc89eadc237d
Merge: cb40a82e7 434bdcd6d
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 22:46:08 2024 +0100
Merge pull request #15336 from marcusmoore/fixes/remove-displayed-parentheses
Fixed `)` being added to expected asset checkin report email header
commit fa765667f261205853300a0bde11d719fbbec5e1
Merge: 94d8a547b cb40a82e7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Aug 19 14:41:58 2024 -0700
Merge branch 'develop' into livewire-importer-improvements
commit 434bdcd6d4f3f1ffccdd9d3eb52af5c74d4b24f0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Aug 19 14:31:47 2024 -0700
Add missing parentheses to conditional
commit be5f3f38f802a5aaf290cb9d9151cf2725e10688
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 14:48:12 2024 +0100
Settings pages
Signed-off-by: snipe <snipe@snipe.net>
commit 08c3a25b39a8ff8465d5445bf30e575c6918c5a7
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 14:16:57 2024 +0100
Little more padding
Signed-off-by: snipe <snipe@snipe.net>
commit 34cd4b624404cd12464ede49d2be58ba6a7a0f7e
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 14:15:36 2024 +0100
Added links to apple/google maps
Signed-off-by: snipe <snipe@snipe.net>
commit d89c8682beb4c30bebebf1b28fdd84b18a612477
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:46:31 2024 +0100
Reversed location button ordering
Signed-off-by: snipe <snipe@snipe.net>
commit 6f024849e9949121ec9459383a1510d026daeea8
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:39:24 2024 +0100
Few more
Signed-off-by: snipe <snipe@snipe.net>
commit e048f0955f007b83ad023257b6b65830b22f0b72
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:27:21 2024 +0100
More icons
Signed-off-by: snipe <snipe@snipe.net>
commit 479b2b4fd3e813d56301ec76e112b1997d31cd07
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:23:08 2024 +0100
More icons
Signed-off-by: snipe <snipe@snipe.net>
commit 84f14a05bd09d0e85fcce5aa933e598893266a96
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:20:19 2024 +0100
Fixed logging for asset model restore
Signed-off-by: snipe <snipe@snipe.net>
commit 8d52fa51b16a978ddfdadd49c321956277cdcbb2
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:20:06 2024 +0100
Fixed suppliers buttons
Signed-off-by: snipe <snipe@snipe.net>
commit 229d8b9bf573f0a20ade55bdd1f90f8ea507b84a
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 13:19:59 2024 +0100
Added location restore
Signed-off-by: snipe <snipe@snipe.net>
commit eb8d43a8049cc470e605e7faec493fa7fef396a1
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 12:32:44 2024 +0100
Updated buttons on models
Signed-off-by: snipe <snipe@snipe.net>
commit f82266fadec3524f4ee0304a18a1ec8a4ba642a5
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 11:58:31 2024 +0100
Cleaned up presenters
Signed-off-by: snipe <snipe@snipe.net>
commit b4b6f7a35f8060b5bec460d537816b72e8b0fd1b
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 11:58:21 2024 +0100
Added css-consumable to overrides for table headers
Signed-off-by: snipe <snipe@snipe.net>
commit 0bc995b87f6dc5db5523ed099cafd6ea396c642a
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 11:58:05 2024 +0100
Updated more icons
Signed-off-by: snipe <snipe@snipe.net>
commit 59725f203173f5eb9536d052d1356f8be2ca5df4
Author: snipe <snipe@snipe.net>
Date: Mon Aug 19 11:57:40 2024 +0100
Removed extra debugging in test
Signed-off-by: snipe <snipe@snipe.net>
commit 00bc9ac8065f4a960d508c4883ba01b77b1eb2b4
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 22:39:14 2024 +0100
Fixed spacing
Signed-off-by: snipe <snipe@snipe.net>
commit f200960a5756e306d4230b70b702c8c772505597
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 22:26:57 2024 +0100
Aaaand more
Signed-off-by: snipe <snipe@snipe.net>
commit c700127f1ae3db8cd2d4585476ac27b1c146fe43
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 22:09:00 2024 +0100
Updated user view
Signed-off-by: snipe <snipe@snipe.net>
commit ae2f9571b43665eee44b7e9ed48e0358b65eff04
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 21:57:37 2024 +0100
And still more
Signed-off-by: snipe <snipe@snipe.net>
commit a77dcad33654a960f117ba993ba78a78c5c76aab
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 20:30:53 2024 +0100
More links
Signed-off-by: snipe <snipe@snipe.net>
commit 7ace9324b4450ef0da8fa2c2dd9d21cc96a32175
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 20:30:22 2024 +0100
Added padlock sound
Signed-off-by: snipe <snipe@snipe.net>
commit d2e889e927a1b88aca3564d140093f146e7bfb71
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 19:21:59 2024 +0100
Still more
Signed-off-by: snipe <snipe@snipe.net>
commit 803bdb457c12f186c75e7d837d301aeb6b8ad217
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 18:48:19 2024 +0100
Added calendar
Signed-off-by: snipe <snipe@snipe.net>
commit 7c9b1f6e38b56305a2f6f59c7bb28df9cc3c599d
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 18:39:22 2024 +0100
Added the plus icon
Signed-off-by: snipe <snipe@snipe.net>
commit d545537a431942b3b1b0d0e625c2daa8ab95853f
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 18:34:13 2024 +0100
More icons
Signed-off-by: snipe <snipe@snipe.net>
commit 4d8904938dfa80487a37b72171a5a692f5dbcdb0
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 18:24:26 2024 +0100
Added calendar icon for datepickers
Signed-off-by: snipe <snipe@snipe.net>
commit 0c09f2b2c0e935c93f66088552589a6c7950ec61
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 18:13:49 2024 +0100
Moar icon replacement
Signed-off-by: snipe <snipe@snipe.net>
commit bffba025113c5f95cf140802f41ea03c49db4030
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 17:26:44 2024 +0100
Updated icons
Signed-off-by: snipe <snipe@snipe.net>
commit 901f4df7eef6a814e9274dd9addc56c715363c3e
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 17:03:36 2024 +0100
Added more icons
Signed-off-by: snipe <snipe@snipe.net>
commit 9337cba34030be17c2fd8ccc50d42d8b5cc081e9
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 15:53:58 2024 +0100
Added download
Signed-off-by: snipe <snipe@snipe.net>
commit 2b0c67c26381a55ade9104438386fef646b5c17e
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 15:51:00 2024 +0100
Load the icon helper
Signed-off-by: snipe <snipe@snipe.net>
commit da71f031f5b66662ec5c64f913f3be76e349e23d
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 15:48:24 2024 +0100
Use icon in hardware view
Signed-off-by: snipe <snipe@snipe.net>
commit d2e585baa76991037b82cfa9b610a279b744ad00
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 15:47:45 2024 +0100
Added icon blade
Signed-off-by: snipe <snipe@snipe.net>
commit a102c085dfb36ecc64f7056720418fd00e268310
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 15:47:37 2024 +0100
Added icon helper
Signed-off-by: snipe <snipe@snipe.net>
commit e8a22f3c5bf0fc22602a1373cf91090d40e9d734
Merge: d843cf8dc cb40a82e7
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 04:55:04 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit cb40a82e796dbffb2fe237c290d44bdb9fdd1bcc
Merge: 7e6ff3cbe 4253acad4
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 04:54:23 2024 +0100
Merge pull request #15324 from snipe/jerk_prevention
Prevent passing an array as login
commit 4253acad4c9bdabdbc42ea3ea46885fde8ebf706
Author: snipe <snipe@snipe.net>
Date: Sun Aug 18 04:51:36 2024 +0100
Prevent passing an array as login
Signed-off-by: snipe <snipe@snipe.net>
commit d843cf8dcc94e50c36958e4180ec76f9e351d7ad
Merge: 1013dcae6 7e6ff3cbe
Author: snipe <snipe@snipe.net>
Date: Sat Aug 17 00:52:10 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 1013dcae618b77bc96df9c52298f912d3d756684
Merge: c30c649aa e7ef3bf51
Author: snipe <snipe@snipe.net>
Date: Sat Aug 17 00:38:44 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 70e5e0f9df91c10d94568c98168be1f5fdc5686a
Author: spencerrlongg <spencer@spencerlong.com>
Date: Fri Aug 16 12:52:06 2024 -0500
get rid of dd
commit dec4691c73b28bab35ed8fdb1ff83578ad517bb0
Author: spencerrlongg <spencer@spencerlong.com>
Date: Fri Aug 16 12:50:09 2024 -0500
should be good to go now
commit c30c649aaae21ab6dad1e077155cc0bc4e09e2af
Merge: bb1385369 ad6d09b6a
Author: snipe <snipe@snipe.net>
Date: Fri Aug 16 16:44:02 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit bb1385369c65ac2eab73ba626ab8b2bad7439270
Merge: c1caf6088 43b338d61
Author: snipe <snipe@snipe.net>
Date: Fri Aug 16 16:18:00 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit c1caf6088eeb0474dd90a66b12d592541084fc89
Author: snipe <snipe@snipe.net>
Date: Fri Aug 16 13:12:13 2024 +0100
Prod assets
Signed-off-by: snipe <snipe@snipe.net>
commit 12dfe71ea840bf5b54365be22f432278630537fa
Merge: ca8926871 ea2b1b074
Author: snipe <snipe@snipe.net>
Date: Fri Aug 16 12:48:42 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ca89268716df8d706182aba2a780c05a5a1afe30
Merge: ec5731353 3167ee91d
Author: snipe <snipe@snipe.net>
Date: Fri Aug 16 11:02:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 94d8a547b88a4ee77caf0b3de85d382d07a74840
Merge: 6521c0252 b39a7c6f0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 15 13:47:49 2024 -0700
Merge branch 'develop' into livewire-importer-improvements
commit 43b109fac07f5b5725c094ff1f671b61db42fb16
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 15 13:20:22 2024 -0700
Use cached values for textarea and radio input
commit 75c1e7658fe6303ca6decc82fcdb91a2aad995ab
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 15 10:43:41 2024 -0700
Improve method name
commit e7c9c799bbd90320ada1da9343cb8539bc23ecf1
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 15 10:40:23 2024 -0700
Add wire:keys
commit 6ab976f353b67b03824ed2b29ea78155dd294b4b
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Aug 15 10:32:33 2024 -0700
Use cached values for text input
commit ec5731353a5ce6921eff8faa5579c9a185d9eeb6
Merge: 3283704fe b39a7c6f0
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 15:53:52 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 3283704fe855ff1dabff53454b3248de8e3c05cb
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 12:25:08 2024 +0100
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
commit 540df3204628a030027e138e8b24fdfa03088582
Merge: 85486fa58 594f50664
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 12:24:59 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
commit 85486fa58c5598e6178abe48203f84f3e0b2931a
Merge: 3618df2ec 10dc1f136
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 10:53:54 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 3618df2ec5c81efd3634f74ec18346f91f6b3cc4
Merge: a201f22fd 8f7bce7aa
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 10:44:39 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit a201f22fdb85ce2f7f0961b6f19ef842163fa8a3
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 10:36:12 2024 +0100
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
commit 6070d530cf95d5666fcee4349754efe8f36842ee
Merge: 6c0cf9447 4d66f7c93
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 10:35:33 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 6c0cf944738bc6b5813f83a7165be2500ae2f218
Merge: bf4b91516 381003eea
Author: snipe <snipe@snipe.net>
Date: Thu Aug 15 10:28:08 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 9622e05cf5b545bac1f506af085e6c7e27259848
Author: spencerrlongg <spencer@spencerlong.com>
Date: Wed Aug 14 18:41:06 2024 -0500
correct api test
commit afaf53cdfc37d49ba1afbbe178cd974fbb83920f
Author: spencerrlongg <spencer@spencerlong.com>
Date: Wed Aug 14 18:14:21 2024 -0500
failing ui test
commit f031309f8ffce5747c29e24d467b93cf61ace657
Author: spencerrlongg <spencer@spencerlong.com>
Date: Wed Aug 14 16:09:15 2024 -0500
set up api controller for route/model binding
commit 20ec420ba3a51638f7934e5a3820907760fc544c
Author: spencerrlongg <spencer@spencerlong.com>
Date: Wed Aug 14 13:53:29 2024 -0500
not quite done, api side needs some work
commit ab63a19affed7fe30f2ba13db4e17b391342414a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 14 11:01:51 2024 -0700
Initialize concept of cached values
commit a70b94e707a66c1666d2ba5a1d85eff6f1cd461f
Merge: 120cfd13c 3e2945709
Author: spencerrlongg <spencer@spencerlong.com>
Date: Wed Aug 14 11:36:19 2024 -0500
Merge branch 'refs/heads/develop' into bug/sc-26584
commit 008bf036b5159cf086e3b4e7af2f27774de8461c
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Aug 14 16:09:34 2024 +0100
Got rid of weird namespace declaration and commented-out data-toggle line
commit cc5ad456e6b65c3e0d8d1ad9d7bd7ab4b31d2249
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Aug 14 15:59:21 2024 +0100
Expose the 'sanitize' system for backup restores to the web GUI
commit bf4b915168d19668f9653fb0bbbf66204cec3239
Merge: 0a9c2e354 0f1e5181a
Author: snipe <snipe@snipe.net>
Date: Wed Aug 14 10:45:13 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 0a9c2e354f44469972da3ecc063f4f7a1c1d1331
Merge: 47f1b3b14 e54400718
Author: snipe <snipe@snipe.net>
Date: Wed Aug 14 10:02:43 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 038e86954b10fda8100d3a6cf5c87f48880e69e4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 13 17:30:53 2024 -0700
Improve property name
commit f6c1642bf231ca69fa7a2b328957050dcf39af18
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Aug 13 17:01:35 2024 -0700
Use computed fields in CustomFieldSetDefaultValuesForModel component
commit 120cfd13c544fb79e69f5f59aa44f908b4a39947
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Aug 13 14:07:40 2024 -0500
translation
commit 09f2739298933ea8150a6dfda4aa19b3c5baa94f
Author: spencerrlongg <spencer@spencerlong.com>
Date: Tue Aug 13 13:45:41 2024 -0500
works, un-reassignable licenses are an issue
commit 47f1b3b14e291a46b66d028e259425dd8e017f5b
Merge: 198b76ebc 3044af941
Author: snipe <snipe@snipe.net>
Date: Tue Aug 13 16:48:06 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 198b76ebc2c7099aed211e812ac85f1f3db49060
Merge: 5546f9676 6e84c29ce
Author: snipe <snipe@snipe.net>
Date: Tue Aug 13 15:47:00 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 5546f9676a9795d17cfd6c518f8f8bc78e80b1a0
Merge: 46caa478d 9e73eaf95
Author: snipe <snipe@snipe.net>
Date: Tue Aug 13 13:51:33 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ec863df0074ce785aa3ac80f4871accb8eb2145b
Author: spencerrlongg <spencer@spencerlong.com>
Date: Mon Aug 12 16:58:53 2024 -0500
rm conditional that might be unnecessary
commit cc3b8e0681f74276958c988d986de07cff3e798d
Author: spencerrlongg <spencer@spencerlong.com>
Date: Mon Aug 12 16:58:21 2024 -0500
this should more or less work, but i need to determine if this is the best way
commit ff145abbe720f36604585005b26cf62873169f56
Author: spencerrlongg <spencer@spencerlong.com>
Date: Mon Aug 12 16:13:03 2024 -0500
use array for eager loading, makes ide prettier
commit 46caa478d2eb120f3a1acec3b04dc4c9866e6116
Merge: 4d8569e75 e6106aa7c
Author: snipe <snipe@snipe.net>
Date: Mon Aug 12 20:47:45 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4d8569e7548aedc9121f2a03f78736247a849744
Merge: 4dc57f95e c9f8a84d4
Author: snipe <snipe@snipe.net>
Date: Mon Aug 12 18:01:21 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4dc57f95e2bbd997deed5cc2e81717e04b5522f0
Merge: 316ee6f81 9d354ca65
Author: snipe <snipe@snipe.net>
Date: Mon Aug 12 16:38:23 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 316ee6f81092d419a95da198ad118590de134648
Merge: 509cc812e 3f2139349
Author: snipe <snipe@snipe.net>
Date: Mon Aug 12 16:30:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 509cc812ea1ef38b17bc3f4f21d9b98c92a3448e
Merge: d5f66bc0d e7fb29fce
Author: snipe <snipe@snipe.net>
Date: Mon Aug 12 15:58:40 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit d5f66bc0dd2092bc4f36812eff5016b0d41b6561
Merge: 1e213c31e ce5be8ac2
Author: snipe <snipe@snipe.net>
Date: Mon Aug 12 10:10:59 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 1e213c31ef6af0d9c420d74a1da5e2bd9e6c606c
Merge: 91874dfe0 1777bb4b9
Author: snipe <snipe@snipe.net>
Date: Sun Aug 11 10:26:16 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 91874dfe0b5191daf5438d7ca5f2a64acf4d80f4
Merge: 0e6eda5e8 5c6c655cd
Author: snipe <snipe@snipe.net>
Date: Sat Aug 10 19:37:37 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 0e6eda5e8afbed2448dc671e2a72aad6e882b4b3
Merge: 24560b936 60eb60215
Author: snipe <snipe@snipe.net>
Date: Sat Aug 10 18:29:41 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 24560b93626946d9b74c0b262356fa81c5e27bd7
Author: snipe <snipe@snipe.net>
Date: Sat Aug 10 18:24:49 2024 +0100
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
commit 6521c025264979fa57e788c1cf223e862912d8c9
Merge: 8d1cc22c5 9350a2018
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Aug 7 15:20:39 2024 -0700
Merge branch 'develop' into livewire-importer-improvements
# Conflicts:
# resources/views/livewire/importer.blade.php
commit bb465dbfaafeb6d42a4ee277d1cfe6d7067dfa34
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Jul 24 15:09:23 2024 +0100
Cut down run number to 100 from 1000
commit 8cbcc237c0c587f05dd5e6e96bb900507c249d84
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Jul 24 13:27:31 2024 +0100
Cleanup of Stale workflow for GH - set to debug-mode to start
commit 97e3af8fc989f0b03db39e984c45ba540f7f8ed7
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Sat Jun 29 00:59:47 2024 +0100
WIP on new GitHub-backed stalebot settings
commit 914e29210ae746ed78c240b3f037611e0e8bd149
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Jun 26 18:53:01 2024 +0100
Initial rough stab at re-implementing stalebot
commit 8d1cc22c5818baa8673e24cb402090acfbb73a10
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Jul 18 12:00:01 2024 -0700
Turn on legacy binding since other components still use it
commit 7685de45f255979cbf1799dd8c6936a2c874419c
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 17:12:14 2024 -0700
Turn off legacy binding
commit 199e68ff2929e4f13d6fdd35ec71751b71cf82e5
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 17:10:12 2024 -0700
Simplify computed propery
commit 81bffccf0144dce331cabe57b7c5993fba13a6b2
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 16:28:26 2024 -0700
Use better error message
commit cfca1514c00e7ce1eab506b110f93f59a1b2eaf8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 16:22:44 2024 -0700
Swap file_id for activeFileId
commit b4ed01243bbac083ddd66d912207bd865098c30a
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 13:40:41 2024 -0700
Add more details
commit 3772a21a517c9805929f66e38122cbe7bf6f06f8
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 13:37:24 2024 -0700
Move comment up
commit 04b6cb763f1cad48da45e4b2c2a491e95430728e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Wed Jul 17 10:58:48 2024 -0700
Add todo
commit dd32341502c94f5dbcac64196a4e3acdc7e95462
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 17:21:18 2024 -0700
Display message if attempting to delete non-existent file
commit f58e3114a23435331536000d04ee3090ad4fb9f4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 17:17:45 2024 -0700
Simplify destroy method and update list
commit eba494ad8c5a9441fdf348507f8332ba1efa4142
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 17:03:42 2024 -0700
Make $activeFile a computed property
commit 7e89b58746d5e18863fb2097fd6727aabaeeb04c
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 16:08:42 2024 -0700
Move files to computed property
commit b7744105a09e87a673f50eff32c1a7516d91c5ec
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 14:20:41 2024 -0700
Migrate import type to component
commit 69263f0e5b2d5e600e4368a766104691a6e65e3f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 13:30:29 2024 -0700
Migrate header row to component
commit 017530ba4ba45f96d77cb27dd85e724b0d3783e7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Tue Jul 16 12:02:50 2024 -0700
Make updating hook more specific
commit c8dad528a8d5244cf01111523dfcadd58eb5ada1
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Jul 15 16:15:58 2024 -0700
Migrate a couple items out of mount
commit 256e989ba113650fbe5624bc00735e9329a2795d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Jul 15 15:49:18 2024 -0700
Add test for importer
commit 9793016603cb35524e3e421edf0fe4044e6a42e3
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Jul 11 13:32:16 2024 -0700
Remove unneeded AuthorizesRequests
commit 9e06f2d17fdcdb709a9feada88f2ab7088459f08
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Jul 11 13:22:10 2024 -0700
Remove commented code
commit d4d19569eeecb16e9064e47f47ca503afba469a5
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Jul 11 10:52:47 2024 -0700
adds execution timer
commit 43c7504f899d560e70d033fc8a2ac9823e1fabde
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Jul 11 10:03:51 2024 -0700
adds an all option, adds help context for all, seperates logic
commit 1fa6a763bcfd2c543f58073fdfe40eca927ad636
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 10 11:09:57 2024 -0700
updated description
commit 726308bfd58a1ba4a99174fcd47c052b6404821f
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 10 10:58:45 2024 -0700
removed typo
commit 22ddb695f2cfe9306b75d7d53eb201cb4a64595b
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 10 10:57:47 2024 -0700
better description
commit 09b2feac5401694cdb8a4f306a7418895bd4ec37
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 10 10:56:44 2024 -0700
updates assets with selected model to inherit asset model eol
commit 57e1df86c8041b0efe6dbbfbcc5c92195dd15fb5
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 10 10:21:24 2024 -0700
finds model and collects assets with such model
commit 3ea5d4ee4067b236af345416666faa8c6e976669
Author: Robert-Azelis <82208283+Robert-Azelis@users.noreply.github.com>
Date: Thu May 2 12:55:17 2024 +0200
Update BulkAssetsController.php
Fix for bulk updarte of purchase date to calculate new EOL
commit 5fa0c87ab0554e7c6455d7cd4922ae82cd6657f1
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Apr 30 12:02:11 2024 -0700
null debugbar
commit 75aa01791a2fe64da98f29a942923ab028a92586
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Apr 30 11:54:33 2024 -0700
adds location select to the create new user vice asset checkout
commit 697595d96377ac41bf1525d363f093621ff50102
Merge: 0bdd8a591 9502525a4
Author: akemidx <116301219+akemidx@users.noreply.github.com>
Date: Tue Nov 21 16:07:26 2023 -0500
Merge branch 'develop' into eol_date_range_for_reports
commit 0bdd8a59175a846c70ac122dd4b2124d67cbd6b8
Author: akemidx <kojotek.dx@gmail.com>
Date: Wed Aug 2 16:40:38 2023 -0400
fixing key names
commit e35dd2daa16c61c01bd666411ad93ea5503de601
Author: akemidx <kojotek.dx@gmail.com>
Date: Wed Jul 26 17:45:18 2023 -0400
asset_eol_date stuff
commit f71b69a739c8437c4ef2c6065ba80f8e08102d29
Author: akemidx <kojotek.dx@gmail.com>
Date: Wed Jul 26 17:31:06 2023 -0400
adding eol fields
commit 499a3debcdd1e996ac05fa8dc28d2e39e2bdcb2a
Author: akemidx <kojotek.dx@gmail.com>
Date: Tue Jul 11 14:08:55 2023 -0400
this WILL break. i'm back to site not found which is something missing. otherwise the columns are either blank or another value like expected checkin i was using to test a bit
Signed-off-by: snipe <snipe@snipe.net>
2024-11-12 07:39:22 -08:00
|
|
|
return '<x-icon type="reports" class="text-orange" />';
|
2021-09-01 17:33:59 -07:00
|
|
|
}
|
|
|
|
}
|