mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-16 10:34:08 -08:00
22c79d8e1b
commit6bec573956
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 commit1fc5bb54e1
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> commitb6ad69fac2
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 commit47b2cdb846
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> commit357ef7e375
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 commit6928b1b273
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> commit000f3171e3
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> commit5ef3183a52
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… commit050831868e
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 commita41529dbc4
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 commit4fcf5ac7da
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 commitaa168fcb5b
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> commit9c1c93ad52
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 commitad99b8b456
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Nov 6 10:37:31 2024 -0800 Use generic ID translation commitb96a312539
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 commitbab1e58ea4
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 commit654f67b6ac
Author: snipe <snipe@snipe.net> Date: Wed Nov 6 14:05:42 2024 +0000 Updated webpack Signed-off-by: snipe <snipe@snipe.net> commit3965bcd7c1
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 commit2362cb5e52
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Nov 4 16:32:46 2024 -0800 refactor to getNotifiables commite7cb4a75eb
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Nov 4 15:56:53 2024 -0800 Show accessory checkout id in user accessory table commit93494ac554
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Nov 4 15:17:58 2024 -0800 put dataprovider back in for tests commit0d707a1851
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Nov 4 15:13:10 2024 -0800 fixes notifications for licenses and asset to asset checkouables commit287f4addf0
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" commit2e96d478f1
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" commitf32ebdc7ac
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 commitd6c7dc8e1c
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 31 15:37:01 2024 -0700 Add missing livewire file commit5897d37fcf
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. commit21a27dcac1
Merge:379138076
49de07045
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 31 12:55:46 2024 -0700 fixed conflicts commit3791380764
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 31 12:52:47 2024 -0700 remove unused uses commit7a0f79ecd2
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 31 12:51:22 2024 -0700 remove test route commit97a449e80e
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 31 12:50:13 2024 -0700 removes instanceof User check commite65942064e
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 31 12:45:29 2024 -0700 send emails even if target has no email commit49de07045a
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 commit7e996c40f5
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 commit69e74bbdd3
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. commit73e8f160cf
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 commitbd23772fe9
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 30 11:42:15 2024 -0700 changes cc_email validation to allow array commit73772a0138
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 30 11:12:31 2024 -0700 change button text commitb26cae372c
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 30 10:40:23 2024 -0700 merged in develop commitd6ba303f39
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 commitf68df1fa06
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> commitf0813e03bf
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 commit05875ebd1f
Author: snipe <snipe@snipe.net> Date: Mon Oct 28 22:04:35 2024 +0000 Updated translations Signed-off-by: snipe <snipe@snipe.net> commit9a0eee8f03
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Oct 28 15:03:43 2024 -0700 revert testing variables commit6128765d1f
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Oct 28 15:03:03 2024 -0700 change wording on notification button commitc24f79c025
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Oct 28 14:58:43 2024 -0700 update method comment commite7c4343c90
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Oct 28 14:56:48 2024 -0700 readd checkin accessory format commitc0620c27ff
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Oct 28 14:30:34 2024 -0700 adds back laravels channel formats commited81973fe6
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Oct 28 13:57:42 2024 -0700 adds notifications for deprecation commit2d318b394c
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 commitb987b3dc00
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 commit5c49716129
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 28 10:24:35 2024 -0700 Dump logs on test failure commit86d784bd59
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> commit589f9cccdf
Author: snipe <snipe@snipe.net> Date: Mon Oct 28 12:04:10 2024 +0000 Fixed #15732 Signed-off-by: snipe <snipe@snipe.net> commit4d848e45e6
Author: snipe <snipe@snipe.net> Date: Mon Oct 28 11:55:24 2024 +0000 Fixed #15736 Signed-off-by: snipe <snipe@snipe.net> commit58ff641f82
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 24 22:53:53 2024 -0700 removed unused variables commitce68f550d8
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 24 16:01:17 2024 -0700 remove alert emails from cc commit6f0c1b12b1
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 24 15:04:54 2024 -0700 this adds check out message for consumables commit278bc5e52a
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 24 14:59:10 2024 -0700 ads check in and checkout message for license seats commitcce75a8185
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 24 14:48:23 2024 -0700 adds check in and checkout messag for accessories commite27ff13377
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 24 14:39:40 2024 -0700 adds check in and checkout message for assets commit56365495a1
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 24 14:26:42 2024 -0700 remove unnecessary fields in accessory checkout mail commit18da80e6de
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 24 14:24:00 2024 -0700 fix checkoutable listener for microsoft teams commit18760e3fa1
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 24 12:21:51 2024 -0700 replaces teams notification package, passes integration test commit57107c487c
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 24 09:40:10 2024 -0700 fixed last test, definetly the last test commitdfc63641dc
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]) commit07a51ec8b1
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` commit6329f5b87e
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 23 17:33:23 2024 -0700 removed unused variable from test commite0ec6795b5
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> commit15073a0d38
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 23 17:27:37 2024 -0700 last test to fix commita80c09c16d
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 commit5509d756b7
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` commitb16a978f1b
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 23 16:25:51 2024 -0700 uses manufacturer factory for manufactuer_id commitab3b9c4510
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 23 16:24:01 2024 -0700 remove unnecessary code from checkinasset notification commit2cc2b2b1df
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 23 16:06:27 2024 -0700 apply array_filter to cc emails to prevent errors commit62d06b44d6
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 commitf29a383179
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 commitfd74c35102
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 23 15:08:29 2024 -0700 remove old notify by mail from consumable notification commitc681946b1d
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 23 15:05:39 2024 -0700 added component markdown changes commit257d25bd9e
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 commit6c34a5c52c
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 23 14:54:21 2024 -0700 conditionally check cc emails, initiate variables commit1b5f4415ae
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 23 14:44:45 2024 -0700 corrected cc email behavior commit55ba6279a4
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> commita9eea830e3
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> commitaf564935d5
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 commit3ee76be7e3
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> commitd58f87862c
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 commit0b6859c491
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> commit1e9922a0b0
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 22 16:14:36 2024 -0700 fix moar tests commitead27accac
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 22 15:45:52 2024 -0700 fixed accessory tests and notifiable target commit727c0e458c
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 22 14:34:39 2024 -0700 remove translation commit870dc747db
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 22 14:27:32 2024 -0700 oops commit0fb3d83fac
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 22 14:26:54 2024 -0700 revert controller change commit0d59ccd6a6
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 22 14:23:26 2024 -0700 upgraded livewire v3.5.9 => v3.5.12 commit5da3ce3564
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 commitc3bbca30ad
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 commit37f14fff3b
Author: snipe <snipe@snipe.net> Date: Tue Oct 22 22:07:28 2024 +0100 Fixed typo Signed-off-by: snipe <snipe@snipe.net> commiteb6c51fabd
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> commit5ecd2b6293
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Oct 22 14:04:05 2024 -0700 Default checkbox elements to an empty array commit1e31592c55
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 22 11:49:06 2024 -0700 messing with the tests commitdccb788a88
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 commitd10fe77ee7
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 commit5e1d792bba
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() commit9cf71976f6
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> commit15745d9737
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 commitbd97955b9e
Author: snipe <snipe@snipe.net> Date: Tue Oct 22 16:38:46 2024 +0100 Bumped hash Signed-off-by: snipe <snipe@snipe.net> commit252d99421c
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 commit5767a98ad8
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 commit0c820cbc0d
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 commitdb81701621
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 commita05c33febf
Author: snipe <snipe@snipe.net> Date: Tue Oct 22 15:43:19 2024 +0100 Squashed commit of the following: commit147fcfb8eb
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 commit58a3d09b5f
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 commit30a06a5942
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 commit6c6af78e08
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 commit3f79fd7ea7
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 commit9b06bbb6c3
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 commitce30863177
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 13:57:04 2024 -0700 Remove brianium/paratest dependency commitd7f70146f4
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 13:48:25 2024 -0700 Remove extra icon in accessory file upload list commit867fa2f36e
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 12:40:24 2024 -0700 Display file in activity report for accessories commit0933a2d4ea
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 17 18:01:48 2024 -0700 Remove --parallel flag commit46ad1d072f
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 commitbcb4bd9eb4
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 commitf50ccbcc49
Author: Tobias Regnery <tobias.regnery@gmail.com> Date: Thu Oct 17 11:07:28 2024 +0200 Fix outdated comment in CompanyableTrait As of commit5800e8d
the user model uses CompanyableTrait so remove this clearly outdated comment commit3cf746d7df
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 commit6b7af802af
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 commitfdcc17ca2c
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> commit147fcfb8eb
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 commit58a3d09b5f
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 commit30a06a5942
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 commit6c6af78e08
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 commit3f79fd7ea7
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 commit9b06bbb6c3
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 commitce30863177
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 13:57:04 2024 -0700 Remove brianium/paratest dependency commitd7f70146f4
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 13:48:25 2024 -0700 Remove extra icon in accessory file upload list commit867fa2f36e
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 12:40:24 2024 -0700 Display file in activity report for accessories commite1882ee6d2
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 12:21:45 2024 -0700 Add comment commit7eee239378
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 12:20:28 2024 -0700 use is_numeric instead of is_int commit4188849ae1
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 12:19:48 2024 -0700 Add failing test case commit787e651778
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> commitef9b6e3b07
Author: snipe <snipe@snipe.net> Date: Mon Oct 21 16:34:54 2024 +0100 Code cleanup Signed-off-by: snipe <snipe@snipe.net> commit06c599cc17
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> commit6105323877
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> commit0933a2d4ea
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 17 18:01:48 2024 -0700 Remove --parallel flag commita8d853c44a
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 17 15:26:27 2024 -0700 Remove focus group tags commit7e1b47708e
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 17 15:18:41 2024 -0700 Fix failing test ensuring company id is an integer commit979e4502ff
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 commitff113ef523
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 17 14:56:58 2024 -0700 typo fix commit99dd51a965
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 17 14:53:18 2024 -0700 Improve name commit15c2169477
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 17 14:31:05 2024 -0700 Scaffold additional tests commit50fa6ce335
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 17 14:12:22 2024 -0700 Scaffold tests commit7ae76e7db9
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 17 13:55:03 2024 -0700 remove viewdata array from 3 tests commitb98058ca98
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 17 13:48:26 2024 -0700 fix tests pt 3 commit83e8186d9e
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 17 13:39:56 2024 -0700 fix assertSent to AssertNotSent on some test commitcdd4fef7df
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 17 13:34:55 2024 -0700 attempt to fix tests p2 commitdceb8e305f
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 17 13:11:39 2024 -0700 attempt to fix tests commit123cdeb858
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 17 12:39:48 2024 -0700 add email check to listener commit496b44e887
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 17 12:28:57 2024 -0700 merged composer lock from dev commita690cc3582
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 17 12:26:55 2024 -0700 removing my composer stuff again..for the last time commitceb3f5cea6
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 17 12:19:50 2024 -0700 added mail-gun and http-client to 8.1 commit65735a31f1
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Oct 17 12:18:34 2024 -0700 removed symfony/mailgun-mailer symfony/http-client commit285d6897cf
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 commit159a1d3f43
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 17 11:48:55 2024 -0700 Be more explicit commitd1149730be
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> commit46ad1d072f
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 commit780ed91a10
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. commitbcb4bd9eb4
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 commitf50ccbcc49
Author: Tobias Regnery <tobias.regnery@gmail.com> Date: Thu Oct 17 11:07:28 2024 +0200 Fix outdated comment in CompanyableTrait As of commit5800e8d
the user model uses CompanyableTrait so remove this clearly outdated comment commit9a79483375
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 16 16:59:18 2024 -0700 removed namespaces from routing commited6034065b
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 16 16:47:36 2024 -0700 removed test route commita7754c1a7f
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 16 16:46:52 2024 -0700 fixed asset checkout markdown, and notifiable variable commit0e9b3c9119
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> commit4933aa5784
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> commitd67addc69e
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> commit02c80ff18a
Author: snipe <snipe@snipe.net> Date: Thu Oct 17 00:18:40 2024 +0100 Added comment Signed-off-by: snipe <snipe@snipe.net> commitc01190fac2
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> commit017884f843
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> commitc49921f50f
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> commitc49abb6aea
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> commitccd2019448
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> commit96191a5e93
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> commitc56affd663
Author: snipe <snipe@snipe.net> Date: Thu Oct 17 00:07:37 2024 +0100 Added SVG icon Signed-off-by: snipe <snipe@snipe.net> commit02bda3cd95
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 16 15:53:05 2024 -0700 adds Checkout Consumable mailable and slackwebhook channel to notifs commit02ff646da4
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 16 15:44:45 2024 -0700 adds checkin license mailable commit4becdca8aa
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 16 15:39:20 2024 -0700 removes toMail from license notificaqtion commit2584d60344
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 16 15:38:49 2024 -0700 adds Licenses seat checkout Mailable commitf1d83a3f28
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 16 15:30:53 2024 -0700 forgot to add asset checkout markdown to projet commitc39df34bdf
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 16 15:29:50 2024 -0700 forgot to add accessory mail to project commitdcdf600b78
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 16 15:27:34 2024 -0700 adds Checkin and Checkout mailables and listner logic commit3cf746d7df
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 commit6b7af802af
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 commit9710436d54
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 16 13:12:07 2024 -0700 adds Mailables for asset checkin and out commit16cffe9a9d
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 16 12:53:35 2024 -0700 simplified checkout webhook call commit9e1b86f586
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Oct 16 12:51:19 2024 -0700 sends checkout notification via webhook commit3ab2521cb0
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. commit604a964462
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Oct 16 11:52:24 2024 -0700 Improve scenario descriptions commit2f72c66614
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Oct 16 11:30:06 2024 -0700 Add additional case commitfdcc17ca2c
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. commitcba1a56040
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Oct 15 17:38:11 2024 -0700 Improve readability? commitd9afde4610
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Oct 15 17:00:22 2024 -0700 Write failing test commit9f06a0e441
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 commit42095c0167
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Oct 15 13:02:22 2024 -0700 Add reference link commitf8476f7133
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 15 12:49:52 2024 -0700 finished the construct and mail call in the listner commitb29d032bf0
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 15 11:28:27 2024 -0700 adds checkoutAssetMail class, and content method commit2500375400
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 commite4e1d0d50a
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 commit16c8264e76
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 commit0ae9ce0aa9
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> commit50b8f180b3
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> commit914a647204
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 commite9225ff3ea
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> commitd0d4159088
Author: snipe <snipe@snipe.net> Date: Tue Oct 15 12:42:09 2024 +0100 Fixed typo Signed-off-by: snipe <snipe@snipe.net> commit69b6080bd8
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 commitb997d728fb
Author: snipe <snipe@snipe.net> Date: Tue Oct 15 10:30:34 2024 +0100 Added LLM note Signed-off-by: snipe <snipe@snipe.net> commitddead359d0
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 commitf3c4e55667
Author: Tobias Regnery <tobias.regnery@gmail.com> Date: Mon Oct 14 15:14:41 2024 +0200 Refactor asset creation with API Commitfb4fe3004
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. commit0d35335da7
Author: snipe <snipe@snipe.net> Date: Fri Oct 11 16:06:17 2024 +0100 Removed debugging Signed-off-by: snipe <snipe@snipe.net> commitfeaa714304
Author: snipe <snipe@snipe.net> Date: Fri Oct 11 14:23:57 2024 +0100 Nicer disabled button Signed-off-by: snipe <snipe@snipe.net> commite1a70023b1
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 commitde62359c67
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 commit12bda8fc7b
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 commitfb4fe30049
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 to75ac7f80b9
which is part of version 6.3.0. Fix this by restoring the previous behaviour to check the company_id with getIdForCurrentUser(). commitb054017c9f
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> commit524a442724
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com> Date: Thu Oct 10 23:32:07 2024 +0100 Improved import performance commit8aa298f6b0
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 commit1f34657734
Author: snipe <snipe@snipe.net> Date: Thu Oct 10 12:30:35 2024 +0100 Fixed test Signed-off-by: snipe <snipe@snipe.net> commit0856ee648e
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 commit1dafc970df
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> commit94a074a193
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 commit2d49e1eff2
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 commit705bc6f0c0
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 commitb5b93fdd3a
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> commitd9432baf7a
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> commit90be2a4498
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> commit3886da8941
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> commit130e0c6242
Author: snipe <snipe@snipe.net> Date: Wed Oct 9 22:15:37 2024 +0100 More validation Signed-off-by: snipe <snipe@snipe.net> commit4361a10818
Author: snipe <snipe@snipe.net> Date: Wed Oct 9 22:15:30 2024 +0100 Added string Signed-off-by: snipe <snipe@snipe.net> commitaa8048ac15
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> commit710e738e8e
Author: snipe <snipe@snipe.net> Date: Wed Oct 9 22:15:16 2024 +0100 Fixed tests Signed-off-by: snipe <snipe@snipe.net> commit3705b91439
Author: snipe <snipe@snipe.net> Date: Wed Oct 9 20:51:34 2024 +0100 Added more validation Signed-off-by: snipe <snipe@snipe.net> commit707bdad192
Author: snipe <snipe@snipe.net> Date: Wed Oct 9 20:33:56 2024 +0100 Updated test Signed-off-by: snipe <snipe@snipe.net> commit242fe33f97
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> commitded79469c1
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> commitd9fbf330e5
Author: snipe <snipe@snipe.net> Date: Wed Oct 9 20:33:15 2024 +0100 Fixed translations Signed-off-by: snipe <snipe@snipe.net> commit2cb9ac26cd
Author: snipe <snipe@snipe.net> Date: Wed Oct 9 19:57:04 2024 +0100 Renamed test Signed-off-by: snipe <snipe@snipe.net> commit185bc966e6
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> commita7f7e4938f
Author: snipe <snipe@snipe.net> Date: Wed Oct 9 19:31:56 2024 +0100 Added form action Signed-off-by: snipe <snipe@snipe.net> commit2883e79193
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> commit9c4191ae0a
Author: snipe <snipe@snipe.net> Date: Wed Oct 9 19:30:42 2024 +0100 Basic tests Signed-off-by: snipe <snipe@snipe.net> commit3a77b83e9c
Author: snipe <snipe@snipe.net> Date: Wed Oct 9 19:30:34 2024 +0100 Added space Signed-off-by: snipe <snipe@snipe.net> commitd9be2b5a5e
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> commit69c43c610c
Author: snipe <snipe@snipe.net> Date: Wed Oct 9 19:30:00 2024 +0100 Fixed typo Signed-off-by: snipe <snipe@snipe.net> commit4f957bcf71
Author: snipe <snipe@snipe.net> Date: Wed Oct 9 18:34:53 2024 +0100 Required flag Signed-off-by: snipe <snipe@snipe.net> commit5cda7cce48
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> commit41b94e7128
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> commitaa55fa6ff4
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> commit67a605c9a5
Author: Brady Wetherington <bwetherington@grokability.com> Date: Wed Oct 9 17:01:26 2024 +0100 Fix bulk checkout to users, assets, and locations commitc2663ea1e0
Author: akemidx <kojotek.dx@gmail.com> Date: Tue Oct 8 16:38:33 2024 -0400 withouttrashed commit3ee5713740
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 commitab8a22f77e
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 commit56e7ea6677
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 commit26d7572bcc
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 commit8c9132aff9
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 commit382ebef8ca
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 commit2be88cb955
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 commit3f36d5f9b3
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> commitf76da48448
Author: Lewis Foster <lewis@sniff122.tech> Date: Sat Oct 5 18:27:42 2024 +0100 Docker Env: Change trusted proxies to RFC1918 commit8035326675
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 3 16:53:19 2024 -0700 Add test commitdfdd85abb1
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 3 15:14:07 2024 -0700 Remove unused imports commit063ea1892b
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 3 15:02:03 2024 -0700 Add trait to clean up files after test runs commite213053775
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 3 13:59:58 2024 -0700 Swap factory syntax commit88d549e7c5
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 3 13:40:37 2024 -0700 Remove unused data provider method commit983a25aa5f
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 3 13:39:54 2024 -0700 Simplify permission tests commitbde05d6ed9
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 3 13:15:49 2024 -0700 Use new() instead of times() commitb5ffe54bd0
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 3 13:15:02 2024 -0700 Swap assertEquals parameter order commit863c0a8b60
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 3 11:43:02 2024 -0700 Fix import_type for accessory state commit32551d55d7
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 commit7fc498a597
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 commitcb281c6408
Author: snipe <snipe@snipe.net> Date: Thu Oct 3 17:33:46 2024 +0100 Tweaked line height Signed-off-by: snipe <snipe@snipe.net> commitf483cd448f
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> commit78ca1026fd
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 commit722d5a58e7
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> commit7461c3e0ca
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> commit3c0f4181ae
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> commit3699d79363
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 commit350b627ce1
Author: Brady Wetherington <bwetherington@grokability.com> Date: Thu Oct 3 14:23:40 2024 +0100 Fix numeric sort 'ambiguous order clause' error commitee046a8688
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Oct 2 10:50:40 2024 -0700 Add matching Model::reguard() commitb34a7c8aad
Author: snipe <snipe@snipe.net> Date: Wed Oct 2 15:48:35 2024 +0100 Removed die() Signed-off-by: snipe <snipe@snipe.net> commitf92bf5dc20
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> commit4d9e85026a
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> commit54fbd0540d
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 commitb483bb1633
Author: snipe <snipe@snipe.net> Date: Wed Oct 2 12:40:45 2024 +0100 Bumped version Signed-off-by: snipe <snipe@snipe.net> commit4db7358086
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 commit0dd6f41f66
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> commit684c20ae39
Author: snipe <snipe@snipe.net> Date: Wed Oct 2 11:00:49 2024 +0100 Fixed parenthasis Signed-off-by: snipe <snipe@snipe.net> commit3153bbb13f
Author: spencerrlongg <spencer@spencerlong.com> Date: Tue Oct 1 17:04:18 2024 -0500 dumb fix commit3dc64cc5e0
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Oct 1 13:35:39 2024 -0700 Reference accessory checkout and not the accessory commitc32f4e34b4
Author: snipe <snipe@snipe.net> Date: Tue Oct 1 20:35:49 2024 +0100 Minor formatting fix Signed-off-by: snipe <snipe@snipe.net> commitca1886cebc
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 commita79dfea40a
Author: snipe <snipe@snipe.net> Date: Tue Oct 1 20:30:58 2024 +0100 Updated strings Signed-off-by: snipe <snipe@snipe.net> commit45ab49eeab
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 commit8232618a9f
Author: spencerrlongg <spencer@spencerlong.com> Date: Tue Oct 1 14:26:32 2024 -0500 change the other one too commit9a651b567d
Author: spencerrlongg <spencer@spencerlong.com> Date: Tue Oct 1 14:24:03 2024 -0500 change error to warning commit97d00e5aa8
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> commit5b90d79494
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Oct 1 11:50:48 2024 -0700 Use created_by commitb9cfdf2e54
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 1 11:41:59 2024 -0700 reworked monthly depreciation variable value commit1139acd9f3
Author: spencerrlongg <spencer@spencerlong.com> Date: Tue Oct 1 13:36:47 2024 -0500 catch errors around request notifications commitb7ad80bd31
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 1 11:24:24 2024 -0700 fix monthly depreciation value commit5ffd1b8daa
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 1 11:02:39 2024 -0700 fixes if statement in transformer commit9a2117466e
Author: snipe <snipe@snipe.net> Date: Tue Oct 1 18:23:40 2024 +0100 Removed placeholder Signed-off-by: snipe <snipe@snipe.net> commit7e3a062984
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> commitd274fb6963
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 commit27ba641aa5
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> commit5823197e6f
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> commitcfc04a1d12
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 commitcae8aa7840
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> commit12da43303f
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> commitfdfea390fb
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 commitb04afbbc85
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 commitb964ce1025
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 commit6217cba201
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. commit68e3f375fc
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Sep 30 11:15:49 2024 -0700 removes sortablity from current value column commit5689e940b8
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> commite807cfab86
Merge:0b3f45856
001348c63
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com> Date: Mon Sep 30 12:47:52 2024 +0100 Merge branch 'develop' into importTests commit0b3f458561
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com> Date: Mon Sep 30 12:42:41 2024 +0100 Added tests for Import feature commit001348c638
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> commit1b041af862
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 commit260b153689
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 commit05d74f7a92
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> commitdc85588d7f
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> commit585f998cae
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> commitd120585f94
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> commit166a700342
Merge:6c85ba349
36b27fcda
Author: snipe <snipe@snipe.net> Date: Fri Sep 27 13:37:28 2024 +0100 Merge remote-tracking branch 'origin/develop' commit36b27fcda3
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> commita44490e448
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> commit9aada2ec70
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 commit3f74ff25d2
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Sep 25 16:19:09 2024 -0700 fixed error message commitef82f954e5
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Sep 25 15:47:57 2024 -0700 fixed required css, and user input lengths commit3f311ba2fb
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 commit96953aa2ed
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 commitb797c37acb
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Sep 25 12:48:05 2024 -0700 replace duplicate code with partials commit6c85ba3495
Merge:9f8473e25
ac6411743
Author: snipe <snipe@snipe.net> Date: Wed Sep 25 20:45:02 2024 +0100 Merge remote-tracking branch 'origin/develop' commitac6411743b
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 commit3f0245f88f
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> commitc02647a0fa
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> commitedca3f432c
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> commit2218c94aa3
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> commite609b39760
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 commit12522a3791
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Sep 25 12:07:15 2024 -0700 fix spacing issues commitf6d7ea19e4
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> commit18ddffe8f9
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Sep 25 11:42:16 2024 -0700 fix partial variable intialization, fix width of input fields commit9b03f46490
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 commit926a319552
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 commit9f8473e254
Merge:0e61d0b19
cb6e5042d
Author: snipe <snipe@snipe.net> Date: Wed Sep 25 18:36:40 2024 +0100 Merge remote-tracking branch 'origin/develop' commitcb6e5042d9
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 commitc1a887b48b
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 commit658c94ad8b
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> commit0e61d0b195
Merge:abdddbec4
ba1220484
Author: snipe <snipe@snipe.net> Date: Wed Sep 25 15:51:38 2024 +0100 Merge remote-tracking branch 'origin/develop' commitba12204842
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 commit1c3babacaf
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> commitabdddbec44
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 commiteeabc8dc9d
Author: snipe <snipe@snipe.net> Date: Wed Sep 25 11:33:45 2024 +0100 Dev assets Signed-off-by: snipe <snipe@snipe.net> commit21f8ac8e52
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 commita425c2b765
Merge:34eb10ff7
c38222e95
Author: snipe <snipe@snipe.net> Date: Wed Sep 25 10:52:19 2024 +0100 Merge remote-tracking branch 'origin/develop' commit2a2666be0b
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Sep 24 13:24:50 2024 -0700 makes required a pseudo field commitc38222e956
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 commit0ce5832b6c
Author: snipe <snipe@snipe.net> Date: Tue Sep 24 17:29:40 2024 +0100 Removed debugging Signed-off-by: snipe <snipe@snipe.net> commitb6340532d7
Author: Brady Wetherington <bwetherington@grokability.com> Date: Tue Sep 24 17:15:39 2024 +0100 Improve the error and success messages and linking commit5fb43dd159
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> commitde57d71bf1
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> commitba69259f2d
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> commitc71411465a
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 commit8cf1e4dceb
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 commit66249a37ed
Author: snipe <snipe@snipe.net> Date: Tue Sep 24 11:08:31 2024 +0100 Tweaked styles Signed-off-by: snipe <snipe@snipe.net> commit96712cb398
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> commitfac4833b58
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 23 17:15:16 2024 -0700 Remove unused import commita12c9d053f
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 23 16:44:25 2024 -0700 Hide label when printing commit8b3b68b308
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 commit4b02db5031
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 23 16:26:22 2024 -0700 Add authorization check in bulk users controller commitab90c0cf05
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 23 16:10:40 2024 -0700 Add missing eager load in bulk users controller commitcef7ddc719
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 23 16:10:21 2024 -0700 Add eager loads to userscontroller commit3870095a28
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 commita02e250b22
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 23 15:26:15 2024 -0700 Add page breaks for each user commit8ac5c0e471
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 23 14:05:47 2024 -0700 Re-combine layout and view commita2d4dcf6e8
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 23 12:49:36 2024 -0700 Use bulk actions menu commit54044bfa5e
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 23 10:57:57 2024 -0700 Add eager loads commite493cc964d
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 23 10:48:07 2024 -0700 Remove AssetCountForSidebar middleware from print view commit29af210f4f
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 commit34eb10ff73
Merge:7d7d58769
ab0c009c0
Author: snipe <snipe@snipe.net> Date: Fri Sep 20 19:45:20 2024 +0100 Merge remote-tracking branch 'origin/develop' commitab0c009c0d
Author: snipe <snipe@snipe.net> Date: Fri Sep 20 19:45:10 2024 +0100 Fixed seeder Signed-off-by: snipe <snipe@snipe.net> commit7d7d58769c
Merge:245d5dc46
b68805cf8
Author: snipe <snipe@snipe.net> Date: Fri Sep 20 19:13:00 2024 +0100 Merge remote-tracking branch 'origin/develop' commitb68805cf83
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> commit245d5dc469
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 commit7d858129d9
Author: snipe <snipe@snipe.net> Date: Fri Sep 20 14:44:19 2024 +0100 Bumped hash Signed-off-by: snipe <snipe@snipe.net> commit65ce63bc9b
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 commit54fba2f547
Author: snipe <snipe@snipe.net> Date: Fri Sep 20 14:40:41 2024 +0100 Update jspdf autotable Signed-off-by: snipe <snipe@snipe.net> commit5eea9d1950
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> commitb84a634ec7
Author: snipe <snipe@snipe.net> Date: Fri Sep 20 14:33:35 2024 +0100 Corrected comment Signed-off-by: snipe <snipe@snipe.net> commit2fc88a0e08
Author: snipe <snipe@snipe.net> Date: Fri Sep 20 14:33:26 2024 +0100 Eager load adminuser Signed-off-by: snipe <snipe@snipe.net> commitbc540b6564
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> commitf53b852dff
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> commitb83d1a043f
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` commit4ab478bb97
Merge:d96c5e1ba
cdb7ccb8f
Author: snipe <snipe@snipe.net> Date: Fri Sep 20 13:44:45 2024 +0100 Merge remote-tracking branch 'origin/develop' commitb21c303e56
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 commit5128fd49e6
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 19 17:27:25 2024 -0700 Allow printing all users commit2d2d5bdc7e
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 19 17:23:47 2024 -0700 Pass user in array commit8364d26c9b
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 19 17:18:26 2024 -0700 Extract parent layout commitefd6d7625f
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 19 17:16:05 2024 -0700 Remove bad closing tag commitbdf5708bfc
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 19 17:10:43 2024 -0700 Remove accidental line commite95703cb18
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 19 17:10:07 2024 -0700 Use eager load commit7ad4a29970
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 19 16:54:39 2024 -0700 Add eager loading commitcdb7ccb8f3
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 commit8270947ed2
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 commit4f7c8e0c3d
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 commitd609ed50a4
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 commitb88f2054dd
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> commitd7914e238d
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> commitd7bde37842
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 commit454796e52a
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 commiteef487d61b
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 commit71dbc7abb0
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Sep 19 12:23:07 2024 -0700 refreshed the assetstatus relationship commitd639d6fbc1
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 19 12:21:54 2024 -0700 Add tests for accessory select list endpoint commit74088ea581
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 20:13:38 2024 +0100 Optimize isDeletable counts Signed-off-by: snipe <snipe@snipe.net> commitfff069824b
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 19 12:11:03 2024 -0700 Add tests for update accessory endpoint commitd446773fdd
Author: spencerrlongg <spencer@spencerlong.com> Date: Thu Sep 19 14:05:48 2024 -0500 catch exceptions on notification commitf283b5fbe8
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 19:56:39 2024 +0100 Eager load adminuser Signed-off-by: snipe <snipe@snipe.net> commita5be18bb14
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 19 11:55:15 2024 -0700 Add test for limit and offset commiteb6f05faf7
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 19:41:46 2024 +0100 Eager load adminuser Signed-off-by: snipe <snipe@snipe.net> commit118183ff58
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 19:41:39 2024 +0100 Removed footer Signed-off-by: snipe <snipe@snipe.net> commit2137890496
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 19 11:33:20 2024 -0700 Remove dead code commitebf6ce6980
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> commit9b22d6d493
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 19 11:24:01 2024 -0700 Add tests for accessory checkouts endpoint commit5ebf0ed2b2
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 19:19:14 2024 +0100 Updated variable Signed-off-by: snipe <snipe@snipe.net> commit836893cba5
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> commitcd98b3817d
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 18:26:08 2024 +0100 Removed duplicate line Signed-off-by: snipe <snipe@snipe.net> commit727806372c
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> commit5e1c736d49
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> commit6579fa72da
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> commit82d6e1510f
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> commit822ea96dfd
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> commitb247fc33b9
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 17:28:01 2024 +0100 Added legacy comment Signed-off-by: snipe <snipe@snipe.net> commit2dcae780c0
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 17:26:21 2024 +0100 Reapply deleted code Signed-off-by: snipe <snipe@snipe.net> commit5c3180ffa0
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 17:25:09 2024 +0100 Removed duplicate code Signed-off-by: snipe <snipe@snipe.net> commit65eba30038
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> commitbbce7b40ca
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 17:20:56 2024 +0100 Additional consistencies Signed-off-by: snipe <snipe@snipe.net> commit02a29c71ef
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 17:01:48 2024 +0100 Added created_by Signed-off-by: snipe <snipe@snipe.net> commit6699995972
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> commit951f03094a
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> commit354b00ef15
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> commitc93229179b
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> commita77a7065d7
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> commit4363e8b34c
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 16:20:42 2024 +0100 Updated importer Signed-off-by: snipe <snipe@snipe.net> commit9adb2c24f3
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 16:06:36 2024 +0100 Squashed commit of the following: commitdddbf27d78
Author: snipe <snipe@snipe.net> Date: Wed Sep 18 14:18:52 2024 +0100 Updated language strings Signed-off-by: snipe <snipe@snipe.net> commitfcefcc8184
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 commit04bb3eec83
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] commitf963b9a19f
Author: Brady Wetherington <bwetherington@grokability.com> Date: Wed Sep 18 13:24:26 2024 +0100 Fix selected-index of Countries drop-down commit154d5d8d91
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 commit3519a82ddd
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 16:55:20 2024 -0700 Fix name: TestsFullMultipleCompaniesSupport commita629df07bf
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:49:08 2024 -0700 Implement interfaces on existing test classes commit9a13fcab23
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:38:38 2024 -0700 Pluralize commitf5705a1dde
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:34:55 2024 -0700 More unification commitf325c4afdb
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:32:38 2024 -0700 Unify assertion method commit1fddacd7d0
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:25:11 2024 -0700 Re-order test methods commit4af893df61
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:20:24 2024 -0700 Improve assertions commitb8b3f91ce4
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:55:18 2024 -0700 Formatting commit7f40f55343
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:52:02 2024 -0700 Add tests for delete supplier endpoint commitb06e8d442d
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:37:08 2024 -0700 Add tests for delete status label endpoint commitc269184c60
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:29:41 2024 -0700 Add tests for delete predefined kit endpoint commit53c673dee2
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:13:12 2024 -0700 Add tests for delete manufacturer endpoint commit50730fc4fb
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 12:37:18 2024 -0700 Add tests for delete location endpoint commit60a54cee79
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 12:33:30 2024 -0700 Add tests for delete license endpoint commit446e962a50
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:38:51 2024 -0700 Add tests for delete group endpoint commit79a4bb7316
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:35:44 2024 -0700 Add tests for delete depreciation endpoint commit2f76c1bc5b
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:33:21 2024 -0700 Add assertion commit38b9f4a438
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:29:20 2024 -0700 Add tests for delete departments endpoint commit3105f53aff
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 16:54:29 2024 -0700 Add tests for delete custom fieldsets endpoint commit2047cfed09
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 16:20:32 2024 -0700 Add tests for delete custom fields endpoint commite3268d32df
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 16:00:02 2024 -0700 Add tests for delete consumable endpoint commit6df8b0ac0e
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 15:52:07 2024 -0700 Add tests for delete component endpoint commit910f13c1f7
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 15:38:30 2024 -0700 Add tests for delete companies endpoint commit8ce2512f55
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:54:44 2024 -0700 Add tests for delete category endpoint commit0ec415d4d0
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:46:22 2024 -0700 Clean up commit2044570e95
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:39:36 2024 -0700 Add tests for delete asset model endpoint commitb336c6273d
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:32:42 2024 -0700 Pluralize test classes commit5299b3e9f0
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:29:44 2024 -0700 Remove code handled by CompanyableChildTrait commit872b76b45f
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:29:10 2024 -0700 Add tests for delete asset maintenance endpoint commit275cf4630e
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:16:37 2024 -0700 Add tests for delete asset endpoint commit5c2660bd34
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:02:32 2024 -0700 Introduce interface commitc7ae9d9dfa
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 12:58:47 2024 -0700 Add tests for delete accessory endpoint commit9e5f6d656a
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> commit634a4afa75
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> commit7650628d30
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> commit7f690a6238
Author: snipe <snipe@snipe.net> Date: Thu Sep 19 15:58:32 2024 +0100 Fixed variable name Signed-off-by: snipe <snipe@snipe.net> commitb32ab6a06c
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Sep 18 16:36:24 2024 -0700 import User model commit4ff5fc1ff9
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Sep 18 16:19:35 2024 -0700 clean up variables commit86f13a9735
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 18 16:13:34 2024 -0700 Add index test commitc40209f500
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Sep 18 15:23:44 2024 -0700 seperates emails and webhook notifications commita071fff954
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 18 12:32:14 2024 -0700 Implement tests commit8b50ef077d
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 18 11:58:33 2024 -0700 Implement test commit607f29030f
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 18 11:53:27 2024 -0700 Stub out test commita6bcd3c0c2
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 18 11:47:59 2024 -0700 Add validation test commit9b293afaac
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 18 11:28:29 2024 -0700 Remove more dead code commit636c776620
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 18 11:27:37 2024 -0700 Remove dead code commitd5f659024c
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 18 11:27:09 2024 -0700 Add test for logging commit832e50a71e
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 18 11:19:41 2024 -0700 Implement test commitfa19686248
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 18 11:18:21 2024 -0700 Implement test commitc021609c13
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 commit655abe8be5
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> commitd96c5e1ba4
Merge:a807646d3
dddbf27d7
Author: snipe <snipe@snipe.net> Date: Wed Sep 18 14:20:55 2024 +0100 Merge remote-tracking branch 'origin/develop' commitdddbf27d78
Author: snipe <snipe@snipe.net> Date: Wed Sep 18 14:18:52 2024 +0100 Updated language strings Signed-off-by: snipe <snipe@snipe.net> commitbae9982833
Author: snipe <snipe@snipe.net> Date: Wed Sep 18 14:18:14 2024 +0100 Updated request methods Signed-off-by: snipe <snipe@snipe.net> commita807646d39
Merge:83b4bf9cf
fcefcc818
Author: snipe <snipe@snipe.net> Date: Wed Sep 18 13:48:09 2024 +0100 Merge remote-tracking branch 'origin/develop' commitabe79df6dc
Author: snipe <snipe@snipe.net> Date: Wed Sep 18 13:47:30 2024 +0100 Added translation Signed-off-by: snipe <snipe@snipe.net> commitfcefcc8184
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 commit04bb3eec83
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] commitf963b9a19f
Author: Brady Wetherington <bwetherington@grokability.com> Date: Wed Sep 18 13:24:26 2024 +0100 Fix selected-index of Countries drop-down commit154d5d8d91
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 commit1582d81e5b
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> commit7c85ad54eb
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> commit7b31df7c14
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Sep 17 09:11:58 2024 -0700 Begin additional test case commit83b4bf9cf8
Merge:9ff211105
6c996b775
Author: snipe <snipe@snipe.net> Date: Tue Sep 17 15:54:53 2024 +0100 Merge remote-tracking branch 'origin/develop' commit6c996b7759
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 commit9e957baeb5
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> commit12fd9cd97a
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 17:00:08 2024 -0700 Update interface name commit9e03c4ba6f
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 commit3519a82ddd
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 16:55:20 2024 -0700 Fix name: TestsFullMultipleCompaniesSupport commit8eb1c487bc
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 16:52:10 2024 -0700 implement FMCS test for accessory index commite835637ef0
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 16:40:10 2024 -0700 Add accessory checkin test commiteb35608bb5
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 16:35:33 2024 -0700 Remove call handled by form request commit3f07f682de
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 16:35:21 2024 -0700 Migrate existing tests to TestsPermissionsRequirement commita629df07bf
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:49:08 2024 -0700 Implement interfaces on existing test classes commit9a13fcab23
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:38:38 2024 -0700 Pluralize commitf5705a1dde
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:34:55 2024 -0700 More unification commitf325c4afdb
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:32:38 2024 -0700 Unify assertion method commit1fddacd7d0
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:25:11 2024 -0700 Re-order test methods commit4af893df61
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:20:24 2024 -0700 Improve assertions commitb8b3f91ce4
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:55:18 2024 -0700 Formatting commit7f40f55343
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:52:02 2024 -0700 Add tests for delete supplier endpoint commitb06e8d442d
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:37:08 2024 -0700 Add tests for delete status label endpoint commitc269184c60
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:29:41 2024 -0700 Add tests for delete predefined kit endpoint commit53c673dee2
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:13:12 2024 -0700 Add tests for delete manufacturer endpoint commit50730fc4fb
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 12:37:18 2024 -0700 Add tests for delete location endpoint commit60a54cee79
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 12:33:30 2024 -0700 Add tests for delete license endpoint commit446e962a50
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:38:51 2024 -0700 Add tests for delete group endpoint commit79a4bb7316
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:35:44 2024 -0700 Add tests for delete depreciation endpoint commit2f76c1bc5b
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:33:21 2024 -0700 Add assertion commit38b9f4a438
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:29:20 2024 -0700 Add tests for delete departments endpoint commitfe5fc6e0ce
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 commit62747a0090
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 commit9ff2111055
Merge:1328366a4
b465cc98d
Author: snipe <snipe@snipe.net> Date: Mon Sep 16 14:52:48 2024 +0100 Merge remote-tracking branch 'origin/develop' commitb465cc98d8
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 commit4debaaea39
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> commit1328366a48
Merge:7e14f8c6d
8774da392
Author: snipe <snipe@snipe.net> Date: Mon Sep 16 12:38:56 2024 +0100 Merge remote-tracking branch 'origin/develop' commit4facc4007e
Author: setpill <37372069+setpill@users.noreply.github.com> Date: Fri Sep 13 17:05:48 2024 +0200 feat: Explicitly request LDAP attributes during sync commit31da47e046
Author: setpill <37372069+setpill@users.noreply.github.com> Date: Fri Sep 13 17:05:28 2024 +0200 refactor: Put LDAP attribute mapping in array commit3105f53aff
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 16:54:29 2024 -0700 Add tests for delete custom fieldsets endpoint commit2047cfed09
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 16:20:32 2024 -0700 Add tests for delete custom fields endpoint commite3268d32df
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 16:00:02 2024 -0700 Add tests for delete consumable endpoint commit6df8b0ac0e
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 15:52:07 2024 -0700 Add tests for delete component endpoint commit910f13c1f7
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 15:38:30 2024 -0700 Add tests for delete companies endpoint commit8ce2512f55
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:54:44 2024 -0700 Add tests for delete category endpoint commit0ec415d4d0
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:46:22 2024 -0700 Clean up commit2044570e95
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:39:36 2024 -0700 Add tests for delete asset model endpoint commitb336c6273d
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:32:42 2024 -0700 Pluralize test classes commit5299b3e9f0
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:29:44 2024 -0700 Remove code handled by CompanyableChildTrait commit872b76b45f
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:29:10 2024 -0700 Add tests for delete asset maintenance endpoint commit275cf4630e
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:16:37 2024 -0700 Add tests for delete asset endpoint commit5c2660bd34
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:02:32 2024 -0700 Introduce interface commitc7ae9d9dfa
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 12:58:47 2024 -0700 Add tests for delete accessory endpoint commit0bc98e971f
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Sep 12 12:26:19 2024 -0700 refactoring modals with partials and fixing misalignments commit8774da3921
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 commitc6c5cb73cf
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Sep 11 10:49:27 2024 -0700 fixes consumables positioning with smaller media commita97530367d
Author: snipe <snipe@snipe.net> Date: Wed Sep 11 17:29:22 2024 +0100 Fixed tests again Signed-off-by: snipe <snipe@snipe.net> commit43250ae881
Author: snipe <snipe@snipe.net> Date: Wed Sep 11 17:04:09 2024 +0100 Updated tests Signed-off-by: snipe <snipe@snipe.net> commit04e96b8f20
Author: snipe <snipe@snipe.net> Date: Wed Sep 11 16:43:41 2024 +0100 Added tests Signed-off-by: snipe <snipe@snipe.net> commit98323185de
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> commit9e5f6d656a
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 commit7e14f8c6d6
Merge:fddbdafb9
ab3b65531
Author: snipe <snipe@snipe.net> Date: Wed Sep 11 12:25:28 2024 +0100 Merge remote-tracking branch 'origin/develop' commitab3b655312
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> commit601d8d7e5f
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 commitca01261c1f
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 commit15183c4822
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Sep 10 11:05:03 2024 -0700 rephrased the ternary <-correctly spelled commitfddbdafb99
Author: snipe <snipe@snipe.net> Date: Tue Sep 10 19:03:56 2024 +0100 Fixed conflict Signed-off-by: snipe <snipe@snipe.net> commita5dbece1a9
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 commit4f0f72b29e
Author: snipe <snipe@snipe.net> Date: Tue Sep 10 18:15:12 2024 +0100 Fixed version Signed-off-by: snipe <snipe@snipe.net> commit4183d1834f
Author: snipe <snipe@snipe.net> Date: Tue Sep 10 18:14:03 2024 +0100 Pre-release assets Signed-off-by: snipe <snipe@snipe.net> commit713bb104ec
Merge:7f2cae4f2
4998d60f3
Author: snipe <snipe@snipe.net> Date: Tue Sep 10 14:46:15 2024 +0100 Merge remote-tracking branch 'origin/develop' commit4998d60f39
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 commit7cf30003b6
Author: snipe <snipe@snipe.net> Date: Tue Sep 10 14:41:08 2024 +0100 Updated strings Signed-off-by: snipe <snipe@snipe.net> commitf6bf2d03c4
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 commit6f44441a8b
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 commite7e5dfbdfa
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 commitd62315fbe4
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 commit7f3f77dec8
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 commit82e56c6832
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 commit76c9015aa9
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 9 16:51:40 2024 -0700 Add test case commit5d5f421294
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 9 16:49:43 2024 -0700 Add test case commit367f02af86
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Sep 9 16:34:04 2024 -0700 more partials and includes commit7a1c721eca
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Sep 9 16:22:56 2024 -0700 making modal partials for reuse commit6423df2133
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 commitdc6a5bf998
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 9 14:54:19 2024 -0700 Reflash session so login message is displayed commit0820dd9da4
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 9 14:36:32 2024 -0700 Update test names commitaa6ab2df60
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 9 14:35:38 2024 -0700 Add permission tests for some accessory api endpoints commit22a2cc0256
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 9 13:21:10 2024 -0700 Add test for dashboard counts commit57fab0268b
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Sep 9 13:02:25 2024 -0700 made it a terenary commitad5768d8b2
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Sep 9 12:45:11 2024 -0700 fixes margin for the sidebar using rtl languages commit35533c39d5
Merge:d4426e468
549dec9f9
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 9 12:18:02 2024 -0700 Merge branch 'develop' into company_tests commitde403f6e07
Merge:010f66f4c
549dec9f9
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 9 12:17:53 2024 -0700 Merge branch 'develop' into accessory_tests commit549dec9f9e
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 commitd4426e4686
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 9 11:03:00 2024 -0700 Add simple tests for company creation via UI commitb2a6349243
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 commitc5dbc5f6b8
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> commit7f2cae4f26
Merge:e34f549e4
ce97e2a30
Author: snipe <snipe@snipe.net> Date: Mon Sep 9 03:56:05 2024 +0100 Merge remote-tracking branch 'origin/develop' commitce97e2a30f
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 commit7d9a0eba04
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> commit010f66f4c9
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 4 15:48:11 2024 -0700 Add validation test commit9c6718b459
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 4 15:46:35 2024 -0700 Organize commit9f832a93c9
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 4 15:44:52 2024 -0700 Ensure user is stored commit487d88c012
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 4 15:43:01 2024 -0700 Add some ui tests for accessories commit0e9f7153c0
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Sep 4 15:13:45 2024 -0700 Add composer commands for generating coverage reports via Herd commit7c8955b126
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Sep 4 12:38:35 2024 -0700 revert changes to label view commit20fa4c39f9
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Sep 4 12:26:44 2024 -0700 adds setEula to support\settings commitf04a4a3cf5
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Sep 4 12:21:49 2024 -0700 adds test commitcf07186ae8
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 commit51d63d57c6
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 commite34f549e4c
Merge:a8813cca9
e1fcfc8dc
Author: snipe <snipe@snipe.net> Date: Mon Sep 2 19:16:23 2024 +0100 Merge remote-tracking branch 'origin/develop' commite1fcfc8dc1
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 commit9fe8a866e0
Author: snipe <snipe@snipe.net> Date: Mon Sep 2 19:07:21 2024 +0100 Updated test Signed-off-by: snipe <snipe@snipe.net> commite8e3060a75
Author: snipe <snipe@snipe.net> Date: Mon Sep 2 18:51:22 2024 +0100 Added tests Signed-off-by: snipe <snipe@snipe.net> commit6aaf2f623f
Author: snipe <snipe@snipe.net> Date: Mon Sep 2 18:49:55 2024 +0100 Removed extra route Signed-off-by: snipe <snipe@snipe.net> commitdfbccf50e8
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> commita8813cca94
Merge:9fef27a44
13dbf9ee7
Author: snipe <snipe@snipe.net> Date: Sat Aug 31 13:48:59 2024 +0100 Merge remote-tracking branch 'origin/develop' commit13dbf9ee74
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> commitf8bbb7ad9b
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 commit3c7d455ee3
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> commit9fef27a448
Merge:d2b88a510
12fa50597
Author: snipe <snipe@snipe.net> Date: Thu Aug 29 21:07:56 2024 +0100 Merge remote-tracking branch 'origin/develop' commit12fa505972
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> commitd2b88a5107
Merge:4e35f389d
4e4930ba6
Author: snipe <snipe@snipe.net> Date: Thu Aug 29 21:02:21 2024 +0100 Merge remote-tracking branch 'origin/develop' commit4e4930ba62
Author: snipe <snipe@snipe.net> Date: Thu Aug 29 21:01:48 2024 +0100 Check for array Signed-off-by: snipe <snipe@snipe.net> commit4e35f389df
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 commit76301bc30d
Author: snipe <snipe@snipe.net> Date: Thu Aug 29 20:05:03 2024 +0100 Fixed typo Signed-off-by: snipe <snipe@snipe.net> commit964e105cf9
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 commit6fd24c7e14
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 commit231bc1e2de
Author: snipe <snipe@snipe.net> Date: Thu Aug 29 18:31:34 2024 +0100 Updated blade selectors Signed-off-by: snipe <snipe@snipe.net> commit37d04b7176
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> commite62a802926
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> commit69e981364a
Author: snipe <snipe@snipe.net> Date: Thu Aug 29 17:51:20 2024 +0100 Made multiple select Signed-off-by: snipe <snipe@snipe.net> commite5b9d9a28b
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 commitabb4221539
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> commite4ebabdaba
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 commitda1e383295
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 commitb64ed254e0
Author: snipe <snipe@snipe.net> Date: Thu Aug 29 13:49:09 2024 +0100 Fixed tests Signed-off-by: snipe <snipe@snipe.net> commitba291edc42
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 commitec2ea955d8
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 commitc197644ba7
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 commit29b30cc5d3
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 commit6af27516dc
Author: snipe <snipe@snipe.net> Date: Thu Aug 29 11:29:00 2024 +0100 Upgraded webpack Signed-off-by: snipe <snipe@snipe.net> commita89f17a145
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 commitde0565f5b3
Author: snipe <snipe@snipe.net> Date: Thu Aug 29 11:24:06 2024 +0100 Updated jquery UI Signed-off-by: snipe <snipe@snipe.net> commit4111ef0d78
Merge:cfa56e221
68c708bde
Author: snipe <snipe@snipe.net> Date: Thu Aug 29 11:20:21 2024 +0100 Merge remote-tracking branch 'origin/develop' commit68c708bdef
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 commit5581950fee
Author: snipe <snipe@snipe.net> Date: Thu Aug 29 11:17:17 2024 +0100 Corrected language string Signed-off-by: snipe <snipe@snipe.net> commitcfa56e2219
Merge:7f1dfcc93
58e366a06
Author: snipe <snipe@snipe.net> Date: Thu Aug 29 11:08:53 2024 +0100 Merge remote-tracking branch 'origin/develop' commit58e366a063
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 commitb06c527767
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> commit7f1dfcc935
Merge:6f3fb21fe
26f28a862
Author: snipe <snipe@snipe.net> Date: Wed Aug 28 14:29:06 2024 +0100 Merge remote-tracking branch 'origin/develop' commit26f28a862a
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 commit94c981e22c
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> commit6f3fb21fef
Merge:a48e79a1f
e8da7e2df
Author: snipe <snipe@snipe.net> Date: Wed Aug 28 12:50:19 2024 +0100 Merge remote-tracking branch 'origin/develop' commite8da7e2df2
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 commitd635c86e00
Author: snipe <snipe@snipe.net> Date: Wed Aug 28 12:46:30 2024 +0100 Added tests Signed-off-by: snipe <snipe@snipe.net> commit406ff6984b
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> commitc6ddc501c5
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> commit4839181beb
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> commit63a05c89a7
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> commit385c4f69f7
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> commit486cd8c8c9
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> commiteb5d93b3c2
Author: snipe <snipe@snipe.net> Date: Wed Aug 28 12:38:55 2024 +0100 Added assets relationship Signed-off-by: snipe <snipe@snipe.net> commita5ff623484
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> commitb5a4389815
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> commit7b5b559baa
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 commit67a9929745
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> commita48e79a1fc
Merge:c207d4843
64c4433b9
Author: snipe <snipe@snipe.net> Date: Tue Aug 27 07:37:53 2024 +0100 Merge remote-tracking branch 'origin/develop' commit64c4433b98
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 commit22bc088f6f
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> commitd3e8e06638
Author: snipe <snipe@snipe.net> Date: Mon Aug 26 14:07:06 2024 +0100 Add @swift2512 as a contributor commitc207d48430
Merge:991e48696
1b933f7ad
Author: snipe <snipe@snipe.net> Date: Mon Aug 26 14:01:38 2024 +0100 Merge remote-tracking branch 'origin/develop' commit1b933f7add
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> commit991e48696a
Merge:797488504
3fe891a05
Author: snipe <snipe@snipe.net> Date: Mon Aug 26 10:26:06 2024 +0100 Merge remote-tracking branch 'origin/develop' commit3fe891a05b
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> commit7974885041
Merge:4ef85bd52
f4c5b712f
Author: snipe <snipe@snipe.net> Date: Mon Aug 26 10:24:19 2024 +0100 Merge remote-tracking branch 'origin/develop' commitf4c5b712f4
Author: snipe <snipe@snipe.net> Date: Mon Aug 26 10:24:07 2024 +0100 Removed colons Signed-off-by: snipe <snipe@snipe.net> commit4ef85bd529
Merge:6eab83a85
4c8dc7818
Author: snipe <snipe@snipe.net> Date: Fri Aug 23 17:58:08 2024 +0100 Merge remote-tracking branch 'origin/develop' commit4c8dc7818d
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 commit5c43a1f87c
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> commitd3b265de8e
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> commit263151658f
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> commit6eab83a85a
Merge:cce1f87da
aa86e07cd
Author: snipe <snipe@snipe.net> Date: Fri Aug 23 15:22:53 2024 +0100 Merge remote-tracking branch 'origin/develop' commitaa86e07cd2
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> commitcce1f87da6
Merge:b460e8dc8
d92fa5de6
Author: snipe <snipe@snipe.net> Date: Fri Aug 23 15:18:30 2024 +0100 Merge remote-tracking branch 'origin/develop' commitd92fa5de65
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> commitb460e8dc83
Merge:50cb7e65c
c589140ea
Author: snipe <snipe@snipe.net> Date: Fri Aug 23 08:42:32 2024 +0100 Merge remote-tracking branch 'origin/develop' commitc589140ea0
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 commit52894615ce
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> commit8546bbdd65
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> commit50cb7e65c9
Merge:821dd158d
cc2c8f76d
Author: snipe <snipe@snipe.net> Date: Fri Aug 23 07:32:39 2024 +0100 Merge remote-tracking branch 'origin/develop' commitcc2c8f76d0
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 commit1ffa69c43c
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 commitf85ebd7ffd
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> commit78d355f136
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 commitec0346e4a8
Author: snipe <snipe@snipe.net> Date: Fri Aug 23 07:19:08 2024 +0100 Add @setpill as a contributor commitfc5eb37776
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 commit9a73311a99
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Aug 22 17:04:04 2024 -0700 Fix nested checkboxes being updated as a group commitaec781e7df
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Aug 22 16:03:30 2024 -0700 Be a little more explicit commit1d7853cbfe
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 commit7f3c86165b
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Aug 22 13:58:31 2024 -0700 Conditionally disable Add default values checkbox commit10b45812c4
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Aug 22 13:38:01 2024 -0700 Improve id for checkboxes and radio buttons commitc3165717ed
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Aug 22 13:20:04 2024 -0700 Handle old input commitd0a351a132
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Aug 22 12:59:03 2024 -0700 Add comment commit68749e7e87
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Aug 22 12:58:35 2024 -0700 Simplify logic commit0abb5637e0
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Aug 22 12:54:54 2024 -0700 WIP: handle old input commitaf0a95be12
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Aug 21 17:00:32 2024 -0700 Simplify assertions commitd67975cb62
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Aug 21 16:59:44 2024 -0700 Implement fix commit663b2fd844
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Aug 21 16:59:38 2024 -0700 Add test case commitbcace9d019
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Aug 21 16:54:16 2024 -0700 Point test to correct endpoint commitb59bf3e7dc
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Aug 21 16:49:29 2024 -0700 Add failing test commit3957d670d0
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Aug 22 10:04:46 2024 -0700 fixes send acceptance reminder query commit821dd158d1
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 commit833dace2b4
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 commit56e31d2303
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> commitec365b0804
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. commitaef0ac68c3
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. commitf12f9a816f
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. commita000d6454f
Author: Iisakki Jaakkola <iihaja@utu.fi> Date: Thu Aug 22 15:46:40 2024 +0300 Fix non-functional development docker-compose file. commitca8864c061
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> commit423f4f9126
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 commit456c7d8d91
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 commit54cfe3f6e6
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 commit5e0b18104d
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 commit8b5d3f7fbd
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> commit744f43676d
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> commitec0b9b198f
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 commit6c9a402685
Author: snipe <snipe@snipe.net> Date: Thu Aug 22 11:20:52 2024 +0100 Updated prod assets Signed-off-by: snipe <snipe@snipe.net> commit1b310f3a24
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 commit94300d81d6
Author: snipe <snipe@snipe.net> Date: Thu Aug 22 11:19:32 2024 +0100 Updated dev assets Signed-off-by: snipe <snipe@snipe.net> commitbc9ea5a2ec
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 commit4635a6efc3
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 commit9608414eae
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 commit5efddf6f5b
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> commit305dc049a4
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> commit3ac0702094
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> commit47d8e2f8b9
Author: snipe <snipe@snipe.net> Date: Thu Aug 22 09:42:05 2024 +0100 Add @Scarzy as a contributor commita2246b9645
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Aug 21 17:00:32 2024 -0700 Simplify assertions commit1d89759706
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Aug 21 16:59:44 2024 -0700 Implement fix commit206f8fe605
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Aug 21 16:59:38 2024 -0700 Add test case commit21d2217619
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Aug 21 16:54:16 2024 -0700 Point test to correct endpoint commit833bcb282f
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Aug 21 16:49:29 2024 -0700 Add failing test commit83dd9ce20e
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 commita8eb76fd8d
Author: r-xyz <100710244+r-xyz@users.noreply.github.com> Date: Wed Aug 21 22:25:41 2024 +0200 Fixed model files API routes. commitcd7db5c4a8
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. commitda7313bc9d
Author: r-xyz <100710244+r-xyz@users.noreply.github.com> Date: Wed Aug 21 20:24:22 2024 +0200 Fix models files API routes. commit4ec361c718
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 commit738ef442fd
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 commitd29b3bfb9a
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> commit6fdce3c536
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. commit912bbf0e32
Author: snipe <snipe@snipe.net> Date: Wed Aug 21 13:02:21 2024 +0100 More print fixes Signed-off-by: snipe <snipe@snipe.net> commitc54bff0f83
Merge:d3f30ced9
01c4fe611
Author: snipe <snipe@snipe.net> Date: Wed Aug 21 12:24:13 2024 +0100 Merge remote-tracking branch 'origin/develop' commit01c4fe6113
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 commit0fa9f57971
Author: Brady Wetherington <bwetherington@grokability.com> Date: Wed Aug 21 11:53:38 2024 +0100 Improvements to upgrade.php script to improve Windows experience commit1ab29ec3a4
Author: r-xyz <100710244+r-xyz@users.noreply.github.com> Date: Wed Aug 21 11:52:09 2024 +0200 Rename docker startup scripts coherently. commit7e475a0786
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 commit26b3c62ab8
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> commitd3f30ced94
Merge:973e2e575
d0acf5b8a
Author: snipe <snipe@snipe.net> Date: Wed Aug 21 10:13:57 2024 +0100 Merge remote-tracking branch 'origin/develop' commitd0acf5b8a6
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 commit74fbc23823
Author: snipe <snipe@snipe.net> Date: Wed Aug 21 10:09:35 2024 +0100 Updated tests Signed-off-by: snipe <snipe@snipe.net> commita23dee52f2
Author: snipe <snipe@snipe.net> Date: Wed Aug 21 09:58:47 2024 +0100 Added tests Signed-off-by: snipe <snipe@snipe.net> commit4d03f1e110
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> commit963911f2e1
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Aug 21 00:23:10 2024 -0700 changed order of info stgack commit59832126cb
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Aug 20 16:52:51 2024 -0700 Improve comment commit680cce3ee2
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Aug 20 16:42:29 2024 -0700 Align indents commit6c5ec6a16c
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Aug 20 16:41:24 2024 -0700 Get datepicker working commit5d1f98bf93
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Aug 20 15:38:43 2024 -0700 Simplify by directly wire:modeling commit9d484077ae
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Aug 20 14:24:37 2024 -0700 missed a file commit9858b0f37f
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Aug 20 14:23:55 2024 -0700 fixes info tab for users and assets commit973e2e5756
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 commit09033b19a7
Author: snipe <snipe@snipe.net> Date: Tue Aug 20 19:44:13 2024 +0100 Bumped hash Signed-off-by: snipe <snipe@snipe.net> commit46ed076428
Merge:d3a555ce9
5fdeb9c41
Author: snipe <snipe@snipe.net> Date: Tue Aug 20 19:42:56 2024 +0100 Merge remote-tracking branch 'origin/develop' commit5fdeb9c413
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 commit22d3734075
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 commiteca6b03f44
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Aug 20 11:08:53 2024 -0700 Allow id to be rendered commitbbdbec7197
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Aug 20 11:00:39 2024 -0700 Rely on $attributes behavior rendering passed attributes commit6c450d1338
Author: snipe <snipe@snipe.net> Date: Tue Aug 20 18:18:17 2024 +0100 Updated languages Signed-off-by: snipe <snipe@snipe.net> commita8cd1027f3
Author: spencerrlongg <spencer@spencerlong.com> Date: Tue Aug 20 11:40:15 2024 -0500 rm commented code commitd3a555ce91
Author: snipe <snipe@snipe.net> Date: Tue Aug 20 11:49:39 2024 +0100 Updated assets Signed-off-by: snipe <snipe@snipe.net> commit0f8e041809
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 commitd99b306ae9
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 commit74136761df
Author: snipe <snipe@snipe.net> Date: Tue Aug 20 11:45:13 2024 +0100 Added TrimStrings middleware Signed-off-by: snipe <snipe@snipe.net> commitf597d64339
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 commit0072f1500e
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> commit64bed01a91
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 commitf6319e11e7
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> commit5d9f988df3
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> commitf8c72fb0ac
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 commit8e1111c681
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 commit886514a25f
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 commitfa765667f2
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 commit434bdcd6d4
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Aug 19 14:31:47 2024 -0700 Add missing parentheses to conditional commitbe5f3f38f8
Author: snipe <snipe@snipe.net> Date: Mon Aug 19 14:48:12 2024 +0100 Settings pages Signed-off-by: snipe <snipe@snipe.net> commit08c3a25b39
Author: snipe <snipe@snipe.net> Date: Mon Aug 19 14:16:57 2024 +0100 Little more padding Signed-off-by: snipe <snipe@snipe.net> commit34cd4b6244
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> commitd89c8682be
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> commit6f024849e9
Author: snipe <snipe@snipe.net> Date: Mon Aug 19 13:39:24 2024 +0100 Few more Signed-off-by: snipe <snipe@snipe.net> commite048f0955f
Author: snipe <snipe@snipe.net> Date: Mon Aug 19 13:27:21 2024 +0100 More icons Signed-off-by: snipe <snipe@snipe.net> commit479b2b4fd3
Author: snipe <snipe@snipe.net> Date: Mon Aug 19 13:23:08 2024 +0100 More icons Signed-off-by: snipe <snipe@snipe.net> commit84f14a05bd
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> commit8d52fa51b1
Author: snipe <snipe@snipe.net> Date: Mon Aug 19 13:20:06 2024 +0100 Fixed suppliers buttons Signed-off-by: snipe <snipe@snipe.net> commit229d8b9bf5
Author: snipe <snipe@snipe.net> Date: Mon Aug 19 13:19:59 2024 +0100 Added location restore Signed-off-by: snipe <snipe@snipe.net> commiteb8d43a804
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> commitf82266fade
Author: snipe <snipe@snipe.net> Date: Mon Aug 19 11:58:31 2024 +0100 Cleaned up presenters Signed-off-by: snipe <snipe@snipe.net> commitb4b6f7a35f
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> commit0bc995b87f
Author: snipe <snipe@snipe.net> Date: Mon Aug 19 11:58:05 2024 +0100 Updated more icons Signed-off-by: snipe <snipe@snipe.net> commit59725f2031
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> commit00bc9ac806
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 22:39:14 2024 +0100 Fixed spacing Signed-off-by: snipe <snipe@snipe.net> commitf200960a57
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 22:26:57 2024 +0100 Aaaand more Signed-off-by: snipe <snipe@snipe.net> commitc700127f1a
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 22:09:00 2024 +0100 Updated user view Signed-off-by: snipe <snipe@snipe.net> commitae2f9571b4
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 21:57:37 2024 +0100 And still more Signed-off-by: snipe <snipe@snipe.net> commita77dcad336
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 20:30:53 2024 +0100 More links Signed-off-by: snipe <snipe@snipe.net> commit7ace9324b4
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 20:30:22 2024 +0100 Added padlock sound Signed-off-by: snipe <snipe@snipe.net> commitd2e889e927
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 19:21:59 2024 +0100 Still more Signed-off-by: snipe <snipe@snipe.net> commit803bdb457c
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 18:48:19 2024 +0100 Added calendar Signed-off-by: snipe <snipe@snipe.net> commit7c9b1f6e38
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> commitd545537a43
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 18:34:13 2024 +0100 More icons Signed-off-by: snipe <snipe@snipe.net> commit4d8904938d
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> commit0c09f2b2c0
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 18:13:49 2024 +0100 Moar icon replacement Signed-off-by: snipe <snipe@snipe.net> commitbffba02511
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 17:26:44 2024 +0100 Updated icons Signed-off-by: snipe <snipe@snipe.net> commit901f4df7ee
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 17:03:36 2024 +0100 Added more icons Signed-off-by: snipe <snipe@snipe.net> commit9337cba340
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 15:53:58 2024 +0100 Added download Signed-off-by: snipe <snipe@snipe.net> commit2b0c67c263
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> commitda71f031f5
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> commitd2e585baa7
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 15:47:45 2024 +0100 Added icon blade Signed-off-by: snipe <snipe@snipe.net> commita102c085df
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 15:47:37 2024 +0100 Added icon helper Signed-off-by: snipe <snipe@snipe.net> commite8a22f3c5b
Merge:d843cf8dc
cb40a82e7
Author: snipe <snipe@snipe.net> Date: Sun Aug 18 04:55:04 2024 +0100 Merge remote-tracking branch 'origin/develop' commitcb40a82e79
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 commit4253acad4c
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> commitd843cf8dcc
Merge:1013dcae6
7e6ff3cbe
Author: snipe <snipe@snipe.net> Date: Sat Aug 17 00:52:10 2024 +0100 Merge remote-tracking branch 'origin/develop' commit1013dcae61
Merge:c30c649aa
e7ef3bf51
Author: snipe <snipe@snipe.net> Date: Sat Aug 17 00:38:44 2024 +0100 Merge remote-tracking branch 'origin/develop' commit70e5e0f9df
Author: spencerrlongg <spencer@spencerlong.com> Date: Fri Aug 16 12:52:06 2024 -0500 get rid of dd commitdec4691c73
Author: spencerrlongg <spencer@spencerlong.com> Date: Fri Aug 16 12:50:09 2024 -0500 should be good to go now commitc30c649aaa
Merge:bb1385369
ad6d09b6a
Author: snipe <snipe@snipe.net> Date: Fri Aug 16 16:44:02 2024 +0100 Merge remote-tracking branch 'origin/develop' commitbb1385369c
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 commitc1caf6088e
Author: snipe <snipe@snipe.net> Date: Fri Aug 16 13:12:13 2024 +0100 Prod assets Signed-off-by: snipe <snipe@snipe.net> commit12dfe71ea8
Merge:ca8926871
ea2b1b074
Author: snipe <snipe@snipe.net> Date: Fri Aug 16 12:48:42 2024 +0100 Merge remote-tracking branch 'origin/develop' commitca89268716
Merge:ec5731353
3167ee91d
Author: snipe <snipe@snipe.net> Date: Fri Aug 16 11:02:56 2024 +0100 Merge remote-tracking branch 'origin/develop' commit94d8a547b8
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 commit43b109fac0
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Aug 15 13:20:22 2024 -0700 Use cached values for textarea and radio input commit75c1e7658f
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Aug 15 10:43:41 2024 -0700 Improve method name commite7c9c799bb
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Aug 15 10:40:23 2024 -0700 Add wire:keys commit6ab976f353
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Aug 15 10:32:33 2024 -0700 Use cached values for text input commitec5731353a
Merge:3283704fe
b39a7c6f0
Author: snipe <snipe@snipe.net> Date: Thu Aug 15 15:53:52 2024 +0100 Merge remote-tracking branch 'origin/develop' commit3283704fe8
Author: snipe <snipe@snipe.net> Date: Thu Aug 15 12:25:08 2024 +0100 Updated assets Signed-off-by: snipe <snipe@snipe.net> commit540df32046
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 commit85486fa58c
Merge:3618df2ec
10dc1f136
Author: snipe <snipe@snipe.net> Date: Thu Aug 15 10:53:54 2024 +0100 Merge remote-tracking branch 'origin/develop' commit3618df2ec5
Merge:a201f22fd
8f7bce7aa
Author: snipe <snipe@snipe.net> Date: Thu Aug 15 10:44:39 2024 +0100 Merge remote-tracking branch 'origin/develop' commita201f22fdb
Author: snipe <snipe@snipe.net> Date: Thu Aug 15 10:36:12 2024 +0100 Bumped version Signed-off-by: snipe <snipe@snipe.net> commit6070d530cf
Merge:6c0cf9447
4d66f7c93
Author: snipe <snipe@snipe.net> Date: Thu Aug 15 10:35:33 2024 +0100 Merge remote-tracking branch 'origin/develop' commit6c0cf94473
Merge:bf4b91516
381003eea
Author: snipe <snipe@snipe.net> Date: Thu Aug 15 10:28:08 2024 +0100 Merge remote-tracking branch 'origin/develop' commit9622e05cf5
Author: spencerrlongg <spencer@spencerlong.com> Date: Wed Aug 14 18:41:06 2024 -0500 correct api test commitafaf53cdfc
Author: spencerrlongg <spencer@spencerlong.com> Date: Wed Aug 14 18:14:21 2024 -0500 failing ui test commitf031309f8f
Author: spencerrlongg <spencer@spencerlong.com> Date: Wed Aug 14 16:09:15 2024 -0500 set up api controller for route/model binding commit20ec420ba3
Author: spencerrlongg <spencer@spencerlong.com> Date: Wed Aug 14 13:53:29 2024 -0500 not quite done, api side needs some work commitab63a19aff
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Aug 14 11:01:51 2024 -0700 Initialize concept of cached values commita70b94e707
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 commit008bf036b5
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 commitcc5ad456e6
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 commitbf4b915168
Merge:0a9c2e354
0f1e5181a
Author: snipe <snipe@snipe.net> Date: Wed Aug 14 10:45:13 2024 +0100 Merge remote-tracking branch 'origin/develop' commit0a9c2e354f
Merge:47f1b3b14
e54400718
Author: snipe <snipe@snipe.net> Date: Wed Aug 14 10:02:43 2024 +0100 Merge remote-tracking branch 'origin/develop' commit038e86954b
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Aug 13 17:30:53 2024 -0700 Improve property name commitf6c1642bf2
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Aug 13 17:01:35 2024 -0700 Use computed fields in CustomFieldSetDefaultValuesForModel component commit120cfd13c5
Author: spencerrlongg <spencer@spencerlong.com> Date: Tue Aug 13 14:07:40 2024 -0500 translation commit09f2739298
Author: spencerrlongg <spencer@spencerlong.com> Date: Tue Aug 13 13:45:41 2024 -0500 works, un-reassignable licenses are an issue commit47f1b3b14e
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 commit198b76ebc2
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 commit5546f9676a
Merge:46caa478d
9e73eaf95
Author: snipe <snipe@snipe.net> Date: Tue Aug 13 13:51:33 2024 +0100 Merge remote-tracking branch 'origin/develop' commitec863df007
Author: spencerrlongg <spencer@spencerlong.com> Date: Mon Aug 12 16:58:53 2024 -0500 rm conditional that might be unnecessary commitcc3b8e0681
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 commitff145abbe7
Author: spencerrlongg <spencer@spencerlong.com> Date: Mon Aug 12 16:13:03 2024 -0500 use array for eager loading, makes ide prettier commit46caa478d2
Merge:4d8569e75
e6106aa7c
Author: snipe <snipe@snipe.net> Date: Mon Aug 12 20:47:45 2024 +0100 Merge remote-tracking branch 'origin/develop' commit4d8569e754
Merge:4dc57f95e
c9f8a84d4
Author: snipe <snipe@snipe.net> Date: Mon Aug 12 18:01:21 2024 +0100 Merge remote-tracking branch 'origin/develop' commit4dc57f95e2
Merge:316ee6f81
9d354ca65
Author: snipe <snipe@snipe.net> Date: Mon Aug 12 16:38:23 2024 +0100 Merge remote-tracking branch 'origin/develop' commit316ee6f810
Merge:509cc812e
3f2139349
Author: snipe <snipe@snipe.net> Date: Mon Aug 12 16:30:53 2024 +0100 Merge remote-tracking branch 'origin/develop' commit509cc812ea
Merge:d5f66bc0d
e7fb29fce
Author: snipe <snipe@snipe.net> Date: Mon Aug 12 15:58:40 2024 +0100 Merge remote-tracking branch 'origin/develop' commitd5f66bc0dd
Merge:1e213c31e
ce5be8ac2
Author: snipe <snipe@snipe.net> Date: Mon Aug 12 10:10:59 2024 +0100 Merge remote-tracking branch 'origin/develop' commit1e213c31ef
Merge:91874dfe0
1777bb4b9
Author: snipe <snipe@snipe.net> Date: Sun Aug 11 10:26:16 2024 +0100 Merge remote-tracking branch 'origin/develop' commit91874dfe0b
Merge:0e6eda5e8
5c6c655cd
Author: snipe <snipe@snipe.net> Date: Sat Aug 10 19:37:37 2024 +0100 Merge remote-tracking branch 'origin/develop' commit0e6eda5e8a
Merge:24560b936
60eb60215
Author: snipe <snipe@snipe.net> Date: Sat Aug 10 18:29:41 2024 +0100 Merge remote-tracking branch 'origin/develop' commit24560b9362
Author: snipe <snipe@snipe.net> Date: Sat Aug 10 18:24:49 2024 +0100 Updated prod assets Signed-off-by: snipe <snipe@snipe.net> commit6521c02526
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 commitbb465dbfaa
Author: Brady Wetherington <bwetherington@grokability.com> Date: Wed Jul 24 15:09:23 2024 +0100 Cut down run number to 100 from 1000 commit8cbcc237c0
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 commit97e3af8fc9
Author: Brady Wetherington <bwetherington@grokability.com> Date: Sat Jun 29 00:59:47 2024 +0100 WIP on new GitHub-backed stalebot settings commit914e29210a
Author: Brady Wetherington <bwetherington@grokability.com> Date: Wed Jun 26 18:53:01 2024 +0100 Initial rough stab at re-implementing stalebot commit8d1cc22c58
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 commit7685de45f2
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Jul 17 17:12:14 2024 -0700 Turn off legacy binding commit199e68ff29
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Jul 17 17:10:12 2024 -0700 Simplify computed propery commit81bffccf01
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Jul 17 16:28:26 2024 -0700 Use better error message commitcfca1514c0
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Jul 17 16:22:44 2024 -0700 Swap file_id for activeFileId commitb4ed01243b
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Jul 17 13:40:41 2024 -0700 Add more details commit3772a21a51
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Jul 17 13:37:24 2024 -0700 Move comment up commit04b6cb763f
Author: Marcus Moore <contact@marcusmoore.io> Date: Wed Jul 17 10:58:48 2024 -0700 Add todo commitdd32341502
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Jul 16 17:21:18 2024 -0700 Display message if attempting to delete non-existent file commitf58e3114a2
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Jul 16 17:17:45 2024 -0700 Simplify destroy method and update list commiteba494ad8c
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Jul 16 17:03:42 2024 -0700 Make $activeFile a computed property commit7e89b58746
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Jul 16 16:08:42 2024 -0700 Move files to computed property commitb7744105a0
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Jul 16 14:20:41 2024 -0700 Migrate import type to component commit69263f0e5b
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Jul 16 13:30:29 2024 -0700 Migrate header row to component commit017530ba4b
Author: Marcus Moore <contact@marcusmoore.io> Date: Tue Jul 16 12:02:50 2024 -0700 Make updating hook more specific commitc8dad528a8
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Jul 15 16:15:58 2024 -0700 Migrate a couple items out of mount commit256e989ba1
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Jul 15 15:49:18 2024 -0700 Add test for importer commit9793016603
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Jul 11 13:32:16 2024 -0700 Remove unneeded AuthorizesRequests commit9e06f2d17f
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Jul 11 13:22:10 2024 -0700 Remove commented code commitd4d19569ee
Author: Godfrey M <godmartinz@gmail.com> Date: Thu Jul 11 10:52:47 2024 -0700 adds execution timer commit43c7504f89
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 commit1fa6a763bc
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 10 11:09:57 2024 -0700 updated description commit726308bfd5
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 10 10:58:45 2024 -0700 removed typo commit22ddb695f2
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 10 10:57:47 2024 -0700 better description commit09b2feac54
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 commit57e1df86c8
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 10 10:21:24 2024 -0700 finds model and collects assets with such model commit3ea5d4ee40
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 commit5fa0c87ab0
Author: Godfrey M <godmartinz@gmail.com> Date: Tue Apr 30 12:02:11 2024 -0700 null debugbar commit75aa01791a
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 commit697595d963
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 commit0bdd8a5917
Author: akemidx <kojotek.dx@gmail.com> Date: Wed Aug 2 16:40:38 2023 -0400 fixing key names commite35dd2daa1
Author: akemidx <kojotek.dx@gmail.com> Date: Wed Jul 26 17:45:18 2023 -0400 asset_eol_date stuff commitf71b69a739
Author: akemidx <kojotek.dx@gmail.com> Date: Wed Jul 26 17:31:06 2023 -0400 adding eol fields commit499a3debcd
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>
134 lines
4.3 KiB
PHP
134 lines
4.3 KiB
PHP
<?php
|
|
|
|
namespace App\Presenters;
|
|
|
|
/**
|
|
* Class CategoryPresenter
|
|
*/
|
|
class CategoryPresenter extends Presenter
|
|
{
|
|
/**
|
|
* Json Column Layout for bootstrap table
|
|
* @return string
|
|
*/
|
|
public static function dataTableLayout()
|
|
{
|
|
$layout = [
|
|
[
|
|
'field' => 'id',
|
|
'searchable' => false,
|
|
'sortable' => true,
|
|
'switchable' => true,
|
|
'title' => trans('general.id'),
|
|
'visible' => false,
|
|
], [
|
|
'field' => 'name',
|
|
'searchable' => true,
|
|
'sortable' => true,
|
|
'switchable' => false,
|
|
'title' => trans('general.name'),
|
|
'visible' => true,
|
|
'formatter' => 'categoriesLinkFormatter',
|
|
], [
|
|
'field' => 'image',
|
|
'searchable' => false,
|
|
'sortable' => true,
|
|
'title' => trans('general.image'),
|
|
'visible' => true,
|
|
'formatter' => 'imageFormatter',
|
|
], [
|
|
'field' => 'category_type',
|
|
'searchable' => true,
|
|
'sortable' => true,
|
|
'title' => trans('general.type'),
|
|
'visible' => true,
|
|
], [
|
|
'field' => 'item_count',
|
|
'searchable' => false,
|
|
'sortable' => true,
|
|
'title' => trans('general.qty'),
|
|
'visible' => true,
|
|
], [
|
|
'field' => 'has_eula',
|
|
'searchable' => false,
|
|
'sortable' => false,
|
|
'title' => trans('admin/categories/table.eula_text'),
|
|
'visible' => false,
|
|
'formatter' => 'trueFalseFormatter',
|
|
], [
|
|
'field' => 'checkin_email',
|
|
'searchable' => false,
|
|
'sortable' => true,
|
|
'class' => 'css-envelope',
|
|
'title' => 'Send Email',
|
|
'visible' => true,
|
|
'formatter' => 'trueFalseFormatter',
|
|
], [
|
|
'field' => 'require_acceptance',
|
|
'searchable' => false,
|
|
'sortable' => true,
|
|
'title' => trans('admin/categories/table.require_acceptance'),
|
|
'visible' => true,
|
|
'formatter' => 'trueFalseFormatter',
|
|
], [
|
|
"field" => "use_default_eula",
|
|
"searchable" => false,
|
|
"sortable" => true,
|
|
"title" => trans('admin/categories/general.use_default_eula_column'),
|
|
'visible' => true,
|
|
"formatter" => 'trueFalseFormatter',
|
|
],[
|
|
'field' => 'created_by',
|
|
'searchable' => false,
|
|
'sortable' => true,
|
|
'title' => trans('general.created_by'),
|
|
'visible' => false,
|
|
'formatter' => 'usersLinkObjFormatter',
|
|
], [
|
|
'field' => 'created_at',
|
|
'searchable' => true,
|
|
'sortable' => true,
|
|
'switchable' => true,
|
|
'title' => trans('general.created_at'),
|
|
'visible' => false,
|
|
'formatter' => 'dateDisplayFormatter',
|
|
], [
|
|
'field' => 'updated_at',
|
|
'searchable' => true,
|
|
'sortable' => true,
|
|
'switchable' => true,
|
|
'title' => trans('general.updated_at'),
|
|
'visible' => false,
|
|
'formatter' => 'dateDisplayFormatter',
|
|
], [
|
|
'field' => 'actions',
|
|
'searchable' => false,
|
|
'sortable' => false,
|
|
'switchable' => false,
|
|
'title' => trans('table.actions'),
|
|
'formatter' => 'categoriesActionsFormatter',
|
|
],
|
|
];
|
|
|
|
return json_encode($layout);
|
|
}
|
|
|
|
/**
|
|
* Link to this categories name
|
|
* @return string
|
|
*/
|
|
public function nameUrl()
|
|
{
|
|
return (string) link_to_route('categories.show', $this->name, $this->id);
|
|
}
|
|
|
|
/**
|
|
* Url to view this item.
|
|
* @return string
|
|
*/
|
|
public function viewUrl()
|
|
{
|
|
return route('categories.show', $this->id);
|
|
}
|
|
}
|