Commit Graph

3693 Commits

Author SHA1 Message Date
Godfrey M 49342a4542 added status names to asset history 2023-12-05 11:50:43 -08:00
snipe 0089ea2321 Merge pull request #13882 from marcusmoore/fixes/jquery-validation
Fix client side validation in the v7 branch
2023-12-05 17:26:48 +00:00
snipe 3f35124838 Merge pull request #13888 from spencerrlongg/chore/sc-16907
Convert Vue Personal Access Tokens to Livewire
2023-12-05 16:45:16 +00: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 b17078fffd a couple notes 2023-11-28 22:15:13 -06:00
spencerrlongg c886fb555b checkout on store tests almost done 2023-11-28 22:11:20 -06:00
spencerrlongg 15d11f7f4e test checkout to user on store 2023-11-28 21:46:03 -06:00
akemidx 2a54797dce permission level proof of formatting 2023-11-28 17:58:37 -05:00
akemidx 9770016eec beginning of permission groups export 2023-11-28 17:47:36 -05: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
snipe 3b9f069627 Switched back to old version
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 15:54:42 +00:00
snipe 2c6b957fbe Removed unused query
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 15:28:37 +00:00
snipe 6ae03a204b Added the model info back in
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 15:21:14 +00:00
snipe c91713e20a Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 15:14:55 +00:00
snipe 4723cfd4ba More refactoring
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 13:33:32 +00:00
snipe f9d5c451bc Committing this for now - not done
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 13:33:32 +00:00
snipe 5574218966 More FAFO - cleanup needed, but model_id works now
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 13:33:32 +00:00
snipe c997ae44c2 FAFO troubleshooting
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 13:33:32 +00:00
Brady Wetherington 6210716199 Merge branch 'develop' into snipeit_v7_laravel10 2023-11-27 13:04:39 +00:00
snipe 81b2273c37 Refactored checkout screen to redirect if invalid category
Signed-off-by: snipe <snipe@snipe.net>
2023-11-23 16:18:28 +00:00
snipe 31f429e1c4 Merge pull request #13934 from snipe/fixes/escaped_asset_tag_in_return_msg
Escape the asset tag before passing it to the view
2023-11-22 23:21:54 +00:00
snipe 1307ef19cf Escape the asset tag before passing it to the view
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 23:20:47 +00:00
snipe aed6b531cb Derp. Extra return statement
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 23:05:38 +00:00
snipe ba127be344 Use saveQuietly to prevent double entries
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 23:00:30 +00:00
snipe 45d9119733 Removed debugging/comments
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 22:32:34 +00:00
snipe 8481768c3d Save quietly for login methods
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 21:42:21 +00:00
snipe 20c0f687e9 Added restored to asset observer, removed manual logging
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 20:09:10 +00:00
snipe d06cfe6502 Changed verb to “restore” from “restored”
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 20:08:41 +00:00
snipe e2d0136336 Fixed goofy translation
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 18:14:44 +00:00
snipe 6a3ab526de Refactorer API controller restore methods
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 18:04:24 +00:00
snipe f7ccef16e7 Refactorer controller restore methods
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 18:02:47 +00:00
snipe 0d29ac9856 Fixded gate return
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 13:48:20 +00:00
snipe a08dcbdfdb Quick revert for #13830
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 12:25:42 +00:00
snipe 01fec1d6bb Redirect back to the specific consumable for correction
Signed-off-by: snipe <snipe@snipe.net>
2023-11-20 15:39:39 +00:00
snipe 7c88601066 Grab the API
Signed-off-by: snipe <snipe@snipe.net>
2023-11-20 15:31:39 +00:00
snipe fe2cfa0d38 Redirect if category is missing or invalid
Signed-off-by: snipe <snipe@snipe.net>
2023-11-20 15:28:44 +00:00
snipe e41a16dbf3 Merge pull request #13879 from Godmartinz/location_search_bug
added user location scope
2023-11-19 07:01:59 +00:00
spencerrlongg af3417d6cc add return type 2023-11-16 11:42:37 -06:00
spencerrlongg c3e02286d3 i can't blame this on livewire - animations or something? 2023-11-16 11:24:54 -06:00
Spencer Long 19850e8c5a Merge branch 'snipeit_v7_laravel10' into chore/sc-16907 2023-11-15 20:37:15 -06:00
spencerrlongg 9cf81c7ad4 cleanup, validation 2023-11-15 20:29:14 -06:00