DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 10:04:13 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
15641 commits 96 branches 267 tags 295 MiB
Commit graph

6112 commits

Author SHA1 Message Date
snipe ae2f9571b4 And still more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 21:57:37 +01:00
snipe a77dcad336 More links 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 20:30:53 +01:00
snipe d2e889e927 Still more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 19:21:59 +01:00
snipe 7c9b1f6e38 Added the plus icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:39:22 +01:00
snipe 4d8904938d Added calendar icon for datepickers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:24:26 +01:00
snipe 0c09f2b2c0 Moar icon replacement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:13:49 +01:00
snipe bffba02511 Updated icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 17:26:44 +01:00
snipe 901f4df7ee Added more icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 17:03:36 +01:00
snipe 9337cba340 Added download 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 15:53:58 +01:00
snipe a102c085df Added icon helper 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 15:47:37 +01:00
snipe 4253acad4c Prevent passing an array as login 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 04:51:36 +01:00
snipe a25efe53aa Removed some debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-17 00:35:42 +01:00
snipe 318aff1ef0 Fixed behavior for null model numbers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-17 00:27:44 +01:00
snipe 3ae4a5caf0 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 22:53:27 +01:00
snipe 9b6a36c8aa Removed unusued parameter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 22:45:57 +01:00
snipe 1a4aebf805 Added TwoColumnUniqueUndeletedTrait trait 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 22:45:47 +01:00
snipe 6ad7100aa3 Removed unused use statements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 22:45:17 +01:00
snipe b57283d8d1 Removed commented code 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 22:43:56 +01:00
snipe 7658f7c41d First shot 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 20:29:53 +01:00
spencerrlongg 70e5e0f9df get rid of dd 2024-08-16 12:52:06 -05:00
snipe 856c57cb12 Corrected some translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 12:39:59 +01:00
snipe 3167ee91d1 Added a setting test and validation on settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 10:51:49 +01:00
snipe de29c1d8a0
Merge pull request #15314 from Glukose1/features/add_setting_due_for_checkin_in_days 
Added #15312: Add checkin due in days setting
 2024-08-16 10:21:36 +01:00
Marcus Moore 94d8a547b8
Merge branch 'develop' into livewire-importer-improvements 2024-08-15 13:47:49 -07:00
Marcus Moore 75c1e7658f
Improve method name 2024-08-15 10:43:41 -07:00
Marcus Moore 6ab976f353
Use cached values for text input 2024-08-15 10:32:33 -07:00
snipe b39a7c6f0c String constraint
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 15:42:11 +01:00
snipe a3d847151a Model name uniqueness 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 15:19:27 +01:00
snipe 4356cb7b9b Added confetti option 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 11:32:42 +01:00
Glukose1 d8df52cc8f Implemented setting to specify the amount of days before an assets appers in the due for checkin page. Currently this uses the audit warning days but a sperated setting gives the possibility of defineing different values for each field. 2024-08-15 12:20:51 +02:00
snipe d8038ac483 Removed status label list 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 10:17:08 +01:00
snipe 01c69c8f8f Allow optional status label on quickscan checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 10:08:48 +01:00
spencerrlongg f031309f8f set up api controller for route/model binding 2024-08-14 16:09:15 -05:00
spencerrlongg 20ec420ba3 not quite done, api side needs some work 2024-08-14 13:53:29 -05:00
Marcus Moore ab63a19aff
Initialize concept of cached values 2024-08-14 11:01:51 -07:00
spencerrlongg a70b94e707 Merge branch 'refs/heads/develop' into bug/sc-26584 2024-08-14 11:36:19 -05:00
Brady Wetherington cc5ad456e6 Expose the 'sanitize' system for backup restores to the web GUI 2024-08-14 15:59:21 +01:00
snipe 371afde52d Bulk edit asset name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-14 09:52:25 +01:00
Marcus Moore 038e86954b
Improve property name 2024-08-13 17:30:53 -07:00
Marcus Moore f6c1642bf2
Use computed fields in CustomFieldSetDefaultValuesForModel component 2024-08-13 17:01:35 -07:00
spencerrlongg 120cfd13c5 translation 2024-08-13 14:07:40 -05:00
spencerrlongg 09f2739298 works, un-reassignable licenses are an issue 2024-08-13 13:45:41 -05:00
snipe e9fc455a30
Merge pull request #15192 from Godmartinz/status_labels_check_emails 
Added status labels to confirmation emails
 2024-08-13 18:24:15 +01:00
