akemidx
37ce68af5b
once again fixing an apostrophe
2023-02-02 15:54:05 -05:00
akemidx
214a1af61a
apostrophe updates
2023-01-30 16:54:23 -05:00
akemidx
79d9cff22a
translations added for the hardware blades
2023-01-26 16:26:31 -05:00
snipe
4104d7260f
Include new eol date picker blade
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-22 00:55:31 -08:00
snipe
3587017591
Updated EOL date in view blade
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-22 00:55:19 -08:00
snipe
cfa342c81a
Updated HTML for “standard” image edit/delete
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 16:23:04 -08:00
Marcus Moore
0fa956403c
Fix row divider overflow
2023-01-19 14:16:28 -08:00
snipe
0c39c7a53d
Updated blades to add byod as a “status”
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:25:46 -08:00
snipe
fce620b54f
Added byod to blades
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:11:02 -08:00
snipe
e05764ac34
Truncate URL with ellipsis if too long
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-05 18:42:26 -08:00
snipe
ace73acba1
Merge pull request #12263 from Godmartinz/gh12211_label_padding_adjustment
...
Fixed: page-break and padding at the end of document for labels
2023-01-05 09:59:35 -08:00
Godfrey M
301c4fda6e
fixes conflicts
2023-01-05 09:55:25 -08:00
Godfrey M
38575e93e8
fixes the rules for adding page-break and padding at the end of document
2022-12-20 09:45:41 -08:00
snipe
389ec3a3cb
Merge pull request #12247 from Godmartinz/gh12225_serial_added_to_components
...
adds serial to components tab of assets
2022-12-13 12:57:50 -08:00
Godfrey M
6a72c344b7
removed the cuddlers
2022-12-13 12:32:30 -08:00
Godfrey M
4442b446b9
adds serial to components tab of assets
2022-12-13 10:30:37 -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
ec854ddc1d
adjusts the margin and padding for img barcode in labels
2022-12-07 14:52:23 -08:00
snipe
43acd3b488
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2022-12-07 13:11:17 -08:00
Godfrey M
078e7281cd
adds asset age to asset view
2022-11-28 10:45:58 -08:00
snipe
60d7128a5e
Replace error suppression with better logic
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-15 17:41:57 +00:00
snipe
236684ec92
Fixed model file image path/variable
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-03 14:12:49 -07:00
snipe
b503b672ba
Merge pull request #11951 from Godmartinz/AccessKey_shortcuts
...
adds shortcuts for listing, creating, and saving
2022-10-25 15:53:57 -07:00
Ivan Nieto Vivanco
ab0c5bcd9d
Add precision parameter to the diffForHumans() Carbon function to report
2022-10-12 12:16:13 -05:00
Godfrey M
4fa01350c3
adds shortcuts for listing, creating, and saving
2022-10-11 12:00:15 -07:00
snipe
9d93c72534
Use BS datepicker’s built in clear button
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-26 14:34:35 -07:00
snipe
62ad3fad1c
Remove DL button if file doesn’t exist
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-15 16:11:27 -07:00
snipe
eb1e287c15
Better handle missing files
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-15 16:08:13 -07:00
snipe
1885e73704
Ignore warning icon if no purchase date
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-15 15:42:47 -07:00
snipe
24910433a1
Fixed 500 when depreciation is set but no purchase_date
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-15 15:39:47 -07:00
snipe
72feaee6c0
Added Applecare lookup link if manufacturer is apple
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-14 19:43:48 -07:00
snipe
93428e1ed4
Increased colspan for checkboxes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-31 13:34:27 -07:00
David Sferruzza
f60ea9581d
Fixed #11742 : display correct file sizes when using S3(-like) storage
2022-08-28 12:07:14 +02:00
snipe
af34fc207c
Suppress error output if file doesn’t exist on server
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-24 13:47:56 -07:00
snipe
2c68ec927a
Use trans_choice for string
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-11 18:30:59 -07:00
snipe
a0ba33ed7c
Added checkboxes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-11 18:25:22 -07:00
snipe
da1c1dbdd9
Added warning icon
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:19:08 -07:00
snipe
56b6904564
Added time difference
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:13:02 -07:00
snipe
b035003546
Handled hardware route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 15:59:54 -07:00
snipe
33de45d8fb
Swirtched to conditionally adding the nbsp; that the table needs for proper layout if cell is empty
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-29 00:57:20 -07:00
snipe
723454b04d
Changed model file icon
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-07 16:17:35 -07:00
mikeroq
2781bd02b5
Add TODO to indicate future refactoring.
2022-07-05 18:02:37 -05:00
Mike Roquemore
1b45170ca3
Adds check if request has model_id, if so call fetchCustomFields on document ready
2022-07-01 20:15:11 -05:00
snipe
ed95adb45c
Show model files on hardware page
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 16:17:46 -07:00
snipe
4a3f56acf2
Removed old cooke stuff
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 16:35:54 -07:00
Brady Wetherington
34b4499178
Remember the state of the disclosure triangles in Assets
2022-06-27 12:57:19 -07:00
snipe
8f900fb4e1
More UI tweaks
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 12:15:11 -07:00
snipe
0909feaa6b
Few more UI tweaks
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 11:01:19 -07:00
snipe
7f18180105
Fixed toggle
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 10:26:37 -07:00
snipe
08525a3c20
Few more changes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 09:43:32 -07:00
snipe
d70b36750c
Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset
...
Fixes #8155 - improve the workflow during asset creation
2022-06-24 18:53:07 -07:00
snipe
a7a61a3620
Fixed #11351 - add link on asset view to order number
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-22 11:07:54 -07:00
snipe
a111482217
Use number_format on badges
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-15 14:59:06 -07:00
snipe
5fe1078013
Squashed commit of the following:
...
commit a011b07d99
Merge: b392ed269
6059e9e11
Author: snipe <snipe@snipe.net>
Date: Tue Jun 14 17:52:50 2022 -0700
Merge pull request #11315 from snipe/features/adds_fullscreen_option_to_tables
Added fullscreen option to tables
commit b392ed269b
Merge: 693043e64
e6d792bdf
Author: snipe <snipe@snipe.net>
Date: Tue Jun 14 17:52:41 2022 -0700
Merge pull request #11316 from snipe/fixes/smaller_padlock_on_table_header
Tweaked CSS for smaller padlock
commit 6059e9e119
Author: snipe <snipe@snipe.net>
Date: Tue Jun 14 17:49:00 2022 -0700
Added fullscreen option to tables
Signed-off-by: snipe <snipe@snipe.net>
commit e6d792bdf7
Author: snipe <snipe@snipe.net>
Date: Tue Jun 14 17:43:12 2022 -0700
Tweaked CSS for smaller padlock
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
2022-06-14 17:54:18 -07:00
Ivan Nieto Vivanco
d2fc27e21d
Add formatted date to EOL field in asset detailed view
2022-06-07 18:22:09 -05:00
snipe
1ea667e709
Update views with additional data fields
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:03:56 -07:00
snipe
4db9892f8c
Use partial in overdue audit screen
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:03:12 -07:00
Achmad Fienan Rahardianto
fe65de1207
implements cookie to maintain display preference
2022-06-01 11:54:05 +07:00
Ivan Nieto Vivanco
6d1de73cad
Fixes some html structure in the requested assets view
2022-05-24 14:06:05 -05:00
snipe
e34ea32a5e
Fixed translation styring reference
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-23 20:15:22 -07:00
snipe
8c64e7359a
Added signature column, removed stored_eula_file column
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
Brady Wetherington
e4b24e17f3
Improve comments because the logic is complicated and unintuitive
2022-05-18 16:06:39 -07:00
Brady Wetherington
981741062b
Try to intelligently overwrite fields with default values for custom field
2022-05-18 15:51:32 -07:00
Travers Carter
1fc0adf7b7
Fixed #11126 : don't entitise custom CSS on the labels view
2022-05-18 00:16:18 +10:00
snipe
5f1f6baee9
Fixed unrelated typo
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-14 10:19:12 -07:00
snipe
3a31104b5c
Fixed #11052 - add file sizes to upload displays
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 19:33:14 -07:00
snipe
418a797e7e
Use partial for asset bulk edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:20:29 -07:00
snipe
c64f34ebcc
Check the "do not change” radio button by default
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:14:31 -07:00
Achmad Fienan Rahardianto
dafe353050
Implements #8155 to improve the workflow during asset creation
...
- adding 2 options to hide optional information
2022-04-23 14:41:38 +07:00
Godfrey Martinez
fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf
2022-03-22 10:10:56 -07:00
snipe
760b78b584
Fixed #10819 - use full url for label barcodes
...
I don’t know when/why this would really be necessary, since it would be weird to call /hardware/123/label, but this fixes the broken barcodes
Signed-off-by: snipe <snipe@snipe.net>
2022-03-21 13:57:18 +00:00
snipe
42220cc566
Merge pull request #10809 from inietov/fixes/customfields_boolean_format_not_saving
...
Fixes Customfields with boolean format not saving [ch-9973]
2022-03-19 22:10:54 +00:00
Godfrey M
b2e78e3382
formats most of the pdf blade
2022-03-16 15:53:32 -07:00
Godfrey M
5fcc3c39f3
routes eula agreements for download correctly to the asset history
2022-03-16 11:56:56 -07:00
snipe
9db8bd782d
Merging master down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 18:02:07 +00:00
Godfrey M
6386fa1c5e
clean up
2022-03-16 09:54:10 -07: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
Ivan Nieto Vivanco
86bd90c564
Show icons in the asset view for boolean customfields
2022-03-09 21:46:19 -06:00
Ivan Nieto Vivanco
657cfddd3c
Add a condition to show customfields as the user wants in localization settings
2022-03-08 18:28:13 -06:00
Jens Maes
57e93e4e92
Fixes 10708: change size of fa-hdd to 2x
2022-02-24 11:05:40 +01:00
Jens Maes
c0893c44a3
Fixes 10708: Removed line heigt from manufacturer list item.
2022-02-24 10:29:39 +01: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
snipe
d406dc43c2
Check for valid user before trying to present the auditor name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-10 20:13:02 -08:00
snipe
2ce44bd4e6
Line break for easier debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-10 20:06:55 -08:00
Ivan Nieto Vivanco
413e44be2f
Add custom date to checkin actionlogs and show it in the history of the asset tab
2022-02-08 11:58:23 -06:00
Ivan Nieto Vivanco
d71aa859fc
Add custom date to checkin actionlogs and show it in the history of the asset tab
2022-02-08 11:43:24 -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
f206d4ed4e
Fixed double div in current purchase value
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-12 22:26:56 -08:00
Alex Janes
d2bb3e6377
Merge branch 'develop' into features/quickscan_checkin
2022-01-11 16:40:20 -05:00
Wächtler, Yannick
f906dbd81e
Added missed translation strings, fixed the column width for the date selector (too small in certain languages)
2022-01-10 09:21:23 +01: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
Alex Janes
ea93f82bde
added the notes field to allow users to quickly add notes to multiple checkins at once
2021-12-23 17:37:48 -05:00
Alex Janes
b01a4468c7
refactored from bulkcheckin to quickscancheckin
2021-12-20 23:27:36 -05:00
Alex Janes
55b8d080b9
more lang changes
2021-12-20 19:39:06 -05:00
Alex Janes
3841c3560b
changed a page title
2021-12-20 16:52:00 -05:00
Alex Janes
08cb8c354b
more cleanup to fit formatting convention
2021-12-19 19:11:24 -05:00
Alex Janes
29da4f4325
Removed a bunch of redundant code I created from the API
2021-12-19 18:39:57 -05:00
Alex Janes
bc4fe88ac0
First version of bulk checkin
2021-12-19 16:53:31 -05:00
Wächtler, Yannick
c16ade2d87
Added localized strings for hardware
2021-11-02 14:02:48 +01: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
snipe
dc3af7cc74
Resolved conflicts
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 20:39:24 -07:00
snipe
8bf09d9f89
Make form-based restore button on asset view
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 19:01:16 -07:00
snipe
3594ec9905
Handle bulk check and uncheck
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:58:16 -07:00
snipe
52caee2a9f
Handle checking and unchecking for bulk actions
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:18:26 -07:00
snipe
52ea172e5d
Fix ID array
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:18:07 -07:00
snipe
61f16f47a2
Use Helper alias
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-28 19:44:55 -07:00
Brady Wetherington
f380da3f19
Try to ensure all currency output is formatted correctly.
2021-09-28 16:45:47 -07:00
snipe
7e41c74cc3
Updated more fa icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-26 01:11:08 -07:00
snipe
65a6da5bd2
Added files tab back to assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-25 22:59:02 -07:00
snipe
e03d7b7016
More fa icon updates
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 13:07:02 -07:00
snipe
20e23c1248
Fixed 500 on wrong association
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 12:54:47 -07:00
snipe
decc771459
Starting to refactor the hardware page
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 12:05:48 -07:00
snipe
0d1bd5b470
Updated more fa icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 11:13:34 -07:00
snipe
299ad681f7
More fa icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 07:21:30 -07:00
snipe
dbe93d91cd
Updated fontawesome icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 06:07:46 -07:00
snipe
7f41bdf0b0
Use new striping on hardware page
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 02:17:57 -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
0d633ce618
Fixed issue where created_at date was not showing on uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-13 17:13:01 -07:00
snipe
923d2a79ae
Fixed weird layout on bulk audit [ch17146]
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-18 01:05:09 -07:00
Godfrey M
cef0e424e1
adds a Floor value for depreciation models
2021-08-16 18:14:10 -07:00
Ivan Nieto Vivanco
d2e94dfc1c
Added cookie option to assets Bootstrap Table to save the state of the table.
2021-07-08 14:05:40 -05:00
snipe
174d53aff9
Fixed #9729 - order number maxlength updated to 200
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 20:05:22 -07:00
snipe
1ea843248b
Fixed #9729 - bulk edit order number capped at 20
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 20:04:45 -07:00
snipe
76897f3a3a
Make label printing from asset page more consistent with normal UI
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-12 17:08:53 -07:00
tbrconnect
a29ef73346
Feature #3088 Print labels from asset detail page ( #9559 )
...
This PR adds a "Generate Label" button to the detail asset page as
described in #3088 .
Fixes #3088
Co-authored-by: tilmann.bitterberg <tilmann@tbrglobal.com>
2021-05-12 13:38:26 -07:00
Brady Wetherington
62199f6255
Manually re-add support for Label Logos in Labels ( #9552 )
2021-05-07 17:01:32 -07:00
aranar-pro
5127727730
Fixed #9424 : import history adds asset model to assigned user and respects checkin date ( #9350 )
...
* Fixed #9294 : Assets import history. Behaviour based on Checkin Date added, including assigning checked out items to users.
* Fixed #9294 : Fixed asset import history to respect checkin and update user with checked out items.
* Fixed #9294 : whitespace and comment cleanup for merge
* Fixed #9294 : Fixed asset import history to respect checkin and update user with checked out items.
2021-04-20 21:25:17 -07:00
Supapong Areeprasertkul
b28b245acc
Update labels.blade.php ( #8441 )
...
- Make the qr_size bigger when no barcode printed.
- BUG: Missing unit of font size for .qr-text class.
- Reduce padding-right to remove the additional space above text when print from Google Chrome. (I do not know the cause. I tried "box-sizing: border-box" without success.)
2021-04-20 14:52:17 -07:00
Godfrey Martinez
5fab1d6f0d
FIxes Sum of purchase cost of components not taking quantity into account in Asset View > Components tab ( #9424 )
...
* git commit -m
* added text
2021-04-14 10:19:40 -07:00
snipe
09887bdabd
Removed stray opening tag
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-05 21:54:31 -07:00
Godfrey Martinez
f9f8ce6df6
Auditing feature improvement Better mobile [ch14328] ( #9181 )
2021-04-05 21:53:19 -07:00
ThoBur
c40b8334fc
Update edit.blade.php ( #8876 )
...
Fix issue #8518
2021-02-03 11:59:05 -08:00
snipe
985193ffff
Fixed #9082 - allow deployable status type on checkout
2021-02-03 01:29:54 -08:00
Lucas Pleß
f3a7467235
Added today as default Date for checkout Form. ( #8938 )
2021-01-26 12:06:58 -08:00
snipe
380c6171b7
Check if the asset is deployed before prompting for an expected checkin date
2021-01-12 18:02:10 -08:00
snipe
d36d6b8e07
Added expected_checkout as editable field in asset edit
2021-01-12 16:48:49 -08:00
snipe
fbaf6e2494
Fixed #8747 - upload path for uploaded images
2020-11-16 16:39:02 -08:00
snipe
9db191f0b2
Fixes for #8732 - Flysystem paths, migrator script
2020-11-12 21:46:06 -08:00
snipe
6757df5a2d
Added Checkout Date Time to Asset Details Page [ch1418]
2020-11-10 01:02:08 -08:00
snipe
2263dae8f4
Fixed HTML
2020-10-23 04:07:55 -07:00
snipe
5d112be49a
Fixed #8585 - requested assets page blank
2020-10-22 20:08:33 -07:00
snipe
a6d0209e93
Fixed #8567 - don’t require model for custom report
2020-10-21 12:23:27 -07:00
snipe
002ca52c83
Standardize feature disabled messages in UI
2020-09-16 15:09:58 -07:00
Ivan Nieto
3fcd83c499
Fixes some errors in forms using the deprecated Input:: facade
2020-09-03 13:42:33 -05:00
snipe
9c8ca6af21
Squashed commit of the following:
...
commit e321aeabae
Merge: 8ec99ff43
37568ae9e
Author: snipe <snipe@snipe.net>
Date: Mon Aug 31 12:14:44 2020 -0700
Merge branch 'master' into integrations/2020-08-31-v5-rc
# Conflicts:
# .all-contributorsrc
# .nvmrc
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/UsersController.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/Loggable.php
# composer.json
# composer.lock
# config/version.php
# public/css/build/all.css
# public/css/dist/all.css
# public/css/skins/skin-contrast.css
# public/css/skins/skin-contrast.css.map
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
# resources/assets/less/overrides.less
# resources/macros/macros.php
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/labels.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# resources/views/modals/model.blade.php
# resources/views/modals/user.blade.php
# resources/views/users/index.blade.php
# routes/api.php
# routes/web/fields.php
# tests/unit/UserTest.php
commit 37568ae9ec
Merge: 01a832169
32ad9050c
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:49:37 2020 -0700
Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
commit 32ad9050cf
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:48:53 2020 -0700
Added google maps to CSP
commit 01a832169c
Merge: bcad49ce7
3c6883489
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:38:31 2020 -0700
Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist
Fixed #8335 - added assignedTo scope on status labels API call for assetlist
commit 3c6883489c
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:37:30 2020 -0700
Added assignedTo scope
commit bcad49ce79
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 16:10:22 2020 -0700
Try to better handle slack “too many requests” issue
commit b5acca89d7
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 16:02:15 2020 -0700
Check for admin for slack notifications
commit e52919cf1b
Merge: 714576be4
29f3a5c48
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:35:15 2020 -0700
Merge pull request #8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
commit 29f3a5c48f
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:27:40 2020 -0700
Use more verbose annotation for Auth::user if/else
commit 134e8e6fb9
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:25:07 2020 -0700
Moved user email nulling until after the save
commit 714576be45
Merge: b999c50a2
512899294
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Fri Aug 14 15:24:03 2020 -0700
Merge pull request #8328 from snipe/fix_deprecation_report
Fix deprecation report for customers with many active assets
commit 5128992940
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Fri Aug 14 15:03:03 2020 -0700
Fix deprecation report for customers with many active assets
commit 0291323502
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:57:58 2020 -0700
Use the user as the target
commit e0f6f9b839
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:43:37 2020 -0700
Artisan command to check in licenses from all users
commit f1a6308002
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:43:07 2020 -0700
Check for Auth::user before trying to log id (for cli)
commit b999c50a2e
Merge: 9ca20e496
e3906b245
Author: snipe <snipe@snipe.net>
Date: Wed Aug 12 12:37:47 2020 -0700
Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation
Looks great, thank you!
commit e3906b245c
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Aug 12 12:27:18 2020 -0700
added translation for admin/licenses/message.not_found
commit 9ca20e4964
Merge: e0644dbbf
456a74d88
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Tue Aug 11 17:33:19 2020 -0700
Merge pull request #8313 from snipe/improve_ldap_search_error_reporting
Improve ldap search error reporting
commit 456a74d88c
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Tue Aug 11 16:41:20 2020 -0700
De-merge out incorrectly merged files. Whoops!
commit 799c059070
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Tue Aug 11 16:21:18 2020 -0700
Add internationalized version of LDAP error message
commit c62d43a778
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Aug 10 17:04:17 2020 -0700
Improve Exception management in Artisan LDAP Sync method. Still need to localize this better
commit b725bd0fae
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Aug 10 17:23:04 2020 -0700
Add @PeterUpfold as a contributor
commit e0644dbbf6
Merge: 5b6925b00
004ecad05
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Mon Aug 10 17:22:31 2020 -0700
Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
commit 5b6925b00c
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 21:00:37 2020 -0700
Removed debugging :(
commit df17a859bf
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 20:59:54 2020 -0700
Changed modal IDs so manager creation modal works on user creation main page
commit 24c43056ba
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 20:58:28 2020 -0700
Moved pGenerator script to default layout footer
This fixes an issue where the password generator wouldn’t load in a modal in Chrome
commit 606b7e905d
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 17:02:33 2020 -0700
Small edits to PR template
Slight text changes to ask specifics about versions
commit d73ddad477
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 16:59:26 2020 -0700
Created a PR template
First draft of the PR guidelines template
commit 9a39cf721e
Merge: 7410b1683
8994f3e15
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 12:18:49 2020 -0700
Merge pull request #8258 from ballertv/features/consumable-api
This looks great, thank you!
commit 7410b16835
Merge: e955c983a
b09e7d19b
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Fri Jul 24 16:22:44 2020 -0700
Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4
Add new useraccountcontrol value for valid AD users
commit 8994f3e15e
Author: andres <andresgutierrez535@gmail.com>
Date: Wed Jul 22 19:57:06 2020 -0400
cleanup
commit d23f1a77ca
Author: andres <andresgutierrez535@gmail.com>
Date: Wed Jul 22 18:46:02 2020 -0400
implement checkout API
commit e955c983a3
Merge: 2fa17ac18
eed41e454
Author: snipe <snipe@snipe.net>
Date: Wed Jul 22 13:43:29 2020 -0700
Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer
Added address, city, state and country to importer and city to bulk editor
commit b09e7d19b3
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Wed Jul 22 13:32:16 2020 -0700
Add new useraccountcontrol value for valid AD users; document algorithm and values
commit 2fa17ac185
Merge: b90515437
3b1e46f72
Author: snipe <snipe@snipe.net>
Date: Wed Jul 22 12:06:31 2020 -0700
Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…
commit 3b1e46f72b
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Jul 22 11:25:57 2020 -0700
Update general.php
commit 0c1a1de2a2
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Jul 22 11:24:36 2020 -0700
Update general.php
fixed typo
commit 20c9ae5818
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 22 10:21:19 2020 -0700
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats
commit eed41e4549
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:57:32 2020 -0700
Moved address down further, fixed broken HTML
commit b750f4754f
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:49:54 2020 -0700
Added city to bulk user importer
commit c17a06792a
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:49:38 2020 -0700
Added address, city, state, country to user importer
commit 4f76cc6cfb
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:46:13 2020 -0700
I don’t actually know what this file is for
commit b905154373
Author: snipe <snipe@snipe.net>
Date: Mon Jul 20 14:29:32 2020 -0700
Fixed #8247 - added notes field to user details display
commit daf748e531
Author: snipe <snipe@snipe.net>
Date: Fri Jul 17 12:32:01 2020 -0700
Bumped hash
commit 799a93c46a
Author: snipe <snipe@snipe.net>
Date: Fri Jul 17 12:11:32 2020 -0700
Allow for email/username search on users
commit 34aa12e229
Merge: 81a633288
897757bd0
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 17:44:13 2020 -0700
Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create
Set location_id to rtd_location_id on asset creation
commit 897757bd04
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 17:43:44 2020 -0700
Removed added line for location
commit c7125c3937
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 16:34:39 2020 -0700
Set location_id to rtd_location_id on asset creation
commit 81a6332889
Author: snipe <snipe@snipe.net>
Date: Tue Jul 14 13:55:38 2020 -0700
Removed license ID from seats table cookie info
This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses
commit 6e563f6e4b
Merge: 5320f5c67
7f69ae953
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:54 2020 -0700
Merge branch 'master' of https://github.com/snipe/snipe-it
commit 5320f5c67c
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:45 2020 -0700
Disallow non-super users from editing their own permissions
commit 7f69ae953b
Merge: c79f8c1ba
17f6fbabf
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:00 2020 -0700
Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 17f6fbabfa
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Jul 13 21:12:03 2020 -0700
Switch to 'items' to maintain compatbility with other internal API's
commit c79f8c1baf
Merge: 12c92e30b
536401fe0
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 17:42:16 2020 -0700
Merge pull request #8207 from EDVLeer/patch-1
Update snipeit.sh
commit e7a820f7c9
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Jul 13 17:14:31 2020 -0700
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 12c92e30b7
Author: snipe <snipe@snipe.net>
Date: Fri Jul 10 16:21:27 2020 -0700
Show whether or not the user was imported via LDAP in the view page
commit fd10b755b0
Author: snipe <snipe@snipe.net>
Date: Fri Jul 10 11:30:01 2020 -0700
Removed the sr-only tag in table headers
It was breaking Bootstrap Tables column selector :(
commit dbbb7680d9
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 21:12:50 2020 -0700
A few more fixes for the cli
Do not check out a piece of software if it’s already been checked out to the user
commit cf0dd5bbad
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:43:13 2020 -0700
Small fixes for cli tool
commit 25e53d8c7f
Merge: ec6ed256f
89d433b41
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:27:01 2020 -0700
Merge pull request #8216 from snipe/features/checkout_license_to_all_users
Added CLI tool to checkout license to all users
commit 89d433b41a
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:26:02 2020 -0700
Removed duplicate seat call
commit e2570ada6f
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:04:05 2020 -0700
CLI tool to checkout a license to ALL users
commit 45afe725a1
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:03:47 2020 -0700
Only try to get the company if there is an auth’d user
(Needed for command line tools, where no Auth::user() is present)
commit 536401fe0f
Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com>
Date: Tue Jul 7 08:21:36 2020 +0200
Update snipeit.sh
Ubuntu 20.04
commit ec6ed256fb
Author: snipe <snipe@snipe.net>
Date: Mon Jul 6 18:45:43 2020 -0700
Bumped minor version
commit 2aaa7bed2d
Merge: 339bdddc3
cc9f1577a
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 18:37:41 2020 -0700
Merge pull request #8183 from snipe/features/merge_users
Added merge utility
commit cc9f1577a4
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 17:43:53 2020 -0700
Removed unused use directives
commit ab1fe8be0c
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 17:42:39 2020 -0700
Added merge utility
commit 339bdddc38
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 11:00:33 2020 -0700
Fix for Vue js not loading due to CSP :(
commit 35b9cf4b70
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 02:41:59 2020 -0700
Fixed missing db prefix on scopeDueOrOverdueForAudit
commit 7ccb41371e
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 01:09:39 2020 -0700
Removed unoptimized images directive
securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯
commit 2e60a457bf
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 01:07:00 2020 -0700
Dumb fix for feature-policy being dumb.
commit 2390d2160b
Merge: b42801f6a
00b051b8c
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 00:27:47 2020 -0700
Merge pull request #8164 from snipe/features/additional_security_headers
Additional security headers
commit 00b051b8c7
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 00:26:09 2020 -0700
Added a few more comments
commit 05b3a9ad7e
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 23:17:27 2020 -0700
Config variable for HSTS
commit 4fb880384f
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:37:14 2020 -0700
Changed comment
commit 43042ad841
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:35:59 2020 -0700
Consolidated ReferrerPolicy into new SecurityHeaders file
commit a716382ac4
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:33:37 2020 -0700
Removed CSP middleware (it’s added in the general header)
commit 36c8f7f4f1
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:31:01 2020 -0700
Additional security headers
commit b42801f6ae
Merge: de4934f21
946129f20
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:47:35 2020 -0700
Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector
Fixed weird padlock display in asset listing with encrypted custom fields
commit 946129f206
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:45:20 2020 -0700
Made quote style consistent
commit b941ef1e08
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:41:40 2020 -0700
Pulled CSS font awesome styles out of the blade and into overrides.css
commit d1aa11ec89
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:29:19 2020 -0700
Fix for weird padlock display in asset listing with encrypted custom fields
commit de4934f21d
Merge: af06e4205
b10076b01
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 17:28:38 2020 -0700
Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
commit b10076b015
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Jun 22 17:04:39 2020 -0700
corrected an error where font-size for labels were static in settings.
commit af06e42056
Author: snipe <snipe@snipe.net>
Date: Wed Jun 17 11:17:25 2020 -0700
Bumped version
commit 9a2440dc4b
Merge: beae8efb2
2ac1c1636
Author: snipe <snipe@snipe.net>
Date: Tue Jun 16 20:20:07 2020 -0700
Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid
Better handle the logic to determine if we should display the license checkout blade [ch13792]
commit 2ac1c1636c
Author: snipe <snipe@snipe.net>
Date: Tue Jun 16 16:12:57 2020 -0700
Better handle the logic to determine if we should display the license checkout blade
commit 004ecad059
Author: Peter Upfold <pgithub@upfold.org.uk>
Date: Wed Jun 3 08:59:50 2020 +0100
Force suppress deprecation warning on ldap_control_paged_result()
commit beae8efb21
Merge: d14ab7e3e
9839e5e56
Author: snipe <snipe@snipe.net>
Date: Wed May 27 23:01:33 2020 -0700
Merge pull request #8088 from Godmartinz/Label_Woes
Barcode resizing and text adjustment
commit 9839e5e566
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed May 27 12:27:40 2020 -0700
adjusted for all label text, removed local variable
commit d14ab7e3e1
Author: snipe <snipe@snipe.net>
Date: Wed May 27 00:22:44 2020 -0700
Porting change from #8053 to master
Signed-off-by: snipe <snipe@snipe.net>
commit e7f74d94c1
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:22:45 2020 -0700
Label_Woes
commit e97cf011b6
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:15:39 2020 -0700
Label_Woes
commit ed23505054
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:10:45 2020 -0700
Label_Woes
commit 001e721530
Merge: f88683766
8210da6e8
Author: snipe <snipe@snipe.net>
Date: Wed May 20 10:21:52 2020 -0700
Merge pull request #8063 from dmeltzer/backport-8092
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
commit 8210da6e82
Author: Daniel Meltzer <dmeltzer.devel@gmail.com>
Date: Wed May 20 10:29:27 2020 -0400
Fix Missing Category selection in Asset Model Modal dialog.
A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.
commit f88683766b
Author: snipe <snipe@snipe.net>
Date: Thu May 14 00:55:47 2020 -0700
Roll back previous change
Signed-off-by: snipe <snipe@snipe.net>
commit e4385c0f8c
Author: snipe <snipe@snipe.net>
Date: Thu May 14 00:48:30 2020 -0700
Fixes #8051 regression
Signed-off-by: snipe <snipe@snipe.net>
commit 0550fe0ffa
Author: snipe <snipe@snipe.net>
Date: Tue May 12 10:31:54 2020 -0700
Fix for session fixation vulnerability
Signed-off-by: snipe <snipe@snipe.net>
commit 7fb3a9b82c
Merge: 9a2ed804c
ecb1e87fe
Author: snipe <snipe@snipe.net>
Date: Mon May 11 22:41:36 2020 -0700
Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap
Added option to disable backup in import
commit ecb1e87fe6
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:45:15 2020 -0700
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
commit f43df5f041
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:44:46 2020 -0700
Fixed form label
Signed-off-by: snipe <snipe@snipe.net>
commit 95cc48e422
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:41:10 2020 -0700
Added option to disable backup in import
Signed-off-by: snipe <snipe@snipe.net>
commit 9a2ed804ca
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:28:42 2020 -0700
Fixed mismatched HTML header tags
Signed-off-by: snipe <snipe@snipe.net>
commit d20fad28e5
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:28:24 2020 -0700
Use more modern request helper
Signed-off-by: snipe <snipe@snipe.net>
commit ae813ddf75
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:11:16 2020 -0700
Add @alek13 as a contributor
commit bb42109c0c
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:10:45 2020 -0700
Added a clarifying comment
Signed-off-by: snipe <snipe@snipe.net>
commit f46ecf8ec0
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:20 2020 -0700
Updated composer lock
Signed-off-by: snipe <snipe@snipe.net>
commit b9e821c0e6
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:14 2020 -0700
Small fix for Group Functional Tests
Signed-off-by: snipe <snipe@snipe.net>
commit 9ee28c7513
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:02 2020 -0700
Switched to use info instead of danger on undeployable statuses
Signed-off-by: snipe <snipe@snipe.net>
commit 1a8ba06702
Merge: 0fd232e70
ee4d69b1c
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:53:32 2020 -0700
Merge branch 'master' of https://github.com/snipe/snipe-it
commit 0fd232e70d
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:53:24 2020 -0700
Fixed group functional test
(We had changed the minimum to 2 instead of 3)
Signed-off-by: snipe <snipe@snipe.net>
commit ee4d69b1c5
Merge: 31c535094
d1ad11194
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:52:45 2020 -0700
Merge pull request #8041 from alek13/patch-1
use supported package for slack
commit d1ad111949
Author: Alexander Chibrikin <alek13.me@gmail.com>
Date: Mon May 11 20:31:13 2020 +0300
use supported package for slack
see https://github.com/maknz/slack/issues/94
commit 31c5350941
Author: snipe <snipe@snipe.net>
Date: Fri May 1 01:05:48 2020 -0700
Fixed incorrect route for groups edit
Signed-off-by: snipe <snipe@snipe.net>
commit 7eb70e17e0
Merge: 5bb4f271a
3dfcb4699
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:50:37 2020 -0700
Merge pull request #7993 from snipe/fixes/7989_column_selector
Fixed #7989 - Converted table heading icons in People to CSS glyphs
commit 3dfcb46991
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:41:08 2020 -0700
Minor formatting changes
Signed-off-by: snipe <snipe@snipe.net>
commit 96eb96f964
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:27:00 2020 -0700
Removed stray val (typo)
Signed-off-by: snipe <snipe@snipe.net>
commit a2f08bd3ba
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:08:54 2020 -0700
Added comments
Signed-off-by: snipe <snipe@snipe.net>
commit e009fbe59f
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:04:53 2020 -0700
Converted table heading icons in People to CSS glyphs
Signed-off-by: snipe <snipe@snipe.net>
commit 5bb4f271aa
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 00:47:19 2020 -0700
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
Signed-off-by: snipe <snipe@snipe.net>
2020-08-31 12:17:19 -07:00
Sean Borg
567a9639f4
Enhanced #5762 Able to bulk edit expected checkin date
...
In light of the need to edit 500+ devices #5762 (comment)
I added the expected checkin date to the bulk edit page for assets
2020-07-10 19:21:34 +01:00
Sean Borg
7a433f8598
Updated purchase date format in hardware/bulkedit
...
The Purchase date box in hardware/bulkedit was a different style
to the normal hardware/{id}/edit
It also prevents a strange bug I see in firefox when clicking the old datepicker
it presented 2 datepicker boxes
2020-07-10 19:21:22 +01:00
Godfrey M
edd4797178
fixed a table header error
2020-05-19 16:59:09 -07:00
Daniel Meltzer
bb50828ca0
Remove General serial field now that the serial is part of the multi asset creation.
2020-04-28 11:39:53 -04:00
snipe
05e9861b71
Checkin/checkout fixes
2020-04-21 11:28:31 -07:00
snipe
cff2a65f62
Fixed broken if/else in view from bad merge
2020-04-21 11:13:29 -07:00
snipe
dc6e329d96
Fixed name in comments
2020-04-21 06:18:24 -07:00
snipe
cb71bcc4af
Switch to old() helper
2020-04-21 03:58:31 -07:00
snipe
87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge
...
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
2020-04-20 23:20:34 -07:00
snipe
a8032ac388
Switched to btn-primary for submit
2020-04-02 18:38:54 -07:00
snipe
766c2b22cb
Removed stray tag
2020-04-02 18:33:10 -07:00
snipe
bdddab5b8b
Added role=“option” to option items, additional icon font fixes
2020-04-02 18:17:21 -07:00
snipe
56c2740b68
Radio button tweaks
2020-04-01 06:56:27 -07:00
snipe
4688d62b9f
Small UI fixes
2020-04-01 06:50:37 -07:00
snipe
99686bd73a
Added labels for bulk actions
2020-04-01 06:48:02 -07:00
snipe
2d2cd68061
Switched to h2 from h4
2020-04-01 03:51:08 -07:00
snipe
fd642e95eb
Hide success icons from screen readers
2020-04-01 03:25:07 -07:00
snipe
9ab3370be5
Hide icons in error messages
2020-04-01 03:21:15 -07:00
snipe
7718abaa72
Added aria-hidden
2020-04-01 01:26:44 -07:00
snipe
c3d2e8ff26
Added aria-hidden to inline form error text
2020-04-01 00:18:20 -07:00
snipe
be93b23488
Added aria-label to form fields
2020-04-01 00:15:33 -07:00
snipe
c6c75cc11f
Fixed missing </h3 tags
2020-03-31 23:36:56 -07:00
snipe
e0eb10ca1e
Added aria-hidden tags
2020-03-31 22:49:49 -07:00
snipe
bde45cbb34
Fixed h3 to h2 for semantic header levels
2020-03-31 21:30:24 -07:00
snipe
dfaa1c9578
Use the same “no results” treatment for each tab
2020-03-31 18:45:43 -07:00
snipe
0ef1dfe061
Switched from layout tables to decorated divs for asset detail page
2020-03-31 18:39:58 -07:00
snipe
59accca89d
Added form labelss
2020-03-28 03:43:08 -07:00
snipe
f0ef06ebe1
Added more alt tags
2020-03-27 15:35:29 -07:00
snipe
296de34e8a
WIP: Upgrade develop to Laravel 6.6.1 ( #7637 )
...
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell.
* Upgraded framework to Laravel 6
### TO DO:
- Fix password restriction rules- the old library isn’t compatible with Laravel 6 :(
- Figure out why in-app API calls are returning “Unauthorized”
* More updates from Input:: to Request:: helper
* Switch to Request:: from Input
* Added passport config
* Fixed goofy password minimum in seeder
* Added laravel/helpers
* Changed ($item) to ($item->id) in forms
I have no idea why this is necessary
* Changed ($item) to ($item->id) in forms
* Updated API middleware to auth:api
* Updated with added laravel auth.php values
* FIxed *&!^$%^&$^%!!!! ajax issue
* Switch to Request::get from Input::get
* Switched to Request facade
* Added password security minimums back in
The package we were using has not been updated to Laravel v6, so I created custom validators instead
* Added language strings for error messages for password rules
* Fixed `($item)` issue in formActions for partials
2019-12-10 19:32:50 -08:00
snipe
88fb1370f0
Added slightly friendlier error handling for assets without models
...
This scenario should never happen, barring someone manually editing their data, but better to handle that scenario in a more user-friendly way.
2019-12-06 18:17:03 -08:00
snipe
5290c47e2a
Merge branch 'develop' into v5-master-develop-integration
...
# Conflicts:
# .env.example
# .travis.yml
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Console/Kernel.php
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Middleware/EncryptCookies.php
# app/Http/Requests/AssetRequest.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/AssetImporter.php
# app/Models/AssetMaintenance.php
# app/Models/Location.php
# app/Models/User.php
# composer.json
# composer.lock
# config/backup.php
# config/database.php
# config/version.php
# public/mix-manifest.json
# resources/lang/en-ID/general.php
# resources/lang/vi/admin/settings/general.php
# resources/views/accessories/edit.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# tests/api/ApiCategoriesCest.php
2019-11-18 19:49:39 -08:00
Logan Swartzendruber
4c8b26f732
Implement #3088 : Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view. ( #7388 )
...
* Implement #3088 : Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view.
* Add conditional for including the asset number in the URL of the barcode image.
* Change case of variables to pass Codacy PR review standards.
2019-09-03 11:02:55 -07:00
snipe
47724d7268
Make error text color match
2019-08-14 23:46:00 -07:00
snipe
c9f9a60354
Fixed asset tag error message alignment
2019-08-14 23:28:01 -07:00
snipe
441ae69f5c
Integrations/develop into master ( #7352 )
...
* Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992 )
* Added upcoming audit report
TODO: Fid diff/threshold math
* Added route to list overdue / upcoming assets via API
* Controller/API methods for due/overdue audits
We could probably skip this and just handle it via view in the routes…
* Added query scopes for due and overdue audits
* Added audit due console command to kernel
* Added ability to pass audit specs to main API asset search method
* Added audit presenter
* Added bootstrap-tables presenter formatter to display an audit button
* Added gated sidenav items to left nav
* Added audit due/overdue blades
* Cleanup on audit due/overdue console command
* Added language strings for audit views
* Fixed :threshold placeholder
* Removed unused setting variable
* Fixed next audit date math
* Added scope for both overdue and upcoming
* Derp. Wrong version
* Bumped version
(I will release this version officially tomorrow)
* Leave the activated state for users alone in normal LDAP synchronisation. (#6988 )
* Fixed #7003 - crash when warranty months or purchase date is null
* Fixed #6956 - viewKeys policy inconsistent (#7009 )
* Fixed #6956 - Added additional gates show showing/hiding license keys
* Modified gate to allow user to see licenses if they can create or edit the license as well
* Added API middleware to API routes to enable throttling
TODO: Figure out how to make this costumizable without touching the code
* Import locations from CSV via command line (#7021 )
* Added import locations command
* Small fixes to location importer
* Added country, LDAP OU
* Cleaned up comments, added more clarification to what the script does
* Added ability to update groups via API
Fixes [ch9139]
* Bumped version
* Fixed #6883 - remove escaping of fields on LDAP import
* Fixed #6880 - correctly encrypt encrypted fields via the API
* Fixes #5054 : LDAP users deactivated for none-ad (#7032 )
When using none-AD ldap, users are automatically deactivated every LDAP
sync. This commit changes the behaviour so that if the active flag isn't set,
the users are enabled.
Fixed #5054 , at least for 4.X
* Updated packages
- Updating erusev/parsedown (v1.7.2 => 1.7.3): Downloading (100%)
- Updating squizlabs/php_codesniffer (3.4.1 => 3.4.2): Downloading (100%)
- Updating symfony/polyfill-mbstring (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/var-dumper (v3.4.23 => v3.4.27): Downloading (100%)
- Updating league/flysystem (1.0.50 => 1.0.51): Downloading (100%)
- Updating symfony/translation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating nesbot/carbon (1.36.2 => 1.37.1): Downloading (100%)
- Updating symfony/debug (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/console (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/finder (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-ctype (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php70 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/http-foundation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/event-dispatcher (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/http-kernel (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/process (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/routing (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-util (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php56 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/psr-http-message-bridge (v1.1.1 => v1.1.2): Downloading (failed)
Downloading (100%)
- Updating rollbar/rollbar (v1.7.5 => v1.8.1): Downloading (100%)
- Updating symfony/yaml (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/browser-kit (v3.4.23 => v3.4.27): Downloading (100%)
* Fixed #7044 - API update deleted custom fields if they are not re-presented
* Fixed XSS vulnerability when creating a new categories, etc via modal on create
Same fix as before, because of the weird select2 post-parsing ajax behavior
* Updated email strings
* Fixed #7046 - added user website url back into UI
* Updated language strings
* Bumped version
* Updated packages
* New backups config for spatie
* Removed debugbar service provider (autodiscovery)
* Use laravel v5.5 withCount manual aliases
* Added spatie language files
* Removed old laravel backups config
This config file was renamed in a newer version of spatie laravel-backup
* Set the serialization
* Added the command loader to console kernel
* Renamed fire() to handle()
* Updated withCount to use manual naming
* Updated backup path in backup admin
* Updated travis with new php versions
* Bumped laravel version in readme
* Fixed custom field edit screen
* Fixed baseUrl is undefined error
I literally cannot figure out how this ever worked before.
* Fix for included files in backup
* Bumped version
* Switch has() to filled()
* Change ->has() to ->filled()
* Removed cosole log
* Bumped packages
* Use getReader instead of fetchAssoc for CSV parser
https://csv.thephpleague.com/9.0/upgrading/
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Trying to fix ajax asset validation
This I think gets us closer, but still not handling the validation on the asset properly.
When I do a print_r of the validation in the other items, its looking for an error bag that looks something like this:
```
Illuminate\Support\MessageBag Object
(
[messages:protected] => Array
(
[name] => Array
(
[0] => The name field is required.
)
[seats] => Array
(
[0] => The seats field is required.
)
[category_id] => Array
(
[0] => The category id field is required.
)
)
[format:protected] => :message
)
```
Currently the Assets ajax returns:
```
[2019-05-24 06:52:06] develop.ERROR: array (
'messages' =>
array (
'model_id' =>
array (
0 => 'The model id field is required.',
),
'status_id' =>
array (
0 => 'The status id field is required.',
),
'asset_tag' =>
array (
0 => 'The asset tag field is required.',
),
),
)
```
So not sure why it’s not working.
* Fixed missing asset validation
* Check that a model exists before trying to fiddle with fieldsets
* Tidied up license check
* Removed extra escaping on checkin
* Updated importer to work with newer CSV Reader::getRecords() method
* Fixed field mapping
* Small fix for reordering fields
Fixes Illuminate\Database\QueryException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'order' cannot be null (SQL: insert into `custom_field_custom_fieldset` (`custom_field_id`, `custom_fieldset_id`, `order`, `required`) values (12, 7, , 0)) [ch1151]
This needs revisiting for a more solid fix, especially for data that was already entered bad.
* Fixed bug where sorting by company name in Users API did not work
Fixes [ch9200]
* Removed custom fields from AssignedSearch to prevent confusing data in selectlist
Fixes [ch9193]
* Removed alert-danger from tests
* Fixed missed consumables_count withCount() statement
* Fixed Undefined variable user in $backto if checked out to a non-user
Fixes [ch9194]
* Check for valid model before attempting to access fieldsets
Fixes [ch1249]
* Only build the log upload destination path if there is a matching record
Fixes [ch1232]
* Fixed free_seats_count variable name
(I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables)
* Only gtry to delete the file if a record is found in the log
* Only try to get fieldset if model is valid
* Fixed more camel-casing -> snake-casing
* Only display the file if the log record can be found
* Fixed casing in sync command
* Updated README
* Derp - typo
* Added link to Atlassian plugin
* More Atlassian clarifications
* Show accessory image on view page
* Increased image size to 800px, added lightboxes
* Fixed #7083 - Removed user_exists constraint on department save
If the user has been deleted, this prevented the department from being successfully saved on edit
* Updated branch in version file
* Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084 )
* bump up to php7.1
& change deprecated MAINTAINER to a LABEL so it is visible with `docker inspect`
* AND modapache ><
* 2 updates required to get software-properties+ppa
* Bumped version
* Bumped release again :(
* Missed one
* Fixed #7098 - updated backup config for deleteFile() method
* Fixed #7092 - handle weird port forwarding/port numbers for baseUrl
* Bumped version
* Fixed #7099 - set email to null by default for backup notifications
* Removed old comments
* Fixed #7100 - Check if $user isset on checkin
* Increased throttle to 120 requests per minute
* Added Filipino, corrected order for Spanish variations
* Update language strings
* Bumped hash
* Changed has to filled to fix bulk asset editing
* Bumped point version
* Small fixes for phpleague CSB reader v9
* Improved error checking in locations importer
* Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility
* Reduce minimum group name length to 2 (from 3)
eg: IT
* Back in time fix FOR #7145 for new installs on MySQL 8+
* Fixed permission insert
//TODO
Handle this via model
* Possible fix for reporting/admin migration back in time
* Fixed #7164 - change table name to permission_groups
* Fixed LDAP password blanking on save
* fixing previous commit's actual wiping of password (#7183 )
replaced Input::fille('ldap_pword') with _filled_. Should be good to go.
https://github.com/snipe/snipe-it/issues/7179
https://github.com/snipe/snipe-it/issues/7169
* Bumped version
* Downgrading rollbar for Laravel 5.5
* Spelling Correction (#7206 )
Fixed Spelling for the word reqrite, to be rewrite.
* Fix #6910 : Add logic to manipulate the eloquent query. (#7006 )
* Added company_id to consumables_users table
* Added logic to manage when a pivot table doesn't have the column company_id trough a join with users
* Remove a migration that tries to fix this problem, but is not longer necessary
* Addresses #7238 - add PWA code to layout
Needs additional UX testing
* Better log message for bad LDAP connection
* Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed
* Comment clarification on #7186
* Check for valid seat on hardware view
* Added space between footer and custom message
* Cap warranty months to three characters
Filles rollbar 209
* Cap warranty months to 3 on the frontend blade
* Fixed countable() strings on user destroy
* Check that the user has assets and that the aset model is valid
* Bumped hash
* Caps asset warranty to 20 years
* Command to fix custom field unicode conversion differences between PHP versions (#7263 )
* Fixes #7252 form request changes (#7272 )
* Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests
* Removed debug info
* More fixes for #7252
This is mostly working as intended, if not yet the way Laravel wants us to do it.
Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress.
* Removed experimental method
* Check for digits_between:0,240 for warranty
* Removed debug code
* Apply fix from PR #7273 to master
* Bumped hash
* Fixed #7250 - permission issue for API fieldsets and fields endpoints
This applies the change from #7294 to master
* Add @mskrip as a contributor
* Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name
* CORS for api (#7292 )
* Added CORS support to API
* Changed order so CORS will still work if throttle hit
* Added APP_CORS_ALLOWED_ORIGINS env option
* Fixed typo
* Clarified header comments
* More clarification
* DIsable CORS allowed origins by default to replicate existing behavior
* Change variable name to be clearer
* Bumped version
* Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7317 )
* Added comments to the ByFilter query scope for clarity
* Added accessories checkout/checkin API endpoint
* Fixed CVE-2019-10742
https://nvd.nist.gov/vuln/detail/CVE-2019-10742
* Update README.md (#7334 )
Add reference to CSV importer.
* Group related variables in .env
* History importer fixes
* Fixes to history importer
2019-08-14 21:48:14 -07:00
snipe
8b4a9aa382
Fixes to history importer
2019-08-13 18:15:42 -07:00
snipe
79ab0d8dc2
Check for valid seat on hardware view
2019-07-17 12:09:18 -07:00
snipe
2dd31544fe
Increased image size to 800px, added lightboxes
2019-05-24 19:11:08 -07:00
snipe
407445456a
Merge branch 'features/6204_email_audit-alerts' into develop
...
# Conflicts:
# app/Console/Commands/LdapSync.php
# app/Console/Kernel.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/LicensesController.php
# composer.json
# composer.lock
# config/version.php
# resources/views/auth/two_factor_enroll.blade.php
2019-05-06 08:45:13 -04:00
snipe
e5c2d77c7d
Fixes #6204 - added email alerts and web/API access to assets due for audits ( #6992 )
...
* Added upcoming audit report
TODO: Fid diff/threshold math
* Added route to list overdue / upcoming assets via API
* Controller/API methods for due/overdue audits
We could probably skip this and just handle it via view in the routes…
* Added query scopes for due and overdue audits
* Added audit due console command to kernel
* Added ability to pass audit specs to main API asset search method
* Added audit presenter
* Added bootstrap-tables presenter formatter to display an audit button
* Added gated sidenav items to left nav
* Added audit due/overdue blades
* Cleanup on audit due/overdue console command
* Added language strings for audit views
* Fixed :threshold placeholder
* Removed unused setting variable
* Fixed next audit date math
* Added scope for both overdue and upcoming
* Derp. Wrong version
* Bumped version
(I will release this version officially tomorrow)
2019-05-05 22:32:52 -04:00
snipe
e9b9301efb
Added language strings for audit views
2019-05-05 19:35:20 -04:00
snipe
4369d6adc6
Added audit due/overdue blades
2019-05-05 19:21:48 -04:00
snipe
0b927623e8
Added “record created” string for clarification in asset/license history
2019-03-13 22:06:57 -07:00
Ivan Nieto
c7f48951a9
Valo/checkin date in history of asset ( #6733 )
...
* To see checkin/checkout Date in History of Asset
* Added some logic to get today's date if the checkin_at input is blank
* Updating the action_date taking the value from the action_log table
* Hide created_at field and rename 'Action Date' as only 'Date'
2019-03-13 21:36:32 -07:00
Steffen
e1907e30b1
Allow multiple upload fields and add logo option to labels ( #6736 )
...
* Change upload js to work with multiple upload elements on a single page
* Change uploadFile in upload modal and form partial
* Change uploadFile to js-uploadFile to avoid potential issues in the future
* Remove duplicate style attribute causing webpack to fail
* Missed a css class in rename to js- prefix
* - Move logo uploads to partial for eaiser usage
- Add label logo
- Add css classes to label elements
- Change label prefix text (M: S: ...) to css::before content for easy removal in config
* Add more css classes to labels
* Allow unescaped " (quot) in css ouput
* Add max size param to partial, set defaults for allowedType and size
2019-03-01 15:25:42 -08:00
herroworrd
3f7d2aebc7
Fixed #6634 : Asset Import History fixes and optimizations ( #6657 )
...
* Starting work on asset history importer.
* Starting work on asset history importer.
* Added checkin target.
* Last change... importing history should also probably be an admin only task.
* Added caching for user and asset queries.
* Updated cache keepalive time to DateTimeInterface
* Updated cache keepalive time to DateTimeInterface
2019-02-08 16:05:56 -08:00
Tim Bishop
7835cc34c8
Insert audited items to the top of the list. ( #6376 )
...
When doing a large number of items they soon disappear off the bottom of
the screen. It's handy to be able to check the result as it's happening
so adding them to the top of the list keeps the most recent items visible.
Move the "Processing..." spinner to the header so it stays at the top.
2018-10-31 11:13:08 -07:00
snipe
74c20e62d5
Fixed - suppress the asset create button if the user is not allowed to create assets
2018-10-15 17:57:47 -07:00
snipe
9797412d23
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-10-15 17:02:39 -07:00
snipe
6b6cf06530
Display asset name if one exists and the user cannot edit
2018-10-15 17:02:31 -07:00
snipe
539c3023b9
Added - check whether the user can edit an asset before allowing them to change the name on checkout
2018-10-15 16:52:45 -07:00
Joe Ferguson
704209de9c
Fixed #6301 : Do not allow duplicate asset tags ( #6324 )
...
* Fixed #6301 : Do not allow duplicate asset tags
* Display error message for single asset_tag failure
2018-10-11 17:15:09 -07:00
snipe
c21524f240
Fixed NaN when no asset tag is provided
2018-10-05 05:42:28 -07:00
snipe
ecb8204c3c
Associate serials with multiple asset creation
2018-10-05 05:30:13 -07:00