DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
14317 commits 101 branches 268 tags 320 MiB
Commit graph

4408 commits

Author SHA1 Message Date
snipe 114769c2d9 Made requestable items more generic in translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:26:45 +01:00
snipe 9594596b8a Fixed another hard-coded string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:22:27 +01:00
snipe 69cf697aa3 Added 2fa translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:20:52 +01:00
snipe 30c1e1e86a Merge remote-tracking branch 'origin/develop' 2024-06-20 14:32:46 +01:00
snipe 1113218c6c Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 14:23:15 +01:00
snipe 9e9c37c1e8 Fixed weird linebreaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 14:09:11 +01:00
snipe 6cbdbcb1f1
Merge pull request #14791 from Godmartinz/label-option-limit 
Added some  style changes in label field selector for the `DefaultLabel` template
 2024-06-20 13:51:49 +01:00
snipe c8835bf5db Merge remote-tracking branch 'origin/develop' 2024-06-20 13:40:37 +01:00
snipe bd1f43f9ee Added lastname.firstname as email format 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 13:36:48 +01:00
snipe 66ffe21ce2 Merge remote-tracking branch 'origin/develop' 2024-06-20 13:09:54 +01:00
snipe dd6d040da5 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 12:56:43 +01:00
Marcus Moore f0a11be0b8
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-18 15:10:46 -07:00
snipe d0299de898 Merge remote-tracking branch 'origin/develop' 2024-06-18 11:25:55 +01:00
snipe 941582ac2a Properly scope archived based on settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 10:27:11 +01:00
Marcus Moore a3dea99bbb
Fix category edit form component 2024-06-17 14:24:16 -07:00
Marcus Moore fc351a1896
Remove .live from oauth clients 2024-06-17 13:03:27 -07:00
Marcus Moore d9164281ab
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	resources/views/livewire/oauth-clients.blade.php
 2024-06-17 12:57:04 -07:00
snipe 430808e180 Merge remote-tracking branch 'origin/develop' 2024-06-17 15:52:13 +01:00
snipe 27063d5bae Fix weird layout in admin oauth [sc-25673] 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 15:44:07 +01:00
snipe 5be86b9dbb Merge remote-tracking branch 'origin/develop' 2024-06-17 13:43:45 +01:00
snipe 891a0a0965 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-06-17 13:05:31 +01:00
snipe 50f0797850 Added aria hidden to icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 13:05:27 +01:00
snipe d9cc3c3ec7 Removed extra divs 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 12:52:23 +01:00
snipe d87da78eb5 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Users/UsersController.php
#	config/version.php
#	public/css/build/AdminLTE.css
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all-defer.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-06-17 11:18:33 +01:00
snipe f3e82c2c80 Updated languages 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 10:59:17 +01:00
Marcus Moore c3e6e1144f
Merge branch 'develop' into chore/sc-23725/livewire3 2024-06-12 15:12:40 -07:00
snipe cacb5d62dc
Merge pull request #14800 from snipe/fixes/importer_tweaks 
Importer tweaks
 2024-06-12 12:51:11 +01:00
snipe 7e3d66ec53
Merge branch 'develop' into fixes/companyable_trait_on_users 2024-06-12 11:27:26 +01:00
snipe 1ca9bb5aa8
Merge pull request #14698 from Scarzy/features/asset_file_upload_from_api 
Added #9413: Asset file upload from API
 2024-06-12 11:18:06 +01:00
snipe f8ab9f62f6
Merge pull request #14842 from Godmartinz/adjust-preview-window 
Fixed label preview window position
 2024-06-07 18:09:56 +01:00
Godfrey M 77e6058e4c remembers chosen label 2024-06-06 13:55:15 -07:00
Godfrey M 4a60026162 moves preview down by field definitions 2024-06-06 13:42:06 -07:00
Godfrey M 3621292a0e removes unnecessary height 2024-06-06 13:28:05 -07:00
Godfrey M 6df1c36011 oops 2024-06-06 13:24:02 -07:00
Godfrey M 44dae22a3c adjust label preview window 2024-06-06 13:18:19 -07:00
snipe 871255f28c Fixed #14812 - added consumables to individual inventory report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 20:40:45 +01:00
Marcus Moore 60c7efae3c
Remove commented code 2024-06-05 11:48:10 -07:00
Marcus Moore 48fc6ca60e
Remove commented code 2024-06-05 11:46:57 -07:00
snipe e054fc1ef1 Removed noisy import debugging, made nicer output 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe f4d530b4b1 Removed filename column since it’s never worked 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe 9d56617caf Moved expected checkin date on view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe 832ceeba56 Fixed missing endpush 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 09:57:10 +01:00
snipe fa083098fc
Merge pull request #14819 from snipe/localization/new_strings_2024_06_03 
Updated strings
 2024-06-05 09:46:41 +01:00
