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 1 Packages Projects Releases Wiki Activity
12510 commits 59 branches 275 tags 321 MiB
Commit graph

2595 commits

Author SHA1 Message Date
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 786c41ad79
Add some type hints 2024-01-17 17:41:03 -08:00
Marcus Moore 82f4cc799b
Improve variable name 2024-01-17 11:54:37 -08:00
akemidx a5099b5163 translations/messages on report template controller 2024-01-10 15:23:42 -05:00
akemidx 27103124bf messages/translations 2024-01-09 16:49:56 -05:00
Brady Wetherington 4b90f85372 Fixed [FD-39640]: preserve sort order when generating asset labels 2024-01-09 16:37:33 +00:00
snipe f8a21bdb2d Moved limit and offset to after additional qualifiers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 11:59:31 +00:00
Marcus Moore 742e183b02
Add guard against adding null values to query 
Since $request->filled(null) returns true
 2024-01-04 14:04:00 -08:00
Marcus Moore 740d46a50e
Repopulate report after validation error 2024-01-02 17:59:30 -08:00
Spencer Long 8546407083
Merge branch 'develop' into refactor/store_asset_form_request 2024-01-02 18:05:15 -06:00
snipe 38bd530fae Update en defaults for controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 19:44:20 +00:00
Marcus Moore 71761a48ad
A few more small clean ups 2023-12-20 17:50:55 -08:00
Marcus Moore 9a5c8c4ce6
Formatting and clean ups 2023-12-20 16:24:48 -08:00
Marcus Moore 0504c09a9a
Implement ability to delete templates 2023-12-20 16:19:04 -08:00
Marcus Moore 0527201ae5
Allow templates to be updated 2023-12-20 14:41:23 -08:00
Marcus Moore 26cc4497eb
Use dedicated show route for report templates 2023-12-20 14:01:46 -08:00
akemidx ebf760a477 translations, UI fixes 2023-12-19 18:01:19 -05:00
snipe f9139e0f10 Changed to use instanceof 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 13:25:32 +00:00
snipe f13c1a53ef Get an object instead of a collection 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 12:51:35 +00:00
snipe f08ce34036 Fixed translation string in JSON 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 12:31:55 +00:00
Marcus Moore 9fcb1a2d0e
Rename SavedReport to ReportTemplate 2023-12-18 12:55:48 -08:00
snipe 444c41bedb Fixed #14037 - record current time on accessory checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-15 16:39:18 +00:00
snipe 421802893e Added new fields to action report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-15 10:45:22 +00:00
snipe a90b04c905 Allowed sorting on user_agent, etc 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:34:08 +00: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
snipe 016ca1adc1 Fixed HTML for checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 06:27:50 +00:00
snipe b53a4c366e Removed escaping on notes on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 13:26:41 +00:00
snipe e894138fd4 Added $user->created_at to API user create method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 12:26:02 +00:00
snipe 631dd58de1 Added model name and number to quickscan 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 04:23:04 +00:00
Marcus Moore 89c47c1879
Add validation for saving reports 2023-12-11 16:20:36 -08:00
Marcus Moore b9cda88363
Alphabetize saved reports list 2023-12-11 16:20:17 -08:00
Marcus Moore 52028ddef2
Add authorization to saving saved reports route 2023-12-11 15:34:17 -08:00
Marcus Moore c9157dc55d
Update docblock 2023-12-11 14:20:33 -08:00
Marcus Moore c3b53b28e3
Allow saving custom reports 2023-12-11 14:19:03 -08:00
akemidx e636d7b9d5 multiple saved reports, beginning of dynamic dropdown listing/queried url 2023-12-11 15:28:34 -05:00
snipe 778e45c9fd Fixed maintenances patch endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-07 19:36:12 +00:00
Marcus Moore 5041c07c7e
WIP: implement restoring checkbox inputs 2023-11-30 18:15:04 -08:00
spencerrlongg 2d57b9399c more cleanup 2023-11-30 16:20:48 -06:00
spencerrlongg 6e5f296a13 gets rid of depreciate 2023-11-30 16:08:49 -06:00
spencerrlongg 68d85385a2 get rid of physical 2023-11-30 16:03:30 -06:00
spencerrlongg 88b6a541ee removed references to archived 2023-11-30 15:59:03 -06:00
spencerrlongg 135b7bde7d added some more check out assertions 2023-11-30 11:53:26 -06:00
spencerrlongg d794608a09 note 2023-11-29 15:04:52 -06:00
spencerrlongg c3492f1699 fixed eol, add calculated eol/eol explicit tests 2023-11-29 14:57:31 -06:00
spencerrlongg 9d8433bd6d a couple quick things 2023-11-29 13:15:41 -06:00
spencerrlongg 15d11f7f4e test checkout to user on store 2023-11-28 21:46:03 -06:00
spencerrlongg 75ac7f80b9 some refactor + tests 2023-11-28 15:17:46 -06:00
snipe 899890b224 Use update array nomenclature 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 16:25:35 +00:00
snipe 2d4a14d4bb Fixed from rebase :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:55:41 +00:00