DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
16750 commits 59 branches 275 tags 321 MiB
Commit graph

5165 commits

Author SHA1 Message Date
Marcus Moore d6b4c27302
Migrate form label on branding settings page 2025-02-05 14:14:50 -08:00
Marcus Moore f8d7291923
Migrate form labels on asset tag settings page 2025-02-05 14:11:36 -08:00
Marcus Moore b59674ab77
Migrate form labels on settings alert page 2025-02-05 13:48:50 -08:00
Marcus Moore 0620b8b163
Migrate form label in checkout select partial 2025-02-05 13:44:00 -08:00
Marcus Moore f639d82693
Migrate form label in user select partial 2025-02-05 13:40:27 -08:00
Marcus Moore 13d2d41f0c
Migrate form label in supplier select partial 2025-02-05 13:39:03 -08:00
Marcus Moore 015cd44136
Migrate form label in status select partial 2025-02-05 13:34:07 -08:00
Marcus Moore 4834f60a44
Migrate form label in phone input partial 2025-02-05 13:32:06 -08:00
Marcus Moore 3327e1d8f2
Migrate form label in asset model select partial 2025-02-05 13:30:14 -08:00
Marcus Moore 40e002911c
Migrate form label in manufacturer select partial 2025-02-05 13:29:06 -08:00
Marcus Moore 03bcc3b73f
Migrate form label in location select partial 2025-02-05 13:27:29 -08:00
Marcus Moore f963df0658
Migrate form label in location profile select partial 2025-02-05 13:26:08 -08:00
Marcus Moore 0aa77d281f
Replace calls to Form::label in license-select partial 2025-02-05 13:24:02 -08:00
Marcus Moore 0988255693
Replace calls to Form::label in (unused?) kit select 2025-02-05 13:23:10 -08:00
Marcus Moore fb9e7cf5e1
Migrate form label in fax input partial 2025-02-05 13:19:22 -08:00
Marcus Moore ecc1bd69b9
Migrate form label in department select partial 2025-02-05 13:19:16 -08:00
Marcus Moore 830f095a6e
Migrate form label in datepicker partial 2025-02-05 13:16:28 -08:00
Marcus Moore 288f7e4e93
Migrate form label on consumable select 2025-02-05 13:12:52 -08:00
Marcus Moore a205ae12a4
Migrate form label on (unsed?) company select partial 2025-02-05 13:11:49 -08:00
Marcus Moore 1866426f11
Migrate form label in category select partial 2025-02-05 13:02:36 -08:00
Marcus Moore e4ab6c0c24
Migrate form label on asset select partial 2025-02-05 12:59:00 -08:00
Marcus Moore 189c148761
Migrate labels on address partial 2025-02-05 12:47:06 -08:00
Marcus Moore 8b7c1a195c
Migrate label on accessory select partial 2025-02-05 12:41:35 -08:00
Marcus Moore d77547aecf
Migrate labels on slack component 2025-02-05 12:40:00 -08:00
Marcus Moore 478a5c0e1a
Migrate labels on bulk audit pag 2025-02-05 12:12:43 -08:00
Marcus Moore 5c6757ecf6
Migrate labels on quick checkin page 2025-02-05 12:07:17 -08:00
Godfrey M f2981cf12b adds translations to label settings 2025-02-05 10:55:05 -08:00
Godfrey M c3310a0772 adds translations to LDAP settings page 2025-02-05 10:38:16 -08:00
Marcus Moore fe485acd4a
Swap Form::radio in bulk model edit view 2025-02-04 16:18:49 -08:00
Marcus Moore fbe19738cb
Swap Form::radio in bulk hardware edit view 2025-02-04 15:49:46 -08:00
Marcus Moore d29a62a335
Simplify @checked 2025-02-04 13:50:08 -08:00
Marcus Moore f3959323ff
Add required attribute to name field 2025-02-04 13:33:16 -08:00
Marcus Moore 0d62ab2ad4
Fix call to @checked 2025-02-04 13:31:28 -08:00
Godfrey M cbf9239d86 adds channel not found warning 2025-02-04 11:21:56 -08:00
Marcus Moore 295875c45e
Fix and replace remaining radios on bulk user edit page 2025-02-04 11:02:40 -08:00
Godfrey M 24bb679305 adds check that asset has asset status before checking archived 2025-02-03 12:24:22 -08:00
Marcus Moore 26b4063435
Convert section items 2025-01-30 16:07:46 -08:00
Marcus Moore 8dd432c3a2
Convert section headings 2025-01-30 15:56:08 -08:00
Marcus Moore 0e390f1a9b
Temporarily order properties 2025-01-30 15:54:27 -08:00
Marcus Moore 6fb83d66a2
Revert "Re-order parameters" 
This reverts commit bf96688aef.
 2025-01-30 15:46:22 -08:00
