DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
7403 commits 101 branches 268 tags 288 MiB
Commit graph

2131 commits

Author SHA1 Message Date
snipe 1c0a96b0ce Added gate to supplier 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-13 11:58:12 -07:00
snipe d77a47765e Adds gate to supplier 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-13 11:53:45 -07:00
snipe 2dad27eed6 Added additional gate for selectlists 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-11 11:46:14 -08:00
snipe f5ffda8053 Ahem. 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-10 22:43:51 -08:00
snipe 70af10ae6c
Merge pull request #10640 from JonathonReinhart/10552-add-checkin-api-date 
Fix #10552: Add checkin_at parameter to /hardware/:id/checkin API
 2022-02-10 09:54:20 -08:00
snipe b9a8d45c07 Better messaging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-09 16:30:42 -08:00
snipe 7794c2f44b Check that the fieldset exists before trying to detach it from the fieldset 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-09 16:16:16 -08:00
snipe d06e3dd892 Merge branch 'master' of https://github.com/snipe/snipe-it 2022-02-09 14:40:33 -08:00
snipe 6b25b53462
Merge pull request #10628 from inietov/fixes/default_values_dont_allow_checkbox_radio 
Fixes #10299 Default Values do not allow Checkbox/Radio Buttons
 2022-02-09 14:39:46 -08:00
Ivan Nieto Vivanco 6d79c9f3e2 Save the default values for custom fields with same format than Assets do for actual values 2022-02-09 13:41:33 -06:00
Ivan Nieto Vivanco a36957dd77 Finish the implementation of custom fields default values for checkboxes 2022-02-09 13:12:42 -06:00
Ivan Nieto Vivanco 2f3499e4b9 Show checkboxes a little less assy, actually save the data checked by them 2022-02-09 10:49:10 -06:00
Jonathon Reinhart 3536d08477 Add checkin_at parameter to /hardware/:id/checkin API 
Fixes #10552
 2022-02-08 20:23:09 -05:00
Brady Wetherington c300e7c7f6 Remove extraneous backslash 2022-02-08 12:23:15 -08:00
Brady Wetherington fb890fbc30 Properly alert when invalid JSON is submitted to something that wants JSON 2022-02-08 12:22:59 -08:00
Brady Wetherington 9a66f6a254 Remove extraneous backslash 2022-02-08 12:09:40 -08:00
Brady Wetherington 5e94726ec1 Properly alert when invalid JSON is submitted to something that wants JSON 2022-02-08 12:05:05 -08:00
Jonathon Reinhart cd963179fd Fix /hardware/{id}/checkin API response on error 
Fixes #10629
 2022-02-08 01:08:42 -05:00
snipe b3a0f86431 Temp fix for weird JSON format in history 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-07 18:27:55 -08:00
Ivan Nieto Vivanco eac8e0bdba Add a casting to a truthy/falsy that needs to be integer 2022-02-02 13:54:57 -06:00
snipe ce154a2382
Merge pull request #10455 from adagioajanes/features/quickscan_checkin 
Added #10454: Quick Scan Checkin
 2022-02-01 20:19:45 -08:00
