Commit graph

460 commits

Author SHA1 Message Date
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
spencerrlongg
b0d7eb2168 cancel action finished 2024-10-22 22:44:28 -05:00
spencerrlongg
79e6eafafa cancelled scaffolded out 2024-10-22 22:33:29 -05:00
spencerrlongg
48c812d345 bunch of cleanup, split cancel out 2024-10-22 20:48:27 -05:00
Marcus Moore
b6aae1f8a9
Group routes 2024-10-22 17:30:34 -07:00
spencerrlongg
b59bf495e1 stuff 2024-10-22 15:09:35 -05:00
spencerrlongg
e40849c910 this stuff works 2024-10-21 17:31:26 -05:00
spencerrlongg
b2ff34260a hm, lots of thinking to do 2024-10-17 00:02:15 -05: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
Marcus Moore
2004e58b53
Merge branch 'develop' into updated_ad_hoc_notes 2024-09-26 12:29:28 -07:00
Godfrey M
44447b85c9 Merge branch 'develop' into barcode_settings_hide 2024-09-26 11:27:05 -07:00
snipe
9b03f46490
Merge pull request #15534 from marcusmoore/bulk-print-users
Added the ability to bulk print users
2024-09-25 19:32:01 +01:00
snipe
5fb43dd159 Handle audit *and* audits for urls
Signed-off-by: snipe <snipe@snipe.net>
2024-09-24 16:55:56 +01:00
snipe
de57d71bf1 Fixed #15548 - unify audit due/overdue APIs
Signed-off-by: snipe <snipe@snipe.net>
2024-09-24 16:30:24 +01:00
Marcus Moore
fac4833b58
Remove unused import 2024-09-23 17:15:16 -07:00
Marcus Moore
a2d4dcf6e8
Use bulk actions menu 2024-09-23 12:49:36 -07:00
Marcus Moore
e493cc964d
Remove AssetCountForSidebar middleware from print view 2024-09-23 10:48:07 -07:00
Marcus Moore
5128fd49e6
Allow printing all users 2024-09-19 17:27:25 -07: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
akemidx
74efd850af redoing branch. old branch merge onflicts were waaay too gnarly 2024-09-16 19:30:26 -04:00
snipe
e8e3060a75 Added tests
Signed-off-by: snipe <snipe@snipe.net>
2024-09-02 18:51:22 +01:00
snipe
6aaf2f623f Removed extra route
Signed-off-by: snipe <snipe@snipe.net>
2024-09-02 18:49:55 +01:00
snipe
dfbccf50e8 Added patch/put back into resource routes
Signed-off-by: snipe <snipe@snipe.net>
2024-09-02 18:48:09 +01:00
snipe
c197644ba7
Merge pull request #15284 from spencerrlongg/bug/sc-26584
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
2024-08-29 11:38:15 +01:00
r-xyz
a8eb76fd8d
Fixed model files API routes. 2024-08-21 22:25:41 +02:00
r-xyz
da7313bc9d
Fix models files API routes. 2024-08-21 20:24:22 +02:00
r-xyz
4ec361c718
Add AssetModel files endpoints to API 2024-08-21 19:49:51 +02:00
snipe
229d8b9bf5 Added location restore
Signed-off-by: snipe <snipe@snipe.net>
2024-08-19 13:19:59 +01:00
spencerrlongg
dec4691c73 should be good to go now 2024-08-16 12:50:09 -05:00
spencerrlongg
afaf53cdfc failing ui test 2024-08-14 18:14:21 -05:00
spencerrlongg
20ec420ba3 not quite done, api side needs some work 2024-08-14 13:53:29 -05:00
snipe
1a872b1643 Merge remote-tracking branch 'origin/develop' 2024-08-07 18:15:44 +01:00
snipe
28abb8d8cc Hotfix for 405 update asset
Signed-off-by: snipe <snipe@snipe.net>
2024-08-01 12:30:35 +01:00
snipe
c1c9c3554e Fixed (temp) put route
Signed-off-by: snipe <snipe@snipe.net>
2024-08-01 12:27:02 +01:00
snipe
c3a2cdeee9 Added assets endpoint for locations
Signed-off-by: snipe <snipe@snipe.net>
2024-07-24 20:53:58 +01:00
snipe
b64b774bd5 Use route model binding on clone, removed unneeded route
Signed-off-by: snipe <snipe@snipe.net>
2024-07-24 17:49:21 +01:00
Spencer Long
64be353156
Merge branch 'develop' into bug/sc-24884 2024-07-23 12:55:19 -05:00
snipe
254e2f120b Added clone to consumables
Signed-off-by: snipe <snipe@snipe.net>
2024-07-20 16:40:32 +01:00