DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14284 commits 97 branches 266 tags 291 MiB
Commit graph

932 commits

Author SHA1 Message Date
snipe 9c304f238a
Merge pull request #15029 from snipe/fixes/small_docblock_fixes 
General cleanup - Docblock fixes, adding type hinting, added tests, added asset model form validator
 2024-07-08 17:43:50 +01:00
snipe f3bf74a540 Updated language files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 15:51:19 +01:00
snipe d834ef5104 Updated string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 21:52:37 +01:00
snipe ae9085b11f Modernize use statements, switch to auth() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 20:49:22 +01:00
snipe 278bf3da13 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:23:38 +01:00
snipe 00fc392a12 Added missing traslations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 12:41:04 +01:00
Brady Wetherington 6df9742664 Built a workaround for backup notification translations 2024-06-27 13:17:16 +01:00
snipe 251f2d82b3 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-26 12:53:03 +01:00
snipe adee99db34 Fixes #14968 - translate forbidden page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-26 11:21:56 +01:00
snipe bca6dd41d2 Added avif to translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-25 13:39:36 +01:00
snipe ce107dd688 New strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:39 +01:00
snipe ba4c51dd68 Removed duplicate key 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:25 +01:00
snipe 294fb1f774
Merge pull request #14925 from snipe/fixes/added_2fa_string 
Additional translation strings
 2024-06-24 12:11:45 +01:00
snipe 5fb3cea0bb Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 11:41:20 +01:00
snipe 9a0db72eb4 More strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:40:38 +01:00
snipe e11a42cf68 Re-use login string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:32:00 +01:00
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 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
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 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
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 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 3005565bba Slight tweak to language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 19:29:12 +01:00
snipe d27613f55c Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:46:41 +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
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
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 6a6272ace3 Translate no records found message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-20 11:19:47 +01:00
snipe bcb747f886 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-20 11:19:37 +01:00
snipe 2182ea1ce8 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 21:57:19 +01:00
snipe 81efaa7481
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form 2024-05-16 16:13:21 +01:00