DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
16898 commits 59 branches 275 tags 321 MiB
Commit graph

152 commits

Author SHA1 Message Date
Marcus Moore ae7d7f7d22
Merge branch 'develop' into bug/sc-28148 
# Conflicts:
#	routes/web.php
 2025-02-20 13:23:55 -08:00
snipe 44a7bdbfb5 Moved SAML gui settings routes to web.php 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 14:58:17 +00:00
snipe e264907157 Added breadcrumbs on more web routes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 14:05:12 +00:00
snipe cd7135ea77 More test fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 06:19:50 +00:00
snipe 3954ff20b4 More tweaks to the controllers, more breadcrumbs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 03:29:31 +00:00
snipe 972bd1ef83 Tinkering with routes for breadcrumbs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 00:37:09 +00:00
Marcus Moore 25215fd3c9
WIP: begin migrating notes to ui controller 2025-02-18 15:20:06 -08:00
snipe 580a4c476e
Merge pull request #16244 from marcusmoore/chore/migrate-form-open-pt4 
Replace Form::open and Form::close pt4
 2025-02-18 20:42:44 +00:00
Marcus Moore 215fe501ac
Migrate Form::open and Form::close on activity report page 2025-02-12 12:14:00 -08:00
Marcus Moore 532e6c1c1d
Migrate Form::open in profile view 2025-02-11 14:10:52 -08:00
Marcus Moore 5cf314a314
Migrate Form::open in change password view 2025-02-11 14:10:52 -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
Marcus Moore 53de97db4e
Merge branch 'develop' into saving_custom_report_template 2024-11-12 10:36:07 -08:00
Godfrey M 3791380764 remove unused uses 2024-10-31 12:52:47 -07:00
Godfrey M 7a0f79ecd2 remove test route 2024-10-31 12:51:22 -07:00
Godfrey M e65942064e send emails even if target has no email 2024-10-31 12:45:29 -07:00
Marcus Moore 5f83cb6a14
Use route model binding 2024-10-31 12:34:06 -07:00
Godfrey M 1b5f4415ae corrected cc email behavior 2024-10-23 14:44:45 -07:00
Marcus Moore b6aae1f8a9
Group routes 2024-10-22 17:30:34 -07:00
Godfrey M 9a79483375 removed namespaces from routing 2024-10-16 16:59:18 -07:00
Godfrey M ed6034065b removed test route 2024-10-16 16:47:36 -07:00
Godfrey M 2584d60344 adds Licenses seat checkout Mailable 2024-10-16 15:38:49 -07:00
Godfrey M dcdf600b78 adds Checkin and Checkout mailables and listner logic 2024-10-16 15:27:34 -07:00
Godfrey M 9710436d54 adds Mailables for asset checkin and out 2024-10-16 13:12:07 -07:00
Godfrey M 3ab2521cb0 email comes through, no picture and html markup appear though. 2024-10-16 12:21:33 -07: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
snipe 4d9e85026a Fixed #15439 - check database on healthcheck 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 15:36:01 +01:00
Godfrey M fa5651f335 remove getbarcodes, postbarcodes, barcodes settings blade 2024-09-17 16:21:26 -07: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
Godfrey M ce987b4f6d added front end barcodes to labels 2024-09-17 11:23:38 -07:00
snipe 229d8b9bf5 Added location restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:19:59 +01:00
Marcus Moore 9044aa4ed9
Import class 2024-06-05 11:48:47 -07:00
Marcus Moore b52380f376
Migrate to new namespace 2024-05-29 12:07:48 -07:00
snipe bc8db3deab Added bulk delete routes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:42:14 +00:00
Marcus Moore 530ea474d1
Merge branch 'develop' into saving_custom_report_template 
# Conflicts:
#	resources/lang/en/admin/reports/general.php
#	resources/views/reports/custom.blade.php
 2024-01-23 13:55:07 -08:00
Marcus Moore fda77179a3
Simplify url 2023-12-20 16:48:25 -08:00
Marcus Moore 0504c09a9a
Implement ability to delete templates 2023-12-20 16:19:04 -08:00
Marcus Moore 26cc4497eb
Use dedicated show route for report templates 2023-12-20 14:01:46 -08:00
Marcus Moore 9fcb1a2d0e
Rename SavedReport to ReportTemplate 2023-12-18 12:55:48 -08:00
Marcus Moore 27bb938d9e
WIP: add dedicated edit report page 2023-12-13 18:09:42 -08:00
akemidx ad202be374 update method (WIP ver) 2023-12-13 17:31:58 -05:00
Marcus Moore 52028ddef2
Add authorization to saving saved reports route 2023-12-11 15:34:17 -08:00
snipe e554a80589 Handle redirect from after POST request from backup restore 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-30 20:01:01 +00:00
snipe 6d55d78280 Set resend acceptance to POST 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-09 16:13:41 +01:00
akemidx 734af87f2f template structuring 2023-08-28 19:26:31 -04:00
Grant Le Roux b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
Ivan Nieto Vivanco 1c29bd37a6 Added feature to cancel requests from the Requested Assets view 2023-06-27 18:11:10 -06:00
snipe b183e53c45 Added settings routes for google auth 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:34:48 -07:00
snipe c52b48c383 Google oauth login 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:14:28 -07:00