DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 02:24:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
15863 commits 96 branches 267 tags 295 MiB
Commit graph

4567 commits

Author SHA1 Message Date
Godfrey M 3a96e501cc use old school input 2024-08-07 10:54:06 -07:00
Godfrey M 6b1784f2ee makes shortcuts optional 2024-08-07 10:47:16 -07:00
snipe 0dc7e8b8dc Temp removed other selector 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 18:04:52 +01:00
Godfrey M 46a6a84ecb adds migration and translations 2024-08-06 11:07:39 -07:00
snipe b83d148b37
Merge pull request #15217 from TelecomsSansFrontieres/feature_extend-search-by-tag
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details 
Feature: Extend search capabilities to other assets attributes
 2024-08-05 15:38:51 +01:00
Florent Bervas b804791ff6 feature: extend search capabilities to other assets attributes 2024-08-05 12:26:29 +00:00
snipe a0bd8b6049 Fixed #15205 - adds copy to asset tag 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-02 20:56:31 +01:00
Godfrey M bc0ff706b0 fixes dashboard box overflow 2024-08-01 10:31:39 -07:00
snipe f44abd0b28 Fixed button label
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-31 21:43:09 +01:00
Godfrey M b60e22bcb4 adds closing brackets to signature pad 2024-07-31 11:10:33 -07:00
akemidx fffcbdc44d Merge remote-tracking branch 'upstream/develop' into upstream/dev
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details
2024-07-31 07:14:06 -04:00
akemidx 8d1fa362f7 restoring code 2024-07-31 07:13:42 -04:00
snipe e79a5b7efe
Merge pull request #15193 from Godmartinz/admin-settings 
Fixed admin boxes alignment
 2024-07-31 08:54:44 +01:00
akemidx fccfce2ae8 first thought
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details
2024-07-30 19:27:37 -04:00
Godfrey M 935d2ce29a fixes admin box alignment 2024-07-30 15:05:09 -07:00
Godfrey M eb6f330e67 adds status to check in and out 2024-07-30 09:38:39 -07:00
Spencer Long fd7082c30f
Merge branch 'develop' into bug/sc-23936 2024-07-29 14:00:00 -05:00
snipe 4eccb5ffc6
Merge pull request #15185 from arne-kroeger/feat/accesspories-checkout-to-location-or-asset 
Added #14979: add checkout to location and assets functionality to accessories
 2024-07-29 18:50:48 +01:00
snipe 1c1101aeac Use the pwd_secure_min value (plus 5) for generated password 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-29 14:26:18 +01:00
snipe bc18fac97e Fixed missing div 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-29 10:11:11 +01:00
arne-kroeger b18baf74d2 added options to checkout accessoires to locations and assets 
Added #14979: add checkout functionality to accessoires
 2024-07-29 10:54:53 +02:00
snipe 28c7355697 Fixed missing div 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-29 09:52:38 +01:00
snipe c3a296c19f Added qr code back 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-27 10:12:13 +01:00
snipe aab29fbb6b Use translated string for restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 16:47:40 +01:00
snipe fc8bb82a02 Made dropdown wider 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 12:48:18 +01:00
snipe 5dea3f4495 Added blade component to checkin/checkout pages 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 12:47:33 +01:00
snipe 759ab78f80 Added more redirects 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 11:27:36 +01:00
snipe 243ab51def Fixed back button 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 10:40:48 +01:00
snipe 73a80a5fbc Use blade component for redirect option 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 21:35:13 +01:00
snipe 62655be2d0 Fixed BYOD label 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 18:41:37 +01:00
snipe 24b7659c23
Merge pull request #15150 from marcusmoore/chore/sc-26113 
Registered custom anonymous blade component directory
 2024-07-25 16:08:01 +01:00
snipe 9b422e5c97 Baremetrics BMPay breaks with CSP turned [sc-25011] 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 21:42:20 +01:00
Godfrey Martinez c96ccbb6cb
Merge branch 'develop' into depreciation_percentage 2024-07-24 12:12:28 -07:00
Godfrey M 950fff31ed fix conflicts 2024-07-24 12:12:04 -07:00
Godfrey M f05d8281f3 fixes alignment for error msg 2024-07-24 12:06:56 -07:00
Godfrey M d5c9fa823e adds translations 2024-07-24 11:39:33 -07:00
Godfrey M 99741db645 adds status labels to confirmation emails 2024-07-24 11:24:30 -07:00
snipe 5b8529bc83 Fixed pluralization 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 19:16:08 +01:00
snipe 293abbd1d0 Allow cloning of deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:49:38 +01:00
snipe 466ab1e3c0 Removed the banner since we already warn 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:40:24 +01:00
snipe 95a0f3dbe5 Cleaned up UI on asset view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:26:55 +01:00
snipe 6f8ccd4e10 Fixes #15103 - Added EOL and audit into to user profile assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 12:54:33 +01:00
Marcus Moore 869c06f454
Register anonymous blade component namespace 2024-07-23 15:41:58 -07:00
snipe 7858c72b98 Fixed string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 20:45:12 +01:00
snipe 900c19b76d
Merge pull request #15143 from snipe/fixes/no-NO-language 
Switch to nb-NO from no-NO for Norwegian
 2024-07-23 18:25:27 +01:00
