DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
9542 commits 101 branches 268 tags 288 MiB
Commit graph

3872 commits

Author SHA1 Message Date
Brady Wetherington fb201e61f3 More wiring up Livewire to the back-end. 2023-02-27 14:29:02 -08:00
Brady Wetherington e1c8f155bb Wiring up more bits to Livewire 2023-02-27 14:29:02 -08:00
Brady Wetherington 8009ee79db I think I have, now, full parity on the base Importer level 
Meaning that you can upload new files, delete old files, have error
messages, have status updates - and all of them seem to work.
 2023-02-27 14:29:02 -08:00
Brady Wetherington 0a085af0a0 Getting the basic wiring of the importer over into Livewire 
WIP: Wiring up more and more of the actions on the importer

Files now upload okay, a little glitchy on the display-side though

add to readmes so i dont forget
 2023-02-27 14:28:59 -08:00
snipe c7106a1df2 Added table aliases to fix ambiguous SQL clause 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-27 13:24:09 -08:00
snipe 96c851468c Added max results limit to report index 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-27 12:04:46 -08:00
snipe cb0b234b80
Merge pull request #12561 from inietov/fixes/unable_to_import_purchase_date 
Fixed #12559 Unable to import Purchase Date field
 2023-02-24 10:02:25 -08:00
snipe 3e47d9e689 Pass the existing asset name to the bulk checkout form 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-24 09:54:46 -08:00
Ivan Nieto Vivanco 51efd9b413 Adjust the date format for purchase_date field 2023-02-24 10:59:31 -06:00
Ivan Nieto Vivanco 6bd72125bd Deletes problematic cast 2023-02-23 22:31:41 -06:00
snipe 5e6ebb9a65
Merge pull request #12410 from uberbrady/paginate_accessories_report 
Paginate accessories report
 2023-02-23 12:26:17 -08:00
snipe 8e72da42e8
Merge pull request #12406 from akemidx/vip_tag 
Added a checkbox to notate VIP status
 2023-02-23 12:23:29 -08:00
snipe eb6357636a
Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies 
Fix full company scoping in user selects
 2023-02-23 10:36:33 -08:00
snipe 5a1e5f740d
Merge pull request #12537 from inietov/fixes/expected_checkin_date_validation 
Fixed #12531 Expected Checkin Date on Asset Checkout throws an error
 2023-02-22 16:03:51 -08:00
akemidx 690970b4aa fixing ff error 2023-02-22 18:18:20 -05:00
Marcus Moore f63710fb5c
Remove unused import 2023-02-22 12:34:56 -08:00
Marcus Moore 7667b0a216
Remove extra line 2023-02-22 12:34:35 -08:00
Marcus Moore 931ca98c02
Remove middleware bypass 2023-02-22 12:33:55 -08:00
snipe 81cb29db5e
Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report 
Added images to emailed user inventory report [sc-19801]
 2023-02-22 10:38:07 -08:00
snipe 05f6d0bd5e
Merge pull request #11984 from nh314/Correct-assignedusers-relation 
Correct assignedusers relation setting
 2023-02-21 20:15:20 -08:00
snipe 4bf1566d2a
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during 
Adds Boolean to Users Table for Auto Assigning Licenses
 2023-02-21 20:10:46 -08:00
snipe 0c3115553e
Merge branch 'develop' into vip_tag 2023-02-21 20:03:49 -08:00
Ivan Nieto Vivanco d494afcf01 Add order by clause, to ensure assets and accessories are in order in the report 2023-02-21 21:24:19 -06:00
Ivan Nieto Vivanco 6e994c209f Adds setter to model Asset class for expected checkin 2023-02-19 12:31:10 -06:00
snipe 754842f620 FML - this is a hotfix and I don’t know why this is causing problems 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-16 16:58:00 -08:00
Godfrey M 58801dbb0b allows users to clear their slack settings 2023-02-16 08:43:12 -08:00
snipe e9ab90eafc
Merge pull request #12422 from marcusmoore/fix/adhere-to-email-alerts-setting 
Have acceptance result notifications adhere to alerts enabled setting
 2023-02-15 18:46:08 -08:00
Godfrey M 7b510d5f2b greys out submit button conditionally 2023-02-15 15:46:05 -08:00
snipe 27e5832a28 Use existing slack translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 14:06:52 -08:00
snipe ff895739f4
Merge pull request #12446 from Godmartinz/livewire_slack_inputs 
Adds Livewire slack inputs
 2023-02-15 13:27:07 -08:00
snipe de4f7bd274
Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation 
Enforce Y-m-d as date format for date fields
 2023-02-15 12:54:22 -08:00
snipe 25461caa2c Removed date validation rule 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 12:53:55 -08:00
snipe bfac0fc811
Merge pull request #12470 from inietov/fixes/rollbar_16883_attempt_assign_on_null 
Fixed Rollbar 16883 Error: Attempt to assign property "assigned_to" on null
 2023-02-15 12:33:32 -08:00
snipe 057f0be20a
Merge pull request #12473 from inietov/fixes/rollbar_attempt_to_read_property_on_null 
Fixed ErrorException:  Attempt to read property "id" on null [sc-19855]
 2023-02-15 12:32:53 -08:00
snipe 7980e2ab2e
Merge pull request #12517 from uberbrady/silence_ldap_exceptions 
Silence E_WARNING "exceptions"
 2023-02-15 11:56:37 -08:00
Brady Wetherington 3757c7e353 Make early-boot errors (syntax, others) be more easy-to-read 2023-02-15 11:31:13 -08:00
snipe 3800cdd0da
Merge pull request #12466 from snipe/fixes/style_fixes 
Style fixes
 2023-02-15 11:07:59 -08:00
Ivan Nieto Vivanco 6936efd387 Remove e() function from customfield format input 2023-02-12 16:27:37 -06:00
snipe b0b1c96ab5
Merge pull request #12514 from marcusmoore/fixes/preserve-asset-name-during-api-checkout 
Fix asset names being removed during API checkout requests
 2023-02-14 12:22:03 -08:00
Marcus Moore 8e00191b69
Add comment 2023-02-14 12:19:16 -08:00
Marcus Moore a94f19a68e
Use name if provided by asset checkout request 2023-02-14 12:08:20 -08:00
Marcus Moore 2349f54013
Use translation strings for importer exceptions 2023-02-13 13:30:36 -08:00
Marcus Moore 73f355f3a8
Return 422 instead of 500 when import is invalid 2023-02-08 12:39:42 -08:00
Marcus Moore b3881a43a7
Fix return type 2023-02-08 12:34:25 -08:00
Marcus Moore c2c666aef0
Formatting 2023-02-08 12:32:57 -08:00
Marcus Moore 5962f1b627
Catch json encoding exceptions and display them to the user 2023-02-08 12:21:51 -08:00
Ivan Nieto Vivanco 49b6a1cc53 Adds translation strings to theinventory report sent to users 2023-02-07 18:29:19 -06:00
snipe c1d484b5df Fixed mismatched field/fieldset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 13:31:50 -08:00
snipe ea644f8d47 Still throwing errors, but trying to fix the docblock 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 11:02:20 -08:00
snipe dd5f256450 We shouldn’t need this because aliases?? 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 11:02:02 -08:00