snipe-it

mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00

Author	SHA1	Message	Date
akemidx	8b643cb3b9	note field optional	2024-10-02 18:15:52 -04:00
akemidx	700647c53f	setting created	2024-10-02 18:15:52 -04:00
akemidx	081c5706c4	required, but not optional	2024-10-02 18:15:52 -04:00
snipe	0dd6f41f66	Simplified 2fa if/else Signed-off-by: snipe <snipe@snipe.net>	2024-10-02 11:04:55 +01:00
snipe	684c20ae39	Fixed parenthasis Signed-off-by: snipe <snipe@snipe.net>	2024-10-02 11:00:49 +01:00
snipe	c32f4e34b4	Minor formatting fix 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-10-01 20:35:49 +01:00
snipe	a79dfea40a	Updated strings Signed-off-by: snipe <snipe@snipe.net>	2024-10-01 20:30:58 +01:00
snipe	97d00e5aa8	Fixed erroneous form tag on anchor Signed-off-by: snipe <snipe@snipe.net>	2024-10-01 20:08:54 +01:00
snipe	9a2117466e	Removed placeholder Signed-off-by: snipe <snipe@snipe.net>	2024-10-01 18:23:40 +01:00
snipe	7e3a062984	Use <th> for table header in bulk interstitial Signed-off-by: snipe <snipe@snipe.net>	2024-10-01 18:23:07 +01:00
snipe	5823197e6f	Added checkin action on delete for checked out assets Signed-off-by: snipe <snipe@snipe.net>	2024-10-01 14:29:02 +01:00
snipe	cae8aa7840	Added maxlengths to additional fields Signed-off-by: snipe <snipe@snipe.net>	2024-10-01 14:02:54 +01:00
spencerrlongg	4f9f035c69	added a way to manipulate validator attribute names	2024-09-30 20:09:00 -05:00
snipe	12da43303f	Fixed #15584 - regression with required css change 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-10-01 01:44:05 +01:00
spencerrlongg	cd3059f790	rm numbers too. :(	2024-09-30 13:38:52 -05:00
snipe	5689e940b8	Fixed #15581 - missing bracker Signed-off-by: snipe <snipe@snipe.net>	2024-09-30 18:23:12 +01:00
snipe	001348c638	Unset required on checkout select :( 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 Related to the discussion at #15552 Signed-off-by: snipe <snipe@snipe.net>	2024-09-29 14:33:42 +01:00
snipe	1b041af862	Merge remote-tracking branch 'origin/master' into develop 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> # Conflicts: # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/mix-manifest.json	2024-09-29 11:25:01 +01:00
snipe	05d74f7a92	Covered setup pages too Signed-off-by: snipe <snipe@snipe.net>	2024-09-28 15:42:03 +01:00
snipe	dc85588d7f	Don’t show password as required if editing Signed-off-by: snipe <snipe@snipe.net>	2024-09-28 15:31:44 +01:00
snipe	585f998cae	Fixes for requiredness display Signed-off-by: snipe <snipe@snipe.net>	2024-09-28 15:28:06 +01:00
snipe	d120585f94	Check for valid eula for license, consumable 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 Signed-off-by: snipe <snipe@snipe.net>	2024-09-27 14:07:30 +01:00
snipe	36b27fcda3	Check for valid category before getting the eula 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-09-27 13:37:14 +01:00
snipe	a44490e448	Nowrap on files column Signed-off-by: snipe <snipe@snipe.net>	2024-09-27 13:07:24 +01:00
Marcus Moore	2004e58b53	Merge branch 'develop' into updated_ad_hoc_notes	2024-09-26 12:29:28 -07:00
Godfrey M	44447b85c9	Merge branch 'develop' into barcode_settings_hide	2024-09-26 11:27:05 -07:00
snipe	9aada2ec70	Merge pull request #15498 from Godmartinz/Modal_fix 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 Refactoring modals with partials and fixing misalignments	2024-09-26 09:09:35 +01:00
Godfrey M	ef82f954e5	fixed required css, and user input lengths	2024-09-25 15:47:57 -07:00
spencerrlongg	852a56fa9b	should be all good now	2024-09-25 15:30:41 -05:00
Godfrey M	b797c37acb	replace duplicate code with partials	2024-09-25 12:48:05 -07:00
snipe	c02647a0fa	Moved merge into delete gate, since they do technically delete Signed-off-by: snipe <snipe@snipe.net>	2024-09-25 20:32:03 +01:00
snipe	edca3f432c	Removed gate for delete Signed-off-by: snipe <snipe@snipe.net>	2024-09-25 20:30:58 +01:00
snipe	2218c94aa3	Gates the dropdown based on user permissions Signed-off-by: snipe <snipe@snipe.net>	2024-09-25 20:29:23 +01:00
Godfrey M	12522a3791	fix spacing issues	2024-09-25 12:07:15 -07:00
spencerrlongg	9df78a9ed0	working! need formatting for error messages etc	2024-09-25 14:00:50 -05:00
Godfrey M	18ddffe8f9	fix partial variable intialization, fix width of input fields	2024-09-25 11:42:16 -07:00
snipe	9b03f46490	Merge pull request #15534 from marcusmoore/bulk-print-users Added the ability to bulk print users	2024-09-25 19:32:01 +01:00
Godfrey M	926a319552	Merge branch 'develop' into Modal_fix_p2	2024-09-25 11:10:24 -07:00
spencerrlongg	f3ad89931f	hm ok this kind of works	2024-09-25 13:00:35 -05:00
spencerrlongg	21906d8c27	world set up and idea in place	2024-09-25 12:47:56 -05:00
snipe	cb6e5042d9	Merge pull request #15547 from snipe/disallow_checkout_with_nondeployable_status Fixed #13396 - do not allow checkout to undeployable status types	2024-09-25 18:32:59 +01:00
snipe	658c94ad8b	Changed action_date to created_at Signed-off-by: snipe <snipe@snipe.net>	2024-09-25 17:25:15 +01:00
Godfrey M	2a2666be0b	makes required a pseudo field	2024-09-24 13:24:50 -07:00
Brady Wetherington	b6340532d7	Improve the error and success messages and linking	2024-09-24 17:15:39 +01:00
snipe	ba69259f2d	Fixed #13396 - do not allow checkout to undeployable status types Signed-off-by: snipe <snipe@snipe.net>	2024-09-24 15:35:00 +01:00
Brady Wetherington	c71411465a	First pass at better-handling those annoying Rollbars we keep getting	2024-09-24 15:17:35 +01:00
snipe	66249a37ed	Tweaked styles Signed-off-by: snipe <snipe@snipe.net>	2024-09-24 11:08:31 +01:00
snipe	96712cb398	Fixed app settings view on mobile Signed-off-by: snipe <snipe@snipe.net>	2024-09-24 10:55:26 +01:00
Marcus Moore	a12c9d053f	Hide label when printing	2024-09-23 16:44:25 -07:00
Marcus Moore	8b3b68b308	Show or hide all eulas at once when printing multiple users	2024-09-23 16:43:14 -07:00
Marcus Moore	3870095a28	Fix Cannot read properties of undefined error by removing snipe-table class from eula table	2024-09-23 15:50:24 -07:00
Marcus Moore	a02e250b22	Add page breaks for each user	2024-09-23 15:26:15 -07:00
Marcus Moore	8ac5c0e471	Re-combine layout and view	2024-09-23 14:05:47 -07:00
Marcus Moore	a2d4dcf6e8	Use bulk actions menu	2024-09-23 12:49:36 -07:00
Marcus Moore	29af210f4f	Merge branch 'develop' into bulk-print-users	2024-09-23 10:26:20 -07:00
snipe	5eea9d1950	Corrected text warning translation Signed-off-by: snipe <snipe@snipe.net>	2024-09-20 14:33:56 +01:00
snipe	bc540b6564	Requestable status not saving with manual [sc-26848] Signed-off-by: snipe <snipe@snipe.net>	2024-09-20 14:02:28 +01:00
snipe	b21c303e56	Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by	2024-09-20 13:43:50 +01:00
Marcus Moore	2d2d5bdc7e	Pass user in array	2024-09-19 17:23:47 -07:00
Marcus Moore	8364d26c9b	Extract parent layout	2024-09-19 17:18:26 -07:00
Marcus Moore	efd6d7625f	Remove bad closing tag	2024-09-19 17:16:05 -07:00
Marcus Moore	bdf5708bfc	Remove accidental line	2024-09-19 17:10:43 -07:00
Marcus Moore	e95703cb18	Use eager load	2024-09-19 17:10:07 -07:00
snipe	8270947ed2	Merge pull request #13291 from akemidx/eol_date_range_for_reports Added date range for EOL in custom reports	2024-09-19 21:49:27 +01:00
snipe	118183ff58	Removed footer Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 19:41:39 +01:00
snipe	836893cba5	Added id to report Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 18:35:00 +01:00
snipe	727806372c	Added created_by to status label Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 18:22:11 +01:00
snipe	65eba30038	Fixed markdown in acceptance reminder Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 17:23:34 +01:00
snipe	bbce7b40ca	Additional consistencies Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 17:20:56 +01:00
snipe	9adb2c24f3	Squashed commit of the following: commit `dddbf27d78` Author: snipe <snipe@snipe.net> Date: Wed Sep 18 14:18:52 2024 +0100 Updated language strings Signed-off-by: snipe <snipe@snipe.net> commit `fcefcc8184` Merge: `04bb3eec8` `3519a82dd` Author: snipe <snipe@snipe.net> Date: Wed Sep 18 13:44:44 2024 +0100 Merge pull request #15512 from marcusmoore/testing/fmcs Added tests for delete methods in api commit `04bb3eec83` Merge: `154d5d8d9` `f963b9a19` Author: snipe <snipe@snipe.net> Date: Wed Sep 18 13:41:37 2024 +0100 Merge pull request #15521 from uberbrady/improve_country_selector Fix selected-index of Countries drop-down [fd-44144] commit `f963b9a19f` Author: Brady Wetherington <bwetherington@grokability.com> Date: Wed Sep 18 13:24:26 2024 +0100 Fix selected-index of Countries drop-down commit `154d5d8d91` Merge: `6c996b775` `9e5f6d656` Author: snipe <snipe@snipe.net> Date: Tue Sep 17 23:40:25 2024 +0100 Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets [Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags commit `3519a82ddd` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 16:55:20 2024 -0700 Fix name: TestsFullMultipleCompaniesSupport commit `a629df07bf` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:49:08 2024 -0700 Implement interfaces on existing test classes commit `9a13fcab23` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:38:38 2024 -0700 Pluralize commit `f5705a1dde` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:34:55 2024 -0700 More unification commit `f325c4afdb` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:32:38 2024 -0700 Unify assertion method commit `1fddacd7d0` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:25:11 2024 -0700 Re-order test methods commit `4af893df61` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:20:24 2024 -0700 Improve assertions commit `b8b3f91ce4` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:55:18 2024 -0700 Formatting commit `7f40f55343` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:52:02 2024 -0700 Add tests for delete supplier endpoint commit `b06e8d442d` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:37:08 2024 -0700 Add tests for delete status label endpoint commit `c269184c60` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:29:41 2024 -0700 Add tests for delete predefined kit endpoint commit `53c673dee2` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:13:12 2024 -0700 Add tests for delete manufacturer endpoint commit `50730fc4fb` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 12:37:18 2024 -0700 Add tests for delete location endpoint commit `60a54cee79` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 12:33:30 2024 -0700 Add tests for delete license endpoint commit `446e962a50` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:38:51 2024 -0700 Add tests for delete group endpoint commit `79a4bb7316` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:35:44 2024 -0700 Add tests for delete depreciation endpoint commit `2f76c1bc5b` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:33:21 2024 -0700 Add assertion commit `38b9f4a438` Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:29:20 2024 -0700 Add tests for delete departments endpoint commit `3105f53aff` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 16:54:29 2024 -0700 Add tests for delete custom fieldsets endpoint commit `2047cfed09` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 16:20:32 2024 -0700 Add tests for delete custom fields endpoint commit `e3268d32df` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 16:00:02 2024 -0700 Add tests for delete consumable endpoint commit `6df8b0ac0e` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 15:52:07 2024 -0700 Add tests for delete component endpoint commit `910f13c1f7` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 15:38:30 2024 -0700 Add tests for delete companies endpoint commit `8ce2512f55` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:54:44 2024 -0700 Add tests for delete category endpoint commit `0ec415d4d0` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:46:22 2024 -0700 Clean up commit `2044570e95` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:39:36 2024 -0700 Add tests for delete asset model endpoint commit `b336c6273d` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:32:42 2024 -0700 Pluralize test classes commit `5299b3e9f0` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:29:44 2024 -0700 Remove code handled by CompanyableChildTrait commit `872b76b45f` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:29:10 2024 -0700 Add tests for delete asset maintenance endpoint commit `275cf4630e` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:16:37 2024 -0700 Add tests for delete asset endpoint commit `5c2660bd34` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:02:32 2024 -0700 Introduce interface commit `c7ae9d9dfa` Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 12:58:47 2024 -0700 Add tests for delete accessory endpoint commit `9e5f6d656a` Author: Brady Wetherington <bwetherington@grokability.com> Date: Wed Sep 11 15:45:01 2024 +0100 Improve multi-asset create when using numeric prefixes to asset_tags Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 16:06:36 +01:00
akemidx	3964296ae6	no payload	2024-09-18 17:06:21 -04:00
akemidx	da9a61c28a	no payload	2024-09-18 17:01:37 -04:00
snipe	dddbf27d78	Updated language strings 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 Signed-off-by: snipe <snipe@snipe.net>	2024-09-18 14:18:52 +01:00
snipe	bae9982833	Updated request methods Signed-off-by: snipe <snipe@snipe.net>	2024-09-18 14:18:14 +01:00
snipe	abe79df6dc	Added translation Signed-off-by: snipe <snipe@snipe.net>	2024-09-18 13:47:30 +01:00
Brady Wetherington	f963b9a19f	Fix selected-index of Countries drop-down	2024-09-18 13:24:26 +01:00
Godfrey M	c9854d43a5	fixes selection order	2024-09-17 16:56:02 -07:00
Godfrey M	04708ae2b2	only allows PDF417 for new label engine	2024-09-17 16:54:50 -07:00
Godfrey M	bbb9babf27	one more finger	2024-09-17 16:40:18 -07:00
Godfrey M	e5daf35f65	fat finger fix	2024-09-17 16:39:55 -07:00
Godfrey M	87c72953b2	udpated translation	2024-09-17 16:37:17 -07:00
Marcus Moore	89e2d03a81	Fix the deleted assets radio	2024-09-17 16:24:18 -07:00
Godfrey M	fa5651f335	remove getbarcodes, postbarcodes, barcodes settings blade	2024-09-17 16:21:26 -07:00
akemidx	443447a068	added icon to button	2024-09-17 19:16:44 -04:00
Godfrey M	b33c0fc4dd	updates getbarcode method and labels view	2024-09-17 16:15:56 -07:00
Marcus Moore	8e0b718a4a	Scope Select All checkbox to fields on left side of page	2024-09-17 16:00:32 -07:00
snipe	154d5d8d91	Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets 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 [Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags	2024-09-17 23:40:25 +01:00
Marcus Moore	b51c505d9e	Fix department, manufacturer, and category multi-selects	2024-09-17 15:29:38 -07:00
Marcus Moore	8bba11e1bb	Merge branch 'develop' into saving_custom_report_template # Conflicts: # app/Http/Controllers/ReportsController.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/status-select.blade.php # resources/views/reports/custom.blade.php	2024-09-17 15:26:35 -07:00
akemidx	4b54e980e2	added button	2024-09-17 17:56:22 -04:00
Godfrey M	033a56fe6d	change variables in hardware labels edit post methods	2024-09-17 12:22:05 -07:00
Godfrey M	ce987b4f6d	added front end barcodes to labels	2024-09-17 11:23:38 -07:00
snipe	9e957baeb5	Fixed check for outside assets on user update validation Signed-off-by: snipe <snipe@snipe.net>	2024-09-17 15:46:45 +01:00
akemidx	74efd850af	redoing branch. old branch merge onflicts were waaay too gnarly	2024-09-16 19:30:26 -04:00
snipe	fe5fc6e0ce	Merge pull request #15471 from Godmartinz/Edit_side-panel 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 Fixes margin for the sidebar menus while using rtl languages	2024-09-16 15:56:31 +01:00
snipe	62747a0090	Merge pull request #15493 from Godmartinz/fix_consumables_media_sizing Fixed misalignment of consumables with smaller media	2024-09-16 15:02:55 +01:00
snipe	4debaaea39	Fixed #15504 - allow nulling/not changing locale in user bulk edit Signed-off-by: snipe <snipe@snipe.net>	2024-09-16 14:31:10 +01:00
Godfrey M	0bc98e971f	refactoring modals with partials and fixing misalignments	2024-09-12 12:26:19 -07:00
Godfrey M	c6c5cb73cf	fixes consumables positioning with smaller media	2024-09-11 10:49:27 -07:00
snipe	a97530367d	Fixed tests again Signed-off-by: snipe <snipe@snipe.net>	2024-09-11 17:29:22 +01:00
snipe	98323185de	Null and warn if editing asset to a non-deployabe state Signed-off-by: snipe <snipe@snipe.net>	2024-09-11 16:43:33 +01:00
Brady Wetherington	9e5f6d656a	Improve multi-asset create when using numeric prefixes to asset_tags	2024-09-11 15:45:01 +01:00
snipe	ab3b655312	Fixed #15483 - show EOL by default 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-09-11 12:25:09 +01:00
Marcus Moore	ca01261c1f	Merge branch 'develop' into fixes/custom-field-values	2024-09-10 16:05:39 -07:00
Godfrey M	15183c4822	rephrased the ternary <-correctly spelled	2024-09-10 11:05:03 -07:00
snipe	7cf30003b6	Updated strings Signed-off-by: snipe <snipe@snipe.net>	2024-09-10 14:41:08 +01:00
Godfrey M	367f02af86	more partials and includes	2024-09-09 16:34:04 -07:00
Godfrey M	7a1c721eca	making modal partials for reuse	2024-09-09 16:22:56 -07:00
Marcus Moore	6423df2133	Merge branch 'develop' into fixes/custom-field-values # Conflicts: # resources/views/livewire/custom-field-set-default-values-for-model.blade.php	2024-09-09 16:07:37 -07:00
Godfrey M	57fab0268b	made it a terenary	2024-09-09 13:02:25 -07:00
Godfrey M	ad5768d8b2	fixes margin for the sidebar using rtl languages	2024-09-09 12:45:11 -07:00
Godfrey M	df8b1c0240	hides barcode settings if new label engine enabled	2024-09-03 12:29:52 -07:00
Marcus Moore	51d63d57c6	Hide the "Add default values" checkbox if no fieldset selected	2024-09-03 12:22:43 -07:00
snipe	13dbf9ee74	Added icon for dept 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 Signed-off-by: snipe <snipe@snipe.net>	2024-08-31 13:48:42 +01:00
snipe	3c7d455ee3	Added employee number to asset view Signed-off-by: snipe <snipe@snipe.net>	2024-08-31 13:38:38 +01:00
snipe	76301bc30d	Fixed typo Signed-off-by: snipe <snipe@snipe.net>	2024-08-29 20:05:03 +01:00
snipe	231bc1e2de	Updated blade selectors Signed-off-by: snipe <snipe@snipe.net>	2024-08-29 18:31:34 +01:00
snipe	37d04b7176	Some CSS tweaks for select2 Signed-off-by: snipe <snipe@snipe.net>	2024-08-29 17:52:01 +01:00
snipe	69e981364a	Made multiple select Signed-off-by: snipe <snipe@snipe.net>	2024-08-29 17:51:20 +01:00
snipe	b64ed254e0	Fixed tests Signed-off-by: snipe <snipe@snipe.net>	2024-08-29 13:49:09 +01:00
snipe	c197644ba7	Merge pull request #15284 from spencerrlongg/bug/sc-26584 [Multi-Company] Fixes Users Being Moved With Items Still Assigned	2024-08-29 11:38:15 +01:00
snipe	5581950fee	Corrected language string Signed-off-by: snipe <snipe@snipe.net>	2024-08-29 11:17:17 +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	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	67a9929745	Opens label new window Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 11:56:54 +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	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	f4c5b712f4	Removed colons Signed-off-by: snipe <snipe@snipe.net>	2024-08-26 10:24:07 +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	d92fa5de65	fa-fw on settings icon Signed-off-by: snipe <snipe@snipe.net>	2024-08-23 15:17:25 +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	f85ebd7ffd	Added pull-right to angle bracket Signed-off-by: snipe <snipe@snipe.net>	2024-08-23 07:27:39 +01:00
Marcus Moore	7f3c86165b	Conditionally disable Add default values checkbox	2024-08-22 13:58:31 -07:00
Marcus Moore	10b45812c4	Improve id for checkboxes and radio buttons	2024-08-22 13:38:01 -07:00
snipe	ca8864c061	Fixed small layout quirks in asset view Signed-off-by: snipe <snipe@snipe.net>	2024-08-22 13:28:52 +01:00
snipe	423f4f9126	Merge pull request #14667 from Godmartinz/add_location_to_create_user_via_asset Adds location select to the create new user via asset checkout	2024-08-22 13:25:41 +01:00
snipe	8b5d3f7fbd	Fixed extra closing p tag Signed-off-by: snipe <snipe@snipe.net>	2024-08-22 12:56:32 +01:00
snipe	744f43676d	Fixed checkbox layout on modal from #15296 Signed-off-by: snipe <snipe@snipe.net>	2024-08-22 12:53:16 +01:00
snipe	ec0b9b198f	Merge pull request #15296 from uberbrady/expose_restore_sanitize Expose the 'sanitize' system for backup restores to the web GUI	2024-08-22 12:43:07 +01:00
snipe	bc9ea5a2ec	Merge pull request #15352 from Godmartinz/mobile_breakpoint Fixed Mobile misalignment of info on Assets and Users view pages	2024-08-22 11:18:06 +01:00
snipe	4635a6efc3	Merge pull request #15360 from snipe/more_print_fixes More print fixes for asset view	2024-08-22 11:17:49 +01:00
snipe	5efddf6f5b	Allow clear on country dropdown Signed-off-by: snipe <snipe@snipe.net>	2024-08-22 11:01:39 +01:00
snipe	305dc049a4	Added asterisk help text Signed-off-by: snipe <snipe@snipe.net>	2024-08-22 11:01:28 +01:00
snipe	3ac0702094	Fixed #15344 - make select2 for countries freeform-ish Signed-off-by: snipe <snipe@snipe.net>	2024-08-22 10:13:22 +01:00
r-xyz	4ec361c718	Add AssetModel files endpoints to API	2024-08-21 19:49:51 +02:00
snipe	d29b3bfb9a	Few more hidden-print classes Signed-off-by: snipe <snipe@snipe.net>	2024-08-21 13:06:16 +01:00
snipe	912bbf0e32	More print fixes Signed-off-by: snipe <snipe@snipe.net>	2024-08-21 13:02:21 +01:00
snipe	26b3c62ab8	Cleaned up category title Signed-off-by: snipe <snipe@snipe.net>	2024-08-21 10:29:51 +01:00
Godfrey M	963911f2e1	changed order of info stgack	2024-08-21 00:23:10 -07:00
Marcus Moore	59832126cb	Improve comment	2024-08-20 16:52:51 -07:00
Marcus Moore	680cce3ee2	Align indents	2024-08-20 16:42:29 -07:00
Marcus Moore	6c5ec6a16c	Get datepicker working	2024-08-20 16:41:24 -07:00
Marcus Moore	5d1f98bf93	Simplify by directly wire:modeling	2024-08-20 15:38:43 -07:00
Godfrey M	9d484077ae	missed a file	2024-08-20 14:24:37 -07:00
Godfrey M	9858b0f37f	fixes info tab for users and assets	2024-08-20 14:23:55 -07:00
snipe	5fdeb9c413	Merge pull request #15351 from snipe/localizations/new_translations_2024-08-20 Updated languages	2024-08-20 19:42:08 +01:00
Marcus Moore	eca6b03f44	Allow id to be rendered	2024-08-20 11:08:53 -07:00
Marcus Moore	bbdbec7197	Rely on $attributes behavior rendering passed attributes	2024-08-20 11:00:39 -07:00
snipe	6c450d1338	Updated languages Signed-off-by: snipe <snipe@snipe.net>	2024-08-20 18:18:17 +01:00
snipe	64bed01a91	Merge pull request #15327 from snipe/update_button_style Update icons to use blade components, standardize button colors and format	2024-08-20 10:13:43 +01:00
snipe	f6319e11e7	Added fa-fw to sidebar elements Signed-off-by: snipe <snipe@snipe.net>	2024-08-20 10:11:27 +01:00
snipe	5d9f988df3	Added fw class to topnav icons Signed-off-by: snipe <snipe@snipe.net>	2024-08-20 10:01:49 +01:00
snipe	f8c72fb0ac	Merge pull request #15112 from marcusmoore/livewire-importer-improvements Improved handling attempted access of deleted files in importer	2024-08-20 09:57:03 +01:00
akemidx	8e1111c681	Merge remote-tracking branch 'upstream/develop' into eol_date_range_for_reports	2024-08-19 19:33:44 -04:00
Marcus Moore	fa765667f2	Merge branch 'develop' into livewire-importer-improvements	2024-08-19 14:41:58 -07:00
Marcus Moore	434bdcd6d4	Add missing parentheses to conditional	2024-08-19 14:31:47 -07:00
snipe	be5f3f38f8	Settings pages Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 14:48:12 +01:00
snipe	08c3a25b39	Little more padding Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 14:16:57 +01:00
snipe	34cd4b6244	Added links to apple/google maps Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 14:15:36 +01:00
snipe	d89c8682be	Reversed location button ordering Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 13:46:31 +01:00
snipe	6f024849e9	Few more Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 13:39:24 +01:00
snipe	e048f0955f	More icons Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 13:27:21 +01:00
snipe	479b2b4fd3	More icons Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 13:23:08 +01:00
snipe	8d52fa51b1	Fixed suppliers buttons Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 13:20:06 +01:00
snipe	229d8b9bf5	Added location restore Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 13:19:59 +01:00
snipe	eb8d43a804	Updated buttons on models Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 12:32:44 +01:00
snipe	b4b6f7a35f	Added css-consumable to overrides for table headers Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 11:58:21 +01:00
snipe	0bc995b87f	Updated more icons Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 11:58:05 +01:00
snipe	00bc9ac806	Fixed spacing Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 22:39:14 +01:00
snipe	f200960a57	Aaaand more Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 22:26:57 +01:00
snipe	c700127f1a	Updated user view Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 22:09:00 +01:00
snipe	ae2f9571b4	And still more Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 21:57:37 +01:00
snipe	a77dcad336	More links Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 20:30:53 +01:00
snipe	d2e889e927	Still more Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 19:21:59 +01:00
snipe	803bdb457c	Added calendar Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 18:48:19 +01:00
snipe	7c9b1f6e38	Added the plus icon Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 18:39:22 +01:00
snipe	d545537a43	More icons Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 18:34:13 +01:00
snipe	4d8904938d	Added calendar icon for datepickers Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 18:24:26 +01:00
snipe	0c09f2b2c0	Moar icon replacement Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 18:13:49 +01:00
snipe	bffba02511	Updated icons Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 17:26:44 +01:00
snipe	da71f031f5	Use icon in hardware view Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 15:48:24 +01:00
snipe	d2e585baa7	Added icon blade Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 15:47:45 +01:00
snipe	4253acad4c	Prevent passing an array as login Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 04:51:36 +01:00
snipe	5066eb58f4	Added asset model import to importer Signed-off-by: snipe <snipe@snipe.net>	2024-08-17 02:31:03 +01:00
snipe	559f0d2f90	Added string Signed-off-by: snipe <snipe@snipe.net>	2024-08-16 22:53:21 +01:00
snipe	7658f7c41d	First shot Signed-off-by: snipe <snipe@snipe.net>	2024-08-16 20:29:53 +01:00
snipe	ad6d09b6ad	Removed default label Signed-off-by: snipe <snipe@snipe.net>	2024-08-16 16:43:51 +01:00
snipe	43b338d612	Fixed translation Signed-off-by: snipe <snipe@snipe.net>	2024-08-16 16:15:58 +01:00
snipe	856c57cb12	Corrected some translations Signed-off-by: snipe <snipe@snipe.net>	2024-08-16 12:39:59 +01:00
snipe	90584ab803	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2024-08-16 11:11:00 +01:00
snipe	184f54a6cd	Removed extra spaces Signed-off-by: snipe <snipe@snipe.net>	2024-08-16 11:10:57 +01:00
snipe	f24031b974	Merge pull request #15206 from Godmartinz/dashboard_box_alignment Fixed dashboard box overflow	2024-08-16 11:10:40 +01:00
snipe	de29c1d8a0	Merge pull request #15314 from Glukose1/features/add_setting_due_for_checkin_in_days Added #15312: Add checkin due in days setting	2024-08-16 10:21:36 +01:00
snipe	f9172594b2	Clearer time example display Signed-off-by: snipe <snipe@snipe.net>	2024-08-16 10:14:43 +01:00
Marcus Moore	94d8a547b8	Merge branch 'develop' into livewire-importer-improvements	2024-08-15 13:47:49 -07:00
Marcus Moore	43b109fac0	Use cached values for textarea and radio input	2024-08-15 13:20:22 -07:00
Marcus Moore	75c1e7658f	Improve method name	2024-08-15 10:43:41 -07:00
Marcus Moore	e7c9c799bb	Add wire:keys	2024-08-15 10:40:23 -07:00
Marcus Moore	6ab976f353	Use cached values for text input	2024-08-15 10:32:33 -07:00
snipe	dd458dfa7f	Updated strings Signed-off-by: snipe <snipe@snipe.net>	2024-08-15 12:21:06 +01:00
snipe	b917489f00	Corrected string Signed-off-by: snipe <snipe@snipe.net>	2024-08-15 12:10:41 +01:00
snipe	6216b4fc0d	Use native browser control for required in addition to the css effect Signed-off-by: snipe <snipe@snipe.net>	2024-08-15 11:35:56 +01:00
snipe	4356cb7b9b	Added confetti option Signed-off-by: snipe <snipe@snipe.net>	2024-08-15 11:32:42 +01:00
Glukose1	d8df52cc8f	Implemented setting to specify the amount of days before an assets appers in the due for checkin page. Currently this uses the audit warning days but a sperated setting gives the possibility of defineing different values for each field.	2024-08-15 12:20:51 +02:00
snipe	10dc1f1368	Re-pull the accessory checkout Signed-off-by: snipe <snipe@snipe.net>	2024-08-15 10:51:49 +01:00
snipe	8f7bce7aad	Re-added UI for checkout to non-users for accessories Signed-off-by: snipe <snipe@snipe.net>	2024-08-15 10:44:27 +01:00
snipe	381003eeab	Cleaned up asset tag field on quickscan checkin Signed-off-by: snipe <snipe@snipe.net>	2024-08-15 10:27:31 +01:00
snipe	d268f25f16	Make asset tag required Signed-off-by: snipe <snipe@snipe.net>	2024-08-15 10:16:57 +01:00
snipe	01c69c8f8f	Allow optional status label on quickscan checkin Signed-off-by: snipe <snipe@snipe.net>	2024-08-15 10:08:48 +01:00
spencerrlongg	afaf53cdfc	failing ui test	2024-08-14 18:14:21 -05:00
spencerrlongg	a70b94e707	Merge branch 'refs/heads/develop' into bug/sc-26584	2024-08-14 11:36:19 -05:00
Brady Wetherington	008bf036b5	Got rid of weird namespace declaration and commented-out data-toggle line	2024-08-14 16:09:34 +01:00
Brady Wetherington	cc5ad456e6	Expose the 'sanitize' system for backup restores to the web GUI	2024-08-14 15:59:21 +01:00
snipe	0f1e5181a6	Nicer input layout for bulk edit name Signed-off-by: snipe <snipe@snipe.net>	2024-08-14 10:09:14 +01:00
snipe	371afde52d	Bulk edit asset name Signed-off-by: snipe <snipe@snipe.net>	2024-08-14 09:52:25 +01:00
Marcus Moore	038e86954b	Improve property name	2024-08-13 17:30:53 -07:00
Marcus Moore	f6c1642bf2	Use computed fields in CustomFieldSetDefaultValuesForModel component	2024-08-13 17:01:35 -07:00
spencerrlongg	120cfd13c5	translation	2024-08-13 14:07:40 -05:00
snipe	e9fc455a30	Merge pull request #15192 from Godmartinz/status_labels_check_emails Added status labels to confirmation emails	2024-08-13 18:24:15 +01:00
Godfrey M	8af4126de1	removed indent from blades	2024-08-13 10:21:33 -07:00
Godfrey M	5d1c48c071	fixes alignment, and box issue with pie chart	2024-08-13 10:11:49 -07:00
snipe	3044af9410	Merge pull request #15280 from snipe/bug/sc-23294 Fixed select2 “x” color on multi-select and border color	2024-08-13 16:46:56 +01:00
snipe	4f0f0af83b	Make the border radius match the rest of the site Signed-off-by: snipe <snipe@snipe.net>	2024-08-13 16:46:26 +01:00
snipe	198afee946	Fixed select2 “x” color on mult-select and border color Signed-off-by: snipe <snipe@snipe.net>	2024-08-13 16:42:23 +01:00
snipe	def0af652d	Merge pull request #15279 from TelecomsSansFrontieres/fix_missing-translate-item-assets Fix: add missing admin/hardware/table.name key	2024-08-13 16:35:25 +01:00
Florent Bervas	20e4ba0590	lang: relocated translation key to existing item in general	2024-08-13 15:07:54 +00:00
snipe	389a06aac5	Hide UI elements from print view on assets Signed-off-by: snipe <snipe@snipe.net>	2024-08-13 15:40:51 +01:00
snipe	277a0fd16a	Make selected tab bold Signed-off-by: snipe <snipe@snipe.net>	2024-08-13 14:19:41 +01:00
snipe	1b2094f4e2	Added tooltips to top nav shortcuts Signed-off-by: snipe <snipe@snipe.net>	2024-08-13 13:49:13 +01:00
snipe	3f2139349e	Allow better fallthrough on image Signed-off-by: snipe <snipe@snipe.net>	2024-08-12 16:30:21 +01:00
snipe	225ab47b8e	Simplified logic Signed-off-by: snipe <snipe@snipe.net>	2024-08-12 16:23:09 +01:00
snipe	4c350bd5a3	Remove the regular logo fallback, make image capped by height Signed-off-by: snipe <snipe@snipe.net>	2024-08-12 16:21:58 +01:00
snipe	e7fb29fced	Fixed copy area for serial Signed-off-by: snipe <snipe@snipe.net>	2024-08-12 15:58:30 +01:00
snipe	ce5be8ac24	Merge pull request #15100 from Godmartinz/depreciation_percentage 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 Depreciation Percentage as an option	2024-08-12 10:10:25 +01:00
snipe	5c6c655cdc	Added sounds to quickscan checkin 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-10 19:37:18 +01:00
snipe	1c229a8e08	Made notes field sortable Signed-off-by: snipe <snipe@snipe.net>	2024-08-10 17:00:11 +01:00
snipe	f3331b5045	Removed pound symbol from order number on asset view Signed-off-by: snipe <snipe@snipe.net>	2024-08-10 16:17:07 +01:00
Marcus Moore	6521c02526	Merge branch 'develop' into livewire-importer-improvements # Conflicts: # resources/views/livewire/importer.blade.php	2024-08-07 15:20:39 -07:00
snipe	a99ec062e6	Added checkbox for preferences Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 20:49:07 +01:00
snipe	b4d51599ee	Added sound effects Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 20:38:50 +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	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
Marcus Moore	81bffccf01	Use better error message	2024-07-17 16:28:26 -07:00
snipe	16ae23dbeb	Updated validation strings Signed-off-by: snipe <snipe@snipe.net>	2024-07-18 00:25:00 +01:00
Marcus Moore	cfca1514c0	Swap file_id for activeFileId	2024-07-17 16:22:44 -07: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
Marcus Moore	eba494ad8c	Make $activeFile a computed property	2024-07-16 17:03:42 -07:00
Marcus Moore	7e89b58746	Move files to computed property	2024-07-16 16:08:42 -07:00
Marcus Moore	b7744105a0	Migrate import type to component	2024-07-16 14:20:41 -07: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
Marcus Moore	69263f0e5b	Migrate header row to component	2024-07-16 13:30:29 -07: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
snipe	da2b64c96d	Added string Signed-off-by: snipe <snipe@snipe.net>	2024-07-11 15:24:08 +01:00
Florent Bervas	d9a53460ff	Fix design inconsistency between assets and assigned assets in Print All Assigned report	2024-07-11 09:41:58 +00:00
snipe	8be44f9cf2	Check for time until depreciated Signed-off-by: snipe <snipe@snipe.net>	2024-07-11 10:07:58 +01:00
snipe	71a5d07698	Fixes #15056 - only try to load avatars if one exists or default is set Signed-off-by: snipe <snipe@snipe.net>	2024-07-10 08:56:14 +01:00
Godfrey M	624632d0ca	removed push and endpush	2024-07-09 11:41:31 -07:00
snipe	f4ffbcf76e	Fixed wonky layout on accessory files Signed-off-by: snipe <snipe@snipe.net>	2024-07-09 13:38:50 +01:00
snipe	5597992d63	Fixed API key missing translations Signed-off-by: snipe <snipe@snipe.net>	2024-07-09 13:17:46 +01:00
snipe	09cc9b92d1	Fixed #15050 - erroneous deleted remark Signed-off-by: snipe <snipe@snipe.net>	2024-07-08 22:13:07 +01:00
snipe	9c304f238a	Merge pull request #15029 from snipe/fixes/small_docblock_fixes General cleanup - Docblock fixes, adding type hinting, added tests, added asset model form validator	2024-07-08 17:43:50 +01:00
snipe	4c19b4d831	Added aria-hidden="true" to error icon for accessibility Signed-off-by: snipe <snipe@snipe.net>	2024-07-08 17:39:38 +01:00
snipe	f3bf74a540	Updated language files Signed-off-by: snipe <snipe@snipe.net>	2024-07-08 15:51:19 +01:00
snipe	86c0a3ecad	Added localization for bootstrap-tables Signed-off-by: snipe <snipe@snipe.net>	2024-07-08 15:12:37 +01:00
snipe	d834ef5104	Updated string Signed-off-by: snipe <snipe@snipe.net>	2024-07-04 21:52:37 +01:00
snipe	ae9085b11f	Modernize use statements, switch to auth() Signed-off-by: snipe <snipe@snipe.net>	2024-07-04 20:49:22 +01:00
snipe	3f20e29901	Moved gthe settings for remote loading to the branding section Signed-off-by: snipe <snipe@snipe.net>	2024-07-04 16:55:47 +01:00
snipe	44bcc157e5	Updated icon Signed-off-by: snipe <snipe@snipe.net>	2024-07-04 13:23:46 +01:00
snipe	278bf3da13	Updated language Signed-off-by: snipe <snipe@snipe.net>	2024-07-04 13:23:38 +01:00
snipe	e372527d13	Added default_avatar to settings Signed-off-by: snipe <snipe@snipe.net>	2024-07-04 13:22:36 +01:00
snipe	96be1e1275	Removed duplicate locale directive Signed-off-by: snipe <snipe@snipe.net>	2024-07-04 02:14:10 +01:00
snipe	708d7b5fc5	Use icons for consistency Signed-off-by: snipe <snipe@snipe.net>	2024-07-03 23:43:44 +01:00
snipe	62b5a159a9	Added files column Signed-off-by: snipe <snipe@snipe.net>	2024-07-03 23:31:09 +01:00
snipe	a6d04509a5	Merge pull request #15016 from snipe/improved_user_merge Fixed #15005 - Improvements on user merge	2024-07-03 23:19:50 +01:00
snipe	0071596274	Added upload count Signed-off-by: snipe <snipe@snipe.net>	2024-07-03 23:18:43 +01:00
spencerrlongg	a6690493b0	resolved	2024-07-03 16:12:55 -05:00
snipe	00fc392a12	Added missing traslations Signed-off-by: snipe <snipe@snipe.net>	2024-07-03 12:41:04 +01:00
snipe	f22e99aec8	Merge pull request #14983 from snipe/fixes/use_more_modern_request_syntax_in_blades Use more modern reference for input text	2024-07-02 08:43:34 +01:00
Marcus Moore	3a8f825de5	Link user table counts to section in user show	2024-07-01 14:06:05 -07:00
Marcus Moore	d481850d4c	Add @can around Edit Your Profile button on view assets page	2024-07-01 10:11:27 -07:00
snipe	d687b20467	Use more modern reference for input text Signed-off-by: snipe <snipe@snipe.net>	2024-06-27 15:05:47 +01:00
snipe	7dbcedad40	Merge pull request #14981 from uberbrady/fix_backup_translations Fixed #14976, #14975, #14973 - Translation strings aren't always working	2024-06-27 14:36:52 +01:00
snipe	54fb91c03b	Merge pull request #14831 from marcusmoore/chore/sc-23725/livewire3 Updated Livewire to v3	2024-06-27 13:21:52 +01:00
Brady Wetherington	6df9742664	Built a workaround for backup notification translations	2024-06-27 13:17:16 +01:00
snipe	f23a221750	Merge pull request #14942 from snipe/updates/start_moving_from_collective_forms WIP - First start at switching to regular html labels	2024-06-27 13:12:29 +01:00
snipe	43773954cd	Merge pull request #14966 from Godmartinz/css_issue Fixed importer table background color	2024-06-26 13:33:14 +01:00
snipe	251f2d82b3	Updated language strings Signed-off-by: snipe <snipe@snipe.net>	2024-06-26 12:53:03 +01:00
snipe	adee99db34	Fixes #14968 - translate forbidden page Signed-off-by: snipe <snipe@snipe.net>	2024-06-26 11:21:56 +01:00
Godfrey M	eda2eb2283	fixes all dark modes	2024-06-25 10:24:35 -07:00
Godfrey M	a7123a04ba	fixes importer background color	2024-06-25 10:19:18 -07:00
Marcus Moore	d4861a74df	Merge branch 'develop' into chore/sc-23725/livewire3 # Conflicts: # composer.lock	2024-06-25 10:15:50 -07:00
snipe	bca6dd41d2	Added avif to translation string Signed-off-by: snipe <snipe@snipe.net>	2024-06-25 13:39:36 +01:00
snipe	4d55765e28	Added checkbox to settings Signed-off-by: snipe <snipe@snipe.net>	2024-06-24 14:02:53 +01:00
snipe	aa5fe52e89	Added gate in blade Signed-off-by: snipe <snipe@snipe.net>	2024-06-24 14:01:56 +01:00
snipe	ce107dd688	New strings Signed-off-by: snipe <snipe@snipe.net>	2024-06-24 14:01:39 +01:00
snipe	ba4c51dd68	Removed duplicate key Signed-off-by: snipe <snipe@snipe.net>	2024-06-24 14:01:25 +01:00
snipe	294fb1f774	Merge pull request #14925 from snipe/fixes/added_2fa_string Additional translation strings	2024-06-24 12:11:45 +01:00
snipe	5fb3cea0bb	Updated translations Signed-off-by: snipe <snipe@snipe.net>	2024-06-24 11:41:20 +01:00
snipe	f47bc5ea7d	Updated hardware checkin Signed-off-by: snipe <snipe@snipe.net>	2024-06-23 19:40:52 +01:00
snipe	427615f627	Fiest start at switching to regular html labels Signed-off-by: snipe <snipe@snipe.net>	2024-06-23 18:24:23 +01:00
snipe	9a0db72eb4	More strings Signed-off-by: snipe <snipe@snipe.net>	2024-06-20 15:40:38 +01:00
snipe	e11a42cf68	Re-use login string Signed-off-by: snipe <snipe@snipe.net>	2024-06-20 15:32:00 +01:00
snipe	114769c2d9	Made requestable items more generic in translations Signed-off-by: snipe <snipe@snipe.net>	2024-06-20 15:26:45 +01:00
snipe	9594596b8a	Fixed another hard-coded string Signed-off-by: snipe <snipe@snipe.net>	2024-06-20 15:22:27 +01:00
snipe	69cf697aa3	Added 2fa translation string Signed-off-by: snipe <snipe@snipe.net>	2024-06-20 15:20:52 +01:00
snipe	30c1e1e86a	Merge remote-tracking branch 'origin/develop'	2024-06-20 14:32:46 +01:00
snipe	1113218c6c	Updated strings Signed-off-by: snipe <snipe@snipe.net>	2024-06-20 14:23:15 +01:00
snipe	9e9c37c1e8	Fixed weird linebreaks Signed-off-by: snipe <snipe@snipe.net>	2024-06-20 14:09:11 +01:00
snipe	6cbdbcb1f1	Merge pull request #14791 from Godmartinz/label-option-limit Added some style changes in label field selector for the `DefaultLabel` template	2024-06-20 13:51:49 +01:00
snipe	c8835bf5db	Merge remote-tracking branch 'origin/develop'	2024-06-20 13:40:37 +01:00
snipe	bd1f43f9ee	Added lastname.firstname as email format Signed-off-by: snipe <snipe@snipe.net>	2024-06-20 13:36:48 +01:00
snipe	66ffe21ce2	Merge remote-tracking branch 'origin/develop'	2024-06-20 13:09:54 +01:00
snipe	dd6d040da5	Added translations Signed-off-by: snipe <snipe@snipe.net>	2024-06-20 12:56:43 +01:00
Marcus Moore	f0a11be0b8	Merge branch 'develop' into chore/sc-23725/livewire3 # Conflicts: # composer.lock	2024-06-18 15:10:46 -07:00
snipe	d0299de898	Merge remote-tracking branch 'origin/develop'	2024-06-18 11:25:55 +01:00
snipe	941582ac2a	Properly scope archived based on settings Signed-off-by: snipe <snipe@snipe.net>	2024-06-18 10:27:11 +01:00
Marcus Moore	a3dea99bbb	Fix category edit form component	2024-06-17 14:24:16 -07:00
Marcus Moore	fc351a1896	Remove .live from oauth clients	2024-06-17 13:03:27 -07:00
Marcus Moore	d9164281ab	Merge branch 'develop' into chore/sc-23725/livewire3 # Conflicts: # resources/views/livewire/oauth-clients.blade.php	2024-06-17 12:57:04 -07:00
snipe	430808e180	Merge remote-tracking branch 'origin/develop'	2024-06-17 15:52:13 +01:00
snipe	27063d5bae	Fix weird layout in admin oauth [sc-25673] Signed-off-by: snipe <snipe@snipe.net>	2024-06-17 15:44:07 +01:00
snipe	5be86b9dbb	Merge remote-tracking branch 'origin/develop'	2024-06-17 13:43:45 +01:00
snipe	891a0a0965	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2024-06-17 13:05:31 +01:00
snipe	50f0797850	Added aria hidden to icon Signed-off-by: snipe <snipe@snipe.net>	2024-06-17 13:05:27 +01:00
snipe	d9cc3c3ec7	Removed extra divs Signed-off-by: snipe <snipe@snipe.net>	2024-06-17 12:52:23 +01:00
snipe	d87da78eb5	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Users/UsersController.php # config/version.php # public/css/build/AdminLTE.css # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/build/vendor.js # public/js/dist/all-defer.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json	2024-06-17 11:18:33 +01:00
snipe	f3e82c2c80	Updated languages Signed-off-by: snipe <snipe@snipe.net>	2024-06-17 10:59:17 +01:00
Marcus Moore	c3e6e1144f	Merge branch 'develop' into chore/sc-23725/livewire3	2024-06-12 15:12:40 -07:00
snipe	cacb5d62dc	Merge pull request #14800 from snipe/fixes/importer_tweaks Importer tweaks	2024-06-12 12:51:11 +01:00
snipe	7e3d66ec53	Merge branch 'develop' into fixes/companyable_trait_on_users	2024-06-12 11:27:26 +01:00
snipe	1ca9bb5aa8	Merge pull request #14698 from Scarzy/features/asset_file_upload_from_api Added #9413: Asset file upload from API	2024-06-12 11:18:06 +01:00
snipe	f8ab9f62f6	Merge pull request #14842 from Godmartinz/adjust-preview-window Fixed label preview window position	2024-06-07 18:09:56 +01:00
Godfrey M	77e6058e4c	remembers chosen label	2024-06-06 13:55:15 -07:00
Godfrey M	4a60026162	moves preview down by field definitions	2024-06-06 13:42:06 -07:00
Godfrey M	3621292a0e	removes unnecessary height	2024-06-06 13:28:05 -07:00
Godfrey M	6df1c36011	oops	2024-06-06 13:24:02 -07:00
Godfrey M	44dae22a3c	adjust label preview window	2024-06-06 13:18:19 -07:00
snipe	871255f28c	Fixed #14812 - added consumables to individual inventory report Signed-off-by: snipe <snipe@snipe.net>	2024-06-05 20:40:45 +01:00
Marcus Moore	60c7efae3c	Remove commented code	2024-06-05 11:48:10 -07:00
Marcus Moore	48fc6ca60e	Remove commented code	2024-06-05 11:46:57 -07:00
snipe	e054fc1ef1	Removed noisy import debugging, made nicer output Signed-off-by: snipe <snipe@snipe.net>	2024-06-05 10:28:35 +01:00
snipe	f4d530b4b1	Removed filename column since it’s never worked Signed-off-by: snipe <snipe@snipe.net>	2024-06-05 10:28:35 +01:00
snipe	9d56617caf	Moved expected checkin date on view Signed-off-by: snipe <snipe@snipe.net>	2024-06-05 10:28:35 +01:00
snipe	832ceeba56	Fixed missing endpush Signed-off-by: snipe <snipe@snipe.net>	2024-06-05 09:57:10 +01:00
snipe	fa083098fc	Merge pull request #14819 from snipe/localization/new_strings_2024_06_03 Updated strings	2024-06-05 09:46:41 +01:00
Marcus Moore	b2a0e7958b	Inject alpine on label engine page	2024-06-04 17:03:36 -07:00
Marcus Moore	ef91c8123e	Remove unneeded re-render of select2	2024-06-04 15:49:57 -07:00
Marcus Moore	296cf3e34b	Update OauthClients component	2024-06-04 15:37:41 -07:00
Godfrey M	6202f6157a	fix select2 behavior	2024-06-04 08:41:00 -07:00
snipe	85cb7c92e7	Updated strings Signed-off-by: snipe <snipe@snipe.net>	2024-06-03 20:44:40 +01:00
snipe	877adb082c	Fixed translation string Signed-off-by: snipe <snipe@snipe.net>	2024-06-03 16:40:52 +01:00
snipe	cff382605c	Fixed some missing strings and checks Signed-off-by: snipe <snipe@snipe.net>	2024-06-01 04:01:04 +01:00
snipe	694e3b7f3a	Fixed typo Signed-off-by: snipe <snipe@snipe.net>	2024-06-01 00:42:16 +01:00
snipe	a15ed6eaee	Wrap disabled <a> links in a span for tooltips Signed-off-by: snipe <snipe@snipe.net>	2024-05-31 19:29:29 +01:00
snipe	3005565bba	Slight tweak to language Signed-off-by: snipe <snipe@snipe.net>	2024-05-31 19:29:12 +01:00
snipe	1d97d95c10	UI and styling tweaks Signed-off-by: snipe <snipe@snipe.net>	2024-05-31 18:48:34 +01:00
snipe	4a1b1675cb	Use storage helper Signed-off-by: snipe <snipe@snipe.net>	2024-05-31 18:48:09 +01:00
snipe	8c5249ba4b	Disable buttons on view page if model is invalid Signed-off-by: snipe <snipe@snipe.net>	2024-05-31 18:47:53 +01:00
snipe	b936591240	Warn and disable on checkout if model is invalid Signed-off-by: snipe <snipe@snipe.net>	2024-05-31 18:47:34 +01:00
snipe	76e664d647	Warn and disable the checkout button if model is invalid Signed-off-by: snipe <snipe@snipe.net>	2024-05-31 18:47:18 +01:00
snipe	0253c2a756	Lauout tweaks, warn and disable button if model is invalid Signed-off-by: snipe <snipe@snipe.net>	2024-05-31 18:46:57 +01:00
snipe	d27613f55c	Updated strings Signed-off-by: snipe <snipe@snipe.net>	2024-05-31 18:46:41 +01:00
Marcus Moore	1736bf5510	Merge branch 'develop' into chore/sc-23725/livewire3 # Conflicts: # app/Livewire/LoginForm.php # package.json # resources/views/livewire/login-form.blade.php	2024-05-30 16:56:50 -07:00
Marcus Moore	1a1b891309	Remove unused Login Livewire component	2024-05-30 16:49:05 -07:00
Marcus Moore	2eaac3d381	Fix select2 re-renders	2024-05-30 16:20:04 -07:00
Marcus Moore	f03249898a	Update id syntax in custom fields component	2024-05-30 16:12:52 -07:00
Godfrey M	0ee441a976	adds hidden as well	2024-05-30 11:19:06 -07:00
Godfrey M	cf8de3baa9	fix checkin option from appearing	2024-05-30 11:11:35 -07:00
snipe	aadee068b3	Merge pull request #14740 from Godmartinz/redirect_back_to_asset Added Redirect options to asset check in/out	2024-05-30 14:14:04 +01:00
snipe	a46e2ebfd8	Small tweaks to user export, user view translations Signed-off-by: snipe <snipe@snipe.net>	2024-05-30 13:59:00 +01:00
snipe	f710b1aac3	Merge pull request #14614 from akemidx/feature/sc-19796 ADDED: Export User Permissions (Superuser & Admin)	2024-05-30 13:41:26 +01:00
snipe	f6fe6e70b9	Merge branch 'develop' into redirect_back_to_asset	2024-05-30 13:38:11 +01:00
Marcus Moore	e80b80f5d1	Remove manual livewire tags	2024-05-29 16:04:05 -07:00
Marcus Moore	9e35441281	Importer fixes	2024-05-29 15:50:42 -07:00
Godfrey M	e28ad50bec	fixes the color change	2024-05-29 15:34:08 -07:00
Marcus Moore	7d95e7765d	Add a few .prevents	2024-05-29 14:13:29 -07:00
Scarzy	8a2ea971e1	Add an API assets files controller Based heavily on the Assets assets files controller. Added errors related to to the files management. Added the API endpoints for file upload and show, but only upload is currently tested/works.	2024-05-29 22:01:48 +01:00
Marcus Moore	8d924b60d7	Replace references to @this in importer	2024-05-29 13:51:57 -07:00
Marcus Moore	34595c266d	Update script tag	2024-05-29 13:16:30 -07:00
Marcus Moore	638ae9bdd5	Use new id method	2024-05-29 13:15:59 -07:00
Godfrey M	713ce7836f	add some css in label field selector	2024-05-29 13:07:33 -07:00
Marcus Moore	093c6652a8	Update select2 snippet for Livewire 3	2024-05-29 12:58:24 -07:00
Marcus Moore	43616d1874	Remove alpine reference from webpack	2024-05-29 12:30:20 -07:00
Marcus Moore	73e3ac7dd8	Migrate to $dispatch	2024-05-29 12:18:31 -07:00
Marcus Moore	45419586fe	Migrate away from wire:model.prevent	2024-05-29 12:11:33 -07:00
Marcus Moore	d8a480b2a8	Migrate to wire:model.blur	2024-05-29 12:11:02 -07:00
Marcus Moore	29d87246a2	Migrate away from wire:model.defer	2024-05-29 12:10:46 -07:00
Marcus Moore	58e638d3cb	Migrate to wire:model.live	2024-05-29 12:08:25 -07:00
snipe	12e107a71b	Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout Bulk Consumable Checkout	2024-05-29 19:42:25 +01:00
snipe	7bbee053c6	Updated fa icon call Signed-off-by: snipe <snipe@snipe.net>	2024-05-29 19:19:45 +01:00
snipe	369c819a27	Merge pull request #14754 from Godmartinz/footer_user_bug Removed extra div from User Details.	2024-05-29 11:29:02 +01:00
snipe	a5d0a21757	Fixed string path Signed-off-by: snipe <snipe@snipe.net>	2024-05-29 00:26:33 +01:00

... 8 9 10 11 12 ...

5296 commits