snipe-it

mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00

Author	SHA1	Message	Date
Marcus Moore	d03baa4613	Make diff cleaner	2024-08-07 13:29:45 -07:00
Marcus Moore	41437e4d8f	Merge branch 'develop' into fixes/bulk-checkin-logging # Conflicts: # app/Http/Controllers/Users/BulkUsersController.php	2024-08-07 13:06:59 -07:00
snipe	7d220dd8c2	set default Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 20:58:04 +01:00
snipe	a99ec062e6	Added checkbox for preferences Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 20:49:07 +01:00
snipe	8fe6395287	Added migration Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 20:41:13 +01:00
snipe	b4d51599ee	Added sound effects Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 20:38:50 +01:00
snipe	9350a20189	Include accessories count Some checks failed CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled Details Codacy Security Scan / Codacy Security Scan (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 This isn’t exactly right right now Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 20:19:47 +01:00
snipe	889d5da71e	Check for accessories on bulk items Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 20:04:32 +01:00
snipe	5546ab08c2	Only delete user records in accessories_checkouts for bulk delete Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 19:53:18 +01:00
snipe	ef183f256c	Merge pull request #15242 from Godmartinz/shortcut_option 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 Fixed shortcuts to be optional now	2024-08-07 18:56:27 +01:00
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	1a872b1643	Merge remote-tracking branch 'origin/develop' Some checks are pending CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run Details Codacy Security Scan / Codacy Security Scan (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-08-07 18:15:44 +01:00
snipe	deef9ad181	Merge pull request #15241 from snipe/partial_revert_for_checkout_accessories_to_non_user Partial revert for checkout accessories to non user	2024-08-07 18:15:08 +01:00
snipe	0dc7e8b8dc	Temp removed other selector Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 18:04:52 +01:00
snipe	a5f075548a	Default to user Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 18:04:39 +01:00
Brady Wetherington	1706ddd511	working fixup script, but failing tests. But I have tests!	2024-08-07 16:06:00 +01:00
Marcus Moore	a220986d16	Switch to snake case	2024-08-06 16:13:51 -07:00
Marcus Moore	2a8ac81eed	Fix namespace	2024-08-06 15:22:13 -07:00
Marcus Moore	d3cb3c03d2	Rerun composer update using php 8.1	2024-08-06 15:01:01 -07:00
Marcus Moore	c60bc5cdbe	Change indents back to 2	2024-08-06 13:51:44 -07:00
Marcus Moore	6cfbf835c7	Migrate phpunit.xml vendor/bin/phpunit --migrate-configuration	2024-08-06 13:37:53 -07:00
Marcus Moore	047b77e038	Composer update for phpunit, collision, and paratest composer update phpunit/phpunit nunomaduro/collision brianium/paratest --with-all-dependencies	2024-08-06 13:34:51 -07:00
snipe	766b370264	Merge pull request #15229 from marcusmoore/bug/sc-26552 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 Disallowed checking out components to different companies and fixed number remaining counts	2024-08-06 21:33:55 +01:00
snipe	da33277234	Merge pull request #15230 from marcusmoore/fixes/test-namespaces Fixed handful of test namespaces	2024-08-06 21:32:11 +01:00
Marcus Moore	3e832e5e94	Revert "Define test classes as `final`" This reverts commit `95516b0343`.	2024-08-06 13:31:17 -07:00
Marcus Moore	82e795b642	Revert "Add return types to test methods" This reverts commit `83fb6826ee`.	2024-08-06 13:30:34 -07:00
Shift	95516b0343	Define test classes as `final`	2024-08-06 20:25:22 +00:00
Shift	83fb6826ee	Add return types to test methods	2024-08-06 20:25:22 +00:00
Shift	b1e92ab866	Declare data providers as `static`	2024-08-06 20:25:21 +00:00
Shift	96241cb67c	Adopt PHP attributes in test classes	2024-08-06 20:25:21 +00:00
Shift	b680dab5c9	Ignore PHPUnit cache folder	2024-08-06 20:25:19 +00:00
Shift	984840dc82	Bump PHPUnit dependencies	2024-08-06 20:25:18 +00:00
Marcus Moore	84e447af09	Fix test namespaces	2024-08-06 13:21:36 -07:00
Marcus Moore	c7ddabcc8b	Check for FMCS when checking out component	2024-08-06 12:27:15 -07:00
Marcus Moore	bee80fcf8a	Remove global scope when counting check outs	2024-08-06 12:16:06 -07:00
Marcus Moore	0aff35b622	Scaffold additional failed tests	2024-08-06 12:07:34 -07:00
Godfrey M	46a6a84ecb	adds migration and translations	2024-08-06 11:07:39 -07:00
Marcus Moore	374812f8fe	Add failing test	2024-08-06 10:48:38 -07:00
Marcus Moore	94e00b8a3e	Use new accessory checkout relationship	2024-08-05 17:26:11 -07:00
Marcus Moore	f2b78d18a4	Merge branch 'develop' into fixes/bulk-checkin-logging # Conflicts: # app/Http/Controllers/Users/BulkUsersController.php	2024-08-05 17:25:54 -07:00
Marcus Moore	17eccfcd8b	Formatting	2024-08-05 16:58:27 -07:00
Marcus Moore	01e4382d20	Formatting	2024-08-05 16:58:17 -07:00
Marcus Moore	1c664af326	Remove todo outside of scope	2024-08-05 16:58:08 -07:00
Marcus Moore	392d34422a	Remove code handled by ConsumableAssignment:: call above	2024-08-05 16:57:40 -07:00
Marcus Moore	35e7a3163c	Implement test case	2024-08-05 16:54:31 -07:00
Marcus Moore	96fafa6952	Improve readability	2024-08-05 16:36:29 -07:00
Marcus Moore	a55693211f	Move test class	2024-08-05 16:27:04 -07:00
Marcus Moore	1acd24fdbe	Re-order helpers	2024-08-05 16:26:25 -07:00
Marcus Moore	59b7d5db4b	Remove comment	2024-08-05 16:25:14 -07:00

... 5 6 7 8 9 ...

15152 commits