snipe 06a5ea1530 Fixed duplicate use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-01 18:57:45 -08:00
snipe 5fded57ec6 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/ProfileController.php
#	app/Importer/ItemImporter.php
#	app/Importer/UserImporter.php
#	app/Models/Asset.php
#	app/Models/License.php
#	app/Providers/AppServiceProvider.php
#	app/Services/LdapAd.php
#	config/version.php
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/lang/ar/button.php
#	resources/lang/de/admin/companies/general.php
#	resources/lang/de/admin/custom_fields/general.php
#	resources/lang/de/admin/groups/titles.php
#	resources/lang/de/admin/hardware/form.php
#	resources/lang/de/admin/hardware/general.php
#	resources/lang/de/admin/hardware/message.php
#	resources/lang/de/admin/hardware/table.php
#	resources/lang/de/admin/kits/general.php
#	resources/lang/de/admin/locations/table.php
#	resources/lang/de/admin/reports/general.php
#	resources/lang/de/admin/settings/general.php
#	resources/lang/de/admin/settings/message.php
#	resources/lang/de/admin/users/general.php
#	resources/lang/de/general.php
#	resources/lang/de/mail.php
#	resources/lang/en/admin/asset_maintenances/message.php
#	resources/lang/en/admin/asset_maintenances/table.php
#	resources/lang/en/admin/companies/general.php
#	resources/lang/en/admin/companies/message.php
#	resources/lang/en/admin/custom_fields/general.php
#	resources/lang/en/admin/depreciations/general.php
#	resources/lang/en/admin/groups/titles.php
#	resources/lang/en/admin/hardware/form.php
#	resources/lang/en/admin/hardware/general.php
#	resources/lang/en/admin/hardware/table.php
#	resources/lang/en/admin/kits/general.php
#	resources/lang/en/admin/locations/table.php
#	resources/lang/en/admin/reports/general.php
#	resources/lang/en/admin/settings/general.php
#	resources/lang/en/admin/settings/message.php
#	resources/lang/en/admin/users/general.php
#	resources/lang/en/button.php
#	resources/lang/en/general.php
#	resources/lang/en/help.php
#	resources/lang/en/mail.php
#	resources/lang/en/passwords.php
#	resources/lang/hu/admin/hardware/general.php
#	resources/lang/hu/admin/hardware/table.php
#	resources/lang/hu/admin/locations/table.php
#	resources/lang/is/admin/locations/table.php
#	resources/lang/ko/admin/custom_fields/general.php
#	resources/lang/ko/general.php
#	resources/lang/nl/admin/hardware/general.php
#	resources/lang/nl/admin/hardware/message.php
#	resources/lang/nl/admin/hardware/table.php
#	resources/lang/nl/admin/locations/table.php
#	resources/lang/nl/admin/statuslabels/message.php
#	resources/lang/nl/admin/users/general.php
#	resources/lang/no/admin/companies/general.php
#	resources/lang/no/admin/custom_fields/general.php
#	resources/lang/no/admin/depreciations/general.php
#	resources/lang/no/admin/depreciations/table.php
#	resources/lang/no/admin/groups/titles.php
#	resources/lang/no/admin/hardware/form.php
#	resources/lang/no/admin/hardware/general.php
#	resources/lang/no/admin/hardware/table.php
#	resources/lang/no/admin/kits/general.php
#	resources/lang/no/admin/locations/table.php
#	resources/lang/no/admin/reports/general.php
#	resources/lang/no/admin/settings/general.php
#	resources/lang/no/admin/settings/message.php
#	resources/lang/no/admin/statuslabels/message.php
#	resources/lang/no/admin/users/general.php
#	resources/lang/no/button.php
#	resources/lang/no/general.php
#	resources/lang/no/mail.php
#	resources/lang/no/validation.php
#	resources/lang/pl/admin/companies/general.php
#	resources/lang/pl/admin/custom_fields/general.php
#	resources/lang/pl/admin/depreciations/general.php
#	resources/lang/pl/admin/depreciations/table.php
#	resources/lang/pl/admin/groups/titles.php
#	resources/lang/pl/admin/hardware/form.php
#	resources/lang/pl/admin/hardware/general.php
#	resources/lang/pl/admin/hardware/table.php
#	resources/lang/pl/admin/kits/general.php
#	resources/lang/pl/admin/locations/table.php
#	resources/lang/pl/admin/reports/general.php
#	resources/lang/pl/admin/settings/general.php
#	resources/lang/pl/admin/settings/message.php
#	resources/lang/pl/admin/users/general.php
#	resources/lang/pl/button.php
#	resources/lang/pl/general.php
#	resources/lang/pt-PT/admin/companies/general.php
#	resources/lang/pt-PT/admin/custom_fields/general.php
#	resources/lang/pt-PT/admin/depreciations/general.php
#	resources/lang/pt-PT/admin/depreciations/table.php
#	resources/lang/pt-PT/admin/groups/titles.php
#	resources/lang/pt-PT/admin/hardware/form.php
#	resources/lang/pt-PT/admin/hardware/general.php
#	resources/lang/pt-PT/general.php
#	resources/lang/pt-PT/help.php
#	resources/lang/pt-PT/validation.php
#	resources/lang/ro/admin/companies/general.php
#	resources/lang/ro/admin/custom_fields/general.php
#	resources/lang/ro/admin/groups/titles.php
#	resources/lang/ro/admin/hardware/form.php
#	resources/lang/ro/admin/hardware/general.php
#	resources/lang/ro/admin/hardware/message.php
#	resources/lang/ro/admin/hardware/table.php
#	resources/lang/ro/admin/locations/table.php
#	resources/lang/ro/admin/settings/message.php
#	resources/lang/ru/admin/companies/general.php
#	resources/lang/ru/admin/custom_fields/general.php
#	resources/lang/ru/admin/settings/general.php
#	resources/lang/ru/button.php
#	resources/lang/ru/general.php
#	resources/lang/ru/validation.php
#	resources/lang/sk/admin/settings/general.php
#	resources/lang/sk/button.php
#	resources/lang/sk/general.php
#	resources/lang/tr/admin/hardware/form.php
#	resources/lang/tr/admin/hardware/table.php
#	resources/lang/tr/admin/kits/general.php
#	resources/lang/tr/admin/locations/table.php
#	resources/lang/tr/admin/reports/general.php
#	resources/lang/tr/admin/settings/general.php
#	resources/lang/tr/admin/settings/message.php
#	resources/lang/tr/admin/statuslabels/message.php
#	resources/lang/tr/admin/users/general.php
#	resources/lang/tr/button.php
#	resources/lang/tr/general.php
#	resources/lang/zh-CN/admin/companies/general.php
#	resources/lang/zh-CN/admin/custom_fields/general.php
#	resources/lang/zh-CN/admin/depreciations/general.php
#	resources/lang/zh-CN/admin/depreciations/table.php
#	resources/lang/zh-CN/admin/groups/titles.php
#	resources/lang/zh-CN/admin/hardware/form.php
#	resources/lang/zh-CN/admin/hardware/general.php
#	resources/lang/zh-CN/admin/hardware/message.php
#	resources/lang/zh-CN/admin/hardware/table.php
#	resources/lang/zh-CN/admin/kits/general.php
#	resources/lang/zh-CN/admin/locations/table.php
#	resources/lang/zh-CN/admin/reports/general.php
#	resources/lang/zh-CN/admin/settings/general.php
#	resources/lang/zh-CN/admin/settings/message.php
#	resources/lang/zh-CN/admin/statuslabels/message.php
#	resources/lang/zh-CN/admin/users/general.php
#	resources/lang/zh-CN/button.php
#	resources/lang/zh-CN/general.php
#	resources/lang/zh-CN/mail.php
#	resources/views/depreciations/edit.blade.php
 2022-02-01 18:53:05 -08:00
