Brady Wetherington
|
294606fb0b
|
Move new CORS library to global middleware, the only place it works
|
2022-02-22 19:07:23 -08:00 |
|
snipe
|
dd5f812d88
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/FixDoubleEscape.php
# app/Console/Commands/LdapSync.php
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/CompaniesController.php
# app/Http/Controllers/Api/DepartmentsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Models/Loggable.php
# app/Providers/AuthServiceProvider.php
# config/version.php
# database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
# database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
# package-lock.json
# package.json
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
# resources/views/hardware/view.blade.php
|
2022-02-20 13:29:12 -08:00 |
|
Ivan Nieto Vivanco
|
23a6907975
|
Some minor stylistic changes
|
2022-02-17 18:05:06 -06:00 |
|
|
Ivan Nieto Vivanco
|
5b2a5ff124
|
Put the 'remember_token' column as null in the users table
|
2022-02-17 18:03:00 -06:00 |
|
|
Ivan Nieto Vivanco
|
548b172744
|
Logout every connected user
|
2022-02-17 18:00:24 -06:00 |
|
|
Ivan Nieto Vivanco
|
263893b3c6
|
Search logged in user that made the restore, if they doesn't exist in the restored system, add it again
|
2022-02-17 17:42:06 -06:00 |
|
|
Ivan Nieto Vivanco
|
811ca51c4f
|
Wipe database before restoration
|
2022-02-17 16:59:44 -06:00 |
|
|
snipe
|
d1b45a83b8
|
Blergh, one more linebreak
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-17 14:51:06 -08:00 |
|
|
snipe
|
01a8701a8c
|
Removed extra linebreaks
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-17 14:50:38 -08:00 |
|
|
snipe
|
67fe53e32a
|
Removed debugging, added comments
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-17 14:50:07 -08:00 |
|
|
snipe
|
7f6b8cc43d
|
Removed carbon, since we went with PHP's datetime instead
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-17 14:48:12 -08:00 |
|
|
snipe
|
5fe999eb02
|
Shored up the date math, updated the explanation
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-17 14:34:33 -08:00 |
|
|
snipe
|
ea429d650e
|
Initial audit date fix
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 20:19:38 -08:00 |
|
|
snipe
|
824eedf7c2
|
Added UI elements for is_unique
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 13:47:48 -08:00 |
|
|
snipe
|
a4a0aa5124
|
Removed debugging line
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 13:47:22 -08:00 |
|
|
snipe
|
4f89dfee49
|
Merge pull request #10679 from snipe/fixes/timing_attack_mitigation_for_forgot_password
Added usleep random to forgotten password method to mitigate timing attacks
|
2022-02-16 11:17:00 -07:00 |
|
|
snipe
|
017534bc07
|
Added deleted_at to license transformer
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 09:33:28 -08:00 |
|
|
snipe
|
5540069cce
|
Be more specific with deleted license point
Require this value to be "true" speciically to get the deleted list
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 09:14:04 -08:00 |
|
|
snipe
|
1ad56760ce
|
Adds delete endpoint for licenses
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 09:08:50 -08:00 |
|
|
snipe
|
f878e0ad66
|
Fixes 2FA cookie -> user issue
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-15 18:29:23 -08:00 |
|
|
snipe
|
178e440951
|
Added usleep :(
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-15 18:09:58 -08:00 |
|
|
snipe
|
cab4fa1687
|
Fixes some conceptual gates
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-14 15:42:23 -08:00 |
|
|
snipe
|
4804e5b3ab
|
Added Asset edit/delete gates to maintenances
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-14 15:34:06 -08:00 |
|
|
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 |
|