DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-12 16:44:08 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
11922 commits 97 branches 266 tags 292 MiB
Commit graph

3850 commits

Author SHA1 Message Date
Spencer Long 19850e8c5a
Merge branch 'snipeit_v7_laravel10' into chore/sc-16907 2023-11-15 20:37:15 -06:00
spencerrlongg 12dcf76da9 more cleanup 2023-11-15 20:33:44 -06:00
spencerrlongg 36aac328e4 delete vue component 2023-11-15 20:32:22 -06:00
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 fd02385c22 deleted components i've already rebuilt in livewire 2023-11-15 17:14:09 -06:00
spencerrlongg 713b21de14 note 2023-11-15 16:56:08 -06:00
spencerrlongg 9b31ae3146 create mostly working 2023-11-15 16:51:09 -06:00
spencerrlongg 4cb0012872 cleanup 2023-11-15 16:33:16 -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 e504b20235 couple small changes 2023-11-14 11:01:38 -06:00
Brady Wetherington f64b0d3818 Merge branch 'develop' into snipeit_v7_laravel10 2023-11-14 16:00:29 +00:00
spencerrlongg fbfc817c5f just some cleanup 2023-11-13 19:47:03 -06:00
snipe 4546e87eb5
Merge pull request #13680 from marcusmoore/feature/sc-23769 
Changed data source input to select in new label engine
 2023-11-13 20:38:42 +00:00
snipe 4ecce51b57
Merge pull request #13831 from Godmartinz/multi-sync-ldap-locations 
Added multi location sync for ldap
 2023-11-13 20:20:45 +00:00
spencerrlongg 5615fc09e6 add view modal 2023-11-08 16:55:29 -06:00
spencerrlongg d68f1e4cfa initial display work done 2023-11-08 16:48:20 -06:00
spencerrlongg 7f4b2d6e42 modal and initial stuff working 2023-11-08 16:10:09 -06:00
snipe a24d21e683 Added new unescaped alert box 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:41:05 +00:00
snipe 3f8b63e053 Add linked text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:40:02 +00:00
snipe 26311e46b8 Fixed URL to favicon on default blade (used in 404 messages) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 11:38:48 +00:00
snipe b3a6cc633b
Merge pull request #13769 from Godmartinz/location-dropdown-duplication 
clarifies an address column under locations
 2023-11-08 08:59:07 +00:00
snipe bc9545ca96
Merge pull request #13823 from spencerrlongg/chore/sc-23922 
New Translation Strings for Custom Asset Export
 2023-11-08 08:57:20 +00:00
snipe cf42eca198
Merge pull request #13814 from ntbutler-nbcs/feature-location-history 
Added #13754 - asset history tab to locations view
 2023-11-08 08:55:07 +00:00
spencerrlongg 93101d36b8 removed refresh button on client tables 2023-11-07 15:07:24 -06:00
snipe d0cc42a068 Added employee number to user merge screeb 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-03 20:09:11 +00:00
Godfrey M 3b6a0d6525 allows multi location sync for ldap 2023-11-02 16:50:19 -07:00
spencerrlongg 8f75bb8706 fix translation strings 2023-10-31 21:38:52 -05:00
snipe e381bf978f
Merge pull request #13816 from snipe/bug/sc-23900 
Fixed datetime displayed on license edit for fields that should be date
 2023-10-31 16:59:12 +00:00
snipe 22996895d8 Check for valid model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 16:04:19 +00:00
snipe 28641493ca Check that the category exists 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 15:58:59 +00:00
snipe aa2a25dc19 Display the form errors correctly 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 15:30:49 +00:00
snipe 3495652827 Added checkboxes to intentionally remove field values in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:52:53 +00:00
snipe 209627e2cc Force format if dates are given 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:25:00 +00:00
Nathan Butler 79f380cbe7 Added asset history tab to locations view 2023-10-31 10:28:54 +11:00
Godfrey M 97953ae082 add missing translation string 2023-10-30 12:17:55 -07:00
snipe 8c46f4ef69 Added min_amt value to model detaul page 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-30 13:19:59 +00:00
spencerrlongg 90eb3b86cf added user phone & address fields 2023-10-26 19:10:53 -05:00
snipe aab7eb4a85
Merge pull request #13800 from snipe/fixes/bulk_edit_assets 
Fixed FD-38641 - Bulk asset edit unable to update model_id, misc other bugs
 2023-10-26 15:56:47 +01:00
snipe 1ce95b6eac Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:34:27 +01:00
snipe 64219da0b4
Merge branch 'develop' into Robert-Azelis-EOL_fix_improvements 2023-10-26 13:36:18 +01:00
snipe ff72c4fbaa Added nicer formatting for fields in log meta 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 09:17:28 +01:00
snipe 7042260871 More style polishing on custom fields in bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 04:23:11 +01:00
snipe 77d141d19c Don’t check the delete expected checkin by detault 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 03:56:02 +01:00
snipe 522aa96fcc Changed error variable name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 02:36:18 +01:00
snipe 4b6b36c639 Removed semicolon 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 01:49:14 +01:00
snipe 4a759f0a20 Added fingerprint icon for unique 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 01:49:01 +01:00
snipe 7509d57bf6
Merge pull request #13796 from snipe/feature/sc-23880 
Added optional custom fields to requestable assets page
 2023-10-25 20:57:54 +01:00