snipe 593554daed Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 18:14:19 +01:00
snipe fecd877e8b Migration 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 17:35:06 +01:00
snipe ba6d8ae8c7 Switch to nb-NO from no-NO 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 17:15:44 +01:00
snipe 20868b9ede Load the english file again in case BS table doesn’t have a translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:30:42 +01:00
snipe e08acb851c Removed env part, just check for the remote user login 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:18:33 +01:00
snipe bbad84c6cc Hides the “Disable Other Login Mechanisms” option via env 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:13:59 +01:00
snipe 38affea3f3 More updates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:57:10 +01:00
snipe cea31c5b11 Added more generic buttons with variables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:53:01 +01:00
snipe 2bfee0c29a Few more tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:21:11 +01:00
snipe c08bd8f88b Nicer consumables layout 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:11:45 +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 be17ef4047 Added option to restore from default demo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:06 +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 8b05ef6db4 Updated url checks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 19:48:03 +01:00
snipe c50ab1af67
Merge branch 'develop' into develop 2024-07-19 19:00:56 +01:00
snipe 2a0697022e Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 17:47:22 +01:00
snipe e328dec9f9
Merge branch 'develop' into localizations/more_strings 2024-07-18 18:51:17 +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 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 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 0ef58a9aef Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 03:48:42 +01:00
snipe 16ae23dbeb Updated validation strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:25:00 +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
snipe 239824681d
Merge pull request #15075 from akemidx/checkintranslation 
FIXED: Missing Translation on a Tooltip
 2024-07-17 18:16:02 +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 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
snipe 70d95877d8 Translations for license checkout errors 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:02:58 +01:00
snipe bb00edda4e Added basic jquery validation translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 20:54:48 +01:00
Godfrey M aaa2858337 battling with handling depreciation percentage and amount 2024-07-16 12:25:19 -07:00
snipe 4895023f3b Translate import button 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:56:02 +01:00
snipe 0ed637f0ce Translate importer header 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:41:47 +01:00
snipe 45bf428092 Translated “seat” for license seat view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:04:51 +01:00
snipe e6f2c457a8 Handle localization better, clearer indenting on addresses 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:01:50 +01:00
snipe 04f723327e Fixed translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:01:23 +01:00
snipe 4a9bd95ed3 Added language support for select2 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 18:40:10 +01:00
snipe eb9e276ba7 Fixed #15094 - wrong translation string for model on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 17:14:13 +01:00
MrM e49c96a35e
Added EULAs in print user's assets 
Added EULAs when we want to print all assets assigned to a users and ask him/her to sign.
 2024-07-14 19:10:33 +02:00
snipe 2d1aeca949 Re-use existing string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 18:24:56 +01:00
snipe e06e4db4b7 Small layout tweaks to oauth page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 18:16:03 +01:00
akemidx ad818cf886 missing translation 2024-07-11 17:13:47 -04:00
snipe 5697370dfe
Merge pull request #14722 from Godmartinz/unaccepted_reminder_command 
Adds a command to resend acceptance emails
 2024-07-11 20:37:04 +01:00
snipe 78d24eb451
Merge pull request #15069 from TelecomsSansFrontieres/fix_print-all-assets 
Fixed inconsistent attributes order in Print All Assigned report
 2024-07-11 17:30:41 +01:00
snipe 1527679f4b Handle deletions on the observer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 17:26:43 +01:00
snipe 23f1489b2b Added history tab 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:46:49 +01:00
snipe 58bc84436c Fixed incorrect jquery validation class 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:23:05 +01:00
snipe 2415408a50 Prevent ludicrious amount of min_qty 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:41 +01:00
snipe 67d6f7119d Prevent a ludicrous amount of consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:04 +01:00
snipe d9a114090b Added buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:18:33 +01:00
snipe e123eeea9e Added error message if category type is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:00:20 +01:00