snipe
|
4029efebfd
|
Merge pull request #13159 from Godmartinz/audit_image_bug
fixed audit log image not appearing
|
2023-06-22 21:11:39 +01:00 |
|
Godfrey M
|
fc86530c94
|
uses the trueFalseFormatter now
|
2023-06-13 09:10:42 -07:00 |
|
|
Godfrey M
|
6dd7181d09
|
fixed audit log image not appearing
|
2023-06-12 12:10:19 -07:00 |
|
|
Godfrey M
|
69325beddb
|
adds warranty confirmation to asset maintenance table
|
2023-06-12 11:03:32 -07:00 |
|
|
snipe
|
02cacf76c6
|
Additional multi-select options for custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-16 13:58:21 -07:00 |
|
|
snipe
|
c6eef86661
|
Fixed multiselect for companies
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 13:15:22 -07:00 |
|
|
snipe
|
23e3d18931
|
Used brackets for multiselect company
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 12:35:30 -07:00 |
|
|
snipe
|
9f39d71f16
|
Merge pull request #12831 from Godmartinz/adds_multi_select_to_custom_report
Added Multiselect of companies for custom reports
|
2023-05-10 11:36:21 -07:00 |
|
|
Godfrey M
|
0e1f50c226
|
adds checkout-range to jquery
|
2023-04-19 10:11:26 -07:00 |
|
|
Godfrey M
|
8a5612d1c9
|
fixes comment
|
2023-04-19 09:13:43 -07:00 |
|
|
Godfrey M
|
bdd1045272
|
adds a checkout range for custom asset reports
|
2023-04-19 09:11:44 -07:00 |
|
|
Godfrey M
|
b16c062485
|
fixes partial
|
2023-04-13 12:05:59 -07:00 |
|
|
Godfrey M
|
ab67d903b5
|
adds multi select to custom report for companies
|
2023-04-13 12:02:11 -07:00 |
|
|
snipe
|
9a3e727390
|
Updated other form fields to use new label class, fixed HTML for accessibility
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-03 22:38:56 -07:00 |
|
|
snipe
|
ecb11c3a12
|
Fixed #12682 - add default location to maintenance report
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-21 13:52:21 -07:00 |
|
Brady Wetherington
|
9b80e86306
|
Actually display name of company in Accessories Report
|
2023-03-01 11:34:30 -08:00 |
|
|
Brady Wetherington
|
c9f0f5fe8b
|
Change Accessories report to use server-side pagination from URL
|
2023-01-24 17:35:44 -08:00 |
|
|
Godfrey M
|
0a9fd0b867
|
adds serial to activity report page
|
2022-11-17 13:09:06 -08:00 |
|
|
snipe
|
637604dfaf
|
Fixed #8928 - add URL and ID to custom asset report
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 13:51:47 -07:00 |
|
|
snipe
|
975b4dee2f
|
Added deleted header
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-02 19:58:17 -07:00 |
|
|
snipe
|
9ae7c66b77
|
Fixed indenting
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-02 19:50:21 -07:00 |
|
|
snipe
|
77ab4ac1b5
|
Fixed labels on radio buttons in custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-02 19:48:41 -07:00 |
|
|
Godfrey M
|
ff080a2d8f
|
replace checkboxes with radiobuttons
|
2022-08-02 10:27:55 -07:00 |
|
|
Godfrey M
|
842dafefec
|
adds options to include Deleted assets to custom asset reports
|
2022-08-01 14:52:12 -07:00 |
|
|
snipe
|
f0a9de72b1
|
Use icheckbox formatting on BOM and archived checkboxes
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-18 12:12:22 -07:00 |
|
|
Godfrey M
|
75844c5942
|
adds a checkbox to exclude archived assets from custom reports
|
2022-07-11 09:56:58 -07:00 |
|
|
snipe
|
1ea667e709
|
Update views with additional data fields
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-05 21:03:56 -07:00 |
|
Ivan Nieto Vivanco
|
3e44f39f4d
|
Set the new File column as not visible by default
|
2022-05-25 19:19:25 -05:00 |
|
|
Ivan Nieto Vivanco
|
f208869aff
|
Add column to show filenames in Activity Report if the log action is 'uploaded'
|
2022-05-25 18:50:32 -05:00 |
|
|
snipe
|
9aac1cbba4
|
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/MoveUploadsToNewDisk.php
# app/Http/Controllers/ActionlogController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/BulkUsersController.php
# app/Http/Requests/AssetCheckoutRequest.php
# app/Importer/LicenseImporter.php
# app/Models/Actionlog.php
# app/Models/License.php
# app/Models/User.php
# app/Observers/AssetObserver.php
# composer.lock
# config/version.php
# database/factories/LicenseFactory.php
# database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
# database/migrations/2018_10_18_191228_add_kits_licenses_table.php
# database/migrations/2018_10_19_153910_add_kits_table.php
# database/migrations/2018_10_19_154013_add_kits_models_table.php
# database/migrations/2019_02_07_185953_add_kits_consumables_table.php
# database/migrations/2019_02_07_190030_add_kits_accessories_table.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/ar/general.php
# resources/lang/ar/passwords.php
# resources/lang/cs/general.php
# resources/lang/cs/passwords.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/fr/admin/custom_fields/general.php
# resources/lang/fr/admin/hardware/general.php
# resources/lang/fr/admin/locations/table.php
# resources/lang/fr/admin/settings/message.php
# resources/lang/hu/admin/custom_fields/general.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/general.php
# resources/lang/it/admin/settings/general.php
# resources/lang/nl/admin/custom_fields/general.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/sv-SE/passwords.php
# resources/lang/tr/general.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/reports/activity.blade.php
# resources/views/users/print.blade.php
|
2022-04-28 17:49:06 +01:00 |
|
|
snipe
|
01342ca266
|
Fixed activity report
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-05 22:58:25 +01:00 |
|
|
snipe
|
7941a88623
|
Merge pull request #10817 from dampfklon/fix-10810-unaccepted-assets
Fix #10810 unaccepted assets
|
2022-03-29 12:10:37 +01:00 |
|
Dampfklon
|
29e1d657e3
|
fix missed rename
|
2022-03-11 21:33:25 +01:00 |
|
|
Brady Wetherington
|
8d49d35463
|
Remove another data-toggle="table" - possibly the last one
|
2022-03-07 12:52:57 -08:00 |
|
|
Brady Wetherington
|
6f3e9033c2
|
One attempt to fix the 'datatable double-request' problem.
|
2022-03-07 12:52:57 -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 |
|
|
Wächtler, Yannick
|
2901525194
|
Merge branch 'snipe-develop' into added-localized-strings
|
2021-12-17 00:22:08 +01:00 |
|
|
snipe
|
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 |
|
|
Wächtler, Yannick
|
484b996879
|
fixed merge conflicts
|
2021-12-14 19:48:59 +01:00 |
|
|
Ivan Nieto Vivanco
|
c80aa2a289
|
Add title column to custom reports
|
2021-12-14 12:05:33 -06:00 |
|
|
Ivan Nieto Vivanco
|
0037cdb00c
|
Add title column to custom reports
|
2021-12-13 20:27:23 -06:00 |
|
|
snipe
|
e1bf3b50f4
|
Added model number to accessory report
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-10 15:09:29 -08:00 |
|
|
Wächtler, Yannick
|
6917d59185
|
Added localized strings for reports
|
2021-11-19 12:39:19 +01: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
|
ed99532c30
|
Unaccepted Assets Report Actions (send reminder, delete) added
Unaccepted Assets Export fixed
|
2021-10-07 20:53:02 +02:00 |
|
|
snipe
|
61f16f47a2
|
Use Helper alias
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-28 19:44:55 -07:00 |
|
|
snipe
|
7e41c74cc3
|
Updated more fa icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-26 01:11:08 -07:00 |
|
|
snipe
|
299ad681f7
|
More fa icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 07:21:30 -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 |
|