DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 03:54:16 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
13119 commits 97 branches 267 tags 296 MiB
Commit graph

13119 commits

This branch
This branch
All branches
Author SHA1 Message Date
akemidx f33b6a3e26
Update user.blade.php 2023-02-17 12:52:54 -05:00
akemidx dfc2aa35f4
Update general.php 2023-02-17 12:51:58 -05:00
snipe f71d8b2f07 Merge remote-tracking branch 'origin/develop' 2023-02-16 17:05:48 -08:00
snipe 248eb0885c
Merge pull request #12533 from snipe/fixes/expected_checkin_wtf 
FML - this is a hotfix and I don’t know why this is causing problems
 2023-02-16 17:01:54 -08:00
snipe 754842f620 FML - this is a hotfix and I don’t know why this is causing problems 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-16 16:58:00 -08:00
snipe 43eacff265 Merge remote-tracking branch 'origin/develop' 2023-02-16 12:11:26 -08:00
snipe fdffe76b9f
Merge pull request #12529 from Godmartinz/bug/sc-20046/allow-user-to-submit-the-slack-livewire-form 
allows users to clear their slack settings
 2023-02-16 11:47:58 -08:00
Godfrey M 58801dbb0b allows users to clear their slack settings 2023-02-16 08:43:12 -08:00
snipe e9ab90eafc
Merge pull request #12422 from marcusmoore/fix/adhere-to-email-alerts-setting 
Have acceptance result notifications adhere to alerts enabled setting
 2023-02-15 18:46:08 -08:00
snipe 495d7e057d Merge remote-tracking branch 'origin/develop' 2023-02-15 18:37:39 -08:00
snipe 9f8ea9a243
Merge pull request #12524 from snipe/fixes/small_UI_tweaks 
Cleanup some small UI bugaboos (padding, etc)
 2023-02-15 18:20:08 -08:00
Brady Wetherington 3a2b54fd47 Add libsodium shim, and mark the sodium extension as 'optional' 
Trying to handle some composer.lock conflicts, as savely as possible.
 2023-02-15 18:16:39 -08:00
snipe 71334b5eae More tweaking for top button alignment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 18:13:38 -08:00
snipe f124249e1c More padding twiddles 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 18:08:11 -08:00
snipe e451ca1a5c Stray semicolon 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 17:37:53 -08:00
snipe 3e111fca6e Cleanup some small UI bugaboos (padding, etc) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 17:13:40 -08:00
snipe df64e0e291
Merge pull request #12523 from Godmartinz/bug/sc-20041/slack-ui-livewire-tweaks 
Fixes slack settings submit button availability
 2023-02-15 16:28:57 -08:00
snipe 51c9a7d4f8
Merge pull request #12521 from akemidx/weird_checkout_text 
Fixed awkward checkout text in checkedout side panel
 2023-02-15 16:28:05 -08:00
akemidx d8d713426d indent? 2023-02-15 19:24:20 -05:00
akemidx 7dd789d5c0 translate no assets at checkout 2023-02-15 19:22:13 -05:00
Godfrey M 2d8c8e8f48 removes lazy loading 2023-02-15 16:16:14 -08:00
Godfrey M 7b510d5f2b greys out submit button conditionally 2023-02-15 15:46:05 -08:00
snipe 221f5f5ca7
Merge pull request #12522 from snipe/fixes/slack_livewire_translations 
Fixes slack livewire translations, UI
 2023-02-15 14:45:46 -08:00
snipe d4634e83c9 Nicer padding, removed unused ids 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 14:45:18 -08:00
snipe 6c3ffa7918 Removed unused CSS 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 14:39:24 -08:00
snipe 27e5832a28 Use existing slack translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 14:06:52 -08:00
snipe 2d0bd2b292 Make spinner actually spin 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 14:06:40 -08:00
akemidx b96f2f738d fixed weird phrasing in asset checkout screen 2023-02-15 16:47:48 -05:00
snipe ff895739f4
Merge pull request #12446 from Godmartinz/livewire_slack_inputs 
Adds Livewire slack inputs
 2023-02-15 13:27:07 -08:00
snipe de4f7bd274
Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation 
Enforce Y-m-d as date format for date fields
 2023-02-15 12:54:22 -08:00
snipe 25461caa2c Removed date validation rule 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 12:53:55 -08:00
snipe bfac0fc811
Merge pull request #12470 from inietov/fixes/rollbar_16883_attempt_assign_on_null 
Fixed Rollbar 16883 Error: Attempt to assign property "assigned_to" on null
 2023-02-15 12:33:32 -08:00
snipe 057f0be20a
Merge pull request #12473 from inietov/fixes/rollbar_attempt_to_read_property_on_null 
Fixed ErrorException:  Attempt to read property "id" on null [sc-19855]
 2023-02-15 12:32:53 -08:00
snipe 7980e2ab2e
Merge pull request #12517 from uberbrady/silence_ldap_exceptions 
Silence E_WARNING "exceptions"
 2023-02-15 11:56:37 -08:00
Marcus Moore f99f6d32fa Make phpstan configuration more flexible 2023-02-15 11:33:08 -08:00
Marcus Moore d088b39fb2 Remove ignore errors section covered by larastan config 2023-02-15 11:33:08 -08:00
Marcus Moore 6bfd2fd5ad Sort paths 2023-02-15 11:33:08 -08:00
Marcus Moore 6778cf79a0 Include Larastan configuration file 2023-02-15 11:33:08 -08:00
snipe ac4103281c Still throwing errors, but trying to fix the docblock 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe 03af417e89 We shouldn’t need this because aliases?? 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe 77362b3b41 Added larastan and psalm to composer dev 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe db8c29b901 Psalm and phpstan configs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe 3d219f578e The sea, Brady. 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe 8c3511a00b Fixed wonky switch statement indenting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe c1ae406049 Fixed visibility for constants and methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe 1ef3112628 FIxed yoda operator 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe 0325cbad64 Removed unused else condition 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe 6dc89fc2b0 Use null coalescing operator 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe b25676c96b Fixed Implicit array creation is disallowed. 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe 14e95c47e1 Made constant DATA_SESSION_KEY public 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00