bb095641c2
Update BulkAssetModelsController.php
...
https://huntr.dev/bounties/efdf2ead-f9d1-4767-9f02-d11f762d15e7
2022-01-06 09:50:11 +08:00
884b6b0270
Fixes format property on invalid custom field object
...
Signed-off-by: snipe <snipe@snipe.net >
2022-01-03 19:14:50 -08:00
95c30cae8d
Some duplicate imports at the top of the Settings file
2022-01-03 13:53:53 -08:00
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
2ee84c2675
Added a few more comments
...
Signed-off-by: snipe <snipe@snipe.net >
2021-12-30 18:33:28 -08:00
c6ce928567
Added allow list to modal view options
...
Signed-off-by: snipe <snipe@snipe.net >
2021-12-30 18:16:49 -08:00
b4fac3e4ae
Fixed missing index for fieldsets
...
Signed-off-by: snipe <snipe@snipe.net >
2021-12-30 13:16:44 -08:00
bad6b862ca
assets_count doesnt exist as a column
...
Signed-off-by: snipe <snipe@snipe.net >
2021-12-30 12:59:16 -08:00
7acb559069
corrected issue with asset not found errors
2021-12-20 19:55:00 -05:00
2b5aca183c
removed unnecessary additional data call from api method
2021-12-19 19:21:58 -05:00
14b21a6e95
removed some whitespace
2021-12-19 19:17:32 -05:00
08cb8c354b
more cleanup to fit formatting convention
2021-12-19 19:11:24 -05:00
29da4f4325
Removed a bunch of redundant code I created from the API
2021-12-19 18:39:57 -05:00
bc4fe88ac0
First version of bulk checkin
2021-12-19 16:53:31 -05:00
a68ec8bb57
Update LoginController.php
...
Updated if statements to match convention exactly.
2021-12-17 18:52:42 -05:00
74de91c31a
Merge pull request #1 from snipe/develop
...
Develop
2021-12-17 14:51:03 -05:00
9b2dd6522f
Switch GET to POST for asset request
...
Signed-off-by: snipe <snipe@snipe.net >
2021-12-16 20:36:08 -08:00
d99db5c63b
bug fix and formatting fix
2021-12-16 19:04:37 -05:00
398180dc59
Small merge unmagling
...
Signed-off-by: snipe <snipe@snipe.net >
2021-12-16 14:38:04 -08:00
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
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
a6116a1b15
If SAML required, don't accept login form post.
2021-12-16 14:33:25 -05:00
3c8d70c5fb
Add option to environment to require SAML for a more secure installation.
2021-12-16 11:44:07 -05:00
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
c80aa2a289
Add title column to custom reports
2021-12-14 12:05:33 -06:00
0037cdb00c
Add title column to custom reports
2021-12-13 20:27:23 -06:00
a419a690d4
Add a variable to better control the selected user's ids
2021-12-11 18:01:38 -06:00
ea71086dfc
Yank assetlog from eager-load clause in API query for develop
2021-12-10 18:50:34 -08:00
acfb41f129
Remove 'actionlog' from the ::with() clause in the asset query API
2021-12-10 18:42:56 -08:00
1699c09758
Update AssetModelsController.php
2021-12-09 21:42:18 +08:00
918e7c8dae
Fix access control - https://huntr.dev/bounties/19453ef1-4d77-4cff-b7e8-1bc8f3af0862/
2021-12-09 12:57:04 +08:00
86afe6c4b1
Cleanup slack validation
...
Signed-off-by: snipe <snipe@snipe.net >
2021-12-08 18:03:56 -08:00
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
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
8c1cd87831
Added slacksettingsrequest as use statement
...
Signed-off-by: snipe <snipe@snipe.net >
2021-12-08 15:56:22 -08:00
ebdbc20740
Adds stricter validation for slack endpoints
...
Signed-off-by: snipe <snipe@snipe.net >
2021-12-06 11:40:24 -08:00
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
29bbfad693
Applied escaping fix from master to develop
...
Signed-off-by: snipe <snipe@snipe.net >
2021-11-24 19:38:27 -08:00
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
1ca770895a
Apply trim() function when storing Custom Fields names
2021-11-22 18:43:21 -06:00
46d2f8a81d
Disallow file upload to backups on demo
...
Signed-off-by: snipe <snipe@snipe.net >
2021-11-15 19:42:02 -08:00
92b7aaf44b
Log the user out upon successful restore
...
Signed-off-by: snipe <snipe@snipe.net >
2021-11-15 19:40:01 -08:00
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
864cc4f8d5
Fix FIXME's by downgrading them to TODO's :)
2021-11-10 11:37:10 -08:00
457c6080cc
Better handling if there was no file uploaded
...
Signed-off-by: snipe <snipe@snipe.net >
2021-11-10 01:43:45 -08:00
96f76e1f6b
INCOMPLETE: Added restore and upload methods for backups
...
Signed-off-by: snipe <snipe@snipe.net >
2021-11-10 00:07:17 -08:00
1b1b54fbf4
Add modified_value and modified_display so we can use the formatted date but still sort correctly
...
Signed-off-by: snipe <snipe@snipe.net >
2021-11-09 22:37:49 -08:00
0e21a95817
Escape error message in asset autdit apI (same as in v5)
...
Signed-off-by: snipe <snipe@snipe.net >
2021-11-09 19:39:32 -08:00
91f087258b
Merge branch 'develop' into remove_old_ldap
2021-11-09 18:33:41 -08:00
3ea209a507
Escape asset_tag attribute at controller level for consumption in bulk checkout
2021-11-08 20:27:43 -08:00
Haxatron