Ivan Nieto Vivanco 3ef775533a Adds actionlog for bulk edits 2022-02-01 12:10:46 -06:00
Ivan Nieto Vivanco 2fec40d7df Adds actionlog for bulk edits 2022-02-01 00:00:12 -06:00
snipe aa3aa78204 Adds Lookup Asset by Custom Field via API [sc-18632] 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-28 09:08:48 -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
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
Brady Wetherington ef463a37d8 Make 'pending' assets properly requestable; use requestable scope 2022-01-14 12:48:33 -08:00
Brady Wetherington 65e584c2bd Revert the unnecessary optimization for asset->count() 2022-01-13 19:37:08 -08:00
Brady Wetherington 4e8ae8a162 Fix extraneous wildcard query in requestable asset search 2022-01-13 16:32:40 -08:00
snipe 984db1ef44 Apply personal API token fix to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 01:39:56 -08:00
snipe 512dbfee7a Added gate to check that the user is allowed to view API keys 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 01:33:27 -08:00
snipe eb8f23a888 Removed commented code 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 01:32:28 -08:00
snipe 8f4ec95fbb Remove assets query, since we handle that via API call now and just need the count() 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 23:23:00 -08:00
snipe 224d0b2fd2 Small language file additions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 22:21:00 -08:00
snipe 43c57c8461 Merge master into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Http/Controllers/BulkAssetModelsController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ModalController.php
#	app/Http/Transformers/GroupsTransformer.php
#	config/version.php
#	package-lock.json
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/assets/less/overrides.less
#	resources/lang/en/admin/hardware/message.php
#	resources/lang/en/admin/settings/general.php
#	resources/views/partials/bootstrap-table.blade.php
#	routes/web.php
 2022-01-12 20:51:33 -08:00
