snipe-it

mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 01:54:09 -08:00

Author	SHA1	Message	Date
snipe	a89f17a145	Merge pull request #15410 from snipe/snyk/upgrade-jquery-ui Updated jquery UI	2024-08-29 11:25:56 +01:00
snipe	de0565f5b3	Updated jquery UI Signed-off-by: snipe <snipe@snipe.net>	2024-08-29 11:24:06 +01:00
snipe	4111ef0d78	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-29 11:20:21 +01:00
snipe	68c708bdef	Merge pull request #15409 from snipe/fixes-string Corrected language string	2024-08-29 11:18:34 +01:00
snipe	5581950fee	Corrected language string Signed-off-by: snipe <snipe@snipe.net>	2024-08-29 11:17:17 +01:00
snipe	cfa56e2219	Merge remote-tracking branch 'origin/develop'	2024-08-29 11:08:53 +01:00
snipe	58e366a063	Merge pull request #15408 from snipe/redirect-on-print-if-user-invalid Check that the user exists before trying to print	2024-08-29 11:08:02 +01:00
snipe	b06c527767	Check that the user exists before trying to print Signed-off-by: snipe <snipe@snipe.net>	2024-08-29 11:06:30 +01:00
snipe	7f1dfcc935	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-28 14:29:06 +01:00
snipe	26f28a862a	Merge pull request #15404 from snipe/bug/sc-26717-model-delete 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 Set image to null if model is deleted	2024-08-28 14:26:03 +01:00
snipe	94c981e22c	Set image to null if model is deleted Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 14:23:49 +01:00
snipe	6f3fb21fef	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-28 12:50:19 +01:00
snipe	e8da7e2df2	Merge pull request #15403 from snipe/clean_up_depreciations 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 #15392 - filter by depreciation when showing models	2024-08-28 12:46:48 +01:00
snipe	d635c86e00	Added tests Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 12:46:30 +01:00
snipe	406ff6984b	Added click to select on models table Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 12:42:23 +01:00
snipe	c6ddc501c5	Filter by depreciation_id Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 12:40:12 +01:00
snipe	4839181beb	Added counts to API Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 12:40:01 +01:00
snipe	63a05c89a7	Added counts to show method Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 12:39:52 +01:00
snipe	385c4f69f7	Added counts to depreciation transformer Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 12:39:43 +01:00
snipe	486cd8c8c9	Nicer formatting for searchableAttributes Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 12:39:09 +01:00
snipe	eb5d93b3c2	Added assets relationship Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 12:38:55 +01:00
snipe	a5ff623484	Added asset, license, model count to API Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 12:38:43 +01:00
snipe	b5a4389815	Added badge count, fixed model bulk edit menu Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 12:38:31 +01:00
snipe	7b5b559baa	Merge pull request #15401 from snipe/fixes-15397-new-window-for-label Opens label new window	2024-08-28 11:57:29 +01:00
snipe	67a9929745	Opens label new window Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 11:56:54 +01:00
snipe	a48e79a1fc	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-27 07:37:53 +01:00
snipe	64c4433b98	Merge pull request #15396 from snipe/add_start_end_date_to_users_edit 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 Added `start_date` and `end_date` to user bulk edit	2024-08-27 07:36:37 +01:00
snipe	22bc088f6f	Added start_date and end_date to user bulk edit Signed-off-by: snipe <snipe@snipe.net>	2024-08-27 07:21:19 +01:00
snipe	d3e8e06638	Add @swift2512 as a contributor 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-08-26 14:07:06 +01:00
snipe	c207d48430	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-26 14:01:38 +01:00
snipe	1b933f7add	Added s to fa icons Signed-off-by: snipe <snipe@snipe.net>	2024-08-26 13:47:17 +01:00
snipe	991e48696a	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-26 10:26:06 +01:00
snipe	3fe891a05b	Removed a few more commas 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-08-26 10:25:27 +01:00
snipe	7974885041	Merge remote-tracking branch 'origin/develop'	2024-08-26 10:24:19 +01:00
snipe	f4c5b712f4	Removed colons Signed-off-by: snipe <snipe@snipe.net>	2024-08-26 10:24:07 +01:00
snipe	4ef85bd529	Merge remote-tracking branch 'origin/develop' 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	2024-08-23 17:58:08 +01:00
snipe	4c8dc7818d	Merge pull request #15389 from snipe/added_generate_label_to_button_stack 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 Fixed #15388 - Moved generate label button	2024-08-23 17:57:00 +01:00
snipe	5c43a1f87c	Use proper style for buttons Signed-off-by: snipe <snipe@snipe.net>	2024-08-23 17:54:49 +01:00
snipe	d3b265de8e	Moved button on hardware Signed-off-by: snipe <snipe@snipe.net>	2024-08-23 17:48:36 +01:00
snipe	263151658f	Moved general label button Signed-off-by: snipe <snipe@snipe.net>	2024-08-23 17:44:09 +01:00
snipe	6eab83a85a	Merge remote-tracking branch 'origin/develop'	2024-08-23 15:22:53 +01:00
snipe	aa86e07cd2	Fixed #15385 - small icon tweaks Signed-off-by: snipe <snipe@snipe.net>	2024-08-23 15:22:39 +01:00
snipe	cce1f87da6	Merge remote-tracking branch 'origin/develop'	2024-08-23 15:18:30 +01:00
snipe	d92fa5de65	fa-fw on settings icon Signed-off-by: snipe <snipe@snipe.net>	2024-08-23 15:17:25 +01:00
snipe	b460e8dc83	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-23 08:42:32 +01:00
snipe	c589140ea0	Merge pull request #15383 from snipe/re-adds-checkout-button 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 #15378 - Corrected gate on checkin button on asset view	2024-08-23 08:42:04 +01:00
snipe	52894615ce	More specific gate for checkin Signed-off-by: snipe <snipe@snipe.net>	2024-08-23 08:40:41 +01:00
snipe	8546bbdd65	Fixed gate for checkout button Signed-off-by: snipe <snipe@snipe.net>	2024-08-23 08:38:47 +01:00
snipe	50cb7e65c9	Merge remote-tracking branch 'origin/develop'	2024-08-23 07:32:39 +01:00
snipe	cc2c8f76d0	Merge pull request #15375 from Godmartinz/fix-acceptance-reminder-command Fixes the `acceptance-reminder` command	2024-08-23 07:31:29 +01:00

... 8 9 10 11 12 ...

15665 commits