snipe 72fd9977e5
Merge pull request #15277 from uberbrady/silence_saml_errors 
Fixed: [sc-26355] Attempt to de-escalate SAML login and logout errors
 2024-08-13 15:51:03 +01:00
Brady Wetherington 10f35c682b Re-add space 2024-08-13 15:49:51 +01:00
Brady Wetherington 4b96721393 Attempt to de-escalate SAML login and logout errors 2024-08-13 14:55:13 +01:00
snipe c163d6774f
Merge pull request #15198 from spencerrlongg/feature/add_trait_to_request 
Add MayContainCustomFields Trait to Asset Update Request
 2024-08-13 14:12:52 +01:00
spencerrlongg ec863df007 rm conditional that might be unnecessary 2024-08-12 16:58:53 -05:00
spencerrlongg cc3b8e0681 this should more or less work, but i need to determine if this is the best way 2024-08-12 16:58:21 -05:00
spencerrlongg ff145abbe7 use array for eager loading, makes ide prettier 2024-08-12 16:13:03 -05:00
snipe b45a8f4b5f Added reporting-only access for selectlists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-12 20:44:17 +01:00
snipe ac1543d568 Fixed #15247 - make pie chart on dashboard respect the “show archived” setting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-12 17:54:42 +01:00
snipe 9d354ca657
Merge pull request #15266 from uberbrady/checkout_to_fixer 
Checkout-to fixer
 2024-08-12 16:34:19 +01:00
snipe ce5be8ac24
Merge pull request #15100 from Godmartinz/depreciation_percentage
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Added Depreciation Percentage as an option
 2024-08-12 10:10:25 +01:00
snipe 1777bb4b93 Pulled searchable relation on model - needs revisit
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-11 10:26:02 +01:00
snipe ce33deed86 Remove unused use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-10 17:14:34 +01:00
snipe 1e6c172f18 Removed unusued use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-10 17:14:20 +01:00
snipe a1ce9b9285 Added query scope for ordering by admin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-10 17:00:50 +01:00
snipe 6ec3693030 Load admin on actionlog 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-10 17:00:34 +01:00
snipe 71729f0b16 Load admin and model on assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-10 17:00:20 +01:00
snipe f76fbe75e0
Merge pull request #15221 from marcusmoore/fixes/bulk-checkin-logging
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details 
Fixed accessories and consumables not being logged correctly during bulk check-in
 2024-08-08 10:43:59 +01:00
snipe 8094f3c0e1
Merge pull request #15245 from spencerrlongg/bug/acceptance_issue 
Fixed Issue with Acceptances Being Created
 2024-08-08 01:22:34 +01:00
Marcus Moore 6521c02526
Merge branch 'develop' into livewire-importer-improvements 
# Conflicts:
#	resources/views/livewire/importer.blade.php
 2024-08-07 15:20:39 -07:00
spencerrlongg 2412333152 added conditional to listener 2024-08-07 16:53:06 -05:00
Marcus Moore d03baa4613
Make diff cleaner 2024-08-07 13:29:45 -07:00
Marcus Moore 41437e4d8f
Merge branch 'develop' into fixes/bulk-checkin-logging 
# Conflicts:
#	app/Http/Controllers/Users/BulkUsersController.php
 2024-08-07 13:06:59 -07:00
