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
16754 commits 59 branches 275 tags 321 MiB
Commit graph

590 commits

Author SHA1 Message Date
snipe c0f0f43dd7
Merge pull request #16188 from Godmartinz/translations-for-labels-n-ldap 
Adds translations to LDAP  and Label settings pages
 2025-02-18 19:56:14 +00:00
snipe ac907add83
Merge pull request #16082 from marcusmoore/chore/sc-28173 
Replace calls to Form::text
 2025-02-18 14:58:40 +00:00
snipe a9d6a5f618 Updated note partial to use generic notes text 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:39:46 +00:00
Marcus Moore 0797c4ac97
Merge branch 'develop' into chore/sc-28173 
# Conflicts:
#	resources/views/settings/saml.blade.php
#	resources/views/settings/security.blade.php
#	resources/views/setup/user.blade.php
 2025-02-10 15:57:41 -08:00
snipe ab10fb466c
Merge pull request #16193 from marcusmoore/chore/migrate-label-helpers-pt3 
Replace calls to Form::label pt3
 2025-02-06 10:17:26 +00:00
snipe dcabf90409
Merge pull request #16192 from marcusmoore/chore/migrate-label-helpers-pt2 
Replace calls to Form::label pt2
 2025-02-06 10:17:11 +00:00
snipe 27752f595c
Merge pull request #16194 from marcusmoore/chore/migrate-label-helpers-pt4 
Replace calls to Form::label pt4
 2025-02-06 10:16:33 +00: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
Godfrey M f2981cf12b adds translations to label settings 2025-02-05 10:55:05 -08:00
Marcus Moore 0ef20c524f
Replace Form::text in certain views 2025-01-15 13:01:32 -08:00
Marcus Moore 1cb72e3e9c
Replace Form::text in certain views 2025-01-15 11:53:22 -08: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
snipe 15296d2b1c
Merge pull request #15714 from akemidx/saving_custom_report_template 
Saved Custom Report Templates
 2024-12-19 22:43:59 +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
spencerrlongg 72f58b0405 leaving this here for notes etc 2024-12-11 19:13:51 -06:00
spencerrlongg 03c90d7b60 note, will come back to this once question is answered 2024-12-09 13:29:06 -06:00
snipe 6874f703bf Some CSS twiddling 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-02 17:42:26 +00:00
Marcus Moore a20e03fce9
Merge branch 'develop' into saving_custom_report_template 2024-10-21 17:13:15 -07:00
Brady Wetherington 6b7af802af Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar 2024-10-16 22:02:45 +01:00
Marcus Moore 5306e1cd15
Merge branch 'develop' into saving_custom_report_template 
# Conflicts:
#	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/supplier-select.blade.php
#	resources/views/reports/custom.blade.php
 2024-10-15 12:32:01 -07:00
Brady Wetherington 67a605c9a5 Fix bulk checkout to users, assets, and locations 2024-10-09 17:01:26 +01:00
snipe cae8aa7840 Added maxlengths to additional fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-01 14:02:54 +01:00
snipe 585f998cae Fixes for requiredness display 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-28 15:28:06 +01: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
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