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
|
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 |
|
|
snipe
|
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 |
|
|
snipe
|
ea0d92c439
|
Merge branch 'develop' into fixes/fmcs_departments
|
2021-10-28 18:18:08 -07:00 |
|
|
snipe
|
d36849bd41
|
Merge branch 'develop' into feature/remove_deleted_user_from_unaccepted_assets_report
|
2021-10-28 18:11:03 -07:00 |
|
|
snipe
|
645529ba78
|
Merge pull request #9889 from ncareau/api-licenses
Add licenses api parameters and fix a missing variable in license view.
|
2021-10-28 17:20:09 -07:00 |
|
|
snipe
|
3088230236
|
Merge pull request #10209 from Godmartinz/feature/sc-1474/sync-parent-asset-location-with-children-assets
Fixes Bug: When parent asset is assigned to other location, children assets loca…
|
2021-10-28 16:49:44 -07:00 |
|
|
snipe
|
1895dd326f
|
Merge pull request #10245 from Sxderp/pr-support-appache-rewrite-redirect-headers-for-remote-user
support apache REDIRECT_* for remote user login
|
2021-10-28 16:34:57 -07:00 |
|
|
snipe
|
52ef9280ba
|
Adds reqestable as model bulk edit field
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-28 15:15:54 -07:00 |
|
Steven Daniele
|
efc644c960
|
support apache REDIRECT_* for remote user login
|
2021-10-28 14:23:38 -04:00 |
|
Ivan Nieto Vivanco
|
9eaf89aaa7
|
Add a variable to better control the selected user's ids
|
2021-10-21 13:28:58 -05:00 |
|
|
snipe
|
6e0f8068b2
|
Fixed duplicate use statement from merge fuckery
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-20 17:54:32 -07:00 |
|
|
snipe
|
9ee13f0d2a
|
Fixed dupe use statement from merge fuckery
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-20 17:53:43 -07:00 |
|
|
snipe
|
aa8f1378c9
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Http/Controllers/Accessories/AccessoriesController.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Assets/BulkAssetsController.php
# app/Http/Controllers/Components/ComponentsController.php
# app/Http/Controllers/Consumables/ConsumablesController.php
# app/Http/Controllers/Licenses/LicenseFilesController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/UserFilesController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Http/Transformers/LicensesTransformer.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# config/app.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/en/admin/users/message.php
# resources/lang/is/button.php
# resources/lang/ja/admin/kits/general.php
# resources/lang/ro/admin/users/general.php
# resources/lang/zh-HK/admin/depreciations/general.php
# resources/lang/zh-HK/admin/models/general.php
# resources/views/hardware/qr-view.blade.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/users/view.blade.php
# routes/web.php
# routes/web/hardware.php
# routes/web/models.php
# routes/web/users.php
|
2021-10-20 17:26:41 -07:00 |
|
Godfrey M
|
9ae7d0b23a
|
when parent asset is assigned to other location, children assets location are updated as well.
|
2021-10-20 17:01:25 -07:00 |
|
|
snipe
|
5d94b99035
|
Switched to 5 in one minute
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-08 15:53:32 -07:00 |
|
|
snipe
|
0674ef5a3d
|
Fixed number to 1 (for minutes)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-08 15:43:32 -07:00 |
|
|
snipe
|
702791210e
|
Throttle password reset requests to 5 every 60 seconds
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-08 14:26:30 -07:00 |
|
Dampfklon
|
7645f23f5c
|
remove pending Acceptances on checkin
|
2021-10-07 21:03:46 +02:00 |
|
|
Dampfklon
|
4418ad2340
|
Enable display of deleted acceptances, strike deleted users, add date, enable sorting
|
2021-10-07 21:03:46 +02:00 |
|
|
Dampfklon
|
12ee06deb6
|
add Download All Button, change route analogue to activity report
|
2021-10-07 21:01:50 +02:00 |
|
|
Dampfklon
|
9a9ca59544
|
Fix decprecated implode usage
|
2021-10-07 20:55:47 +02:00 |
|
|
Dampfklon
|
ed99532c30
|
Unaccepted Assets Report Actions (send reminder, delete) added
Unaccepted Assets Export fixed
|
2021-10-07 20:53:02 +02:00 |
|
|
snipe
|
ccd430ce07
|
Switched back down to debug level
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-06 12:38:21 -07:00 |
|
|
snipe
|
f306401e7e
|
Fixed SVG XSS vuln
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-06 12:26:45 -07:00 |
|
|
snipe
|
34eab88b7e
|
Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-04 20:25:31 -07:00 |
|
|
snipe
|
b20c841a89
|
Fixed asset models restore
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-04 19:29:13 -07:00 |
|
|
snipe
|
52ea172e5d
|
Fix ID array
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-04 17:18:07 -07:00 |
|
Brady Wetherington
|
f3338667c7
|
Create new ParseCurrency helper and use it in the appropriate controllers
|
2021-09-28 18:20:39 -07:00 |
|
|
Brady Wetherington
|
f380da3f19
|
Try to ensure all currency output is formatted correctly.
|
2021-09-28 16:45:47 -07:00 |
|
NMC
|
c680977791
|
Merge branch 'develop' into api-licenses
|
2021-09-27 15:02:51 -04:00 |
|
|
snipe
|
d88c0ae5ec
|
Merge pull request #10103 from snipe/fixes/make_boolean_fields_nullable
Fixed issue when creating a status label via API - default_label and show_in_nav being not nullable
|
2021-09-26 13:41:52 -07:00 |
|
|
snipe
|
2f9582ee5c
|
Switched to loadMissing for performance
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-23 17:31:19 -07:00 |
|
|
snipe
|
3b7ce0091c
|
Load components in the assets API if components=true in API request
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-23 17:23:53 -07:00 |
|
|
snipe
|
3862b6476b
|
Merge pull request #10122 from inietov/fixes/api_issue_when_component_checkout
Fixes API Issue when checking out a component
|
2021-09-23 13:21:48 -07:00 |
|
|
Ivan Nieto Vivanco
|
7dfab3a6e2
|
Change the condition to 'bigger or equal' instead of just 'bigger than' in ComponentsController checkout api
|
2021-09-23 15:02:39 -05:00 |
|
|
snipe
|
a6b3aa5f04
|
Don't try to delete the file if there is no log entry
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-22 19:04:25 -07:00 |
|
|
snipe
|
61cf9ec009
|
Small conflict handling bits
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-22 00:00:44 -07:00 |
|
|
snipe
|
e27065fe16
|
Merge branch 'develop-v6-integration' into develop-v6-rc1
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/ResetDemoSettings.php
# app/Helpers/Helper.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/ComponentsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/DepreciationsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Requests/ImageUploadRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Http/Transformers/DepreciationsTransformer.php
# app/Listeners/CheckoutableListener.php
# app/Models/Accessory.php
# app/Models/Asset.php
# app/Models/Company.php
# app/Models/Ldap.php
# app/Models/User.php
# app/Presenters/AssetPresenter.php
# app/Presenters/CategoryPresenter.php
# composer.json
# composer.lock
# config/version.php
# database/factories/AssetModelFactory.php
# database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
# database/seeds/AssetModelSeeder.php
# package-lock.json
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/js/vue.js
# resources/lang/af/validation.php
# resources/lang/ar/admin/settings/general.php
# resources/lang/ar/validation.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/bg/validation.php
# resources/lang/cs/admin/settings/general.php
# resources/lang/cs/validation.php
# resources/lang/cy/help.php
# resources/lang/cy/validation.php
# resources/lang/da/admin/settings/general.php
# resources/lang/da/validation.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/validation.php
# resources/lang/el/validation.php
# resources/lang/en-GB/admin/settings/general.php
# resources/lang/en-GB/validation.php
# resources/lang/en-ID/admin/hardware/table.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/validation.php
# resources/lang/es-CO/admin/settings/general.php
# resources/lang/es-CO/auth/message.php
# resources/lang/es-CO/button.php
# resources/lang/es-CO/help.php
# resources/lang/es-CO/validation.php
# resources/lang/es-ES/admin/settings/general.php
# resources/lang/es-ES/auth/message.php
# resources/lang/es-ES/button.php
# resources/lang/es-ES/help.php
# resources/lang/es-ES/validation.php
# resources/lang/es-MX/admin/settings/general.php
# resources/lang/es-MX/validation.php
# resources/lang/es-VE/admin/settings/general.php
# resources/lang/es-VE/auth/message.php
# resources/lang/es-VE/button.php
# resources/lang/es-VE/help.php
# resources/lang/es-VE/validation.php
# resources/lang/et/validation.php
# resources/lang/fa/validation.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/fi/validation.php
# resources/lang/fil/validation.php
# resources/lang/fr/admin/settings/general.php
# resources/lang/fr/validation.php
# resources/lang/ga-IE/validation.php
# resources/lang/he/admin/settings/general.php
# resources/lang/he/general.php
# resources/lang/he/validation.php
# resources/lang/hr/validation.php
# resources/lang/hu/validation.php
# resources/lang/id/validation.php
# resources/lang/is/admin/categories/general.php
# resources/lang/is/admin/companies/message.php
# resources/lang/is/admin/companies/table.php
# resources/lang/is/admin/components/general.php
# resources/lang/is/admin/components/table.php
# resources/lang/is/admin/consumables/table.php
# resources/lang/is/admin/depreciations/general.php
# resources/lang/is/admin/depreciations/message.php
# resources/lang/is/admin/hardware/form.php
# resources/lang/is/admin/hardware/general.php
# resources/lang/is/admin/hardware/message.php
# resources/lang/is/admin/hardware/table.php
# resources/lang/is/admin/kits/general.php
# resources/lang/is/admin/licenses/form.php
# resources/lang/is/admin/licenses/general.php
# resources/lang/is/admin/locations/table.php
# resources/lang/is/admin/manufacturers/table.php
# resources/lang/is/admin/reports/message.php
# resources/lang/is/admin/settings/general.php
# resources/lang/is/admin/settings/message.php
# resources/lang/is/admin/statuslabels/message.php
# resources/lang/is/admin/suppliers/message.php
# resources/lang/is/admin/suppliers/table.php
# resources/lang/is/admin/users/table.php
# resources/lang/is/mail.php
# resources/lang/is/validation.php
# resources/lang/it/admin/settings/general.php
# resources/lang/it/validation.php
# resources/lang/iu/validation.php
# resources/lang/ja/mail.php
# resources/lang/ja/validation.php
# resources/lang/ko/validation.php
# resources/lang/lt/validation.php
# resources/lang/lv/validation.php
# resources/lang/mi/validation.php
# resources/lang/mk/validation.php
# resources/lang/ml-IN/validation.php
# resources/lang/mn/validation.php
# resources/lang/ms/validation.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/validation.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/validation.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/mail.php
# resources/lang/pt-BR/validation.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/validation.php
# resources/lang/ru/validation.php
# resources/lang/sl/validation.php
# resources/lang/sr-CS/admin/settings/general.php
# resources/lang/sr-CS/validation.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/sv-SE/auth/message.php
# resources/lang/sv-SE/button.php
# resources/lang/sv-SE/mail.php
# resources/lang/sv-SE/validation.php
# resources/lang/ta/validation.php
# resources/lang/th/validation.php
# resources/lang/tl/validation.php
# resources/lang/tr/mail.php
# resources/lang/tr/validation.php
# resources/lang/uk/admin/accessories/table.php
# resources/lang/uk/admin/asset_maintenances/message.php
# resources/lang/uk/admin/asset_maintenances/table.php
# resources/lang/uk/validation.php
# resources/lang/ur-PK/validation.php
# resources/lang/vi/admin/settings/general.php
# resources/lang/vi/validation.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/validation.php
# resources/lang/zh-HK/validation.php
# resources/lang/zh-TW/validation.php
# resources/lang/zu/validation.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# routes/api.php
|
2021-09-21 23:46:50 -07:00 |
|
|
snipe
|
0763c76a4e
|
Fixed scoping with leftjoin
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 20:54:24 -07:00 |
|
|
snipe
|
5d32c17a2e
|
Removed comments
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 20:01:36 -07:00 |
|
|
snipe
|
10ca7cffc3
|
Fixes for query scoping, ordering, and nicer readability
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 19:59:23 -07:00 |
|
|
snipe
|
61176335d7
|
Improved category_type with strtolower() to make it case insensitive
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 15:51:41 -07:00 |
|
Delta5
|
c8c3c7fbbd
|
Fixed issue with incorrect error message
|
2021-09-21 19:45:18 +00:00 |
|
|
Delta5
|
59302e1d19
|
Add restore to users api endpoint
|
2021-09-21 17:42:26 +00:00 |
|
|
snipe
|
b331bb33d9
|
Code fixes and a new migration
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 15:37:24 -07:00 |
|
|
snipe
|
8a93e1e796
|
Remove asset call on depreciation report controller method
We ajax this in now, so no need for it
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-15 13:49:53 -07:00 |
|
|
snipe
|
d96f877aa4
|
Default show_in_nav to 0
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-15 11:33:13 -07:00 |
|
|
snipe
|
80175cffdc
|
Fixed #9969 - added color, show_in_nav, and default_label to status labels API
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-10 20:44:49 -07:00 |
|
|
snipe
|
2f25eb598b
|
Allow the Assets API controller to handle depreciation reports
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-01 17:33:39 -07:00 |
|