snipe 7d220dd8c2 set default 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 20:58:04 +01:00
snipe a99ec062e6 Added checkbox for preferences 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 20:49:07 +01:00
snipe 9350a20189 Include accessories count
Some checks failed
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Details
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details 
This isn’t exactly right right now

Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 20:19:47 +01:00
snipe 889d5da71e Check for accessories on bulk items 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 20:04:32 +01:00
snipe 5546ab08c2 Only delete user records in accessories_checkouts for bulk delete 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 19:53:18 +01:00
snipe ef183f256c
Merge pull request #15242 from Godmartinz/shortcut_option
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Fixed shortcuts to be optional now
 2024-08-07 18:56:27 +01:00
Godfrey M 6b1784f2ee makes shortcuts optional 2024-08-07 10:47:16 -07:00
snipe a5f075548a Default to user 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 18:04:39 +01:00
Brady Wetherington 1706ddd511 working fixup script, but failing tests. But I have tests! 2024-08-07 16:06:00 +01:00
Marcus Moore c7ddabcc8b
Check for FMCS when checking out component 2024-08-06 12:27:15 -07:00
Marcus Moore bee80fcf8a
Remove global scope when counting check outs 2024-08-06 12:16:06 -07:00
Marcus Moore f2b78d18a4
Merge branch 'develop' into fixes/bulk-checkin-logging 
# Conflicts:
#	app/Http/Controllers/Users/BulkUsersController.php
 2024-08-05 17:25:54 -07:00
Marcus Moore 17eccfcd8b
Formatting 2024-08-05 16:58:27 -07:00
Marcus Moore 01e4382d20
Formatting 2024-08-05 16:58:17 -07:00
Marcus Moore 1c664af326
Remove todo outside of scope 2024-08-05 16:58:08 -07:00
Marcus Moore 392d34422a
Remove code handled by ConsumableAssignment:: call above 2024-08-05 16:57:40 -07:00
Marcus Moore 67b3ab820f
Add todo comments 2024-08-05 16:10:08 -07:00
Marcus Moore bfebcdc7ed
Improve variable name 2024-08-05 15:22:35 -07:00
Florent Bervas ad794248fe add a warning message if asset tag not found 2024-08-05 13:54:33 +00:00
Florent Bervas b804791ff6 feature: extend search capabilities to other assets attributes 2024-08-05 12:26:29 +00:00
Godfrey M ae4f278df1 edited terenaries on notifs 2024-08-01 11:13:20 -07:00
Godfrey M 854903805b one more spot 2024-07-31 12:16:41 -07:00
Godfrey M 868f117b67 Merge branch 'status_labels_check_emails' of github.com:Godmartinz/snipe-it into status_labels_check_emails 2024-07-31 12:03:56 -07:00
Godfrey M b6cac4baae corrects ? usage 2024-07-31 12:03:36 -07:00
snipe 31a2765b30
Merge pull request #15145 from Godmartinz/purge-storage 
Added user storage files to purge command
 2024-07-31 10:16:08 +01:00
spencerrlongg 0941c0944a ok, found issue, but need to test some things now... 2024-07-30 22:55:15 -05:00
spencerrlongg 9b80843c77 tests a little broken, added some nullchecks 2024-07-30 21:44:22 -05:00
spencerrlongg 8684a3efc3 delete note, add trait to other request 2024-07-30 21:22:46 -05:00
spencerrlongg 437ddc01b4 removed extraneous $request->validate() arguments 2024-07-30 16:26:24 -05:00
Godfrey M eb6f330e67 adds status to check in and out 2024-07-30 09:38:39 -07:00
Godfrey M f19899543d changed error to info 2024-07-30 09:18:17 -07:00
snipe 3a2611f8e1
Merge pull request #14565 from spencerrlongg/bug/sc-23936
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Checks that custom fields exist before saving
 2024-07-30 11:36:55 +01:00
