DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 22:07:29 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
16439 commits 103 branches 268 tags 292 MiB
Commit graph

459 commits

Author SHA1 Message Date
Marcus Moore 80f9159f4d
Change options to text type 2025-01-06 14:29:18 -08:00
snipe 15296d2b1c
Merge pull request #15714 from akemidx/saving_custom_report_template 
Saved Custom Report Templates
 2024-12-19 22:43:59 +00:00
Godfrey M 833af55806 Merge branch 'develop' into barcode_settings_hide 2024-12-12 12:05:29 -08:00
snipe 82108f8a18
Merge pull request #15208 from akemidx/feature/sc-26415 
FEATURE: Option for Notes to be Required on Asset Checkin/Checkout
 2024-11-26 20:11:04 +00:00
Marcus Moore f5206078d4
Fix rollback for webhook_endpoint by using correct column type 2024-11-18 12:25:02 -08:00
Marcus Moore 0209d27081
Fix rollback for created_by 2024-11-18 12:24:47 -08:00
Marcus Moore 53de97db4e
Merge branch 'develop' into saving_custom_report_template 2024-11-12 10:36:07 -08:00
Marcus Moore 363ec841d1
Re-introduce soft deletes 2024-11-07 16:40:37 -08:00
Brady Wetherington 050831868e Improved indexes on manager_id for locations and users, including deleted_at 2024-11-07 11:39:27 +00:00
Brady Wetherington 4fcf5ac7da Add new indexes to locations and users for faster manager lookups 2024-11-06 21:19:41 +00:00
Godfrey M ae3cb7b37b adds migration to update new with old if blank and remove old barcod variables 2024-10-31 14:35:13 -07:00
Marcus Moore 54b4db86d2
Revert "Add soft deletes" 
This reverts commit 0eadab49f1.
 2024-10-29 15:33:49 -07:00
Marcus Moore 0eadab49f1
Add soft deletes 2024-10-29 15:26:18 -07:00
Marcus Moore 45e98e0282
Merge branch 'develop' into saving_custom_report_template 2024-10-29 15:20:52 -07:00
Marcus Moore 7238238d1f
Use created_by instead of user_id 2024-10-23 16:40:03 -07:00
snipe 3ee76be7e3 Added manufacturer and model_number to components 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-23 17:50:22 +01:00
Marcus Moore 5306e1cd15
Merge branch 'develop' into saving_custom_report_template 
# Conflicts:
#	resources/views/partials/forms/edit/location-select.blade.php
#	resources/views/partials/forms/edit/manufacturer-select.blade.php
#	resources/views/partials/forms/edit/model-select.blade.php
#	resources/views/partials/forms/edit/supplier-select.blade.php
#	resources/views/reports/custom.blade.php
 2024-10-15 12:32:01 -07:00
akemidx 5e74b109d9 front end changes/updates from gh 2024-10-02 18:15:52 -04:00
akemidx 700647c53f setting created 2024-10-02 18:15:52 -04:00
Marcus Moore 8bba11e1bb
Merge branch 'develop' into saving_custom_report_template 
# Conflicts:
#	app/Http/Controllers/ReportsController.php
#	resources/views/partials/forms/edit/category-select.blade.php
#	resources/views/partials/forms/edit/company-select.blade.php
#	resources/views/partials/forms/edit/location-select.blade.php
#	resources/views/partials/forms/edit/manufacturer-select.blade.php
#	resources/views/partials/forms/edit/model-select.blade.php
#	resources/views/partials/forms/edit/status-select.blade.php
#	resources/views/reports/custom.blade.php
 2024-09-17 15:26:35 -07:00
snipe 1582d81e5b Change user_id to created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 22:16:41 +01:00
snipe e8f1190628 Added missing migration from #15314 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 10:44:28 +01:00
snipe 4356cb7b9b Added confetti option 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 11:32:42 +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 8fe6395287 Added migration 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 20:41:13 +01:00
Godfrey M 46a6a84ecb adds migration and translations 2024-08-06 11:07:39 -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
Godfrey Martinez c96ccbb6cb
Merge branch 'develop' into depreciation_percentage 2024-07-24 12:12:28 -07:00
snipe fecd877e8b Migration 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 17:35:06 +01:00
Godfrey M aaa2858337 battling with handling depreciation percentage and amount 2024-07-16 12:25:19 -07:00
snipe 5e97ed1c7e Added migration 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:24:11 +01:00
snipe 72affd7a5b Added migration 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:31 +01:00
Brady Wetherington 28b450fd3c Add index to 'parent_id' for users with large number of locations 2024-05-27 15:38:42 +01:00
snipe de088d452f
Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance 
Adds a note text area to asset acceptances/declines
 2024-05-16 15:06:05 +01:00
Godfrey M 43c32fa1bf fix class name in migration 2024-04-03 11:47:08 -07:00
Godfrey M c01bdb42fc renamed migration 2024-04-03 11:39:17 -07:00
akemidx b124b9af4d adding in change to settings table 2024-03-26 16:50:39 -04:00
Godfrey M 21c3b1fbd2 rename declined message to note, increased width of textarea 2024-03-21 14:03:25 -07:00
akemidx 8640cad033 was using lcoations and not locale. fixed 2024-03-19 16:11:32 -04:00
akemidx dc29717623 fixing default 2024-03-19 15:51:05 -04:00
Godfrey M b9986033cc removed abbr. of variable, changed variable types in migration 2024-03-18 16:03:40 -07:00
akemidx 3680e04817 migration to set legacy locations to an standardized format 2024-03-18 18:29:59 -04:00
Godfrey M 8b52d5da85 fixed typos, reordered jquery, fixed migrations 2024-03-18 12:36:54 -07:00
Godfrey M 4588393b76 adds declined msg to mail notif, updates lang files and checkout acceptance controller 2024-03-18 10:25:55 -07:00
snipe ee75df0f0a
Merge pull request #14346 from snipe/feature/sc-18728 
Added `min_amt` functionality to licenses
 2024-02-28 11:26:25 +00:00
snipe d0d29e03db Migration for min_amt on licenses 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:06:01 +00:00
snipe 0bd27d61b0 Added created_by to groups table 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 08:15:59 +00:00
Brady Wetherington d3815ddce7 Remove commented-out timestamps on the saml_nonces table 2024-01-25 20:13:49 +00:00
Brady Wetherington b39b575fec Add table-check; add command-description for Artisan command 2024-01-25 20:07:18 +00:00