Marcus Moore bf96688aef
Re-order parameters 2025-01-30 15:37:05 -08:00
Marcus Moore eb4aeb47c1
Replace Form::radio in top section of group permissions page 2025-01-30 15:36:38 -08:00
Marcus Moore ac925af3d0
Replace a few radio inputs on bulk user edit page 2025-01-27 13:50:22 -08:00
Marcus Moore 4f08b2360c
Migrate radios on custom report page 2025-01-27 13:36:59 -08:00
Marcus Moore 00cdb13803
Convert remaining Form:hidden in labels view 2025-01-27 11:23:01 -08:00
Marcus Moore ef6d747b37
Convert some Form:hidden in labels view 2025-01-27 11:15:09 -08:00
Marcus Moore e26abb8684
Replace Form::hidden with @csrf 2025-01-27 11:07:19 -08:00
Marcus Moore 82801242d3
Merge branch 'develop' into chore/sc-28173 
# Conflicts:
#	resources/views/settings/alerts.blade.php
 2025-01-22 14:54:53 -08:00
snipe d696ed8a5a
Merge pull request #16107 from marcusmoore/chore/migrate-password-helper 2025-01-22 17:28:23 +00:00
Marcus Moore c3d17c5727
Remove value for readonly 2025-01-22 09:27:40 -08:00
snipe be535671bc Updated language files 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-22 17:09:41 +00:00
Marcus Moore 5ddf0dd789
Migrate form submit helper 2025-01-21 16:36:22 -08:00
Marcus Moore b003890dd2
Migrate password helpers 2025-01-21 16:14:20 -08:00
snipe d5309c7d94 Added fragment to uploads for redirect 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-21 18:06:00 +00:00
snipe 02eeb7f916 Added extrab option in bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-17 19:04:23 +00:00
snipe e9ad43afbe Better hide reset password functionality for LDAP users 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-17 18:51:08 +00:00
snipe b3d35beeb9 Fixes #15017 - card view for mobile 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-17 16:58:30 +00:00
snipe 5e465fa417 Merge remote-tracking branch 'origin/master' into 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
2025-01-16 19:06:02 +00:00
snipe de5d66f5d2 Comment out ad-hoc note button for now 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-16 19:05:52 +00:00
Marcus Moore 68988524d6
Replace Form::text in certain views 2025-01-15 16:31:16 -08:00
Marcus Moore c278900581
Replace Form::text in certain views 2025-01-15 15:58:33 -08:00
snipe 1d0c156d2e Increased due for checkin warning 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-15 22:12:18 +00:00
snipe 7de5e2e7ef One more audot field increase 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-15 22:11:22 +00:00
snipe 8d935b34eb Fixed audit interval input width 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-15 22:07:53 +00:00
snipe 9830959f11 Fixed input width on audit interval
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>
 2025-01-15 22:07:15 +00:00