Godfrey M 53ad312700 added missing closing bracket 2024-07-29 15:17:32 -07:00
Godfrey M 89d375daad add indents 2024-07-29 15:15:41 -07:00
Godfrey M d46f9776fe remove text 2024-07-29 15:14:58 -07:00
Godfrey M f9a47c8a9f adds a try catch 2024-07-29 15:12:48 -07:00
Godfrey M e395ee1878 adds a try catch 2024-07-29 15:12:32 -07:00
snipe 4c5b82ae37
Merge pull request #15188 from Godmartinz/1d_barcode_select_bug 
Fixed 1d barcode targeting.
 2024-07-29 20:00:21 +01:00
Spencer Long fd7082c30f
Merge branch 'develop' into bug/sc-23936 2024-07-29 14:00:00 -05:00
Godfrey M 86049624c7 retargeted new label engine to correct 1d column 2024-07-29 10:42:26 -07:00
arne-kroeger e8d0147075 Adjusted missing down on migration and code smells 2024-07-29 19:04:10 +02:00
arne-kroeger b18baf74d2 added options to checkout accessoires to locations and assets 
Added #14979: add checkout functionality to accessoires
 2024-07-29 10:54:53 +02:00
snipe aab29fbb6b Use translated string for restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 16:47:40 +01:00
snipe e4a82edd3f
Merge pull request #15172 from snipe/features/blade_component_for_submit 
Use blade component for submit redirect on asset edit/create
 2024-07-26 15:13:30 +01:00
snipe ff100c0b9f Added more tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 14:58:10 +01:00
snipe 037cc4d098 More tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 14:27:07 +01:00
snipe cd7f276c40 Fixed logging for component 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 13:09:21 +01:00
snipe 5d7f1f77a3 Added redirect to checkin/checkout controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 12:48:07 +01:00
snipe c6e709cd36 Added parameters 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 12:45:06 +01:00
snipe 759ab78f80 Added more redirects 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 11:27:36 +01:00
snipe b6d9f736e3 Pulled use session 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 10:41:28 +01:00
snipe 57f6ecb1da Added created_by to license view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 10:24:13 +01:00
snipe 068535a80c Removed logging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 22:08:46 +01:00
snipe 08f4fe5f35 Add status messages to redirect 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 22:02:34 +01:00
snipe 018b5684fc Refactor helper method for redirection 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 22:02:03 +01:00
snipe 73a80a5fbc Use blade component for redirect option 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 21:35:13 +01:00
snipe f77d300549
Merge pull request #15169 from uberbrady/create_directories_when_needed_on_restore 
Create intermediate directories on restore if needed - Fixes [SC-25950]
 2024-07-25 18:45:54 +01:00
Brady Wetherington eb938bdba3 Create intermediate directories on restore if needed 2024-07-25 18:40:26 +01:00
Brady Wetherington 84df23e1f6 Better handle older SQL dumps that got created in Windows format 2024-07-25 18:07:25 +01:00
snipe a439d8abe8 Use fully qualified use statements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 16:08:46 +01:00
snipe 24b7659c23
Merge pull request #15150 from marcusmoore/chore/sc-26113 
Registered custom anonymous blade component directory
 2024-07-25 16:08:01 +01:00
