DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 09:34:10 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
7793 commits 95 branches 267 tags 295 MiB
Commit graph

7793 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe f91be34baf
Merge pull request #11025 from snipe/fixes/missed_a_few_trans_strings 
Fixed #10890 - Missed a few hard coded english strings
 2022-05-06 02:02:15 -07:00
snipe fba731ac1c Missed a few hard coded english strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 02:01:17 -07:00
snipe 784bf4d784 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.github/ISSUE_TEMPLATE/feature_request.yml
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ReportsController.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/users/print.blade.php
#	webpack.mix.js
 2022-05-06 01:52:43 -07:00
snipe 6304709c77
Merge pull request #11023 from snipe/fixes/10890_use_translation_strings_in_assigned_printout 
Fixed #10890 - Use translation strings in assigned printout instead of hardcoded English
 2022-05-06 01:33:46 -07:00
snipe 39ee825ba2 Fixed html lang specification 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 01:32:20 -07:00
snipe c0e9393092 Fixed #10890 - use translation strings in user asset printout 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 01:30:58 -07:00
snipe 1ac626a43a
Merge pull request #11022 from snipe/fixes/specify_full_url_in_favicons 
Use full app_url in favicon paths
 2022-05-06 00:22:14 -07:00
snipe 3a415b2fce Use full app_url in favicon paths 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 00:19:32 -07:00
snipe b20921cb62 Removed duplicate session regenerate 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 21:35:05 -07:00
snipe 2e03270fca Updated feature request YAML 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 19:06:25 -07:00
snipe 5370c2ca42
Merge pull request #10941 from Godmartinz/gh8856_signature_not_showing_in_print_all 
[Fix] changes the query for the accept signature on print blade
 2022-05-05 13:32:37 -07:00
snipe 0939591efb
Merge pull request #11003 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null_develop 
Fixes QueryException Integrity constraint violation: Column 'order' cannot be null for develop
 2022-05-05 13:28:00 -07:00
snipe a859eac4a0
Merge pull request #11002 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null 
Fixes QueryException Integrity constraint violation:  Column 'order' cannot be null
 2022-05-05 13:27:45 -07:00
snipe 35d81be8d1
Merge pull request #11018 from snipe/update_bootstrap_table_to_latest 
Update BS tables and table export to latest
 2022-05-05 13:23:55 -07:00
snipe a5760cfe7b Update BS tables and table export to latest 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 12:22:20 -07:00
snipe cab29745e7 More small tweaks to feature request template 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 11:17:31 -07:00
snipe 41fa42f7d8 FR updates 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 11:14:55 -07:00
snipe eb49c33e1b Reverting feature request YAML 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 11:10:11 -07:00
snipe 31f2b73e5a Bumped version to GM 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 10:55:29 -07:00
snipe 953b3a8d6e
Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8 
Merge master into develop for RC 6.0.0-8
 2022-05-05 10:53:17 -07:00
snipe c01f0880ef Changed language string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 10:52:57 -07:00
snipe c838354b74
Merge pull request #11016 from benwa/patch-1 
Update feature_request.yml
 2022-05-05 10:19:37 -07:00
Bennett Blodinger 46c4d1a3d6
Update feature_request.yml 
Correcting the label/description fields
 2022-05-05 09:49:41 -05:00
snipe 57ed3afcc4 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-04 16:50:50 -07:00
snipe 5c78a15835 Removed dupe lines from merge conflict 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-03 12:56:29 -07:00
snipe 011ab604f2
Merge pull request #11001 from inietov/fixes/download_all_triggers_getDisplayNameAttribute_on_null_develop 
Fixes Activity Report Download all action fails creating the CSV report for develop.
 2022-05-03 20:52:47 +01:00
snipe fd71b48489
Merge pull request #11000 from inietov/fixes/download_all_triggers_getDisplayNameAttribute_on_null 
Fixes Activity Report Download all action fails creating the CSV report.
 2022-05-03 20:52:42 +01:00
Ivan Nieto Vivanco 37805509da Adds an integer casting to the order input field so it cannot be null 2022-05-01 15:27:05 -05:00
Ivan Nieto Vivanco 01232d9a54 Adds an integer casting to the order input field so it cannot be null 2022-05-01 15:16:56 -05:00
Ivan Nieto Vivanco ac8da55270 Evaluate if an item still exists before trying to get its name in the report 2022-05-01 13:25:55 -05:00
Ivan Nieto Vivanco 1cbbf8f976 Evaluate if an item still exists before trying to get its name in the report 2022-05-01 13:11:05 -05:00
snipe 313150e6dd
Merge pull request #10998 from johnson-yi/fixes/saml_logout 
Fixes #10980 - Prevent immediate saml login after normal logout
 2022-04-30 19:49:54 +01:00