Marcus Moore 8e790fdc47
Replace Form::text in certain views 2025-01-15 13:37:00 -08:00
Marcus Moore 0ef20c524f
Replace Form::text in certain views 2025-01-15 13:01:32 -08:00
Marcus Moore 5ccaf2c23e
Replace Form::text in certain views 2025-01-15 12:23:43 -08:00
Marcus Moore bec9511df1
Add more spacing for input values to be displayed 2025-01-15 12:10:05 -08:00
Marcus Moore 017948c3bb
Replace Form::text in certain views 2025-01-15 12:07:33 -08:00
Marcus Moore 1cb72e3e9c
Replace Form::text in certain views 2025-01-15 11:53:22 -08:00
Marcus Moore e45f563b50
Convert Form::textareas to blade component 2025-01-14 13:16:31 -08:00
snipe 0bb2e98af3 Built assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-14 12:33:59 +00:00
snipe 1c8d94c953
Merge pull request #15525 from akemidx/updated_ad_hoc_notes 2025-01-14 11:33:21 +00:00
Marcus Moore 9573428201
Introduce textarea component 2025-01-13 16:34:12 -08:00
snipe a7543b407f Added a few more words 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-13 17:07:22 +00:00
snipe 98b1ba1e39 Moved keywords in lang file 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-13 17:04:48 +00:00
Nebel 9f0581275b
Merge branch 'develop' into feature/custom-data-options-for-2d-barcode 2025-01-13 15:49:32 +01:00
Godfrey M 001ccf1ce9 adds translation string instead of hardcoded message 2025-01-09 14:47:07 -08:00
snipe 71c7c64fde Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-09 15:54:51 +00:00
snipe 639afe5b9b Check for blank OR null on formatter 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-09 15:11:22 +00:00
Godfrey M 94f44d1b77 fix label type values in db and defaults. update help text 2025-01-07 10:00:52 -08:00
snipe 4d3db2ab44
Merge pull request #15919 from Godmartinz/table_dropdownmenu-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
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Details
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Details 
Removed the `table-responsive` div from several index blades
 2025-01-06 18:11:19 +00:00
snipe 15296d2b1c
Merge pull request #15714 from akemidx/saving_custom_report_template 
Saved Custom Report Templates
 2024-12-19 22:43:59 +00:00
snipe d49bfb562a
Merge branch 'develop' into testing/license-checkin 2024-12-19 22:29:31 +00:00
snipe 8d24c0af0d
Merge pull request #15982 from spencerrlongg/bug/sc-27228 
Update Checkout Button Permission for Predefined Kits
 2024-12-19 22:25:51 +00:00
snipe 360e0ff534 Added a few order options on audit report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-19 22:19:33 +00:00
spencerrlongg 7eb936883a rm note 2024-12-17 16:38:29 -06:00
spencerrlongg eb054897d6 Remove leftover testing logic and fix checkout permissions 
Removed console logs and temporary testing code from the bootstrap-table view. Updated the transformer to correctly check checkout permissions against the Asset class instead of PredefinedKit.
 2024-12-17 16:06:10 -06:00
akemidx 5992d2a1d2 adding to controller 2024-12-17 15:43:13 -05:00
snipe 9b04d2e51c Updated route in view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 5226d507d4 Updated route 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe e0643cd744 Added currency and history icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:30 +00:00
snipe 27fab0f573 Use history icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:34:51 +00:00
snipe 183a4d49d8 Refactor of #15235 - added accessory checkout to locations, assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:34:49 +00:00
snipe edacc4eb54
Merge pull request #15446 from Godmartinz/barcode_settings_hide
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 
Refactored Barcode Settings into Label Settings
 2024-12-16 16:09:34 +00:00
Marcus Moore 699476da90
Scaffold and implement some license checkin tests 2024-12-12 17:33:34 -08:00
Godfrey M 833af55806 Merge branch 'develop' into barcode_settings_hide 2024-12-12 12:05:29 -08:00
snipe 38db890660 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-12 19:22:56 +00:00
snipe c5e2aed164 Check for assigned (not assigned_to) before trying to present() the name on bulk delete assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-12 17:37:08 +00:00