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
13233 commits 96 branches 267 tags 296 MiB
Commit graph

13233 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe 8e3657d62e Upgrade alpinejs from 3.12.3 to 3.13.2 #13936 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:19:59 +00:00
snipe ddd7f206d3
Merge pull request #13942 from snipe/security/snyk_13935 
Updated acorn to 8.11.2
 2023-11-23 15:17:34 +00:00
snipe 81cf08adf5 Updated acorn to 8.11.2 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:16:40 +00:00
snipe 1b77632ecb
Merge pull request #13941 from snipe/security/snyk_13938 
Upgraded webpack to 5.89.0
 2023-11-23 15:15:08 +00:00
snipe d4bdaf16e7 Upgraded webpack to 5.89.0 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:13:13 +00:00
snipe e3a8952f4b
Merge pull request #13940 from snipe/features/add_location_to_user_view_assets 
Added location to user view assets
 2023-11-23 15:02:23 +00:00
snipe ad6b286e10 Added default location to view-assets view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:01:39 +00:00
snipe 7f94b7df32 Removed refresh from asset view table 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:01:24 +00:00
snipe 776b16d379 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-11-22 23:41:31 +00:00
snipe 6409018b08 Bumped hash and moved to pre version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:41:03 +00:00
snipe 780279a620 Merge remote-tracking branch 'origin/develop' 2023-11-22 23:22:46 +00:00
snipe 31f429e1c4
Merge pull request #13934 from snipe/fixes/escaped_asset_tag_in_return_msg 
Escape the asset tag before passing it to the view
 2023-11-22 23:21:54 +00:00
snipe 3a0b994443
Merge pull request #13933 from snipe/fixes/removed_extra_return 
Removed extra return statement in consumables API checkout method
 2023-11-22 23:21:06 +00:00
snipe 1307ef19cf Escape the asset tag before passing it to the view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:20:47 +00:00
snipe aed6b531cb Derp. Extra return statement 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:05:38 +00:00
snipe 43db3b13ef Merge remote-tracking branch 'origin/develop' 2023-11-22 23:02:20 +00:00
snipe bb0ba0bebe
Merge pull request #13932 from snipe/features/use_allowlist_for_user_logging 
Use allowlist for user observer logging
 2023-11-22 23:01:52 +00:00
snipe ba127be344 Use saveQuietly to prevent double entries 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:00:30 +00:00
snipe c6178bd619 Added translation for success password save 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:59:59 +00:00
snipe 3929c8f260 Nicer alert layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:57:54 +00:00