DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9978 commits 101 branches 268 tags 288 MiB
Commit graph

9978 commits

This branch
This branch
All branches
Author SHA1 Message Date
akemidx 0909d94c8f actually added the icons haha 2023-03-15 15:07:07 -04:00
akemidx 68094b23b9 moved dell and levono icons to local machine 2023-03-15 15:02:33 -04:00
snipe fdacd5d5b5
Merge pull request #12636 from akemidx/feature/sc-20330/date-on-all-assigned-pdf 
Datestamp on "Print All Assigned" generated form
 2023-03-15 11:31:52 -07:00
akemidx f38f6f57ae fixed localization and formatting. simplified code to remove php snippet 2023-03-15 14:00:29 -04:00
akemidx a3353b8496 committing 2023-03-15 13:48:22 -04:00
snipe 08e09a3215
Merge pull request #12675 from snipe/security/webpack_upgrade 
Updated webpack
 2023-03-14 19:55:42 -07:00
snipe 039a5dde7d Updated webpack 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-14 19:54:58 -07:00
snipe 1968aebf78
Merge pull request #12674 from snipe/fixes/translation_variable_for_slack 
Fixed missing variable in Slack hook test
 2023-03-14 19:03:42 -07:00
snipe a0617edaf0 Fixed missing variable in Slack hook test 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-14 19:02:38 -07:00
Marcus Moore fb789eb048
Remove hard-coded depreciation_id in factories 2023-03-14 17:51:20 -07:00
snipe 4c66267f3b
Merge pull request #12668 from inietov/fixes/undefined_array_key_0 
Fixed ErrorException: Undefined array key 0 [sc-20424]
 2023-03-14 17:10:04 -07:00
Marcus Moore f7577bff52
Merge branch 'develop' into fixes/purify-factories 2023-03-14 17:09:30 -07:00
snipe 322fd76353
Merge pull request #12664 from Godmartinz/The_final_lowercase 
The final lowercase in webhooks
 2023-03-14 17:09:20 -07:00
snipe c12d261fc8
Merge pull request #12673 from marcusmoore/fixes/fix-component-factory 
Fixed Component factory
 2023-03-14 17:05:38 -07:00
snipe a991bdd136
Merge pull request #12672 from inietov/fixes/consumable_factory_seeder 
Fixed Consumable Factory Seeder
 2023-03-14 17:04:33 -07:00
Marcus Moore 9cd8460e1e
Add proper date format to purchase date in the component factory 2023-03-14 17:02:45 -07:00
Marcus Moore 72a61783a3
Inline two relationships in asset maintenance factory 2023-03-14 14:59:34 -07:00
snipe f0d05a7461 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2023-03-14 14:34:11 -07:00
snipe 88624ff2c0 Add @marcusmoore as a contributor 2023-03-14 14:34:03 -07:00
snipe f71ee699f4 Add @spencerrlongg as a contributor 2023-03-14 14:33:31 -07:00
snipe ce83d3aec1
Merge pull request #12670 from spencerrlongg/bug/sc-20437 
Catch Duplicate Headers in Asset History Import
 2023-03-14 14:32:34 -07:00
slong753 60b70a4074 catch and redirect back with error 2023-03-14 16:07:09 -05:00
Marcus Moore 1ff094dd47
Remove hard-coded model_id in asset factory 2023-03-14 13:56:25 -07:00
Marcus Moore ef8007a890
Remove hard-coded status_id in asset factory 2023-03-14 13:24:50 -07:00
akemidx d50a5d1880 dell and lenovo icons/links added 2023-03-14 16:04:03 -04:00
Marcus Moore a2efe3fa67
Remove hard-coded category_id in factories 2023-03-14 12:50:02 -07:00
akemidx a9782b7e00 testing links 2023-03-14 15:26:44 -04:00
Marcus Moore 4c4101fe64
Fix key name 2023-03-14 12:04:31 -07:00
akemidx 9c5ee060d3 WIP string/int error 2023-03-14 15:01:56 -04:00
Marcus Moore 7cf424b914
Remove hard-coded manufacturer_id in factories 2023-03-14 12:01:23 -07:00
Marcus Moore e8ff7cc09c
Remove hard-coded user_id in factories 2023-03-14 11:34:58 -07:00
snipe dfd9fcc5e0
Merge pull request #12599 from inietov/fixes/unknown_column_0_in_field_list 
Fixed Column not found: 1054 Unknown column '0' in 'field list' [sc-20004]
 2023-03-14 09:51:42 -07:00
snipe b83980299a
Merge pull request #12667 from snipe/fixes/small_livewire_ui_fixed 
Small UI tweaks
 2023-03-14 09:47:45 -07:00
snipe 5a709a83e7 Small UI tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-14 09:38:30 -07:00
Ivan Nieto Vivanco 66bb897ac4 Fix format to purchase date 2023-03-14 02:55:20 -06:00
Ivan Nieto Vivanco 67471a3a77 Evaluate if the collection is empty before access the array index 2023-03-13 21:44:06 -06:00
Marcus Moore adba450b40
Remove some hard-coded ids in factories 2023-03-13 17:27:06 -07:00
snipe 7acf449ed3
Merge pull request #12665 from snipe/fixes/fixed_migration_for_smaller_chunking 
Removed loading and reduced chunking to 10
 2023-03-13 17:23:19 -07:00
Godfrey M 955d8313b2 the final lowercase 2023-03-13 17:14:02 -07:00
snipe 1b9c3c93ad Removed loading and reduced chunking to 10 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-13 17:12:51 -07:00
snipe a2667a7520
Merge pull request #12663 from Godmartinz/webhook_tweaks 
fixes webhook variables to lowercase
 2023-03-13 16:55:32 -07:00
Marcus Moore 099ec3f550
Remove creation of category within category factory state 2023-03-13 16:45:43 -07:00
Marcus Moore 6e6a021928
Add temporary command to display model counts 2023-03-13 16:44:47 -07:00
Godfrey M 1bd37b49e9 adds translations for webhook names 2023-03-13 16:13:02 -07:00
Ivan Nieto Vivanco d224f3177e Delete a rule that was breaking validation 2023-03-13 16:43:10 -06:00
Godfrey M 6474249ea8 uppercased names 2023-03-13 15:29:53 -07:00
Godfrey M 7612c5d852 lowercases variables 2023-03-13 15:26:51 -07:00
Ivan Nieto Vivanco e7b3daa80c Adjust validator to only receive valid groups id's 2023-03-13 16:10:08 -06:00
snipe 477bd27cba
Merge pull request #12570 from Godmartinz/generalize_webhooks 
Adds General option to the webhooks settings
 2023-03-13 14:54:51 -07:00
Ivan Nieto Vivanco e4204a6dd1 Adds validator to PATCH request in the API UsersController 2023-03-13 15:49:05 -06:00