Alex Janes d2bb3e6377
Merge branch 'develop' into features/quickscan_checkin 2022-01-11 16:40:20 -05:00
Alex Janes edef640d35
Merge branch 'develop' into features/lock_logins_to_saml 2022-01-11 09:05:14 -05:00
snipe ea83567e7d
Merge pull request #10494 from exula/fix/increase_max_licenses 
Fixed #7824
 2022-01-10 15:04:47 -08:00
snipe d9624b59b4
Merge pull request #10264 from nuraeil/added-localized-strings 
Added #10242: Improved localized strings
 2022-01-10 14:48:52 -08:00
Brad 81084fa717 Fixed #7824 
Previously there was a 999 max seats on Licenses as anything above that seemed to cause slowdowns and failure.

This commit allievates those pain points

- removed freeSeats as a hydrated Eloquent model on JSON requests for the licenses index
- removed 'licenseSeats.user', 'licenseSeats.asset' from the 'with' clause as it's not needed in the view (Datatabales takes care of that)
- removed the 999 max seats limit from the License Model,
- reworked how new license seats are created when increasing seats or creating licenses
- Added an index the license_seats table to help speed up lookups
 2022-01-10 14:03:28 -05:00
Wächtler, Yannick 04d649122b Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO 2022-01-06 12:35:37 +01:00
Haxatron bb095641c2
Update BulkAssetModelsController.php 
https://huntr.dev/bounties/efdf2ead-f9d1-4767-9f02-d11f762d15e7
 2022-01-06 09:50:11 +08:00
snipe 884b6b0270 Fixes format property on invalid custom field object 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-03 19:14:50 -08:00
Brady Wetherington 95c30cae8d Some duplicate imports at the top of the Settings file 2022-01-03 13:53:53 -08:00
Brady Wetherington 3c7f2e89ec Merge branch 'develop' into remove_old_ldap 
Had to re-do the composer install because the conflicts were too complicated.
 2022-01-03 12:56:58 -08:00
snipe 2ee84c2675 Added a few more comments 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-30 18:33:28 -08:00
snipe c6ce928567 Added allow list to modal view options 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-30 18:16:49 -08:00
snipe b4fac3e4ae Fixed missing index for fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-30 13:16:44 -08:00
snipe bad6b862ca assets_count doesnt exist as a column 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-30 12:59:16 -08:00
Alex Janes d0bfd8dfd2 Fixed the collection of the groups total to GroupsTransformer.php. Groups page should now paginate correctly. 2021-12-23 20:54:34 -05:00
Alex Janes 7acb559069 corrected issue with asset not found errors 2021-12-20 19:55:00 -05:00
Alex Janes 2b5aca183c removed unnecessary additional data call from api method 2021-12-19 19:21:58 -05:00
Alex Janes 14b21a6e95 removed some whitespace 2021-12-19 19:17:32 -05:00
Alex Janes 08cb8c354b more cleanup to fit formatting convention 2021-12-19 19:11:24 -05:00
Alex Janes 29da4f4325 Removed a bunch of redundant code I created from the API 2021-12-19 18:39:57 -05:00
Alex Janes bc4fe88ac0 First version of bulk checkin 2021-12-19 16:53:31 -05:00
Alex Janes a68ec8bb57
Update LoginController.php 
Updated if statements to match convention exactly.
 2021-12-17 18:52:42 -05:00
Alex Janes 74de91c31a
Merge pull request #1 from snipe/develop 
Develop
 2021-12-17 14:51:03 -05:00
