Ivan Nieto Vivanco
|
570dd09dcd
|
Add validation to Accessories and Consumables to not let the user update the number of items to less than they already have checked out
|
2022-03-15 17:52:19 -06:00 |
|
Godfrey M
|
b2f7262cd2
|
adds table structure for asset history
|
2022-03-14 19:38:36 -07:00 |
|
Godfrey M
|
e1a6a2afc6
|
adds translation for accept_eula, a bit more logic on the Acceptance Controller that is not working yet
|
2022-03-10 12:15:50 -08:00 |
|
Godfrey M
|
59c583ac74
|
adds the ability to save eula pdfs to storage, still working on storing them in the DB and exposing them in the UI
|
2022-03-08 16:42:27 -08:00 |
|
snipe
|
3e2fe10480
|
Fixed getAssetBySerial
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-05 09:03:29 -08:00 |
|
snipe
|
2d7a8b5e15
|
Merge pull request #10776 from snipe/added_trim_to_email_and_username
Added trim to email and username
|
2022-03-04 11:57:33 -08:00 |
|
snipe
|
9a358087ec
|
Add remote user to bulk edit
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 06:47:23 -08:00 |
|
snipe
|
67134ca387
|
Do a trim() before inserting/updating
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 06:18:52 -08:00 |
|
snipe
|
0dfc27f56e
|
Added remote to allowed_columns for sorting
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 05:44:46 -08:00 |
|
snipe
|
43c1949092
|
Add remote option to user
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 05:35:26 -08:00 |
|
snipe
|
f840652395
|
Suppress errors for missing signatures
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 03:18:28 -08:00 |
|
snipe
|
67ed0d91c0
|
Handle file_get_contents more gracefully
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 02:54:37 -08:00 |
|
snipe
|
b876d0abb0
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .env.example
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Kernel.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Importer/AssetImporter.php
# app/Models/Accessory.php
# app/Models/Consumable.php
# app/Presenters/AccessoryPresenter.php
# app/Presenters/ComponentPresenter.php
# app/Presenters/ConsumablePresenter.php
# app/Providers/AuthServiceProvider.php
# composer.json
# composer.lock
# config/app.php
# config/cors.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/build/app.js.LICENSE.txt
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/accessories/view.blade.php
# resources/views/consumables/view.blade.php
# resources/views/settings/saml.blade.php
# routes/api.php
|
2022-03-03 21:59:38 -08:00 |
|
snipe
|
9acb5413f6
|
Added notes field to controllers
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 20:29:25 -08:00 |
|
snipe
|
08a2fe4edb
|
Merge pull request #10773 from snipe/features/adds_ldap_import_and_assets_count_to_user_api
Features/adds ldap import and assets count to user api
|
2022-03-03 19:15:14 -08:00 |
|
snipe
|
6abe8f296b
|
We don’t need the users table here
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 19:12:03 -08:00 |
|
snipe
|
a53a67be4a
|
Added consumables, licenses, accessories count filters too
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 19:08:08 -08:00 |
|
snipe
|
b72cac3511
|
Adds ldap_import and assets_count filter to user API endpoint
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 19:03:35 -08:00 |
|
snipe
|
c940d36fff
|
Updated maintenance gate in API
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 18:49:54 -08:00 |
|
snipe
|
cd12028845
|
Use “update” instead of edit in gate
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 18:47:20 -08:00 |
|
snipe
|
3339a691e1
|
Merge pull request #10721 from snipe/features/adds_users_consumables_endpoint
Added consumables endpoint to user API
|
2022-03-02 14:33:45 -08:00 |
|
Ivan Nieto Vivanco
|
0df9dd8320
|
Delete a function that is not longer used
|
2022-03-01 18:59:50 -06:00 |
|
Godfrey M
|
533670f3f1
|
faulty method for converting asset acceptance to pdf
|
2022-02-24 14:50:16 -08:00 |
|
snipe
|
42fcd29200
|
Fixed #10436 on master, applies #10449
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-22 21:06:54 -08:00 |
|
snipe
|
dc2e6c2b06
|
Adds consumables endpoint to user API
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-22 20:44:34 -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
|
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
|
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 |
|
Dampfklon
|
0d49fc3a2e
|
remove unused route, controller functions and view
|
2022-02-13 12:10:19 +01: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 |
|