Marcus Moore 44dbbeb608
Add accessory and consumable specific checkin methods 2024-07-24 14:17:49 -07:00
snipe c3a2cdeee9 Added assets endpoint for locations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:53:58 +01:00
snipe adf58a06da Added check for purchase date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:13:11 +01:00
snipe 63f0b5279d Added check for purchase_date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:13:01 +01:00
Godfrey Martinez c96ccbb6cb
Merge branch 'develop' into depreciation_percentage 2024-07-24 12:12:28 -07:00
Godfrey M d5c9fa823e adds translations 2024-07-24 11:39:33 -07:00
Godfrey M 99741db645 adds status labels to confirmation emails 2024-07-24 11:24:30 -07:00
snipe 293abbd1d0 Allow cloning of deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:49:38 +01:00
snipe ab1e097b7c Early return for requiredness 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 10:41:14 +01:00
Marcus Moore 869c06f454
Register anonymous blade component namespace 2024-07-23 15:41:58 -07:00
spencerrlongg b61ab423ca ok NOW it should be fine 2024-07-23 17:35:48 -05:00
spencerrlongg 090a595c99 conflict 2024-07-23 17:34:17 -05:00
Spencer Long bc417308c7
Merge branch 'develop' into bug/check_requiredness 2024-07-23 17:32:43 -05:00
spencerrlongg e77e16b9aa this works 2024-07-23 17:22:20 -05:00
spencerrlongg 0ae297634e ugh 2024-07-23 16:59:58 -05:00
spencerrlongg 0f2f559d7a test works, helper still needs work. pushing to check something 2024-07-23 16:46:29 -05:00
snipe 57b5b12952
Merge pull request #15148 from marcusmoore/fixes/dates-in-user-import 
Fixed start_date and end_date in user importer
 2024-07-23 22:37:19 +01:00
snipe 1f4118a146 Fixed rule 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 22:15:37 +01:00
Marcus Moore f4a3823d88
Handle empty strings for dates by converting them to null 2024-07-23 13:57:28 -07:00
snipe 00ebc8b64d
Merge pull request #15136 from snipe/fixes/cookie_serialization 
Remove cookie serialization
 2024-07-23 21:41:44 +01:00
snipe effd273245
Merge pull request #14458 from spencerrlongg/bug/sc-24884 
Add Form Request and Tests for Update Asset API Method
 2024-07-23 20:57:47 +01:00