snipe 9b2dd6522f Switch GET to POST for asset request 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-16 20:36:08 -08:00
Alex Janes d99db5c63b bug fix and formatting fix 2021-12-16 19:04:37 -05:00
snipe 398180dc59 Small merge unmagling 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-16 14:38:04 -08:00
snipe c3d55ee27e Merge master down into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Exceptions/Handler.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Models/Setting.php
#	config/version.php
#	resources/lang/af/button.php
#	resources/lang/ar/button.php
#	resources/lang/bg/button.php
#	resources/lang/cs/button.php
#	resources/lang/cy/button.php
#	resources/lang/da/button.php
#	resources/lang/de/button.php
#	resources/lang/el/button.php
#	resources/lang/en-GB/button.php
#	resources/lang/en-ID/button.php
#	resources/lang/es-CO/admin/groups/message.php
#	resources/lang/es-MX/button.php
#	resources/lang/et/admin/custom_fields/general.php
#	resources/lang/et/admin/hardware/table.php
#	resources/lang/et/admin/kits/general.php
#	resources/lang/et/admin/manufacturers/message.php
#	resources/lang/et/admin/models/general.php
#	resources/lang/et/admin/settings/general.php
#	resources/lang/et/button.php
#	resources/lang/et/mail.php
#	resources/lang/fa/button.php
#	resources/lang/fa/help.php
#	resources/lang/fi/button.php
#	resources/lang/fil/button.php
#	resources/lang/fr/button.php
#	resources/lang/ga-IE/button.php
#	resources/lang/he/button.php
#	resources/lang/hr/button.php
#	resources/lang/hu/admin/settings/general.php
#	resources/lang/hu/auth/message.php
#	resources/lang/hu/button.php
#	resources/lang/hu/mail.php
#	resources/lang/id/admin/hardware/table.php
#	resources/lang/id/button.php
#	resources/lang/it/button.php
#	resources/lang/iu/button.php
#	resources/lang/ja/button.php
#	resources/lang/ko/button.php
#	resources/lang/lt/button.php
#	resources/lang/lv/button.php
#	resources/lang/mi/button.php
#	resources/lang/mk/button.php
#	resources/lang/ml-IN/button.php
#	resources/lang/mn/button.php
#	resources/lang/ms/admin/hardware/table.php
#	resources/lang/ms/admin/kits/general.php
#	resources/lang/ms/admin/models/general.php
#	resources/lang/ms/admin/models/message.php
#	resources/lang/ms/admin/settings/general.php
#	resources/lang/ms/button.php
#	resources/lang/nl/button.php
#	resources/lang/no/admin/hardware/table.php
#	resources/lang/no/admin/kits/general.php
#	resources/lang/no/admin/settings/general.php
#	resources/lang/no/auth/message.php
#	resources/lang/no/button.php
#	resources/lang/no/help.php
#	resources/lang/no/mail.php
#	resources/lang/pl/button.php
#	resources/lang/pt-BR/button.php
#	resources/lang/pt-PT/auth/message.php
#	resources/lang/pt-PT/button.php
#	resources/lang/pt-PT/mail.php
#	resources/lang/ro/button.php
#	resources/lang/ru/admin/settings/general.php
#	resources/lang/ru/button.php
#	resources/lang/ru/help.php
#	resources/lang/sl/admin/custom_fields/general.php
#	resources/lang/sl/admin/hardware/table.php
#	resources/lang/sl/admin/kits/general.php
#	resources/lang/sl/admin/manufacturers/message.php
#	resources/lang/sl/admin/models/general.php
#	resources/lang/sl/admin/settings/general.php
#	resources/lang/sl/admin/users/general.php
#	resources/lang/sl/auth/message.php
#	resources/lang/sl/button.php
#	resources/lang/sl/help.php
#	resources/lang/sr-CS/button.php
#	resources/lang/ta/button.php
#	resources/lang/th/button.php
#	resources/lang/th/mail.php
#	resources/lang/tl/button.php
#	resources/lang/tr/admin/settings/general.php
#	resources/lang/tr/auth/message.php
#	resources/lang/tr/button.php
#	resources/lang/uk/button.php
#	resources/lang/ur-PK/button.php
#	resources/lang/vi/button.php
#	resources/lang/zh-CN/button.php
#	resources/lang/zh-HK/button.php
#	resources/lang/zh-TW/admin/hardware/table.php
#	resources/lang/zh-TW/button.php
#	resources/lang/zu/button.php
#	resources/views/models/custom_fields_form.blade.php
#	resources/views/reports/custom.blade.php
#	resources/views/settings/slack.blade.php
 2021-12-16 14:26:24 -08:00
Alex Janes 6898119891 Replaced env() with config() to check environment variables 
Made the app.php description for 'REQUIRE_SAML' a bit more... descriptive.
 2021-12-16 16:56:39 -05:00
Alex Janes a6116a1b15 If SAML required, don't accept login form post. 2021-12-16 14:33:25 -05:00
Alex Janes 3c8d70c5fb Add option to environment to require SAML for a more secure installation. 2021-12-16 11:44:07 -05:00
Bradley Coudriet dbdc1c7f3f
Update SettingsController.php to save Slack Settings 
This goes with #10438 that I just submitted about Slack Settings not saving.

