DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7219 commits 101 branches 268 tags 288 MiB
Commit graph

7219 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe a65fb63b6b
Merge pull request #10511 from inietov/features/audit_date_in_importer 
Adds audit dates in the asset importer
 2022-01-27 10:58:53 -08:00
snipe 9634dde0dd
Merge pull request #10567 from inietov/fixes/importing_and_checking_out_licenses_master 
Fixes Importing licenses without product key duplicates the license
 2022-01-27 10:58:06 -08:00
snipe 0eab249819
Merge pull request #10569 from inietov/fixes/donked_layout_required_field_error_depreciation_develop 
Fixes donked layout required field error depreciation in develop[sc-17111]
 2022-01-27 10:57:33 -08:00
snipe 077caa29f8
Merge pull request #10570 from inietov/fixes/donked_layout_required_field_error_depreciation 
Fixes donked layout required field error depreciation [sc-17111]
 2022-01-26 21:23:51 -08:00
Ivan Nieto Vivanco a87478d3ac Set the actual field we are evaluating as required (months) 2022-01-26 23:02:27 -06:00
Ivan Nieto Vivanco 34819ec5cf Fixes the appearance of some error messages 2022-01-26 23:00:52 -06:00
Ivan Nieto Vivanco 44349db597 Fixes the appearance of some error messages 2022-01-26 22:58:02 -06:00
snipe c70ae19c28
Merge pull request #10529 from uberbrady/fix_insecure_host_headers 
Force UrlGenerator's Root URL to be the base of APP_URL unless overriden (v5)
 2022-01-26 16:59:55 -08:00
snipe b153138d1e
Merge pull request #10534 from inietov/feature/add_remaining_address_field_to_user_import_develop 
Add Zip field in the User Importer for develop [sc-18556]
 2022-01-26 16:58:37 -08:00
snipe d0b90bdff9
Merge pull request #10568 from inietov/fixes/importing_and_checking_out_licenses 
Fixes Importing licenses without product key duplicates the license for develop branch
 2022-01-26 16:30:00 -08:00
Ivan Nieto Vivanco 55fdc86e02 Tweak query in the License Importer to not require a Product Key 2022-01-26 17:51:04 -06:00
Ivan Nieto Vivanco 450cb8f92f Tweak query in the License Importer to not require a Product Key 2022-01-26 17:49:34 -06:00
snipe 8ebade7892
Merge pull request #10566 from inietov/fixes/cant_add_customfield_to_fieldset 
Fix #10564: Edit the route to associate custom fields with fieldsets
 2022-01-26 13:02:26 -08:00
Ivan Nieto Vivanco fcd203f4dc Fix the route to associate custom fields with fieldsets 2022-01-26 14:43:20 -06:00
Brady Wetherington 48f1380f6e
Merge pull request #10528 from uberbrady/fix_insecure_host_headers_v6 
Force UrlGenerator's Root URL to be the base of APP_URL unless overriden
 2022-01-24 18:26:30 -08:00
snipe eade041b6e Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2022-01-21 12:33:53 -08:00
snipe ee47a02792 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-21 12:33:49 -08:00
snipe 8813f55770
Merge pull request #10545 from inietov/fixes/unable_to_add_asset_model 
Fixes #10536 Unable to add asset model (v6.0.0-RC-1)
 2022-01-21 10:13:10 -08:00
Ivan Nieto Vivanco 7383ec7f1e Add an early return if the model id is not set (for new Asset Models) 2022-01-21 11:45:45 -06:00
snipe 0721ab8bbf Regenerated production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-20 11:01:04 -08:00
snipe 00c8a1ee21
Merge pull request #10533 from inietov/feature/add_remaining_address_field_to_user_import 
Add Zip field in the User Importer [sc-18556]
 2022-01-19 12:07:18 -08:00
Ivan Nieto Vivanco c86ed892ab Add Zip field in the User Importer 2022-01-19 13:52:15 -06:00
Ivan Nieto Vivanco 1fc71a4111 Add Zip field in the User Importer 2022-01-19 13:35:54 -06:00
Brady Wetherington 0c4768fd2a Force UrlGenerator's Root URL to be the base of APP_URL unless overriden 
(For v5)
 2022-01-18 15:52:59 -08:00
