Commit graph

14362 commits

Author SHA1 Message Date
snipe 78bd950daa Added select2 language files
Signed-off-by: snipe <snipe@snipe.net>
2024-07-16 18:39:42 +01:00
snipe a0d461d3e2
Merge pull request #15099 from snipe/fixes/15094_wrong_translation_string
Fixed #15094 - wrong translation string for model on checkout
2024-07-16 17:23:46 +01:00
snipe eb9e276ba7 Fixed #15094 - wrong translation string for model on checkout
Signed-off-by: snipe <snipe@snipe.net>
2024-07-16 17:14:13 +01:00
snipe 35160f88e0 Corrected return type
Signed-off-by: snipe <snipe@snipe.net>
2024-07-16 16:09:08 +01:00
snipe 51242fcbb2 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-07-13 16:09:03 +01:00
snipe 99be9ddb47 Add @dbakan as a contributor 2024-07-13 16:08:56 +01:00
snipe be4317361d
Merge pull request #15082 from dbakan/fix/optimize-command
Fixed #10224: fix route names for optimize command
2024-07-13 16:08:32 +01:00
Daniel Albertsen a175b6a38b fix routes and tests 2024-07-13 16:36:14 +02:00
Daniel Albertsen 431da6c903 add test to ensure artisan optimize works 2024-07-13 16:36:14 +02:00
snipe b68fcf1de5 Added unaccepted asset test
Signed-off-by: snipe <snipe@snipe.net>
2024-07-12 12:19:40 +01:00
snipe d21ebc6f0d Fixed return type
Signed-off-by: snipe <snipe@snipe.net>
2024-07-12 11:04:56 +01: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
snipe 5132aa0254 Bumped version
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 19:07:30 +01:00
snipe aebe96913a Add @FlorentDotMe as a contributor 2024-07-11 17:31:20 +01:00
snipe 78d24eb451
Merge pull request #15069 from TelecomsSansFrontieres/fix_print-all-assets
Fixed inconsistent attributes order in Print All Assigned report
2024-07-11 17:30:41 +01:00
snipe c5c5ac58e5
Merge pull request #15071 from snipe/fixes/small_consumables_optimizations
Small consumables optimizations
2024-07-11 17:27:41 +01: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 23f1489b2b Added history tab
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 16:46:49 +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 58bc84436c Fixed incorrect jquery validation class
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 16:23:05 +01:00
snipe 2415408a50 Prevent ludicrious amount of min_qty
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 16:22:41 +01:00
snipe 00d7b36c36 Eager load suppliers
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 16:22:22 +01:00
snipe 67d6f7119d Prevent a ludicrous amount of consumables
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 16:22:04 +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 d9a114090b Added buttons
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 16:18:33 +01:00
snipe b10441c928 Detach associated pivot records
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 16:01:18 +01:00
snipe e123eeea9e Added error message if category type is invalid
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 16:00:20 +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 2b5463475c Added test
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 15:25:26 +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 a6b2f5df1d Added tests
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 15:24:56 +01:00
snipe da2b64c96d Added string
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 15:24:08 +01:00
snipe 9e9b07f10f Removed duplicate status check
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 15:23:59 +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
Florent Bervas d9a53460ff Fix design inconsistency between assets and assigned assets in Print All Assigned report 2024-07-11 09:41:58 +00:00
snipe 5364838fc0 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-07-11 10:08:10 +01:00
snipe 8be44f9cf2 Check for time until depreciated
Signed-off-by: snipe <snipe@snipe.net>
2024-07-11 10:07:58 +01:00
snipe 68136ea217
Merge pull request #15052 from snipe/jerm/handle-windows-ca-jank-in-upgrade-script
upgrade.php: If we're on windows, make sure we can load intermediate certificates
2024-07-11 09:11:37 +01:00
snipe ec063b4af5 Updated PHP min version
Signed-off-by: snipe <snipe@snipe.net>
2024-07-10 17:07:44 +01:00
snipe bfa42ff84a
Merge pull request #15051 from snipe/jerm/add-upgrade-script-debugging
upgrade.php: More helpful output when we can't read .upgrade_requirements.json
2024-07-10 16:51:30 +01:00
snipe 22aca1af53 Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
2024-07-10 16:12:20 +01:00