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

14462 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 87c2dc5bb5 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2024-07-18 19:11:41 +01:00
snipe 06efcd3c46 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-07-18 18:55:18 +01:00
snipe faa791e94c
Merge pull request #15101 from snipe/localizations/more_strings 
More localizations
 2024-07-18 18:51:35 +01:00
snipe e328dec9f9
Merge branch 'develop' into localizations/more_strings 2024-07-18 18:51:17 +01:00
snipe 8e60a7b22b
Merge pull request #15110 from marcusmoore/fixes/test-namespace-fixes 
Fixed a coupled test namespaces
 2024-07-18 18:50:27 +01:00
snipe 958b6035e1 Add @r-xyz as a contributor 2024-07-18 18:49:59 +01:00
snipe 94e0739a74
Merge pull request #15115 from r-xyz/alpine-upload-limit 
Improved Docker environment settings: implement `PHP_UPLOAD_LIMIT` for Alpine images
 2024-07-18 18:49:00 +01:00
snipe 4465aef991
Merge pull request #15114 from snipe/checkout_multiple_accessories 
Checkout multiple of an accessory in one checkout
 2024-07-18 17:38:19 +01:00
snipe 822bc6f085 Removed response in form request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 17:37:45 +01:00
snipe 19bd99d159 Updated count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 17:33:24 +01:00
r-xyz 5c17fefb08
Implement PHP_UPLOAD_LIMIT in Alpine images. 2024-07-18 11:54:58 +02:00
snipe ee589ca112
Merge pull request #15088 from mauro-miatello/develop 
Added EULAs in print user's assets
 2024-07-18 09:09:34 +01:00
snipe f984b45de2
Merge branch 'develop' into checkout_multiple_accessories 2024-07-18 05:11:51 +01:00
snipe d56252c6b3 Added more back :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 05:10:45 +01:00
snipe 44b950cb8e Added back in missing validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 05:07:50 +01:00
snipe 985714d504 Test passing now - I hope 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 05:04:17 +01:00
snipe 97ead7120e Use from routes for posting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 04:54:07 +01:00
snipe 670021a482 Apply the optimize fix 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 04:43:46 +01:00
snipe 9858cc5baf Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 04:43:30 +01:00
snipe fa5b59cf21 Added qty 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 04:29:49 +01:00
snipe 0ef58a9aef Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 03:48:42 +01:00
snipe 0c4e498df3 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 03:48:35 +01:00
snipe b5b60f22d5 Removed int 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 03:48:21 +01:00
snipe 2f0c74aef0 Updated tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 03:48:06 +01:00
snipe f56006fb6b More refactoring 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 01:46:53 +01:00
snipe 79a13e3618 Added numCheckedOut method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:26:58 +01:00
snipe d9b7df5b85 Added form requests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:26:42 +01:00
snipe 0c933bcc5d Cleaned up controllers, use form requests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:25:42 +01:00
snipe 4c4b0f722a Added qty to email notification 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:25:29 +01:00
snipe 6c3cafa72f Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:25:07 +01:00
snipe 16ae23dbeb Updated validation strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:25:00 +01:00
snipe 4f3064bdb1 Added store accesstory form request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:24:51 +01:00
snipe 2b0627c1f6 Added accessory checkout request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:24:28 +01:00
snipe 345a4306e8 Added SubstituteBindings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-17 23:02:10 +01:00
snipe beb0836d69 Updated route 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-17 23:01:44 +01:00
snipe 1eb16cdb02
Merge pull request #15111 from marcusmoore/fixes/optimize-test 
Undo `optimize` command in test after it is completed
 2024-07-17 21:03:01 +01:00
snipe 05e278d08b Added qty to email 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-17 20:58:21 +01:00
snipe c21821a864 Added new form fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-17 20:58:12 +01:00
Marcus Moore a56f3f85f8
Clear the config and route caching done by optimize command after test 2024-07-17 12:21:46 -07:00
Marcus Moore ba13b9924b
Fix test namespaces 2024-07-17 11:04:35 -07:00
snipe 239824681d
Merge pull request #15075 from akemidx/checkintranslation 
FIXED: Missing Translation on a Tooltip
 2024-07-17 18:16:02 +01:00
snipe 0ac82fbbe1
Merge pull request #15084 from snipe/fixes_ldap_sync_locale 
Fixes #15067 - updated ldap sync locale to use `app()->getLocale()`
 2024-07-17 18:15:32 +01:00
snipe 8c5a9fa38f
Merge pull request #15089 from snipe/dependabot/github_actions/develop/codacy/codacy-analysis-cli-action-4.4.5 
Bump codacy/codacy-analysis-cli-action from 4.4.1 to 4.4.5
 2024-07-17 16:47:28 +01:00
snipe 2f8306cba8 Merge remote-tracking branch 'origin/develop' 2024-07-17 16:27:16 +01:00
snipe 65dcb2a9bd
Merge pull request #15085 from snipe/small_tweaks_to_oauth_page 
Small layout tweaks to oauth page
 2024-07-16 21:36:17 +01:00
snipe d5e1dc54c6 Use translated strings for action log meta 
This is only partially complete and I mostly hate it

Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:35:45 +01:00
snipe a3b2912e89 Updated string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:16:23 +01:00
snipe 7f412ec3f5 Missing string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:14:41 +01:00
snipe 94e881e5f0 Cleared up language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:11:03 +01:00
snipe d53a032402 More consistent UI for indented checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:07:03 +01:00