Johnson Yi 281c6df7b3 Customize login page when REQUIRE_SAML is enabled 2022-04-29 15:35:40 +00:00
Johnson Yi 92fe1287ea Do not saml login automatically after normal logout 2022-04-29 15:35:08 +00:00
snipe 5a8c3444e2
Merge pull request #10994 from snipe/fixes/use_str_slug_for_fileName_export 
Fixed model export filename to use str_slug for filename for JS export (like we do elsewhere)
 2022-04-28 21:58:28 +01:00
snipe edab4e1371 Uses str_slug for filename for JS export (like we do elsewhere) 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-28 21:55:26 +01:00
snipe 150724b744 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-28 17:51:27 +01:00
snipe 9aac1cbba4 Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Console/Commands/MoveUploadsToNewDisk.php
#	app/Http/Controllers/ActionlogController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/StatuslabelsController.php
#	app/Http/Controllers/Assets/AssetCheckinController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/BulkUsersController.php
#	app/Http/Requests/AssetCheckoutRequest.php
#	app/Importer/LicenseImporter.php
#	app/Models/Actionlog.php
#	app/Models/License.php
#	app/Models/User.php
#	app/Observers/AssetObserver.php
#	composer.lock
#	config/version.php
#	database/factories/LicenseFactory.php
#	database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
#	database/migrations/2018_10_18_191228_add_kits_licenses_table.php
#	database/migrations/2018_10_19_153910_add_kits_table.php
#	database/migrations/2018_10_19_154013_add_kits_models_table.php
#	database/migrations/2019_02_07_185953_add_kits_consumables_table.php
#	database/migrations/2019_02_07_190030_add_kits_accessories_table.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/ar/general.php
#	resources/lang/ar/passwords.php
#	resources/lang/cs/general.php
#	resources/lang/cs/passwords.php
#	resources/lang/de/admin/custom_fields/general.php
#	resources/lang/de/admin/settings/general.php
#	resources/lang/de/admin/settings/message.php
#	resources/lang/fr/admin/custom_fields/general.php
#	resources/lang/fr/admin/hardware/general.php
#	resources/lang/fr/admin/locations/table.php
#	resources/lang/fr/admin/settings/message.php
#	resources/lang/hu/admin/custom_fields/general.php
#	resources/lang/hu/admin/settings/general.php
#	resources/lang/hu/general.php
#	resources/lang/it/admin/settings/general.php
#	resources/lang/nl/admin/custom_fields/general.php
#	resources/lang/nl/admin/settings/general.php
#	resources/lang/nl/general.php
#	resources/lang/pl/admin/custom_fields/general.php
#	resources/lang/sv-SE/passwords.php
#	resources/lang/tr/general.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/reports/activity.blade.php
#	resources/views/users/print.blade.php
 2022-04-28 17:49:06 +01:00
snipe 173ec44b9e
Merge pull request #10991 from snipe/fixes/added_gate_to_requested_assets 
Added access gate to the requested assets index
 2022-04-28 15:47:54 +01:00
snipe 2e9cf8fa87 Added access gate to the requested assets index 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-28 15:45:37 +01:00
snipe 126bb486b5 Add @chrisweirich as a contributor 2022-04-28 15:30:12 +01:00
snipe c8d5445178
Merge pull request #10982 from Trizelos/develop 
Fixed #10983: Possibility to set region for AWS (SES)
 2022-04-28 14:23:39 +01:00
Christian Weirich 4be6288ae3 Possibility to set region for AWS (SES) 2022-04-27 15:26:33 +02:00
snipe 0abc108686
Merge pull request #10971 from snipe/fixes/potential_xss_in_depreciation 
Escape checkout target name
 2022-04-24 15:27:58 +01:00
snipe f623d05d0c Escape checkout target name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-24 15:27:11 +01:00
snipe ef7f21e3ba
Merge pull request #10952 from Godmartinz/fixes_double_updates 
fixes double updates from action log and history
 2022-04-21 21:25:29 +01:00
Godfrey M 91694064fb fixes double updates from action log and history 2022-04-18 11:30:24 -07:00
snipe 9a0219eff7
Merge pull request #10943 from snipe/fixes/add_status_id_to_checkout_api 
Added status_id to asset checkout API
 2022-04-15 14:38:44 +01:00
snipe b2087a9947 Adds validator to make sure the status ID is deployable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-15 13:06:55 +01:00
snipe 6b1329133b Adds status ID to asset checkout API endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-15 13:06:35 +01:00