Commit graph

3077 commits

Author SHA1 Message Date
spencerrlongg
9cf81c7ad4 cleanup, validation 2023-11-15 20:29:14 -06:00
spencerrlongg
6c6417e595 ok, maybe i do like livewire 2023-11-15 20:19:03 -06:00
spencerrlongg
efa8ba5965 nice, just need frontend work now 2023-11-15 17:24:54 -06:00
spencerrlongg
af144a5184 cleanup 2023-11-15 16:55:21 -06:00
spencerrlongg
9b31ae3146 create mostly working 2023-11-15 16:51:09 -06:00
spencerrlongg
eaa68327f7 SINGLE QUOTES 2023-11-15 16:27:01 -06:00
spencerrlongg
9f303cc116 playing around with livewire 2023-11-14 11:50:27 -06:00
spencerrlongg
fbfc817c5f just some cleanup 2023-11-13 19:47:03 -06:00
spencerrlongg
8e4c0f60a1 return format 2023-11-08 17:36:54 -06:00
spencerrlongg
d68f1e4cfa initial display work done 2023-11-08 16:48:20 -06:00
Brady Wetherington
db400dffb5 Merge branch 'develop' into snipeit_v7_laravel10
Rebuild assets and re-install from npm
2023-10-16 20:13:59 +01:00
snipe
752171d5b8 Use singleton for offset
Signed-off-by: snipe <snipe@snipe.net>
2023-10-16 20:05:11 +01:00
snipe
a92a9d7616 Removed duplicated deleted
Signed-off-by: snipe <snipe@snipe.net>
2023-10-13 19:53:11 +01:00
snipe
8f23a45cb3 Removed dummy text
Signed-off-by: snipe <snipe@snipe.net>
2023-10-13 19:49:03 +01:00
snipe
93cccf4f5f Handle case where value is deleted in history
Signed-off-by: snipe <snipe@snipe.net>
2023-10-13 19:32:09 +01:00
Marcus Moore
417f9c21e4 Fix the storing of group permissions when creating via API 2023-10-10 17:51:29 -07:00
snipe
f685ba01b6 Reversed order of find
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:43:14 +01:00
snipe
e3591dc756
Merge pull request #13728 from snipe/fixes/13725_for_dev
Fixes qty remaining requirements for component checkout via API
2023-10-09 16:34:40 +01:00
snipe
b9dc7f88d0 Fix qty requirements for Components API checkout
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:32:30 +01:00
snipe
866bbe5e11 Removed extra debugging
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:15:14 +01:00
snipe
6d55d78280 Set resend acceptance to POST
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:13:41 +01:00
snipe
e5f5802235 Added tighter controls for matching log ID and item_id
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 15:17:03 +01:00
snipe
eea2eabaee Escaping asset history old/new values
Signed-off-by: snipe <snipe@snipe.net>
2023-10-06 19:45:23 +01:00
snipe
cd3b4754e8
Merge pull request #13704 from Godmartinz/feature/sc-23571_v2
Added a check-in button on components tab of Asset view
2023-10-05 14:28:37 +01:00
Brady Wetherington
7a5714cc85 Merge branch 'develop' into snipeit_v7_laravel10 2023-10-03 20:37:17 +01:00
Godfrey M
c69958d95d removed dead space 2023-10-03 12:32:24 -07:00
Godfrey M
92776adb93 remove unnecessary changes 2023-10-03 12:31:58 -07:00
Godfrey M
dee36fc294 adds component checkin to asset tab 2023-10-03 12:30:08 -07:00
snipe
129e9b90dc
Merge pull request #13585 from spencerrlongg/eol_2
Standardize Asset EOL Date
2023-10-02 16:09:22 +01:00
snipe
0184d25a95
Merge pull request #13681 from marcusmoore/bug/sc-23778
Fixed uncaught type error when attempting to render barcodes with invalid characters
2023-09-29 01:50:07 +01:00
Marcus Moore
41eccaeae0 Set dummy asset tag to value that is valid for EAN13 2023-09-28 17:31:45 -07:00
snipe
c1f545a523
Merge pull request #13679 from Godmartinz/bug/sc-23688
Fixed General Webhooks error messaging and validation
2023-09-28 20:24:09 +01:00
Godfrey M
8792d654b6 added translations for messages 2023-09-28 12:15:17 -07:00
Godfrey M
c21586dee5 adds better error messaging 2023-09-28 11:29:46 -07:00
snipe
f16e81e0e8
Merge pull request #13678 from spencerrlongg/bug/sc-23596
Fieldset Properly Sortable in Asset Models Table
2023-09-28 19:24:04 +01:00
spencerrlongg
a54fab5c33 add fieldset to allowed_columns 2023-09-28 13:02:12 -05:00
spencerrlongg
4d67c72eea scope and switch case in api 2023-09-28 12:26:23 -05:00
snipe
6fa0d42bc2 Fixed bug where license checkout/checkin notes were not being saved
Signed-off-by: snipe <snipe@snipe.net>
2023-09-28 15:40:18 +01:00
snipe
492fb15036 Fixed #13670 - order number missing from license import
Signed-off-by: snipe <snipe@snipe.net>
2023-09-28 14:24:07 +01:00
snipe
ee72c92d4f Fix for asset history with enfrypted fields
Signed-off-by: snipe <snipe@snipe.net>
2023-09-28 03:00:49 +01:00
snipe
660abeca9e
Merge pull request #13638 from marcusmoore/bug/sc-20704
Fixed exception being thrown when selected import was deleted
2023-09-26 15:00:35 +01:00
snipe
279e6c7e4f Check for null company ID
Signed-off-by: snipe <snipe@snipe.net>
2023-09-26 14:33:42 +01:00
Marcus Moore
5a88a64ebd Remove unnecessary redirect 2023-09-20 17:35:34 -07:00
Marcus Moore
b1199100a0 Display error message if import file deleted before it can be selected 2023-09-20 17:22:12 -07:00
Godfrey M
b7901ae2d8 dont allow redirects, messaging applied, general webhook validation applied 2023-09-20 12:54:34 -07:00
spencerrlongg
4660a2e5b7 rm more duplicate 2023-09-20 14:37:32 -05:00
spencerrlongg
a9123754f5 remove unnecessary code 2023-09-20 14:34:42 -05:00
spencerrlongg
7dab59c98d fix for no eol, fix for optional in view 2023-09-20 14:17:30 -05:00
Godfrey M
66abf8d5c0 redoing logic 2023-09-19 17:46:29 -07:00
spencerrlongg
d65d1930e4 asset models 2023-09-19 19:24:53 -05:00