spencerrlongg e8864ffb01 test added, permission fixed 2024-07-23 14:29:17 -05:00
Brady Wetherington d893de2b7e Merge branch 'develop' into fix_setup_ssl_check 2024-07-23 20:24:38 +01:00
Brady Wetherington 7f7cfef81b Mark test as Incomplete, and downgrade error back to debug for tests 2024-07-23 20:24:05 +01:00
Godfrey M d01972bbe5 adds tests for amount and percent 2024-07-23 11:53:59 -07:00
spencerrlongg 1139ed676a $id to $asset->id (thanks tests) 2024-07-23 13:03:25 -05:00
Spencer Long 64be353156
Merge branch 'develop' into bug/sc-24884 2024-07-23 12:55:19 -05:00
Godfrey M 750015684d purges user storage files 2024-07-23 10:42:50 -07:00
snipe ba6d8ae8c7 Switch to nb-NO from no-NO 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 17:15:44 +01:00
snipe 175862d3c9 Added route param to message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 16:37:01 +01:00
Brady Wetherington 5eea08088d Improve .env file checking to not validate SSL certificates 2024-07-23 16:03:02 +01:00
snipe c752c2a125 Make the passport cookie name configurable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 14:22:19 +01:00
snipe 4ac4f9b0a9 Customize cookie name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 14:17:16 +01:00
snipe 09abcb44bb Remove cookie serialization 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 13:49:47 +01:00
snipe 38affea3f3 More updates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:57:10 +01:00
snipe 254e2f120b Added clone to consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:40:32 +01:00
snipe 2bfee0c29a Few more tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:21:11 +01:00
snipe 8fc5c0b5be Use other default avatar, not in the avatars directory 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:34:40 +01:00
snipe 6f3eedf5e6 Removed restoreDefaultAvatar method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:25:27 +01:00
snipe 241eb7b031 One more bad sig 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 06:06:27 +01:00
snipe ca399794c3 Fixed incorrect signature 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 06:05:01 +01:00
snipe 736d4cc59a Use new deleting method in ImageUploadRequest 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:34 +01:00
snipe ad85f8be2f Cleaned up 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:12 +01:00
snipe c6c006f143 Added restore from demo method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:54:40 +01:00
snipe 10856516ac Split out the image deletion into a separate method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 03:40:16 +01:00
snipe e373be7dde Skip deleting default avatar from disk on delete 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 01:01:27 +01:00
snipe ca7c0aa47c Added default avatar to seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:59:25 +01:00
snipe 793cf27318 Fixed use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 22:50:24 +01:00
snipe 94619e3284 Fixed #15121 - bulk delete restore logging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 19:56:58 +01:00
snipe c50ab1af67
Merge branch 'develop' into develop 2024-07-19 19:00:56 +01:00
snipe e328dec9f9
Merge branch 'develop' into localizations/more_strings 2024-07-18 18:51:17 +01:00
snipe 822bc6f085 Removed response in form request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 17:37:45 +01:00
snipe 19bd99d159 Updated count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 17:33:24 +01:00
snipe 9858cc5baf Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 04:43:30 +01:00
snipe 0c4e498df3 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 03:48:35 +01:00
snipe b5b60f22d5 Removed int 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 03:48:21 +01:00
snipe f56006fb6b More refactoring 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 01:46:53 +01:00
Marcus Moore 199e68ff29
Simplify computed propery 2024-07-17 17:10:12 -07:00
Marcus Moore 81bffccf01
Use better error message 2024-07-17 16:28:26 -07:00
snipe 79a13e3618 Added numCheckedOut method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:26:58 +01:00
snipe d9b7df5b85 Added form requests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:26:42 +01:00
snipe 0c933bcc5d Cleaned up controllers, use form requests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:25:42 +01:00
snipe 4c4b0f722a Added qty to email notification 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:25:29 +01:00
snipe 4f3064bdb1 Added store accesstory form request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:24:51 +01:00
snipe 2b0627c1f6 Added accessory checkout request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:24:28 +01:00
Marcus Moore cfca1514c0
Swap file_id for activeFileId 2024-07-17 16:22:44 -07:00
snipe 345a4306e8 Added SubstituteBindings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-17 23:02:10 +01:00
Marcus Moore b4ed01243b
Add more details 2024-07-17 13:40:41 -07:00
Marcus Moore 3772a21a51
Move comment up 2024-07-17 13:37:24 -07:00
Marcus Moore 04b6cb763f
Add todo 2024-07-17 10:58:48 -07:00
snipe 0ac82fbbe1
Merge pull request #15084 from snipe/fixes_ldap_sync_locale 
Fixes #15067 - updated ldap sync locale to use `app()->getLocale()`
 2024-07-17 18:15:32 +01:00
