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
|
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 |
|
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 |
|
|
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
|
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 |
|
|
snipe
|
e4ef970934
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-15 12:26:58 +01:00 |
|
|
snipe
|
f211c11034
|
Merge pull request #10942 from snipe/fixes/xss_user_requested
Fixes potential XSS vuln in user requestable results
|
2022-04-15 12:25:56 +01:00 |
|
|
snipe
|
698c7f4904
|
Fixes potential XSS vuln in user requestable results
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-15 12:22:20 +01:00 |
|
|
snipe
|
7479f5f12d
|
Merge pull request #10936 from snipe/fixes/backport_licenses_loading
Ports #10494 to master
|
2022-04-12 21:31:19 +01:00 |
|
|
snipe
|
161c6b7d31
|
Removed security-advisories package for now
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-12 21:17:29 +01:00 |
|
|
snipe
|
1441cf9f4f
|
Ports #10494 to master
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-12 21:04:57 +01:00 |
|
|
snipe
|
270143bb46
|
Merge pull request #10935 from uberbrady/backport_license_index_master
Backport the license index fix from Develop onto the v5 branch
|
2022-04-12 20:14:00 +01:00 |
|
Brady Wetherington
|
6b0a1ab3fb
|
Backport the license index fix from Develop onto the v5 branch
|
2022-04-12 20:11:25 +01:00 |
|
|
snipe
|
809fe7f6d8
|
Compiled assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-12 19:28:58 +01:00 |
|
|
snipe
|
bdbb0c0ce5
|
Merge pull request #10928 from uberbrady/fix_remembered_columns_develop
Fix #10482 for develop - Downgrade bootstrap-table to fix remembered-columns feature
|
2022-04-11 18:57:24 +01:00 |
|
|
snipe
|
5fba8202d6
|
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-11 15:40:58 +01:00 |
|
|
snipe
|
61f5825c69
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-11 15:37:38 +01:00 |
|
|
snipe
|
5314ef97e5
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-11 15:08:39 +01:00 |
|
|
snipe
|
b7fbc5d018
|
Merge pull request #10927 from uberbrady/fix_columns_master
Fixes #10482 - Downgrade bootstrap-table so columns stay remembered
|
2022-04-11 15:03:08 +01:00 |
|
|
Brady Wetherington
|
3472aa9a46
|
Downgrade bootstrap-table to fix remembered-columns feature
|
2022-04-11 14:41:46 +01:00 |
|
|
Brady Wetherington
|
211a0820e5
|
Downgrade bootstrap-table so columns stay remembered
|
2022-04-11 14:29:59 +01:00 |
|
|
snipe
|
7b891f0952
|
Merge pull request #10913 from inietov/fixes/bulk_user_edit_not_updating_asset_locations
Fixes Bulk user edit not updating checked out asset locations
|
2022-04-07 19:41:01 +01:00 |
|
|
snipe
|
8218b5ef47
|
Merge pull request #10914 from inietov/fixes/bulk_user_edit_not_updating_asset_locations_develop
Fixes Bulk user edit not updating checked out asset locations
|
2022-04-07 19:40:42 +01:00 |
|
|
snipe
|
b73542664b
|
Merge pull request #10919 from Godmartinz/gh10866-checkin_time_always_show_12am
Fixed #10866 - Checkin time always shows 12am
|
2022-04-07 19:40:11 +01:00 |
|
|
snipe
|
6c1bb89776
|
Merge pull request #10920 from Godmartinz/Fixed_#10866_-_Checkin_time_always_shows_12am-master
Fixed #10866 - action_date for check-in not including H:i:s
|
2022-04-07 19:39:59 +01:00 |
|
|
Godfrey M
|
3eb7a87a66
|
fixes action_date for check-in not including H:i:s
|
2022-04-07 11:24:12 -07:00 |
|
|
Godfrey M
|
1325628039
|
fixes typo
|
2022-04-07 11:18:16 -07:00 |
|
|
Godfrey M
|
8498082f21
|
fixes typo
|
2022-04-07 11:16:40 -07:00 |
|
|
Godfrey M
|
6dc45c189b
|
removed deadspace
|
2022-04-07 11:10:36 -07:00 |
|
|
Godfrey M
|
5d0a1ebb7a
|
fixes action_date for check-in not including H:i:s
|
2022-04-07 11:08:43 -07:00 |
|
|
snipe
|
30a5d57ce5
|
Merge pull request #10917 from uberbrady/bs_tables_export_without_html_develop
This disables the display of HTML content during exports
|
2022-04-07 16:44:36 +01:00 |
|
|
snipe
|
0cb4caa4cf
|
Merge pull request #10918 from uberbrady/bs_tables_export_without_html_master
This disables the display of HTML content during exports (cherry-picked for master)
|
2022-04-07 16:44:21 +01:00 |
|