This adds the necessary code to actually save the Slack Settings,
As they are already validated by the SlackSettingsRequest, this seems like an easy and low-impact fix.
 2021-12-15 10:38:51 -05:00
Ivan Nieto Vivanco c80aa2a289 Add title column to custom reports 2021-12-14 12:05:33 -06:00
Ivan Nieto Vivanco 0037cdb00c Add title column to custom reports 2021-12-13 20:27:23 -06:00
snipe 25e2e7ecc6
Merge pull request #10418 from inietov/fixes/bulk_edit_count_more_users_than_selected 
Fixes bulk edit message counts more users than the actual selected users number
 2021-12-13 14:13:14 -08:00
snipe 9d5d1a9f9a Added escape to assigned_to API response 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-13 12:03:03 -08:00
Ivan Nieto Vivanco a419a690d4 Add a variable to better control the selected user's ids 2021-12-11 18:01:38 -06:00
Brady Wetherington ea71086dfc Yank assetlog from eager-load clause in API query for develop 2021-12-10 18:50:34 -08:00
Brady Wetherington acfb41f129 Remove 'actionlog' from the ::with() clause in the asset query API 2021-12-10 18:42:56 -08:00
Haxatron 1699c09758
Update AssetModelsController.php 2021-12-09 21:42:18 +08:00
Haxatron 918e7c8dae
Fix access control - https://huntr.dev/bounties/19453ef1-4d77-4cff-b7e8-1bc8f3af0862/ 2021-12-09 12:57:04 +08:00
snipe 86afe6c4b1 Cleanup slack validation 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 18:03:56 -08:00
snipe ff97b359ad Removed form request on ajax, cleaned up some other things 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 17:58:46 -08:00
snipe 8fa690b635 Reverting form request because it doesn't seem to work (????!!) 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 17:54:15 -08:00
snipe 8c1cd87831 Added slacksettingsrequest as use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 15:56:22 -08:00
snipe 80d36cd72b Added slack settings request 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 15:53:05 -08:00
snipe ebdbc20740 Adds stricter validation for slack endpoints 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-06 11:40:24 -08:00
snipe ff81e6d536
Merge pull request #10361 from snipe/fixes/xss_in_accessories_checkout_notes 
Escape notes in transformCheckedOutAccessory
 2021-11-24 19:56:36 -08:00
snipe 00fad35c2a Escape notes in transformCheckedOutAccessory 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-24 19:54:45 -08:00
snipe 3debe78574
Merge pull request #10350 from inietov/fixes/trim_custom_fields_names 
Apply trim() function when storing Custom Fields names
 2021-11-24 19:42:04 -08:00
snipe 29bbfad693 Applied escaping fix from master to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-24 19:38:27 -08:00
snipe 830d07f84f Removed escaping on input save for asset checkout on creation 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-24 19:19:32 -08:00
Ivan Nieto Vivanco 1ca770895a Apply trim() function when storing Custom Fields names 2021-11-22 18:43:21 -06:00
snipe bbb0d1be17 Possible fix for asset model editing when no custom fieldset is associated 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 21:09:35 -08:00
snipe f7b483358f Escape custom field values in API response 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 20:32:59 -08:00
snipe 476e17055b Escape custom fields in API response 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 20:31:01 -08:00
snipe 46d2f8a81d Disallow file upload to backups on demo 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 19:42:02 -08:00
snipe 92b7aaf44b Log the user out upon successful restore 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 19:40:01 -08:00
snipe f2f8f96991 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Importer/ConsumableImporter.php
#	app/Models/Consumable.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/layouts/default.blade.php
#	routes/web.php
#	routes/web/fields.php
 2021-11-15 19:24:38 -08:00
Brady Wetherington 864cc4f8d5 Fix FIXME's by downgrading them to TODO's :) 2021-11-10 11:37:10 -08:00
snipe 457c6080cc Better handling if there was no file uploaded 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 01:43:45 -08:00
snipe 96f76e1f6b INCOMPLETE: Added restore and upload methods for backups 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 00:07:17 -08:00
snipe 3b25093aeb Removed noisy debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-09 22:38:27 -08:00