snipe
|
1f7ae08d76
|
Merge branch 'develop' into features/make_eol_sortable
|
2023-02-28 18:05:09 -08:00 |
|
|
snipe
|
0c3115553e
|
Merge branch 'develop' into vip_tag
|
2023-02-21 20:03:49 -08:00 |
|
|
snipe
|
590cb6a15b
|
Removed unneeded concat
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-06 12:40:09 -08:00 |
|
|
snipe
|
d9cdb92014
|
Merge branch 'develop' into vip_tag
|
2023-02-01 16:03:23 -08:00 |
|
akemidx
|
b363524305
|
vipuser label updated to vip
|
2023-01-25 15:58:44 -05:00 |
|
|
akemidx
|
596846a94a
|
Add VIP Checkbox
|
2023-01-24 15:29:27 -05:00 |
|
|
snipe
|
cad76f671a
|
Added asset_eol_date to blade
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-22 00:55:42 -08:00 |
|
|
snipe
|
46e3e8a3dd
|
Added new users_count field to API
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 14:39:53 -08:00 |
|
|
snipe
|
acd182e3d2
|
Added byod to presenter with boolean formatter
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-18 13:10:30 -08:00 |
|
|
snipe
|
c3e4d9d773
|
Make column name consistent with field name (BREAKING)
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-17 18:27:47 -08:00 |
|
|
snipe
|
f4630d67be
|
Added catergories to default visiable set
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-15 17:07:50 -08:00 |
|
|
snipe
|
c432fb9d70
|
Merge pull request #12181 from Godmartinz/gh12163_asset_age
Adds asset age to asset index and asset view pages
|
2022-12-13 10:28:17 -08:00 |
|
Godfrey M
|
8d861cfd82
|
adds age to the asset table
|
2022-11-28 10:59:18 -08:00 |
|
Robert-Azelis
|
c2cfd8ff53
|
Update CategoryPresenter.php
|
2022-11-23 19:00:08 +01:00 |
|
|
Robert-Azelis
|
20ad4fb681
|
Update CategoryPresenter.php
Fix snipe#12153
|
2022-11-23 18:42:38 +01:00 |
|
Instead of looking elsewhere, it is better to come here together
|
2fc7a15372
|
Fixed: #12109
|
2022-11-16 18:22:11 +08:00 |
|
|
snipe
|
12c7223bcd
|
Renamed column back to assets_count for legacy
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-26 09:39:03 -07:00 |
|
|
snipe
|
e670ffe349
|
Added Assets Assigned to tab
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-26 00:16:06 -07:00 |
|
|
snipe
|
bdfac1a345
|
Added start/end to the users API
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-05 16:58:37 -07:00 |
|
|
snipe
|
9cf5f30c77
|
Set safeMode to true and use helper for all parsedown
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-29 11:26:47 -07:00 |
|
|
snipe
|
87bed9b294
|
Fixed typo in code comments
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-02 19:24:46 -07:00 |
|
|
snipe
|
ac72b69ece
|
Update method name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-02 19:12:28 -07:00 |
|
|
snipe
|
8e18ce74b2
|
Update method name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-02 19:12:18 -07:00 |
|
|
snipe
|
4edba064d5
|
Removed duplicate model column in depreciation report
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 18:17:30 -07:00 |
|
|
snipe
|
baad3b9d58
|
Only care about the converted name when updating the custom field itself
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-27 14:17:07 -07:00 |
|
|
snipe
|
86d2c2b153
|
Small naming changes
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 19:11:59 -07:00 |
|
|
snipe
|
9c9f5be6fe
|
Do not show the creating admin by default in list view
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 17:28:34 -07:00 |
|
|
snipe
|
2e5e8f363b
|
Added admin to oresenter
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 17:18:04 -07:00 |
|
|
snipe
|
8333c80b7a
|
Added address2 to column selector for locations listing
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-06 19:31:08 -07:00 |
|
|
snipe
|
780222d372
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# resources/views/users/print.blade.php
|
2022-05-10 17:26:26 -07:00 |
|
|
snipe
|
dc8669121d
|
Added license seat ID to the UI
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-09 10:59:06 -07:00 |
|
|
snipe
|
adc017db23
|
Added checkbox to audit listing
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:16:13 -07:00 |
|
|
snipe
|
43c1949092
|
Add remote option to user
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 05:35:26 -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
|
94dded3785
|
Added notes field to presenters for table view show/hide columns
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 20:30:07 -08: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 |
|
Matthew Nickson
|
9381ba2404
|
Merge branch 'develop' into sum_cost_by_quantity
|
2021-11-21 18:59:34 +00:00 |
|
|
snipe
|
c49c5f4164
|
Added text-right to presenters for money values
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-18 15:09:17 -08: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 |
|
|
Matthew Nickson
|
8996c24d1f
|
Merge branch 'develop' into sum_cost_by_quantity
|
2021-10-10 13:01:44 +01:00 |
|
|
snipe
|
7e41c74cc3
|
Updated more fa icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-26 01:11:08 -07:00 |
|
|
snipe
|
67d898e897
|
Updated map icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 14:30:36 -07:00 |
|
|
snipe
|
e03d7b7016
|
More fa icon updates
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 13:07:02 -07:00 |
|
|
snipe
|
ad6f073c82
|
Few more icon updates
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 06:38:23 -07:00 |
|
|
snipe
|
dbe93d91cd
|
Updated fontawesome icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 06:07:46 -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
|
b4a90045e6
|
Added totals to depreciation report footer
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 21:52:18 -07:00 |
|
|
snipe
|
514f9aa64a
|
Fixed #9973 - add use_default_eula to categories API endpoint
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-10 20:23:49 -07:00 |
|
|
snipe
|
94310e18b1
|
Presenters and Transformers for Depreciation report
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-01 17:33:59 -07:00 |
|
|
snipe
|
cce808c784
|
Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]
Duplicates d4e46ee41f but on v5
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-17 21:59:33 -07:00 |
|