DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 17:44:17 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
12550 commits 96 branches 267 tags 295 MiB
Commit graph

12550 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe d4fb7ac403 Merge remote-tracking branch 'origin/develop' 2023-11-28 16:11:01 +00:00
snipe 9d5ceb685d
Merge pull request #13958 from uberbrady/encryption_key_rotator 
Modified re-crypter to also work when given a CLI old-key
 2023-11-28 16:10:45 +00:00
snipe 601ebcc1e6 Removed table header contraint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 16:00:42 +00:00
snipe 2247be77d8 Fixed translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:56:20 +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 187d3abeb4 Use translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:15:07 +00:00
snipe c91713e20a Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:14:55 +00:00
snipe fa1176ce14 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:14:12 +00:00
Brady Wetherington c71726c83e Whoops, left in some debug lines 2023-11-28 13:52:07 +00:00
Brady Wetherington ca430ec9b3 Modified re-crypter to also work when given a CLI old-key 2023-11-28 13:49:58 +00:00
snipe 9d786d9386 Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:43:33 +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
Marcus Moore 77ceac5747
Update docblock 2023-11-27 16:36:51 -08:00
Marcus Moore 990358750b
Add migration for postgres 2023-11-27 16:33:57 -08:00
Marcus Moore 72dbe95168
Add table prefix 2023-11-27 15:55:33 -08:00
Marcus Moore 37bd297094
Fix typo 2023-11-27 14:05:38 -08:00
Marcus Moore 5d32956070
Allow for migrating data when using sqlite 2023-11-27 12:35:13 -08:00
Godfrey M 45e9d0597a makes user total asset cost appear conditionally 2023-11-27 11:36:47 -08:00
snipe 121b86b3e8 Merge remote-tracking branch 'origin/develop' 2023-11-27 15:49:26 +00:00
Brady Wetherington 8e8b1068ff Beginnings of LDAP test suite 2023-11-27 14:50:43 +00:00
snipe c72950166f Merge remote-tracking branch 'origin/develop' 2023-11-27 14:46:37 +00:00
snipe 8c7edcb357
Merge pull request #13953 from snipe/localizations/new_strings 
Updated language strings
 2023-11-27 14:44:01 +00:00
snipe dbb6002f9f Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-27 14:43:16 +00:00
snipe 776c91934b Updated dir name for Khmer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-27 14:39:13 +00:00
snipe 77ab5eb875
Merge pull request #13909 from akemidx/bug/sc-23999 
Hiding Order Column in Custom Fieldsets
 2023-11-24 19:10:42 +00:00
snipe d80c8ff25b Merge remote-tracking branch 'origin/develop' 2023-11-24 10:10:45 +00:00
snipe eca13d0593
Merge pull request #13950 from snipe/fixes/array_key_in_import 
Check for the array key in $activeFile->first_row
 2023-11-24 10:10:08 +00:00
snipe 9607567b75 Check for the array key in $activeFile->first_row 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-24 10:08:35 +00:00
snipe 6cec1bd3b9 Merge remote-tracking branch 'origin/develop' 2023-11-23 17:00:32 +00:00
snipe 1217bff4b6
Merge pull request #13947 from snipe/fixes/refactor_checkout_with_bad_category 
Refactored checkout for items with bad or missing category
 2023-11-23 16:59:51 +00:00
snipe 84d26fe7fa Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	package-lock.json
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/js/dist/all-defer.js
#	public/mix-manifest.json
 2023-11-23 16:53:13 +00:00
snipe ea55daf913 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 16:51:39 +00:00
snipe 0ff99f0479
Merge pull request #13948 from uberbrady/scim_active_flag 
SCIM active flag must be a boolean
 2023-11-23 16:44:22 +00:00
Brady Wetherington 8916c976e1 Merge branch 'develop' into scim_active_flag 2023-11-23 16:36:17 +00:00
Brady Wetherington 7b12d511f8 Force active flag to be returned as true or false 2023-11-23 16:34:03 +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 978bbeccc5 Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 16:18:09 +00:00
snipe accfbc1b99 Show number of remaining seats and category in form 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 16:18:03 +00:00
snipe cf3608ae10 Add @bilias as a contributor 2023-11-23 15:33:08 +00:00
snipe aaa6a31eb3
Merge pull request #13945 from snipe/fixes/green_skin_fix_13915_to_develop 
Higher contrast on green dark skin (#13915 for develop)
 2023-11-23 15:30:00 +00:00
snipe 88cc234cbd Higher contrast for green dark skin 
Applies #13915 to develop

Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:28:43 +00:00
snipe 94eeca7429
Merge pull request #13944 from snipe/security/snyk_13937 
Upgrade jspdf-autotable from 3.5.31 to 3.7.1 #13937
 2023-11-23 15:24:33 +00:00
snipe e0e11845bb Upgrade jspdf-autotable from 3.5.31 to 3.7.1 #13937 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:23:13 +00:00
snipe a7f98ea2a5
Merge pull request #13943 from snipe/security/snyk_13936 
Upgrade alpinejs from 3.12.3 to 3.13.2 #13936
 2023-11-23 15:20:47 +00:00