DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
14508 commits 101 branches 268 tags 320 MiB
Commit graph

14508 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 57ecdd6765 Merge remote-tracking branch 'origin/develop' 2024-07-20 07:43:37 +01:00
snipe 9d890b35c6
Merge pull request #15127 from snipe/fixes/small_default_avatar_tweaks 
Fixes #15076 - Removes ability to remove the default avatar from disk
 2024-07-20 07:42:39 +01:00
snipe 8fc5c0b5be Use other default avatar, not in the avatars directory 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:34:40 +01:00
snipe c4e7448d31 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:25:56 +01:00
snipe ffd2687734 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:25:46 +01:00
snipe 6f3eedf5e6 Removed restoreDefaultAvatar method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:25:27 +01:00
snipe 241eb7b031 One more bad sig 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 06:06:27 +01:00
snipe ca399794c3 Fixed incorrect signature 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 06:05:01 +01:00
snipe 736d4cc59a Use new deleting method in ImageUploadRequest 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:34 +01:00
snipe ad85f8be2f Cleaned up 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:12 +01:00
snipe be17ef4047 Added option to restore from default demo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:06 +01:00
snipe c6c006f143 Added restore from demo method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:54:40 +01:00
snipe 10856516ac Split out the image deletion into a separate method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 03:40:16 +01:00
snipe beac4c8b8a Updated tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 03:39:54 +01:00
snipe b39b39bc8a Ignore the test uploads directory 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 03:39:05 +01:00
snipe e373be7dde Skip deleting default avatar from disk on delete 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 01:01:27 +01:00
snipe ca7c0aa47c Added default avatar to seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:59:25 +01:00
snipe 48a8cf6b70 Removed unused default avatar 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:58:57 +01:00
snipe 7ba1646703 Remove unusued default avatar 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:58:42 +01:00
snipe daa550cc82 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-07-20 00:31:08 +01:00
snipe e9f9d3c259 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:30:03 +01:00
snipe 63377853b8
Merge pull request #15125 from snipe/fixes/display_avatar_on_user_edit 
Show existing images on user edit page
 2024-07-20 00:29:28 +01:00
snipe fc86eefeac Show existing images on user edit page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:27:28 +01:00
snipe a98ad76c6a Merge remote-tracking branch 'origin/develop' 2024-07-19 22:55:09 +01:00
snipe 32c768792a
Merge pull request #15124 from snipe/fixes/path_for_crypt_in_importer 
Fixed use statement for Crypt in the importer, removed unused statements
 2024-07-19 22:54:18 +01:00
snipe 793cf27318 Fixed use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 22:50:24 +01:00
snipe ba568b7975
Merge pull request #15123 from snipe/tests/added_bulk_delete_assets 
Added tests for bulk asset deletion and restore
 2024-07-19 22:36:09 +01:00
snipe 4b5bd76225 Fixed notification use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 22:27:03 +01:00
snipe a54403ef01 Added bulk asset delete test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 22:26:52 +01:00
snipe 13262c5125 Merge remote-tracking branch 'origin/develop' 2024-07-19 20:05:47 +01:00
snipe 9ea38fbb3a
Merge pull request #15122 from snipe/fixes/15121_bulk_delete_and_restore 
Fixed #15121 - bulk delete restore logging
 2024-07-19 20:03:32 +01:00
snipe 94619e3284 Fixed #15121 - bulk delete restore logging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 19:56:58 +01:00
snipe 8b05ef6db4 Updated url checks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 19:48:03 +01:00
snipe 8e03083b83 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-07-19 19:07:53 +01:00
snipe dc2debcd83 Add @DrekiDegga as a contributor 2024-07-19 19:07:41 +01:00
snipe b7ab8b9e8f
Merge pull request #14530 from DrekiDegga/develop 
Added #14426: Makes all Manufacturer links dynamic, not just warranty lookup
 2024-07-19 19:07:25 +01:00
snipe c50ab1af67
Merge branch 'develop' into develop 2024-07-19 19:00:56 +01:00
snipe 7773d334ba
Merge pull request #15120 from snipe/updated_localizations 
Updated strings
 2024-07-19 17:54:30 +01:00
snipe 2a0697022e Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 17:47:22 +01:00
snipe e1eb963962 Updated prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 19:11:51 +01:00
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