Godfrey M baa7e7d561 clean up 2024-07-16 20:27:38 -07:00
Godfrey M ffaacc04ef cleaned up calculateDepreciation method 2024-07-16 20:24:18 -07:00
Marcus Moore dd32341502
Display message if attempting to delete non-existent file 2024-07-16 17:21:18 -07:00
Marcus Moore f58e3114a2
Simplify destroy method and update list 2024-07-16 17:17:45 -07:00
Marcus Moore eba494ad8c
Make $activeFile a computed property 2024-07-16 17:03:42 -07:00
Marcus Moore 7e89b58746
Move files to computed property 2024-07-16 16:08:42 -07:00
Marcus Moore b7744105a0
Migrate import type to component 2024-07-16 14:20:41 -07:00
snipe d5e1dc54c6 Use translated strings for action log meta 
This is only partially complete and I mostly hate it

Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:35:45 +01:00
Marcus Moore 69263f0e5b
Migrate header row to component 2024-07-16 13:30:29 -07:00
snipe 7f412ec3f5 Missing string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:14:41 +01:00
Godfrey M 5bb47e290f validates percentage on store and new depreciations 2024-07-16 13:07:12 -07:00
snipe 70d95877d8 Translations for license checkout errors 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:02:58 +01:00
Godfrey M 48821f8391 updates transformer, api controller 2024-07-16 12:58:23 -07:00
Godfrey M aaa2858337 battling with handling depreciation percentage and amount 2024-07-16 12:25:19 -07:00
Marcus Moore 017530ba4b
Make updating hook more specific 2024-07-16 12:02:50 -07:00
snipe 45bf428092 Translated “seat” for license seat view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:04:51 +01:00
snipe 4a9bd95ed3 Added language support for select2 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 18:40:10 +01:00
snipe 35160f88e0 Corrected return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 16:09:08 +01:00
Marcus Moore c8dad528a8
Migrate a couple items out of mount 2024-07-15 16:15:58 -07:00
snipe ab6b8f520e Fixed field name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:25:37 +01:00
snipe 24e58d1455 Do not update users who already exist since that locale may have been overirrden manually 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:20:04 +01:00
snipe f91ad6b2db Use app()->getLocale() to determine imported user’s language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:15:44 +01:00
snipe eed253bd2f Use app helped instead of facade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:15:18 +01:00
snipe d21ebc6f0d Fixed return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-12 11:04:56 +01:00
Marcus Moore 9793016603
Remove unneeded AuthorizesRequests 2024-07-11 13:32:16 -07:00
Marcus Moore 9e06f2d17f
Remove commented code 2024-07-11 13:22:10 -07:00
snipe fb7d533ff7
Merge pull request #15073 from marcusmoore/feature/livewire-url-prefix 
Allow setting a prefix for Livewire's update and asset urls
 2024-07-11 21:04:50 +01:00
Marcus Moore 9dd3827222
Allow setting a prefix for Livewire's update and asset urls 2024-07-11 12:43:29 -07:00
snipe 5697370dfe
Merge pull request #14722 from Godmartinz/unaccepted_reminder_command 
Adds a command to resend acceptance emails
 2024-07-11 20:37:04 +01:00
Godfrey M d4d19569ee adds execution timer 2024-07-11 10:52:47 -07:00
Godfrey M 43c7504f89 adds an all option, adds help context for all, seperates logic 2024-07-11 10:03:51 -07:00
snipe 1527679f4b Handle deletions on the observer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 17:26:43 +01:00
snipe c2fe3b5459 Use the observer to delete associated files and detach users 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 17:00:38 +01:00
snipe d4a66f9b6c Use better icon for deleting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 17:00:12 +01:00
snipe 5108b1f3ed Capture the log meta for what was changed 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:35:16 +01:00
snipe 00d7b36c36 Eager load suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:22 +01:00
snipe 42dbc894e0 Better handle numRemaining for consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:21:45 +01:00
snipe 94bfe7d9c8 Require the user exists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:18:42 +01:00
snipe b10441c928 Detach associated pivot records 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:01:18 +01:00
snipe 9676d934d2 Drop the with users on the create checkout screen 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:00:08 +01:00
snipe 759bb822ff Make sure the user exists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:59:18 +01:00
snipe abd79219dd Use form request to check for valid category 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:26:24 +01:00
snipe a7a1a377da Added form request for consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:25:07 +01:00
snipe 82743abadc Cleans up the consumables index controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 14:15:18 +01:00
snipe 498a443230 Derp 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 12:01:06 +01:00
snipe 34b49ef079 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 11:59:47 +01:00
Godfrey M 1fa6a763bc updated description 2024-07-10 11:09:57 -07:00
Godfrey M 726308bfd5 removed typo 2024-07-10 10:58:45 -07:00
Godfrey M 22ddb695f2 better description 2024-07-10 10:57:47 -07:00
Godfrey M 09b2feac54 updates assets with selected model to inherit asset model eol 2024-07-10 10:56:44 -07:00
Godfrey M 57e1df86c8 finds model and collects assets with such model 2024-07-10 10:21:24 -07:00
snipe fb10c1439a
Merge pull request #15057 from spencerrlongg/bug/sc-23212-2 
Fixes Potential Exception
 2024-07-10 08:27:59 +01:00