DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11341 commits 96 branches 267 tags 296 MiB
Commit graph

11341 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 6a94a2f515 Return true/false for autoassign_licenses in the API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:25:26 -07:00
snipe f40bef8f9b Added autoassign_licenses to user importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:25:08 -07:00
snipe 6acce098c9 Added autoassign_licenses on user model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:24:56 -07:00
snipe 73cf62e060 Added autoassign_licenses to presenter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:24:00 -07:00
snipe dd78d2fc66 Added language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:51 -07:00
snipe add9e561f9 Added buttons on license page, greyed out where appriate 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:42 -07:00
snipe ff9af7ea74 Added genetic modal partial 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:15 -07:00
snipe bc7c0aa80d Fixed clone tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:00 -07:00
snipe 73188df090 Added autoassign_licenses to bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:22:37 -07:00
snipe cf7f244942 Added (clarified?) edit autoassign_licenses in user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:19:37 -07:00
snipe 06d46a4523 Indenting change for clarity 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:17:55 -07:00
snipe 8e5042418a Added buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:30:32 -07:00
snipe 79ff6a8fc2 Disallow deleting in the API view if there are things checked out 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:30:23 -07:00
snipe 8183b8deba Added stub method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:30:02 -07:00
snipe 0210ecde88 Include confirm modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:29:55 -07:00
snipe b2940f9915 Added confirm modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:29:48 -07:00
snipe b093e428b3 Merge remote-tracking branch 'origin/develop' 2023-04-16 08:54:38 -07:00
snipe 144a6f28ec Added intval 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 08:54:23 -07:00
snipe 65ac877918 Merge remote-tracking branch 'origin/develop' 2023-04-16 08:50:20 -07:00
snipe f50b958b63
Merge pull request #12848 from snipe/fixes/make_limit_into_singletons 
Used a singleton to filter API limit value
 2023-04-16 08:48:28 -07:00
snipe 64256351d8 Used a singleton to filter API limit value 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 08:46:39 -07:00
snipe 62edc0ab7d Merge remote-tracking branch 'origin/develop' 2023-04-16 08:02:44 -07:00
snipe 2c6d4d6b7f
Merge pull request #12847 from snipe/features/moar_labels 
Adds a few more auto-labels
 2023-04-16 08:01:06 -07:00
snipe 2b11c96ce0 Adds a few more auto-labels 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 08:00:25 -07:00
snipe 78ec21acc4 Added location case 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:47:49 -07:00
snipe 5a1d03c1dc Added alias maps 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:47:42 -07:00
snipe a831a34594 New field mapping 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:47:26 -07:00
snipe bcf9188dcd Made default password longer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:47:19 -07:00
snipe c149885ceb Skip the magical user creation if it’s a location 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:47:04 -07:00
snipe 1509672463 Added location importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:46:36 -07:00
snipe bceb0b8a47 Allowed slightly longer zip codes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:46:29 -07:00
snipe 7534d27a03 Added CSV sample 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:46:18 -07:00
snipe 46cce0115e Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2023-04-16 05:46:26 -07:00
snipe 485f5f3a45
Merge pull request #12845 from snipe/security/update_bs_tables 
Upgrade bootstrap-table from 1.20.2 to 1.21.3 (Formerly #12733)
 2023-04-16 05:44:52 -07:00
snipe 21f5d39fa1 Upgrade bootstrap-table from 1.20.2 to 1.21.3 (Formerly #12733) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 05:43:42 -07:00
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