DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
13755 commits 101 branches 268 tags 288 MiB
Commit graph

13755 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore b2a0e7958b
Inject alpine on label engine page 2024-06-04 17:03:36 -07:00
Marcus Moore 99439f0a5c
Define property 2024-06-04 16:14:07 -07:00
Marcus Moore ef91c8123e
Remove unneeded re-render of select2 2024-06-04 15:49:57 -07:00
Marcus Moore 5eb5742b3d
Define property 2024-06-04 15:49:39 -07:00
Marcus Moore 296cf3e34b
Update OauthClients component 2024-06-04 15:37:41 -07:00
Marcus Moore 5a9a231359
Remove alpinejs 2024-05-30 16:57:20 -07:00
Marcus Moore 1736bf5510
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	app/Livewire/LoginForm.php
#	package.json
#	resources/views/livewire/login-form.blade.php
 2024-05-30 16:56:50 -07:00
snipe ee8931f886
Merge pull request #14799 from marcusmoore/chore/remove-unused-component 
Removed unused Livewire component
 2024-05-31 00:54:43 +01:00
Marcus Moore 1a1b891309
Remove unused Login Livewire component 2024-05-30 16:49:05 -07:00
Marcus Moore 2eaac3d381
Fix select2 re-renders 2024-05-30 16:20:04 -07:00
Marcus Moore f03249898a
Update id syntax in custom fields component 2024-05-30 16:12:52 -07:00
snipe 0981cfa902 Built assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 20:22:50 +01:00
snipe 37fbcfa22b
Merge pull request #14798 from Godmartinz/redirect_back_to_asset_fix 
Fixed checkin option from appearing
 2024-05-30 19:41:02 +01:00
Godfrey M 0ee441a976 adds hidden as well 2024-05-30 11:19:06 -07:00
Godfrey M cf8de3baa9 fix checkin option from appearing 2024-05-30 11:11:35 -07:00
snipe 5a5d171ba2 Put session facade back - derp 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 14:15:08 +01:00
snipe aadee068b3
Merge pull request #14740 from Godmartinz/redirect_back_to_asset 
Added Redirect options to asset check in/out
 2024-05-30 14:14:04 +01:00
snipe a46e2ebfd8 Small tweaks to user export, user view translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 13:59:00 +01:00
snipe f710b1aac3
Merge pull request #14614 from akemidx/feature/sc-19796 
ADDED: Export User Permissions (Superuser & Admin)
 2024-05-30 13:41:26 +01:00
snipe f6fe6e70b9
Merge branch 'develop' into redirect_back_to_asset 2024-05-30 13:38:11 +01:00
snipe bed8861179
Merge pull request #14796 from snipe/chore/sc-25715/axios 
Upgraded axios
 2024-05-30 13:17:23 +01:00
snipe 180d7b1b5b Upgraded axios 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 13:13:25 +01:00
snipe 386416ee5d
Merge pull request #14795 from snipe/bug/sc-25687/papaparse 
Upgraded papaparse
 2024-05-30 13:04:00 +01:00
snipe 6b5aa91f3d Upgraded papaparse 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 13:00:57 +01:00
Marcus Moore e80b80f5d1
Remove manual livewire tags 2024-05-29 16:04:05 -07:00
Marcus Moore 9e35441281
Importer fixes 2024-05-29 15:50:42 -07:00
Marcus Moore 7d95e7765d
Add a few .prevents 2024-05-29 14:13:29 -07:00
Marcus Moore ee75b30683
Enable legacy_model_binding 2024-05-29 14:06:27 -07:00
Marcus Moore 8d924b60d7
Replace references to @this in importer 2024-05-29 13:51:57 -07:00
Marcus Moore 34595c266d
Update script tag 2024-05-29 13:16:30 -07:00
Marcus Moore 638ae9bdd5
Use new id method 2024-05-29 13:15:59 -07:00
Marcus Moore 093c6652a8
Update select2 snippet for Livewire 3 2024-05-29 12:58:24 -07:00
Marcus Moore 17f0ac1eae
Set view correctly 2024-05-29 12:57:43 -07:00
Marcus Moore 43616d1874
Remove alpine reference from webpack 2024-05-29 12:30:20 -07:00
Marcus Moore 9dc4f2ca80
Migrate config 2024-05-29 12:24:17 -07:00
Marcus Moore 73e3ac7dd8
Migrate to $dispatch 2024-05-29 12:18:31 -07:00
Marcus Moore 8ff639913d
Migrate away from dispatchBrowserEvent() 2024-05-29 12:17:36 -07:00
Marcus Moore 45419586fe
Migrate away from wire:model.prevent 2024-05-29 12:11:33 -07:00
Marcus Moore d8a480b2a8
Migrate to wire:model.blur 2024-05-29 12:11:02 -07:00
Marcus Moore 29d87246a2
Migrate away from wire:model.defer 2024-05-29 12:10:46 -07:00
Marcus Moore 58e638d3cb
Migrate to wire:model.live 2024-05-29 12:08:25 -07:00
Marcus Moore b52380f376
Migrate to new namespace 2024-05-29 12:07:48 -07:00
Marcus Moore 4ae74fb7f6
Remove alpinejs from package.json 2024-05-29 12:06:54 -07:00
Marcus Moore 7d1acd3d79
Update Livewire via composer 2024-05-29 12:04:06 -07:00
snipe 12e107a71b
Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout 
Bulk Consumable Checkout
 2024-05-29 19:42:25 +01:00
snipe fba72e1e8d
Merge pull request #14789 from snipe/fixes/14781_broken_wrench_icon 
Fixed #14781 - Fixed broken wrench icon on some browsers in manufacturer section
 2024-05-29 19:23:21 +01:00
snipe 7bbee053c6 Updated fa icon call 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 19:19:45 +01:00
snipe 6ea1a3bacf
Merge pull request #14788 from snipe/security/Snyk-Upgrade-jquery-ui-from-1.13.2-to-1.13.3-#14735 
Updated jquery-UI
 2024-05-29 18:47:39 +01:00
snipe 603afe4466 Updated jquery-UI 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 18:44:39 +01:00
snipe 037ee8c07a
Merge pull request #14787 from snipe/fixes/return_redirect_fixes_for_docblock 
Fixes path for redirect response
 2024-05-29 18:28:00 +01:00