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
10310 commits 101 branches 268 tags 288 MiB
Commit graph

10310 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 21e78bee71 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	package-lock.json
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2023-04-15 21:05:18 -07:00
snipe 2eeb7ddf58
Merge pull request #12844 from snipe/fixes/small_blade_parial_fixes 
Small blade parial fixes
 2023-04-15 21:04:35 -07:00
snipe 589f7fa183 Larger qty box 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 21:03:09 -07:00
snipe 9ff62c966e Check for $item (matters mostly in custom report blade) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 21:03:00 -07:00
snipe 86b04c7294 Updated prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 20:50:36 -07:00
snipe 2d03ea943b Applied webpack change from master to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 20:49:34 -07:00
snipe 20ab412e1e Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 20:45:35 -07:00
snipe 513b95e8d7
Merge pull request #12768 from snipe/snyk-upgrade-291b556667d6ffe966495405775b3255 
[Snyk] Upgrade tableexport.jquery.plugin from 1.26.0 to 1.27.0
 2023-04-15 20:44:57 -07:00
snipe 50153717f6
Merge pull request #12798 from snipe/snyk-upgrade-cec198178187b64d2348f74ddc10c797 
[Snyk] Upgrade webpack from 5.76.1 to 5.76.2
 2023-04-15 20:36:48 -07:00
snipe 32030c4f71 Merge remote-tracking branch 'origin/develop' 2023-04-15 18:44:25 -07:00
snipe 955539807c
Merge pull request #12830 from snipe/features/adds_supplier_id_to_components 
Added supplier to components and consumables
 2023-04-15 18:42:23 -07:00
snipe 8c09226b76
Merge pull request #12834 from marcusmoore/mxm/improve-test-setup 
Introduced improved way to interact with settings in tests
 2023-04-15 18:37:34 -07:00
snipe b73aed2b69 Merge remote-tracking branch 'origin/develop' 2023-04-15 18:30:21 -07:00
snipe b9a5a8a500
Merge pull request #12843 from snipe/fixes/temp_fix_seeder 
Temp fix for the seeders
 2023-04-15 18:30:00 -07:00
snipe 8ae14c43f3 This is a temp fix for the seeders 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 18:27:53 -07:00
snipe fc7f1f907d Fixed variable name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 17:37:25 -07:00
snipe f6cfec1e49
Merge pull request #12842 from snipe/fixes/take_two_better_handling_limits 
Use abs() instead of max
 2023-04-15 17:33:12 -07:00
snipe 4cbb9c2409 Use abs() instead of max 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 17:28:25 -07:00
snipe a97b2d141d
Merge pull request #12827 from snipe/fixes/tighter_handling_of_offset_and_limit 
Better handling for weird data passed to the API via limit and offset
 2023-04-15 16:52:33 -07:00
snipe f407a551da Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2023-04-15 16:48:07 -07:00
snipe 36665fde31
Merge pull request #12833 from svpernova09/bump-dockerfile-22-04-php81 
Update Dockerfile to Ubuntu 22.04 and PHP 8.1
 2023-04-14 17:16:42 -07:00
Joe Ferguson 785d2f3558
Update alpine Dockerfiles to PHP 8.1 and Snipe-IT v6.1.0 2023-04-14 13:35:36 -05:00
Joe Ferguson 1d8a4ca090
Update Dockerfile to Ubuntu 22.04 and PHP 8.1 2023-04-14 07:59:16 -05:00
Marcus Moore 473241edca
Move initialization of settings to trait 2023-04-13 16:52:20 -07:00
snipe b690ed97d5 Fixed unclosed parens in translation file 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 12:05:06 -07:00
snipe 2fe7fcecdb Added case switch for sorting on suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:13:45 -07:00
snipe d2b3e251ad Added counters to API controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:12:16 -07:00
snipe 07c0a1927b Added supplier id to controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:12:01 -07:00
snipe ab7c75232b Added supplier to transformers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:10:51 -07:00
snipe 6e183f2ced Added counters for consumables and components 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:10:32 -07:00
snipe 6097d534e9 Added eloquent model relationships 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:10:16 -07:00
snipe 3aac8bccd2 Added presenters for suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:09:59 -07:00
snipe e7c6771e73 Added supplier to components and consumables factories for seeding 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:07:22 -07:00
snipe 45142c6888 Migration to add supplier ID to components and consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:06:49 -07:00
snipe 607ab3988a Added supplier to edit/creatre blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:06:07 -07:00
snipe b6d3f2827b Switched to standardized require check 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:05:52 -07:00
snipe 65bb0486d4 Changed blade to use standard required check 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:04:29 -07:00
snipe a40bad0972 Added consumables and components columns to supplier list 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:04:13 -07:00
snipe 6eed89df91 Added components and consumables tab to suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:03:26 -07:00
Marcus Moore 7c95e45178
Introduce trait to conditionally interact with settings 2023-04-12 17:28:47 -07:00
snipe 112a04b108 Better handle weird data passed to the API via limit and offset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 11:28:46 -07:00
snipe 9a37273750 Merge remote-tracking branch 'origin/develop' 2023-04-12 08:28:50 -07:00
snipe 1a7201d3d9
Merge pull request #12826 from snipe/fixes/added_invalid_parse_to_dont_report 
Added invalid parse to dontReport
 2023-04-12 08:28:26 -07:00
snipe 74babfa081 Added maxlength="10" 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 08:26:36 -07:00
snipe 04f83d34ff Added withInput to carry over older fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 08:25:03 -07:00
snipe aac76d40fe Merge remote-tracking branch 'origin/develop' 2023-04-12 06:37:01 -07:00
snipe 14ec96cf45
Merge pull request #12825 from snipe/fixes/wrong_button_string_on_bulk_user_edit 
Fixed #12822 - Missing translation on bulk edit user submit button
 2023-04-12 06:36:39 -07:00
snipe 0f3702b0fc Fixed incorrect translation string for bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 06:35:28 -07:00
snipe 0e93a9229d Merge remote-tracking branch 'origin/develop' 2023-04-12 06:32:06 -07:00
snipe a119484277
Merge pull request #12824 from snipe/fixes/radio_button_submit_on_merge_users 
Removed iCheck code from merge users script
 2023-04-12 06:31:43 -07:00