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

12647 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 5a1e5f740d
Merge pull request #12537 from inietov/fixes/expected_checkin_date_validation 
Fixed #12531 Expected Checkin Date on Asset Checkout throws an error
 2023-02-22 16:03:51 -08:00
akemidx 690970b4aa fixing ff error 2023-02-22 18:18:20 -05:00
Marcus Moore f63710fb5c
Remove unused import 2023-02-22 12:34:56 -08:00
Marcus Moore 7667b0a216
Remove extra line 2023-02-22 12:34:35 -08:00
Marcus Moore 931ca98c02
Remove middleware bypass 2023-02-22 12:33:55 -08:00
snipe 225b6ef310 Merge remote-tracking branch 'origin/develop' 2023-02-22 12:24:52 -08:00
snipe 13ed2a05a3 Add @AndrewSav as a contributor 2023-02-22 12:24:13 -08:00
Marcus Moore aae2106658
Use existing language translation string 2023-02-22 12:02:14 -08:00
snipe 81cb29db5e
Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report 
Added images to emailed user inventory report [sc-19801]
 2023-02-22 10:38:07 -08:00
snipe 05f6d0bd5e
Merge pull request #11984 from nh314/Correct-assignedusers-relation 
Correct assignedusers relation setting
 2023-02-21 20:15:20 -08:00
snipe 4bf1566d2a
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during 
Adds Boolean to Users Table for Auto Assigning Licenses
 2023-02-21 20:10:46 -08:00
snipe 0c3115553e
Merge branch 'develop' into vip_tag 2023-02-21 20:03:49 -08:00
snipe 942fee4d43
Merge pull request #12447 from akemidx/user_setup_translation 
FIXED: Translations on the User Creation setup page
 2023-02-21 19:53:00 -08:00
snipe ba461d0114
Merge pull request #12538 from AndrewSav/develop 
Added #12532: add version endpoint
 2023-02-21 19:50:07 -08:00
snipe 3ae783a9c7
Merge pull request #12525 from uberbrady/add_sodium_php_shim 
Add libsodium shim, and mark the sodium extension as 'optional'
 2023-02-21 19:38:14 -08:00
Ivan Nieto Vivanco d494afcf01 Add order by clause, to ensure assets and accessories are in order in the report 2023-02-21 21:24:19 -06:00
snipe 57065b8936 Merge remote-tracking branch 'origin/develop' 2023-02-21 09:20:59 -08:00
snipe 40a38486b9
Merge pull request #12545 from snipe/localizations/more_new_translations 
Two more translations
 2023-02-21 09:20:38 -08:00
snipe 29158dece5 Two more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-21 09:19:34 -08:00
snipe f6e4e17e5c Merge remote-tracking branch 'origin/develop' 2023-02-21 09:05:50 -08:00
snipe 8185f264a4
Merge pull request #12544 from snipe/localizations/updated_general 
Updated the general translation file with new strings
 2023-02-21 09:05:24 -08:00
snipe 04d3938f0c Updated the general translation file with new strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-21 09:04:13 -08:00
snipe f109218e16 Re-added dropped translations from CrowdIn 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-21 09:00:10 -08:00
snipe 049213c3da Merge remote-tracking branch 'origin/develop' 2023-02-21 04:02:08 -08:00
snipe 9c1a71e04a
Merge pull request #12541 from snipe/localizations/new_strings 
Updated translations with new strings and new translations
 2023-02-21 03:58:25 -08:00
snipe a0b05bac8d Updated translations with new strings and new translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-21 03:54:55 -08:00
Andrew Savinykh d2ede75de8 fixes #12532 adds version endpoint 2023-02-20 22:19:18 +13:00
Ivan Nieto Vivanco 6e994c209f Adds setter to model Asset class for expected checkin 2023-02-19 12:31:10 -06:00
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