DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-30 07:59:50 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11439 commits 102 branches 268 tags 288 MiB
Commit graph

11439 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe fa6c8d864e Restore label engine checkbox 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:04:19 +01:00
snipe c957f136aa More label tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:03:40 +01:00
snipe 697dc10d76 More label tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:03:32 +01:00
snipe d47b502d86
Merge pull request #13466 from snipe/fixes/weird_label_engine_layout 
Fixes weird label engine layout
 2023-08-15 18:52:54 +01:00
snipe 6b02184e99 Fixed weird layout with checkbox 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 18:48:20 +01:00
snipe 64342838fd Return the user to the labels page on save 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 18:48:12 +01:00
snipe 346f243bc0
Merge pull request #13465 from snipe/fixes/parse_error_in_helper 
Fixed unclosed brace
 2023-08-15 18:14:55 +01:00
snipe 443adc50da Fixed unclosed brace 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 18:12:25 +01:00
snipe cebf0e0de1 Add @cram42 as a contributor 2023-08-15 18:07:56 +01:00
snipe e41368daac
Merge pull request #12050 from cram42/develop 
New Label Engine
 2023-08-15 17:58:57 +01:00
Godfrey M d1efca2ae1 fixes conflicts 2023-08-15 09:28:42 -07:00
snipe c56f664811
Merge pull request #13442 from Robert-Azelis/Robert-Azelis-patch-add_email_to_companies 
Add email to companies
 2023-08-15 13:26:20 +01:00
snipe 6f373aed33
Merge pull request #13461 from snipe/localization/new_translations 
Updated language strings from CrowdIn
 2023-08-15 13:22:14 +01:00
snipe d1ce1b6f18 Updated language strings from CrowdIn 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 13:21:35 +01:00
Ivan Nieto Vivanco 71cb16118d Change error string for a better (?) one 2023-08-14 20:52:00 -06:00
Ivan Nieto Vivanco d365565b6d Add message in the acceptance assets view to indicate when the user can\'t accept nor deny the asset 2023-08-14 20:51:04 -06:00
snipe 24a3e0ee83 Added LOGIN_AUTOCOMPLETE as env var 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 01:56:01 +01:00
Marcus Moore dc1a8840f1
Ensure empty string is not passed to strpos() 2023-08-14 16:40:34 -07:00
Ivan Nieto Vivanco 96440834bd Move the declinedCheckout function so it don/'t separate the class properties 2023-08-14 16:16:28 -06:00
snipe d3fbbec92c
Merge pull request #13455 from snipe/fixes/confusion_around_localization_date 
Fixed #13382 - confusion around localization date
 2023-08-14 22:50:30 +01:00
snipe 9820ab34d7 Use today’s date for date format selectlist 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-14 22:44:29 +01:00
snipe aa333bcf0b
Merge pull request #13448 from Godmartinz/status-label-translations_fix 
Fixed #13446 - added translations to status label type column
 2023-08-14 22:25:46 +01:00
snipe ba56746f57
Merge pull request #13437 from marcusmoore/feature/improve-user-factory 
Allowed permissions in the user factory to be chained
 2023-08-14 22:23:55 +01:00
snipe dcec4ba5e2
Merge pull request #13454 from snipe/fixes/13450_removed_escaping_custom_fieldsets 
Fixed #13450 - remove escaping on saveing new custom fields
 2023-08-14 22:22:35 +01:00
snipe 12e9d2adeb Fixed #13450 - remove escaping on saveing new custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-14 22:21:41 +01:00
Ivan Nieto Vivanco 8da2a8a79c Allows to save signature for declined items 2023-08-14 14:58:10 -06:00
Ivan Nieto Vivanco 4796598bb6 Add declinedCheckout method to Accessory model 2023-08-14 14:35:31 -06:00
Godfrey M c3356ab765 fixed translation choice and color choice 2023-08-14 12:20:46 -07:00
Godfrey M 4446b2311d remove unnecessary changes 2023-08-14 12:14:15 -07:00
Godfrey M 6b94ef6adc fixes the statuslabeltypeforatter instead of the model 2023-08-14 12:13:01 -07:00
Godfrey M a0d5774635 adds translations to status label type column 2023-08-14 10:42:17 -07:00
snipe 291fa1cd29
Merge pull request #13445 from snipe/fixes/typo_in_formatter_for_asset_maintenances 
Fixed case in BS table formatter for boolean
 2023-08-14 13:02:27 +01:00
snipe 58286c9cab Fixed case in BS table formatter for boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-14 13:01:32 +01:00
Robert-Azelis 1e43d88e06
Create 2023_08_13_172600_add_email_to_companies.php 2023-08-13 17:25:33 +02:00
Robert-Azelis da701677c7
Update edit.blade.php 2023-08-13 17:24:17 +02:00
Robert-Azelis 30d33310ae
Update CompanyPresenter.php 2023-08-13 17:23:33 +02:00
Robert-Azelis bbb8ecfee4
Update Company.php 2023-08-13 17:21:55 +02:00
Robert-Azelis 8988a5dfc3
Update CompaniesTransformer.php 2023-08-13 17:20:15 +02:00
Robert-Azelis ed5b4ca0a2
Update CompaniesController.php 2023-08-13 17:18:25 +02:00
Robert-Azelis 07bafa9508
Update CompaniesController.php 2023-08-13 17:15:20 +02:00
snipe a1cfa45344
Merge pull request #13439 from snipe/fixes/500_error_when_cloning_invalid_accessory 
Fixed route for accessory index
 2023-08-11 09:42:00 +01:00
snipe df8f6a8d2b Correctly call the route for accessory index 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-11 09:40:49 +01:00
Marcus Moore 5b86c02366
Set permissions to empty object in user factory 2023-08-10 16:55:44 -07:00
Marcus Moore 41479b1ec7
Allow permissions in the user factory to be chained 2023-08-10 16:35:10 -07:00
Marcus Moore 3a2b15313c
Bump guzzlehttp/psr7 to 2.4.5 2023-08-10 11:53:20 -07:00
Marcus Moore 6b6bb61400
Bump nyholm/psr7 to 1.6.1 2023-08-10 11:52:42 -07:00
snipe 6adaa32286
Merge pull request #13431 from marcusmoore/feature/custom-report-scoping 
Removed unneeded `Company::scopeCompanyables` from `ReportsController`
 2023-08-10 09:57:53 +01:00
snipe a599f0c923
Merge pull request #13434 from marcusmoore/chore/improve-test-stability 
Improved test stability and messaging
 2023-08-10 09:57:26 +01:00
snipe 4db4bf7be4
Merge pull request #13432 from marcusmoore/chore/remove-old-testing-code 
Removed unused Codeception test code
 2023-08-10 09:57:11 +01:00
Marcus Moore 04661d5441
Add help text to response assertion helpers 2023-08-09 17:09:31 -07:00