Marcus Moore b2a0e7958b
Inject alpine on label engine page 2024-06-04 17:03:36 -07:00
Marcus Moore ef91c8123e
Remove unneeded re-render of select2 2024-06-04 15:49:57 -07:00
Marcus Moore 296cf3e34b
Update OauthClients component 2024-06-04 15:37:41 -07:00
Godfrey M 6202f6157a fix select2 behavior 2024-06-04 08:41:00 -07:00
snipe 85cb7c92e7 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-03 20:44:40 +01:00
snipe 877adb082c Fixed translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-03 16:40:52 +01:00
snipe cff382605c Fixed some missing strings and checks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 04:01:04 +01:00
snipe 694e3b7f3a Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 00:42:16 +01:00
snipe a15ed6eaee Wrap disabled <a> links in a span for tooltips 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 19:29:29 +01:00
snipe 3005565bba Slight tweak to language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 19:29:12 +01:00
snipe 1d97d95c10 UI and styling tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:48:34 +01:00
snipe 4a1b1675cb Use storage helper 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:48:09 +01:00
snipe 8c5249ba4b Disable buttons on view page if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:47:53 +01:00
snipe b936591240 Warn and disable on checkout if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:47:34 +01:00
snipe 76e664d647 Warn and disable the checkout button if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:47:18 +01:00
snipe 0253c2a756 Lauout tweaks, warn and disable button if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:46:57 +01:00
snipe d27613f55c Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:46:41 +01: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
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
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 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
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
Godfrey M e28ad50bec fixes the color change 2024-05-29 15:34:08 -07:00
Marcus Moore 7d95e7765d
Add a few .prevents 2024-05-29 14:13:29 -07:00
Scarzy 8a2ea971e1 Add an API assets files controller 
Based heavily on the Assets assets files controller.
Added errors related to to the files management.
Added the API endpoints for file upload and show, but only upload is
currently tested/works.
 2024-05-29 22:01:48 +01: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
Godfrey M 713ce7836f add some css in label field selector 2024-05-29 13:07:33 -07:00
Marcus Moore 093c6652a8
Update select2 snippet for Livewire 3 2024-05-29 12:58:24 -07:00
Marcus Moore 43616d1874
Remove alpine reference from webpack 2024-05-29 12:30:20 -07:00
Marcus Moore 73e3ac7dd8
Migrate to $dispatch 2024-05-29 12:18:31 -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
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 7bbee053c6 Updated fa icon call 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 19:19:45 +01:00
snipe 369c819a27
Merge pull request #14754 from Godmartinz/footer_user_bug 
Removed extra div from User Details.
 2024-05-29 11:29:02 +01:00
snipe a5d0a21757 Fixed string path 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 00:26:33 +01:00
snipe df882bbcbc Pass item’s currency if set by location 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 10:24:10 +01:00
snipe b3fe10baa8
Merge branch 'snipeit_v7_laravel10' into chore/sc-25656/minus_icon_for_fieldsets 2024-05-25 11:19:43 +01:00
snipe dc5e15f919 Added translation for external link 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 11:02:07 +01:00
snipe ad7b291062 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:55:48 +01:00
snipe b54c1caa74 Improved translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:43:28 +01:00
snipe c3cf123189 Better translation for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:39:47 +01:00
snipe 3a2900621c Changed icon, added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:20:52 +01:00
Brady Wetherington 4adbd7af4c Merge branch 'develop' into snipeit_v7_laravel10 2024-05-22 21:02:11 +01:00
Godfrey M c4d96f6ea3 removed extra div 2024-05-22 12:35:32 -07:00
snipe c9f7847fb3
Merge pull request #14745 from snipe/fixes/self_api_endpoint 
Refactor group syncing on user edit API endpoint
 2024-05-22 12:43:22 +01:00