snipe
22c79d8e1b
Squashed commit of the following:
...
commit 6bec573956b6ad69fac1fc5bb54e#15794 from snipe/check_for_file_on_asset_acceptance
Check that the file exists before trying to download stored EULA
commit 1fc5bb54e1b6ad69fac2357ef7e3747b2cdb84#15793 from snipe/allow_eol_explicit
Allow user to specify null for calculation or explicit on bulk edit
commit 47b2cdb846357ef7e375000f3171e6928b1b27#15792 from snipe/edit_eol_from_bulk
Added EOL date to bulk asset edit
commit 6928b1b273000f3171e3#15786
Signed-off-by: snipe <snipe@snipe.net>
commit 5ef3183a52a41529dbc050831868#15783 from uberbrady/improve_user_and_location_manager_indexes
Improved indexes on manager_id for locations and users, including del…
commit 050831868ea41529dbc4aa168fcb54fcf5ac7d#15780 from uberbrady/add_manager_indexes
Add new indexes to locations and users for faster manager lookups
commit 4fcf5ac7daaa168fcb5b9c1c93ad52b96a31253ad99b8b45#15774 from marcusmoore/feature/sc-27350
Added Checkout ID column to user accessory table
commit ad99b8b456b96a312539654f67b6abab1e58ea#15779 from ubc-cpsc/bugfix/CVE-2024-50345
Fixes CVE-2024-50342, CVE-2024-50345, CVE-2024-51736
commit bab1e58ea4654f67b6ac3965bcd7c1287f4addf2362cb5e5#15773 from Godmartinz/Fix_failing_failing_tests
Fixed notifications for licenses and asset to asset checkoutables
commit 2362cb5e52e7cb4a75eb93494ac5540d707a1851287f4addf0f32ebdc7a2e96d478f#15771 from snipe/revert-15744-chore/action-tests-debugging
Revert "Added the display of logs when tests fail in GitHub Actions"
commit 2e96d478f1f32ebdc7ac5897d37fcd6c7dc8e1#15765 from marcusmoore/chore/add-missing-livewire-file
Added missing Livewire file
commit d6c7dc8e1c5897d37fcf49de0704521a27dcac#15763 from Godmartinz/no_to_email_check
Fixed emails not being send if target has no email or if not instance of User. Cc_emails will still be sent.
commit 21a27dcac137913807649de0704537913807647a0f79ecd297a449e80ee65942064e49de07045a7e996c40f73772a013#15731 from Godmartinz/refacto_ms_teams_notifs
Fixed MS Team Notifications to utilize workflows after deprecation
commit 7e996c40f573e8f160c69e74bbdd#15758 from snipe/jerm/fix-deprecation-warning
Fix ${var} deprecation warning in License model
commit 69e74bbdd373e8f160cff68df1fa0bd23772fe#15756 from Godmartinz/cc-email-array
changes `admin_cc_email` validation to allow an array
commit bd23772fe973772a0138b26cae372cd6ba303f399a0eee8f0f68df1fa0f68df1fa06f0813e03bf05875ebd158ff641f8#15681 from Godmartinz/seperating_notification_n_mail
Separated Notifications and Emails: Check ins and Check outs
commit 05875ebd1f9a0eee8f036128765d1fc24f79c025e7c4343c90c0620c27ffed81973fe62d318b394c86d784bd55c4971612#15744 from marcusmoore/chore/action-tests-debugging
Added the display of logs when tests fail in GitHub Actions
commit b987b3dc005c4971612986d784bd59Fixed #15740 - use non-translated strings for icons
Signed-off-by: snipe <snipe@snipe.net>
commit 589f9cccdf#15732
Signed-off-by: snipe <snipe@snipe.net>
commit 4d848e45e6Fixed #15736
Signed-off-by: snipe <snipe@snipe.net>
commit 58ff641f82ce68f550d86f0c1b12b1278bc5e52acce75a8185e27ff1337756365495a118da80e6de18760e3fa157107c487cdfc63641dc07a51ec8bb6340532d#15550 from uberbrady/fix_multi_create_partial_failure
Fix multi create partial failure (fixes: [RB-18591])
commit 07a51ec8b1e0ec6795b727c0e458#15712 from Godmartinz/fix_import-progress-bar
Upgraded `livewire v3.5.9 => v3.5.12`
commit 6329f5b87ee0ec6795b515073a0d38a80c09c16dab3b9c4515509d756b5509d756b755ba6279ab16a978f1#15722 from Godmartinz/fix_component_factory
Fixed Component Factory: use manufacturer factory for `manufactuer_id`
commit b16a978f1bab3b9c45102cc2b2b1df62d06b44d6f29a383179fd74c351055ba6279afd74c35102c681946b1d257d25bd9e6c34a5c52c1b5f4415ae55ba6279a4a9eea830e3af564935d5d58f878623ee76be7e#15720 from snipe/15695_adds_manufacturer_and_model_number_to_components
Fixed #15695 - Added manufacturer and model_number to components
commit 3ee76be7e3d58f87862c5da3ce3560b6859c49#15719 from snipe/#15717_adds_qty_to_consumable
Fixed #15717 - Added ability to checkout consumables in variable qty via API
commit 0b6859c4911e9922a0b0ead27accac727c0e458c870dc747db0fb3d83fac0d59ccd6a65da3ce3564c3bbca30a5ecd2b629#15711 from marcusmoore/fixes/custom-fieldset-checkboxes
Fixed custom field checkboxes on asset edit page
commit c3bbca30addccb788a837f14fff3#15710 from snipe/fixes_lightbox_for_avif
Fixes #15701 - load avif files properly in lightbox
commit 37f14fff3beb6c51fabdFixes #15701 - load avif files properly in lightbox
Signed-off-by: snipe <snipe@snipe.net>
commit 5ecd2b62931e31592c55dccb788a885e1d792bbd10fe77ee#15691 from marcusmoore/fixes/get-id-for-current-user
Updated `Company::getIdForCurrentUser()` to return null in certain scenarios
commit d10fe77ee7e1882ee6d5e1d792bb5e1d792bba9cf71976f780ed91a1#15687 from NebelKreis/fix/dashboard-title-casing
Fixed #15686 : Corrected capitalization for dashboard section titles by removing strtolower()
commit 9cf71976f6Fixed #15706 - Removed purchase order number from asset import
Signed-off-by: snipe <snipe@snipe.net>
commit 15745d9737bd97955b93f74ff25d#15566 from Godmartinz/status-label-error-message
Fixed Status Labels Error Message
commit bd97955b9e252d99421c5767a98addb8170162#15689 from snipe/better_handle_inline_files
Better handle inline files in file listing
commit 5767a98ad80c820cbc0524a44272#15649 from bryanlopezinc/ImproveImporting
Improve import performance
commit 0c820cbc0d147fcfb8e3153bbb13#15598 from spencerrlongg/bug/custom_field_validation_issue
Custom Field Existence Validation Issue
commit db81701621a05c33feb147fcfb8ea05c33febf147fcfb8eb58a3d09b5fdcc17ca2#15676 from Toreg87/fixes/api_create_user_fmcs
Fix user creation with FullMultipleCompanySupport enabled over API
commit 58a3d09b5f30a06a594867fa2f36#15703 from marcusmoore/bug/sc-27188
Linked accessory files in activity report
commit 30a06a59426c6af78e0ce3086317#15693 from marcusmoore/chore/remove-parallel-testing
Removed brianium/paratest
commit 6c6af78e089b06bbb6c3f79fd7ea#15705 from marcusmoore/tests/icon-component-test
Added test to ensure icon component does not end in newline
commit 3f79fd7ea79b06bbb6c346ad1d072d7f70146f#15704 from marcusmoore/bug/remove-extra-icon
Removed second icon in accessory file list
commit ce30863177d7f70146f4867fa2f36e0933a2d4ea46ad1d072fbcb4bd9eb3cf746d7d#15680 from uberbrady/bulk_checkout_to_bulk_actions
Bulk checkout to bulk actions
commit bcb4bd9eb4250037540f50ccbcc4#15683 from Toreg87/fixes/outdated_comment
Fix outdated comment in CompanyableTrait
commit f50ccbcc495800e8d3cf746d7df6b7af802affdcc17ca2c147fcfb8eb58a3d09b5fdcc17ca2#15676 from Toreg87/fixes/api_create_user_fmcs
Fix user creation with FullMultipleCompanySupport enabled over API
commit 58a3d09b5f30a06a594867fa2f36#15703 from marcusmoore/bug/sc-27188
Linked accessory files in activity report
commit 30a06a59426c6af78e0ce3086317#15693 from marcusmoore/chore/remove-parallel-testing
Removed brianium/paratest
commit 6c6af78e089b06bbb6c3f79fd7ea#15705 from marcusmoore/tests/icon-component-test
Added test to ensure icon component does not end in newline
commit 3f79fd7ea79b06bbb6c346ad1d072d7f70146f#15704 from marcusmoore/bug/remove-extra-icon
Removed second icon in accessory file list
commit ce30863177d7f70146f4867fa2f36ee1882ee6d27eee2393784188849ae1787e651778ef9b6e3b0706c599cc1761053238770933a2d4eaa8d853c44a7e1b47708e979e4502ffff113ef52399dd51a96515c216947750fa6ce3357ae76e7db9b98058ca9883e8186d9ecdd4fef7dfdceb8e305f123cdeb858496b44e887a690cc3582ceb3f5cea665735a31f1285d6897cf159a1d3f43d1149730be46ad1d072fbcb4bd9eb3cf746d7d#15680 from uberbrady/bulk_checkout_to_bulk_actions
Bulk checkout to bulk actions
commit 780ed91a10bcb4bd9eb4250037540f50ccbcc4#15683 from Toreg87/fixes/outdated_comment
Fix outdated comment in CompanyableTrait
commit f50ccbcc495800e8d9a79483375ed6034065ba7754c1a7f0e9b3c91194933aa5784d67addc69e02c80ff18ac01190fac2017884f843c49921f50fc49abb6aeaccd201944896191a5e93c56affd66302bda3cd9502ff646da44becdca8aa2584d60344f1d83a3f28c39df34bdfdcdf600b783cf746d7df6b7af802af9710436d5416cffe9a9d9e1b86f5863ab2521cb0604a9644622f72c66614fdcc17ca2ccba1a56040d9afde46109f06a0e44142095c0167f8476f7133b29d032bf0250037540016c8264e7e4e1d0d50#15672 from uberbrady/ldap_location_fixes
Clean up how we use the '$location' in LDAP sync command
commit e4e1d0d50a16c8264e76914a647200ae9ce0aa#15671 from snipe/bug/sc-27147
Bug/sc 27147
commit 0ae9ce0aa950b8f180b3914a64720469b6080bde9225ff3e#15669 from snipe/remlove_ou_requirenedess
Fixed #15663 - remove requiredness for OU
commit e9225ff3ead0d415908869b6080bd8ddead359db997d728f#15666 from snipe/updated_readme_llm
Added LLM note
commit b997d728fbddead359d00d35335daf3c4e5566#15660 from Toreg87/fixes/api_asset_create_fmcs2
Refactor asset creation with API
commit f3c4e55667fb4fe30040d35335da7feaa714304e1a70023b1de62359c6fb4fe3004#15655 from Toreg87/fixes/api_asset_create_fmcs
Fixes #15654 Fix asset creation with API and FullMultipleCompanySupport
commit de62359c6712bda8fc73dc64cc5e#15533 from marcusmoore/testing/fmcs-accessories
Added tests for accessory api controller
commit 12bda8fc7b8aa298f6bb054017c9#15653 from snipe/15651_admin_user_on_maintenances
Fixed #15651 - admin user now displaying on maintenances page
commit fb4fe3004975ac7f80b9b054017c9fFixed #15651 - admin user now displaying on maintenances page
Signed-off-by: snipe <snipe@snipe.net>
commit 524a4427248aa298f6b01f3465773b5b93fdd3#15644 from snipe/form_requests_for_settings
Form requests for settings
commit 1f346577340856ee648e94a074a191dafc970d#15648 from snipe/update_packages
Updated livewire to 3.5.2
commit 1dafc970df94a074a1932d49e1effb34a7c8aa#15601 from snipe/check_db_on_healthcheck
Fixed #15439 - check database on healthcheck
commit 2d49e1eff2705bc6f0cc2663ea1e#15637 from akemidx/bug/sc-26614
FIXED: Badge counter showing deleted assets on User page
commit 705bc6f0c03ee57137467a605c9a#15642 from uberbrady/fix_bulk_checkout
Fix bulk checkout to users, assets, and locations
commit b5b93fdd3ad9432baf7a90be2a44983886da8941130e0c62424361a10818aa8048ac15710e738e8e3705b91439707bdad192242fe33f97ded79469c1d9fbf330e52cb9ac26cd185bc966e6a7f7e4938f2883e791939c4191ae0a3a77b83e9cd9be2b5a5e69c43c610c4f957bcf715cda7cce4841b94e7128aa55fa6ff467a605c9a5c2663ea1e03ee5713740ab8a22f7756e7ea667#15631 from snipe/test/importer-tests
Add importer tests
commit ab8a22f77e26d7572bc8c9132aff#15630 from marcusmoore/bug/sc-27028
Only show EULA when available on print users page
commit 56e7ea667732551d55d803532667#15616 from marcusmoore/test/importer-test-updates
Improve importer tests
commit 26d7572bcc382ebef8cee046a868#15603 from marcusmoore/fixes/add-reguard
Added `Model::reguard()` to importer
commit 8c9132aff9382ebef8ca2be88cb95f76da4844#15621 from sniff122/develop
Docker Env: Change trusted proxies to RFC1918
commit 2be88cb9557fc498a593f36d5f9b#15624 from snipe/fixed_line_break_on_print_all_for_users
Removed duplicate JS and removed line break before user section
commit 3f36d5f9b3f76da484488035326675dfdd85abb1063ea1892be21305377588d549e7c5983a25aa5fbde05d6ed9b5ffe54bd0863c0a8b6032551d55d77fc498a59e807cfab8#15579 from bryanlopezinc/ImportTests
Add Import data tests
commit 7fc498a59778ca1026fcb281c640#15613 from snipe/css_fixes_for_long_values
Smarter word-wrapping on long text
commit cb281c6408f483cd448f78ca1026fd3699d7936722d5a58e#15612 from snipe/fixes_print_assigned_in_profile
Fixes print assigned in profile
commit 722d5a58e77461c3e0ca3c0f4181ae3699d7936354fbd0540350b627ce#15610 from uberbrady/fix_numeric_sort_bug
Fix numeric sort 'ambiguous order clause' error
commit 350b627ce1ee046a8688b34a7c8aadf92bf5dc204d9e85026aFixed #15439 - check database on healthcheck
Signed-off-by: snipe <snipe@snipe.net>
commit 54fbd0540db483bb1634db735808https://github.com/snipe/snipe-it into develop
commit b483bb16334db73580860dd6f41f6b9cfdf2e5#15593 from Godmartinz/Fixed-divide-by-zero-bug
Fixed divide by zero bug in depreciation transformer
commit 0dd6f41f66684c20ae393153bbb13f3dc64cc5e0c32f4e34b4ca1886cebc45ab49eeaa79dfea40#15594 from snipe/localizations/update-2024-10-01
Updated strings
commit a79dfea40a45ab49eeab97d00e5aa8232618a9#15592 from spencerrlongg/bug/catch_request_notify_errors
Catch Errors Around Request Notifications
commit 8232618a9f9a651b567d97d00e5aa85b90d79494b9cfdf2e541139acd9f3b7ad80bd315ffd1b8daa9a2117466e7e3a062984d274fb6963cfc04a1d127ba641aa#15589 from snipe/adds_checkin_action_on_asset_delete
Adds checkin action on asset delete via View UI
commit 27ba641aa55823197e6fcfc04a1d1212da43303cae8aa784#15588 from snipe/added_more_maxlengths
Added maxlengths to additional fields
commit cae8aa784012da43303fFixed #15584 - regression with required css change
Signed-off-by: snipe <snipe@snipe.net>
commit fdfea390fbd609ed50a5689e940bb04afbbc85b964ce1023f311ba2f#15564 from uberbrady/improve_autoclose
Get us better debugging output for new Github Stale Action
commit b964ce10256217cba2068e3f375f#15583 from Godmartinz/remove-sortable-from-depreciations
Removed sortablity for current value column in depreciations report
commit 6217cba2015689e940bb32ab6a06#15524 from Godmartinz/double-notif-bug
Fixed double webhook notifications // Separated email and webhook notifications.
commit 68e3f375fc5689e940b8Fixed #15581 - missing bracker
Signed-off-by: snipe <snipe@snipe.net>
commit e807cfab860b3f45856001348c630b3f458561001348c638#15552
Signed-off-by: snipe <snipe@snipe.net>
commit 1b041af862260b15368d120585f9260b15368936b27fcda05d74f7a9#15573 from snipe/fixed_requiredness_indicator
Fixes for requiredness indicator in UI
commit 05d74f7a92dc85588d7f585f998caed120585f94166a7003426c85ba34936b27fcda36b27fcda3a44490e4489aada2ec70ac6411743ef82f954e#15498 from Godmartinz/Modal_fix
Refactoring modals with partials and fixing misalignments
commit 3f74ff25d2ef82f954e53f311ba2fb96953aa2ede609b3976b797c37ac#23 from Godmartinz/Modal_fix_p3
replace duplicate code with partials
commit b797c37acb6c85ba34959f8473e25ac6411743ac6411743b9b03f46493f0245f88#15563 from snipe/refined_gates_on_user_bulk
Update for #15534 - Refined gates on user bulk
commit 3f0245f88fc02647a0faedca3f432c2218c94aa3e609b397600bc98e97112522a379#22 from Godmartinz/Modal_fix_p2
Modal fix p2
commit 12522a3791f6d7ea19e418ddffe8f99b03f46490cb6e5042dfac4833b5#15534 from marcusmoore/bulk-print-users
Added the ability to bulk print users
commit 926a3195520bc98e971cb6e5042d9f8473e2540e61d0b19cb6e5042dcb6e5042d9c1a887b48ba69259f2#15547 from snipe/disallow_checkout_with_nondeployable_status
Fixed #13396 - do not allow checkout to undeployable status types
commit c1a887b48bba1220484658c94ad8#15561 from snipe/fixes/adds_action_date_to_sorting
Changed `action_date` to `created_at` in activity report
commit 658c94ad8b0e61d0b195abdddbec4ba1220484ba12204842eeabc8dc91c3babaca#15555 from snipe/fixes/user_file_upload
Fixed case on `$logAction` for user file upload
commit 1c3babacafabdddbec44a425c2b76eeabc8dc9eeabc8dc9d21f8ac8e52c38222e952a2666be0#15552 from Godmartinz/ragged-form-inputs
Fixed input field misalignments
commit a425c2b76534eb10ff7c38222e952a2666be0bc38222e9568cf1e4dce0ce5832b6#15549 from snipe/fixes/#15548_unify_audit_api_endpoints
Fixes #15548 - unify audit api endpoints
commit 0ce5832b6cb6340532d75fb43dd159de57d71bf1Fixed #15548 - unify audit due/overdue APIs
Signed-off-by: snipe <snipe@snipe.net>
commit ba69259f2dFixed #13396 - do not allow checkout to undeployable status types
Signed-off-by: snipe <snipe@snipe.net>
commit c71411465a8cf1e4dcebab0c009c066249a37e#15544 from snipe/bug/sc-26855
Fixed app settings view on mobile
commit 66249a37ed96712cb398fac4833b58a12c9d053f8b3b68b3084b02db5031ab90c0cf05cef7ddc7193870095a28a02e250b228ac5c0e471a2d4dcf6e854044bfa5ee493cc964d29af210f4f5128fd49eab0c009c034eb10ff737d7d58769ab0c009c0ab0c009c0d7d7d58769c245d5dc46b68805cf8b68805cf83245d5dc4694ab478bb97d858129d7d858129d965ce63bc9b5eea9d19554fba2f54#15537 from snipe/snyk/updated_jspdf_autotable
Updated jspdf autotable
commit 54fba2f5475eea9d1950b84a634ec72fc88a0e08bc540b6564f53b852dffb83d1a043fcdb7ccb8fb21c303e5#15519 from snipe/features/add_created_at_created_by
Change `user_id` to `created_by`
commit 4ab478bb97d96c5e1bacdb7ccb8fb21c303e56b88f2054dcdb7ccb8f5128fd49e62d2d5bdc7e8364d26c9befd6d7625fbdf5708bfce95703cb187ad4a29970cdb7ccb8f38270947edd446773fd#15532 from spencerrlongg/bug/15253
Catch Exceptions on Checkout Notification
commit 8270947ed24f7c8e0c38e1111c68#13291 from akemidx/eol_date_range_for_reports
Added date range for EOL in custom reports
commit 4f7c8e0c3dd7bde37843ea5d4ee4#14671 from Robert-Azelis/patch-6
[FIX] Update EOL date when used bulk update of purchase date
commit d609ed50a4d639d6fbcd7bde3784b88f2054ddd7914e238dd7bde37842454796e524facc4007#15507 from setpill/setpill/feat/use_explicit_attributes_in_ldap_sync
Added #15506 : Explicitly request used LDAP attributes
commit 454796e52aeef487d617c85ad54e#15518 from snipe/sort_by_numeric_custom_fields
Fixed #11634 - Sort by numeric columns for numeric custom fields
commit eef487d61bdddbf27d771dbc7abb#15531 from Godmartinz/status-doesnt-update-in-email
Fixed mail notification field `status label` not updating
commit 71dbc7abb0d639d6fbc174088ea581fff069824bd446773fddf283b5fbe8a5be18bb14eb6f05faf7118183ff582137890496ebf6ce69809b22d6d4935ebf0ed2b2836893cba5cd98b3817d727806372c5e1c736d496579fa72da82d6e1510f822ea96dfdb247fc33b92dcae780c05c3180ffa065eba30038bbce7b40ca02a29c71ef6699995972951f03094a354b00ef15c93229179ba77a7065d74363e8b34c9adb2c24f3dddbf27d78fcefcc818404bb3eec83519a82dd#15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec83154d5d8d9f963b9a19#15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f154d5d8d916c996b7759e5f6d656#15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 3519a82ddda629df07bf9a13fcab23f5705a1ddef325c4afdb1fddacd7d04af893df61b8b3f91ce47f40f55343b06e8d442dc269184c6053c673dee250730fc4fb60a54cee79446e962a5079a4bb73162f76c1bc5b38b9f4a4383105f53aff2047cfed09e3268d32df6df8b0ac0e910f13c1f78ce2512f550ec415d4d02044570e95b336c6273d5299b3e9f0872b76b45f275cf4630e5c2660bd34c7ae9d9dfa9e5f6d656a634a4afa757650628d307f690a6238b32ab6a06c4ff5fc1ff986f13a9735c40209f500a071fff9548b50ef077d607f29030fa6bcd3c0c29b293afaac636c776620d5f659024c832e50a71efa19686248c021609c137b31df7c1dddbf27d7655abe8be5d96c5e1ba4a807646d3dddbf27d7dddbf27d78bae9982833a807646d3983b4bf9cffcefcc818abe79df6dcfcefcc818404bb3eec83519a82dd#15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec83154d5d8d9f963b9a19#15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f154d5d8d916c996b7759e5f6d656#15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 1582d81e5b7c85ad54eb7b31df7c1483b4bf9cf89ff2111056c996b7756c996b7759fe5fc6e0c9e957baeb#15516 from snipe/fixes/fmcs_edit_user
Fixed check for outside assets on user update validation
commit 9e957baeb512fd9cd97a9e03c4ba6f8eb1c487b3519a82dd3519a82ddd8eb1c487bce835637ef0eb35608bb53f07f682dea629df07bf9a13fcab23f5705a1ddef325c4afdb1fddacd7d04af893df61b8b3f91ce47f40f55343b06e8d442dc269184c6053c673dee250730fc4fb60a54cee79446e962a5079a4bb73162f76c1bc5b38b9f4a438fe5fc6e0ce62747a00915183c482#15471 from Godmartinz/Edit_side-panel
Fixes margin for the sidebar menus while using rtl languages
commit 62747a0090b465cc98dc6c5cb73c#15493 from Godmartinz/fix_consumables_media_sizing
Fixed misalignment of consumables with smaller media
commit 9ff21110551328366a4b465cc98db465cc98d88774da3924debaaea3#15510 from snipe/bulk_users_locale_fix
Fixed #15504 - allow nulling/not changing locale in user bulk edit
commit 4debaaea39Fixed #15504 - allow nulling/not changing locale in user bulk edit
Signed-off-by: snipe <snipe@snipe.net>
commit 1328366a487e14f8c6d8774da3924facc4007e31da47e0463105f53aff2047cfed09e3268d32df6df8b0ac0e910f13c1f78ce2512f550ec415d4d02044570e95b336c6273d5299b3e9f0872b76b45f275cf4630e5c2660bd34c7ae9d9dfa0bc98e971f8774da3921ab3b65531a97530367#15492 from snipe/fixes/edit_to_archived_warning
Fix - warn user on changing status to undeployable when editing
commit c6c5cb73cfa97530367d43250ae88104e96b8f2098323185de9e5f6d656a7e14f8c6d6fddbdafb9ab3b65531ab3b655312Fixed #15483 - show EOL by default
Signed-off-by: snipe <snipe@snipe.net>
commit 601d8d7e5f4f0f72b29ca01261c1#15486 from marcusmoore/fixes/custom-field-values
Fixed a couple bugs in CustomFieldSetDefaultValuesForModel component
commit ca01261c1f6423df2134f0f72b2915183c4822fddbdafb99a5dbece1a9713bb104e4f0f72b294f0f72b29e4183d1834f713bb104ec7f2cae4f24998d60f34998d60f39f6bf2d03c7cf30003b#15481 from snipe/localizations/2024-09-10
Updated translations
commit 7cf30003b6f6bf2d03c46f44441a87c8955b12#15445 from Godmartinz/eula_confusion
Fixed priority for category eula vs default eula
commit 6f44441a8be7e5dfbdf76c9015aa#15469 from marcusmoore/accessory_tests
Added UI tests for creating accessories
commit e7e5dfbdfad62315fbe5d5f42129#15470 from marcusmoore/company_tests
Added UI tests for creating companies
commit d62315fbe47f3f77dec22a2cc025#15472 from marcusmoore/testing/dashboard_counts
Added test for dashboard counts
commit 7f3f77dec882e56c6830820dd9da#15473 from marcusmoore/testing/accessory_api_tests
Added some permission tests for accessory api endpoints
commit 82e56c6832549dec9f9dc6a5bf99#15474 from marcusmoore/bug/sc-26730
Fixed login success message not being displayed
commit 76c9015aa95d5f421294367f02af867a1c721eca6423df213351d63d57c549dec9f9dc6a5bf9980820dd9da4aa6ab2df6022a2cc025657fab0268bad5768d8b235533c39d5d4426e468549dec9f9de403f6e07010f66f4c549dec9f9549dec9f9eb2a6349240e9f7153c#15468 from marcusmoore/coverage
Added coverage commands for Herd users
commit d4426e4686b2a6349243ce97e2a30c5dbc5f6b#15465 from snipe/update_city_on_bulk_user_edit
Correctly save user’s city on bulk edit
commit c5dbc5f6b87f2cae4f26e34f549e4ce97e2a30ce97e2a30fe1fcfc8dc7d9a0eba0#15463 from snipe/consumables_order_by_remaining
Added ability to sort on qty and remaining for consumables
commit 7d9a0eba04010f66f4c99c6718b4599f832a93c9487d88c0120e9f7153c07c8955b12620fa4c39f9f04a4a3cf5cf07186ae851d63d57c6e34f549e4ca8813cca9e1fcfc8dce1fcfc8dc113dbf9ee79fe8a866e#15440 from snipe/fixes/user_api_put_patch
Fixes #15435 - user api put patch API route regression
commit 9fe8a866e0e8e3060a756aaf2f623fdfbccf50e8a8813cca949fef27a4413dbf9ee713dbf9ee74f8bbb7ad9b12fa505973c7d455ee#15431 from snipe/add_employee_num_to_asset_overview
Added employee number to asset view
commit 3c7d455ee39fef27a448d2b88a51012fa5059712fa505972d2b88a51074e35f389d4e4930ba64e4930ba624e35f389dfe5b9d9a2876301bc3076301bc30d964e105cf96fd24c7e1abb422153#15415 from snipe/rules/prevent_company_switch
Validation rules to prevent switching user companies if items are assigned to them
commit 6fd24c7e14e4ebabdab231bc1e2d#15418 from snipe/added_multiple_for_custom_report
Fixed #15416 - Added multiple selects for custom report
commit 231bc1e2de37d04b7176e62a80292669e981364ae5b9d9a28b4111ef0d7e4ebabdababb4221539e4ebabdabab64ed254eda1e38329#15414 from uberbrady/fix_create_user
Use the null-safe property accessor for new-user creation
commit da1e383295b64ed254e0ba291edc42c197644baec2ea955d#15412 from uberbrady/ImprovePatchPurchasePrice
Fix [FD-43836] PATCH of purchase_cost for assets for comma as decimal separator
commit ec2ea955d8c197644ba729b30cc5da8cd1027f#15284 from spencerrlongg/bug/sc-26584
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
commit 29b30cc5d3a89f17a146af27516d#15411 from snipe/snyk/upgrade-webpack
Upgraded webpack
commit 6af27516dca89f17a14568c708bdede0565f5b#15410 from snipe/snyk/upgrade-jquery-ui
Updated jquery UI
commit de0565f5b34111ef0d78cfa56e22168c708bde68c708bdef58e366a065581950fe#15409 from snipe/fixes-string
Corrected language string
commit 5581950feecfa56e22197f1dfcc9358e366a0658e366a06326f28a862b06c52776#15408 from snipe/redirect-on-print-if-user-invalid
Check that the user exists before trying to print
commit b06c5277677f1dfcc9356f3fb21fe26f28a86226f28a862ae8da7e2df94c981e22#15404 from snipe/bug/sc-26717-model-delete
Set image to null if model is deleted
commit 94c981e22c6f3fb21fefa48e79a1fe8da7e2dfe8da7e2df27b5b559bad635c86e0#15403 from snipe/clean_up_depreciations
Fixed #15392 - filter by depreciation when showing models
commit d635c86e00406ff6984bc6ddc501c54839181beb63a05c89a7385c4f69f7486cd8c8c9eb5d93b3c2a5ff623484b5a43898157b5b559baa64c4433b967a992974#15401 from snipe/fixes-15397-new-window-for-label
Opens label new window
commit 67a9929745a48e79a1fcc207d484364c4433b964c4433b98d3e8e066322bc088f6#15396 from snipe/add_start_end_date_to_users_edit
Added `start_date` and `end_date` to user bulk edit
commit 22bc088f6fd3e8e06638c207d48430991e486961b933f7ad1b933f7add991e48696a7974885043fe891a053fe891a05b79748850414ef85bd52f4c5b712ff4c5b712f44ef85bd5296eab83a854c8dc78184c8dc7818daa86e07cd5c43a1f87#15389 from snipe/added_generate_label_to_button_stack
Fixed #15388 - Moved generate label button
commit 5c43a1f87cd3b265de8e263151658f6eab83a85acce1f87daaa86e07cdaa86e07cd2Fixed #15385 - small icon tweaks
Signed-off-by: snipe <snipe@snipe.net>
commit cce1f87da6b460e8dc8d92fa5de6d92fa5de65b460e8dc8350cb7e65cc589140eac589140ea0cc2c8f76d52894615c#15383 from snipe/re-adds-checkout-button
Fixed #15378 - Corrected gate on checkin button on asset view
commit 52894615ce8546bbdd6550cb7e65c9821dd158dcc2c8f76dcc2c8f76d01ffa69c433957d670d#15375 from Godmartinz/fix-acceptance-reminder-command
Fixes the `acceptance-reminder` command
commit 1ffa69c43c78d355f13f85ebd7ff#15380 from snipe/fixed/fixed_nav_bracket
Added pull-right to angle bracket
commit f85ebd7ffd78d355f136ec0346e4aaf0a95be1#15377 from marcusmoore/fixes/custom-field-values-on-validation-error
Fixed custom field defaults being prematurely updated
commit ec0346e4a8fc5eb37776833dace2b1d7853cbf#15379 from setpill/fix/load-trustproxies-middleware
fixed #15374 : load TrustProxies middleware in Kernel.php
commit 9a73311a99aec781e7df1d7853cbfefixed #15374 : load TrustProxies middleware in Kernel.php
commit 7f3c86165b10b45812c4c3165717edd0a351a13268749e7e870abb5637e0af0a95be12d67975cb62663b2fd844bcace9d019b59bf3e7dc3957d670d0821dd158d16c9a40268833dace2b833dace2b4ec365b08056e31d230#15373 from snipe/fixes/#15366_custom_fields
Fixed #15366 use the non-admin edit encrypted custom fields permissions
commit 56e31d2303Fixed #15366 - use permission for encrypted custom fields
Signed-off-by: snipe <snipe@snipe.net>
commit ec365b0804ca8864c06aef0ac68c#15372 from StarlessNights/update-docker-compose-files
Fixed #15371 : docker-compose files updated.
commit aef0ac68c3f12f9a816fa000d6454fca8864c061423f4f9126456c7d8d95fa0c87ab#14667 from Godmartinz/add_location_to_create_user_via_asset
Adds location select to the create new user via asset checkout
commit 456c7d8d9154cfe3f6ed4d19569e#15065 from Godmartinz/explicit_eol_removal_command
Adds `snipeit:remove-explicit-eols` command
commit 54cfe3f6e65e0b18104bb465dbfa#15156 from uberbrady/re-add-stalebot
Re-add stalebot-esque github Action
commit 5e0b18104dec0b9b1988b5d3f7fb#15369 from snipe/fixes/checkbox_on_restore
Fixed checkbox layout on modal from #15296
commit 8b5d3f7fbd744f43676d#15296
Signed-off-by: snipe <snipe@snipe.net>
commit ec0b9b198f94300d81d738ef442f#15296 from uberbrady/expose_restore_sanitize
Expose the 'sanitize' system for backup restores to the web GUI
commit 6c9a4026851b310f3a24c54bff0f894300d81d94300d81d6bc9ea5a2ec4635a6efc963911f2e#15352 from Godmartinz/mobile_breakpoint
Fixed Mobile misalignment of info on Assets and Users view pages
commit 4635a6efc39608414ead29b3bfb9#15360 from snipe/more_print_fixes
More print fixes for asset view
commit 9608414eae47d8e2f8b5efddf6f5#15367 from snipe/fixes/15344_added_freeform_to_country_select2
Fixed #15344 - make select2 for countries freeform-ish
commit 5efddf6f5b305dc049a43ac0702094Fixed #15344 - make select2 for countries freeform-ish
Signed-off-by: snipe <snipe@snipe.net>
commit 47d8e2f8b9a2246b96451d89759706206f8fe60521d2217619833bcb282f83dd9ce20e6fdce3c53a8eb76fd8#15362 from r-xyz/model-files-api
Added #9413 : AssetModel files endpoints to API
commit a8eb76fd8dcd7db5c4a8da7313bc9d4ec361c718738ef442fdd29b3bfb9a6fdce3c53601c4fe6111ab29ec3a#15358 from r-xyz/rename-docker-startup
Renamed docker startup scripts coherently.
commit 912bbf0e32c54bff0f83d3f30ced901c4fe61101c4fe61137e475a0780fa9f5797#15359 from uberbrady/improve_windows_upgrade
Fixed #15190 - Improvements to upgrade.php script to improve Windows experience
commit 0fa9f579711ab29ec3a47e475a0786d0acf5b8a26b3c62ab#15357 from snipe/tighten_category_view_translations
Fixed #15330 - Cleaned up category title
commit 26b3c62ab8d3f30ced94973e2e575d0acf5b8ad0acf5b8a609033b19a74fbc2382#15356 from snipe/validate_location_parent
Fixed #15341 - validate parent ID
commit 74fbc23823a23dee52f24d03f1e110Fixed #15341 - validate parent ID
Signed-off-by: snipe <snipe@snipe.net>
commit 963911f2e159832126cb680cce3ee26c5ec6a16c5d1f98bf939d484077ae9858b0f37f973e2e575646ed0764209033b19a09033b19a746ed076428d3a555ce95fdeb9c415fdeb9c41322d3734076c450d133#15351 from snipe/localizations/new_translations_2024-08-20
Updated languages
commit 22d3734075d99b306aeeca6b03f4#15350 from marcusmoore/icon-component-updates
Fixed icon not rotated and simplified component
commit eca6b03f44bbdbec71976c450d1338a8cd1027f3d3a555ce910f8e041809e8a22f3c5d99b306aed99b306ae9f597d643374136761d#15345 from snipe/add_trim_strings_middleware
Added TrimStrings middleware
commit 74136761dff597d6433964bed01a90072f1500#15342 from snipe/snyk/bs-tables
[Snyk] Upgrade bootstrap-table from 1.23.0 to 1.23.2
commit 0072f1500e64bed01a91f8c72fb0af6319e11e#15327 from snipe/update_button_style
Update icons to use blade components, standardize button colors and format
commit f6319e11e75d9f988df3f8c72fb0ac886514a25fa765667f#15112 from marcusmoore/livewire-importer-improvements
Improved handling attempted access of deleted files in importer
commit 8e1111c681697595d96886514a25886514a25fcb40a82e7434bdcd6d#15336 from marcusmoore/fixes/remove-displayed-parentheses
Fixed `)` being added to expected asset checkin report email header
commit fa765667f294d8a547bcb40a82e7434bdcd6d4be5f3f38f808c3a25b3934cd4b6244d89c8682be6f024849e9e048f0955f479b2b4fd384f14a05bd8d52fa51b1229d8b9bf5eb8d43a804f82266fadeb4b6f7a35f0bc995b87f59725f203100bc9ac806f200960a57c700127f1aae2f9571b4a77dcad3367ace9324b4d2e889e927803bdb457c7c9b1f6e38d545537a434d8904938d0c09f2b2c0bffba02511901f4df7ee9337cba3402b0c67c263da71f031f5d2e585baa7a102c085dfe8a22f3c5bd843cf8dccb40a82e7cb40a82e797e6ff3cbe4253acad4#15324 from snipe/jerk_prevention
Prevent passing an array as login
commit 4253acad4cd843cf8dcc1013dcae67e6ff3cbe1013dcae61c30c649aae7ef3bf5170e5e0f9dfdec4691c73c30c649aaabb1385369ad6d09b6abb1385369cc1caf608843b338d61c1caf6088e12dfe71ea8ca8926871ea2b1b074ca89268716ec57313533167ee91d94d8a547b86521c0252b39a7c6f043b109fac075c1e7658fe7c9c799bb6ab976f353ec5731353a3283704feb39a7c6f03283704fe8540df3204685486fa58594f5066485486fa58c3618df2ec10dc1f1363618df2ec5a201f22fd8f7bce7aaa201f22fdb6070d530cf6c0cf94474d66f7c936c0cf94473bf4b91516381003eea9622e05cf5afaf53cdfcf031309f8f20ec420ba3ab63a19affa70b94e707120cfd13c3e2945709008bf036b5cc5ad456e6bf4b9151680a9c2e3540f1e5181a0a9c2e354f47f1b3b14e54400718038e86954bf6c1642bf2120cfd13c509f273929847f1b3b14e198b76ebc3044af941198b76ebc25546f96766e84c29ce5546f9676a46caa478d9e73eaf95ec863df007cc3b8e0681ff145abbe746caa478d24d8569e75e6106aa7c4d8569e7544dc57f95ec9f8a84d44dc57f95e2316ee6f819d354ca65316ee6f810509cc812e3f2139349509cc812ead5f66bc0de7fb29fced5f66bc0dd1e213c31ece5be8ac21e213c31ef91874dfe01777bb4b991874dfe0b0e6eda5e85c6c655cd0e6eda5e8a24560b93660eb6021524560b93626521c025268d1cc22c59350a2018bb465dbfaa8cbcc237c097e3af8fc9914e29210a8d1cc22c587685de45f2199e68ff2981bffccf01cfca1514c0b4ed01243b3772a21a5104b6cb763fdd32341502f58e3114a2eba494ad8c7e89b58746b7744105a069263f0e5b017530ba4bc8dad528a8256e989ba197930166039e06f2d17fd4d19569ee43c7504f891fa6a763bc726308bfd522ddb695f209b2feac5457e1df86c83ea5d4ee405fa0c87ab075aa01791a697595d9630bdd8a5919502525a40bdd8a5917e35dd2daa1f71b69a739499a3debcd
2024-11-12 15:39:22 +00:00
r-xyz
0d7cf55a3a
Add support for Docker secrets in Standard and alpine image.
2024-08-14 17:40:52 +02:00
r-xyz
5c17fefb08
Implement PHP_UPLOAD_LIMIT in Alpine images.
2024-07-18 11:54:58 +02:00
snipe
f1eb4bd3a5
Merge pull request #14349 from snipe/jerm/update-mailer-configs
...
Update mailer configurations for Symfony mailer
2024-05-29 11:25:55 +01:00
chandanchowdhury
b65bf5082d
Fix #13515 : create directories expected by RestoreFromBackup.php
2024-03-06 15:11:41 -05:00
Jeremy Price
8ace30ee23
Update mailer configurations for Symfony mailer
...
Newer Laravel uses Symfony mailer instead of SwiftMailer, and that means
that some configs and functionality have changed
In this change, we update config/mail.php with the new config layout and
name/functionality changes
of note:
* New configuration layout supporting lots of new/different mailers
* MAIL_DRIVER has become MAIL_MAILER, though we'll support both
* MAIL_ENCRYPTION is mostly useless, and we mark it as such -- symfony
mailer detects which type of encryption to use automagically.
* MAIL_TLS_VERIFY_PEER is now available in case of self-signed
certificates on the mail server, of if you want to access it by a
different name, or by IP
Accordingly, we also update the .env examples, docker configs, and
the .env builder in the snipeit.sh installation script with the above
changes
2024-02-28 23:37:52 -08:00
Brady Wetherington
8ad5fb34d3
Fixed #11708 - pre-create private_storage directories for Docker restores
2022-08-24 17:11:21 -07:00
octobunny
8324b94022
Change PHP post_max_size
...
Must change post_max_size in addition to upload_max_filesize to increase total upload size to greater than 8MB.
2022-08-11 17:07:46 -04:00
Tom Misilo
fb585955b4
Replace .my.cnf with column-statistics.cnf at the system level for mysqldump
...
Fixes #10176
The `column-statistics.cnf` file is copied to `/etc/mysql/conf.d/column-statistics.cnf` for each Dockerfile that exists.
This puts it as a system level mysql client change, so the web ui interface also works.
2022-01-29 07:24:50 -06:00
Thomas Misilo
930666ffa0
Adding .my.cnf to disable column-statistics backup
...
Fixes #10176
The ```.my.cnf``` file is copied to ```/root/.my.cnf``` for each
Dockerfile that exists
2022-01-13 14:36:00 -06:00
Wouter van Os
2c49c32e72
Fixed #10231 : use correct python binary for exit listener
...
This fixes #10231 , without creating an own Dockerfile.
2021-11-02 13:06:36 +01:00
Jeremy Price
22313711d5
Fix ownership of cache directory
...
Snipe-IT was waiting to load because
/var/www/html/storage/framework/cache/ and its contet were owned by
root:root, but docker needed to be able to write to them
This change recursively chowns that path to docker:root, and now it
loads.
2021-10-01 16:54:17 -07:00
Johannes Münch
8f4b88a877
Fixes #9705 Prevent syntax error in startup.sh
...
If SESSION_DRIVER is not defined it leads to a syntax error.
2021-06-12 20:21:43 +02:00
Sabir Manandhar
c3d75d3be3
feat[docker]: create session table migration if session driver is set to database ( #9587 )
2021-05-20 14:31:22 -07:00
sabir-dzangolab
19766a0a72
Fix/startup-sh ( #9586 )
...
* fix: update docker/startup.sh broken after merging hotfixs/2fa_qr
* fix: Typo in Dockerfile.alpine
2021-05-17 15:39:05 -07:00
Mateus Villar
fdcb63f251
Added #9313 : Add new fpm-alpine docker image and docker secrets support ( #9331 )
...
* Add docker secret support
* Add docker secret support to selected environment variables below:
- APP_KEY_FILE -> APP_KEY;
- DB_HOST_FILE -> DB_HOST;
- DB_PORT_FILE -> DB_PORT;
- DB_DATABASE_FILE -> DB_DATABASE;
- DB_USERNAME_FILE -> DB_USERNAME;
- DB_PASSWORD_FILE -> DB_PASSWORD;
- REDIS_HOST_FILE -> REDIS_HOST;
- REDIS_PASSWORD_FILE -> REDIS_PASSWORD;
- REDIS_PORT_FILE -> REDIS_PORT;
- MAIL_HOST_FILE -> MAIL_HOST;
- MAIL_PORT_FILE -> MAIL_PORT;
- MAIL_USERNAME_FILE -> MAIL_USERNAME;
- MAIL_PASSWORD_FILE -> MAIL_PASSWORD;
* Add env file for docker secrets
* Added #9313 : add new fpm-image using docker secrets
* Fix broken symlinks
* Add docker secrets support using shell script
* Remove old docker config php files
2021-04-20 21:14:47 -07:00
João Paulo
e410696a36
Fixed #8884 : Fixed alpine image build ( #8885 )
...
* Fixed #8884 : update alpine image dependencies, fix permission error in vendor folder and laravel.log file
* Fixed #8884 : Removes unnecessary changes to fix alpine image build
* Fixed #8884 : Removes unnecessary changes to fix alpine image build
* Fixed #8884 : Fix typo
2020-12-14 17:42:43 -08:00
snipe
87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge
...
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
2020-04-20 23:20:34 -07:00
Joshi
b14f37d966
Purposal for fix on issue 6251 - max upload filesize ( #7930 )
...
* Added a check and sed to startup.sh for managing max upload size inside the docker container. Issue encountered in 6251
* Changed startup.sh to bash instead of sh to have better variable control. Changed single ticks to double ticks for the sed so that the variable PHP_UPLOAD_LIMIT is expanded
2020-03-31 21:02:10 -07:00
snipe
bca82684a1
Merge branch 'hotfixes/2fa_qr' into develop
...
# Conflicts:
# .all-contributorsrc
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/ImportsController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Requests/ItemImportRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# composer.json
# composer.lock
# config/app.php
# config/version.php
# docker/startup.sh
# public/css/build/all.css
# public/css/dist/all.css
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
2019-03-20 02:17:02 -07:00
Jonathon Reinhart
e59ec8b27f
Run Laravel schedule in docker image using supervisord ( #6606 )
...
* docker: Rename /entrypoint.sh to /startup.sh
This script is not configured as the docker image ENTRYPOINT, thus it is
misleading to name it so.
* docker: Terminate supervisord if a process enters the FATAL state
By terminating PID 1, this will also terminate the Docker container.
* docker: Use supervisord to start up apache and cron
Note that this uses `apache2ctl -DFOREGROUND` rather than manually
sourcing /etc/apache2/envvars and running apache2, as recommended at
https://advancedweb.hu/2018/07/03/supervisor_docker/ .
* docker: Add artisan schedule:run to crontab
This also switches to executing /var/www/html/artisan directly.
* docker: Run artisan schedule:run directly from supervisor
This has the following benefits over using cron:
- Cron doesn't need to be installed
- Docker-provided environment variables are preserved
- It's easy and explicit to run as the docker user
2019-03-07 12:42:00 -08:00
Ľubomír Kučera
9183de578d
docker: Fix upgrades ( #6680 )
...
Until now, the Docker image was not performing actions that are
necessary for an upgrade completion. That is considered an
anti-pattern.
See https://snipe-it.readme.io/docs/upgrading for more information.
2019-02-13 20:49:36 -08:00
Colin Campbell
ef8e20f66b
Alpine linux docker image ( #6645 )
...
* docker-alpine: Alpine linux container + apache 2.4 support
* docker-alpine: Force passport migrations (production mode Exception)
* docker-alpine: Copy default env in Dockerfile
2019-01-30 14:45:36 -08:00
snipe
24aaa36532
Applied 3159e7713a to develop
2018-09-19 17:27:34 -07:00
Hajo Möller
3159e7713a
Fixes #5630
2018-09-11 13:07:45 +02:00
Brady Wetherington
f0332a7388
Add DB port number to docker
...
which gets copied to the docker image's `.env` file during installation. This closes #5718
2018-07-18 19:10:06 -07:00
thelamer
ed5823151b
in order to avoid manual user intervention of running "php artisan migrate" before installation on a clean database pulling in migration scripts on startup if needed, also ownership of keys needs to be the docker user
2018-06-07 22:29:00 -07:00
Anh DAO-DUY
e41ee1bcf8
Fix upload images problem with Docker ( #4906 )
...
Some folders were missing in this script file (Docker installation).
Missing folders caused errors while uploading some images.
2018-01-24 09:13:03 -08:00
snipe
17ee904828
Fixed #4450 - added MAIL_REPLYTO_ADDR to docker.env
2017-11-15 14:48:45 -08:00
morph027
7c8dc9fe2d
docker: use ubuntu:xenial with php7.0 ( #3616 )
...
Nice, thanks! I'll patch this over to develop as well.
2017-06-01 20:50:09 -07:00
Manasses Ferreira
47ac59abef
We noted that the barcode folder was not being created. (what is done now in the entrypoint.sh) At the same time, a wrong directory was being created. (which explains the deleted line in Dockerfile) ( #3456 )
2017-03-31 13:48:50 -07:00
snipe
934b39268d
Merge remote-tracking branch 'origin/develop'
2016-09-06 10:35:33 -07:00
snipe
5cf1c8dfa3
Added DB DUMP PATH to docker.env
2016-08-23 15:51:05 -07:00
timwsuqld
8232cefbba
Fix path to snipeit-ssl.crt ( #2428 )
2016-08-16 13:03:55 -07:00
Brady Wetherington
f145d6cc8c
Change README to point to new documentation site
2016-07-26 13:56:40 -07:00
Brady Wetherington
5e0cc241a0
Forgot to add the new docker.env file
2016-06-02 20:35:05 -07:00
Brady Wetherington
008482203e
Fixes to Dockerfile, updated docker/develop.sh for new options.
2016-05-14 16:46:53 -07:00
Brady Wetherington
f03ecd9d08
Update docker support for upcoming v3
2016-05-14 15:43:46 -07:00
snipe
fe00b0e401
Version 3 - hold onto your butts
2016-03-25 01:18:05 -07:00
snipe
r-xyz
chandanchowdhury
Jeremy Price
Brady Wetherington
octobunny
Tom Misilo
Thomas Misilo
Wouter van Os
Jeremy Price
Johannes Münch
Sabir Manandhar
Mateus Villar
João Paulo
Joshi
Jonathon Reinhart
Ľubomír Kučera
Colin Campbell
Hajo Möller
Brady Wetherington
thelamer
Anh DAO-DUY
morph027
Manasses Ferreira
timwsuqld