Brady Wetherington 455bc736be Force UrlGenerator's Root URL to be the base of APP_URL unless overriden 2022-01-18 15:31:30 -08:00
snipe a26119c262 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2022-01-18 14:50:35 -08:00
snipe e7541f29d2 Use php artisan serve url 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-18 14:50:24 -08:00
snipe f9647614ab
Merge pull request #10527 from inietov/fixes/pdo_exception_syntax_error_when_sendexpirationalers_is_called 
Fixes PDO exeception syntax error when Expiring Alerts Threshold is not set
 2022-01-18 12:43:08 -08:00
Ivan Nieto Vivanco a05795420a Respect the default value of 60 days in expiring licenses 2022-01-18 14:34:14 -06:00
Ivan Nieto Vivanco 42d86bf57b Adds default values if the expiring alerts threshold is null 2022-01-18 14:21:49 -06:00
snipe 201b52baf8
Merge pull request #10523 from inietov/fixes/depreciation_report_shows_assets_that_not_deprecate_master 
Fixes bug where the depreciation report shows assets that not deprecate for master
 2022-01-18 10:37:21 -08:00
snipe c8c559784d
Merge pull request #10522 from inietov/fixes/depreciation_report_shows_assets_that_not_deprecate 
Fixes bug where the depreciation report shows assets that not depreciate
 2022-01-15 12:23:58 -08:00
Ivan Nieto Vivanco f510b9c2a9 Add query to filter non-deprecable assets when the Depreciation Report is called 2022-01-15 14:21:31 -06:00
Ivan Nieto Vivanco 8334ed6f7e Add query to filter non-deprecable assets when the Depreciation Report is called 2022-01-15 14:01:19 -06:00
Ivan Nieto Vivanco 9ae03f21dc Adds condition to only charge custom field's livewire when the model is updated 2022-01-15 12:14:34 -06:00
Ivan Nieto Vivanco 92b3576395 Fixes a route definition to correctly populate the deprecation report 2022-01-15 12:02:43 -06:00
snipe 6d96f96615
Merge pull request #10520 from inietov/fixes/sc-14356/importer_creating_duplicate_asset_models 
Fixes an issue where importer is creating duplicate asset models
 2022-01-15 07:47:36 -08:00
snipe 75bd365ca1
Merge pull request #10521 from inietov/fixes/sc-14356/importer_creating_duplicate_asset_models_master 
Fixes an issue where importer is creating duplicate asset models for Master Branch
 2022-01-15 07:46:39 -08:00
Ivan Nieto Vivanco 153c30eda8 Add to Importer the capacity to search Models only with Model Name since Model Number is not required 2022-01-15 04:32:47 -06:00
Ivan Nieto Vivanco 58b1db29e2 Adds condition to only update the Asset's Model Number if is provided by import file 2022-01-15 04:15:38 -06:00
Ivan Nieto Vivanco 8bd280b416 Add to Importer the capacity to search Models only with Model Name since Model Number is not required 2022-01-15 04:12:30 -06:00
Ivan Nieto Vivanco d5f6f6cafe Fixes duplicate API endpoint that returns fieldsets instead of customfields 2022-01-15 03:46:28 -06:00
snipe b9cc0c9d4c
Merge pull request #10519 from uberbrady/request_pending_assets 
Make 'pending' assets properly requestable; use requestable scope
 2022-01-14 13:07:16 -08:00
Brady Wetherington ef463a37d8 Make 'pending' assets properly requestable; use requestable scope 2022-01-14 12:48:33 -08:00
snipe cfb64be9a4 More specific RC version number 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 21:41:04 -08:00
snipe 91017aed52 Bumped to RC-1 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 21:38:10 -08:00
snipe af2e407543 Normalize array format in en language to the new shitty way 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 21:30:35 -08:00
snipe ddfa5776c5 Updated language strings 
This absolutely sucks. Something changed in CrowdIn or something else, which results in this push being *thousands* of files because someone somewhere decided that `return [];` was vastly inferior to `return array();`

I'll try to fix it. :(

FML

Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 21:27:29 -08:00
snipe da47f62d17 Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 21:20:38 -08:00
snipe 207ff014b1
Merge pull request #10514 from uberbrady/fix_double_wildcard_query_requestable 
Fixed extraneous wildcard query in requestable asset search
 2022-01-13 19:39:08 -08:00