snipe
|
9010b7acd0
|
Use isDeletable instead of asset count
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-20 17:27:10 +00:00 |
|
|
snipe
|
b57b68571e
|
Added blade views
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-20 16:44:45 +00:00 |
|
|
snipe
|
50b841d54d
|
Added table data-dash attributes to make the checkbox stuff work
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-20 16:43:57 +00:00 |
|
|
snipe
|
db73f80058
|
Starting off
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-16 18:57:50 +00:00 |
|
|
snipe
|
4c967a43a7
|
Removed loading of assets for label count
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-05 18:56:51 +00:00 |
|
Nathan Butler
|
79f380cbe7
|
Added asset history tab to locations view
|
2023-10-31 10:28:54 +11:00 |
|
|
snipe
|
14c61e4c17
|
Added phone, fax to departments, locations, companies
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-10 19:44:21 +01:00 |
|
|
snipe
|
bd4757ad7a
|
Merge pull request #12779 from snipe/features/replace_icheck_with_only_css
Move from iCheck to pure CSS for radio and checkboxes
|
2023-04-06 14:58:33 -07:00 |
|
|
snipe
|
161999fbca
|
Fixed #12772 - use the APP_URL config more consistently
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-05 16:05:40 -07:00 |
|
|
snipe
|
1af7cdb715
|
Wrapped the image delete into the existing image upload partial
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-03 22:35:55 -07:00 |
|
|
snipe
|
778787db3c
|
Rip out jquery for location parent
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-01 15:36:01 -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 |
|
|
snipe
|
563a252d18
|
Updated checkboxed with missing minimal class for iCheck
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 14:57:52 -08:00 |
|
|
snipe
|
e670ffe349
|
Added Assets Assigned to tab
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-26 00:16:06 -07:00 |
|
|
snipe
|
4eed2baa31
|
Added default tab to locations
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-20 19:06:58 -07:00 |
|
|
snipe
|
2543fa6b98
|
Fixed user icon for tab
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-17 20:04:42 -07:00 |
|
|
snipe
|
7c34652da0
|
Fixed incorrect icons for mobile view on location tabs
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-17 20:02:27 -07:00 |
|
|
snipe
|
fb228d6ded
|
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-13 12:57:10 -07:00 |
|
|
snipe
|
e07532dd1b
|
Applied master fix to develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-01 18:55:28 -07:00 |
|
|
snipe
|
4133ac6ef0
|
Applied date formatter to Current Date output on location print assigned
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-01 18:47:29 -07:00 |
|
|
snipe
|
d45d322b54
|
Use scoped query for asset count
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 13:43:23 -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 |
|
|
snipe
|
9072f7c6c9
|
Added click-to-select to tables
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 12:49:50 -07:00 |
|
|
snipe
|
b26a4ad333
|
Added missing headers
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-05 21:35:57 -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 |
|
|
snipe
|
9f478b51e2
|
Additional JS tweaking
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-05 20:13:51 -07:00 |
|
|
snipe
|
7c77e03c5a
|
Initial rework of locations display
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-05 18:08:15 -07:00 |
|
|
snipe
|
985e683896
|
Small display improvements
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-05 16:59:53 -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 |
|
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
|
30d30490a3
|
Added localized strings for locations
|
2021-11-02 15:14:54 +01:00 |
|
|
snipe
|
61f16f47a2
|
Use Helper alias
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-28 19:44:55 -07:00 |
|
Ivan Nieto Vivanco
|
1ae665b645
|
Use the property 'archived' so if the 'name' one changes it doesn't fails
|
2021-09-13 16:45:05 -05:00 |
|
|
Ivan Nieto Vivanco
|
1b433920f1
|
Delete an extra semicolon
|
2021-09-13 16:24:12 -05:00 |
|
|
Ivan Nieto Vivanco
|
2b64af0d34
|
Add a condition in the view 'print all assigned' from locations where it skips the assets in relation of if they're archived and that option is marked in the settings
|
2021-09-13 16:17:34 -05:00 |
|
|
snipe
|
ece627b3a3
|
Small fixes for location printing when relationships are missing/invalid, per #9521
Signed-off-by: snipe <snipe@snipe.net>
|
2021-05-05 10:23:46 -07:00 |
|
Peter Sarossy
|
cacb707a7f
|
Added #9355: include Accessories and Consumables on the location reports (#9356)
|
2021-04-20 14:53:04 -07:00 |
|
Masudul Haque Shihab
|
f3831fe010
|
Fixed #9447 change route parameter name in locations view (#9456)
|
2021-04-20 14:49:05 -07:00 |
|
|
snipe
|
b9bab05ac3
|
Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# resources/views/users/print.blade.php
|
2021-04-05 20:55:49 -07:00 |
|
|
snipe
|
2ea805b7ed
|
Added search/sort by Location OU, added to listing
|
2020-11-17 22:17:07 -08:00 |
|
|
snipe
|
ede20523f2
|
Fixed #8680 - location image path
|
2020-11-09 21:08:19 -08:00 |
|
Bennett Blodinger
|
83dfa2a28c
|
Merge branch 'develop' into gmaps-8465
|
2020-09-22 17:41:38 -05:00 |
|
Blodinger
|
471e0fd2fc
|
Changes the Google Maps window to be a bit more detailed
|
2020-09-22 14:30:38 -05: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
|
9ab3370be5
|
Hide icons in error messages
|
2020-04-01 03:21:15 -07:00 |
|
|
snipe
|
4dcc1ffdbc
|
More form labels
|
2020-04-01 02:22:24 -07:00 |
|
|
snipe
|
c6c75cc11f
|
Fixed missing </h3 tags
|
2020-03-31 23:36:56 -07:00 |
|
|
snipe
|
bde45cbb34
|
Fixed h3 to h2 for semantic header levels
|
2020-03-31 21:30:24 -07:00 |
|