snipe
|
3317b5107a
|
Added ribbon to show on user's photo that they are an admin
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 11:13:55 -07:00 |
|
|
snipe
|
0d1bd5b470
|
Updated more fa icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 11:13:34 -07:00 |
|
|
snipe
|
8d1c3106b5
|
Building assets again
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 11:13:15 -07:00 |
|
|
snipe
|
299ad681f7
|
More fa icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 07:21:30 -07:00 |
|
|
snipe
|
b2dc92b088
|
And a few more missed icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 06:44:38 -07:00 |
|
|
snipe
|
ad6f073c82
|
Few more icon updates
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 06:38:23 -07:00 |
|
|
snipe
|
8aba37522d
|
More FA icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 06:18:22 -07:00 |
|
|
snipe
|
dbe93d91cd
|
Updated fontawesome icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 06:07:46 -07:00 |
|
|
snipe
|
06e8e826bc
|
Added some BS tables style overrides for mobile
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 04:12:41 -07:00 |
|
|
snipe
|
4a8f06b0f1
|
Added badge counters to tabs
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 04:12:22 -07:00 |
|
|
snipe
|
8937396a26
|
Added padding to the sidenav on mobile
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 03:02:57 -07:00 |
|
|
snipe
|
fd7c6179d5
|
Show the user's photo frst on mobile view
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 03:02:47 -07:00 |
|
|
snipe
|
9a299973ff
|
Mobile CSS overrides
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 03:02:19 -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
|
90c22caa4b
|
Rework user page to no longer use tables for data layout
This also fixes the weird display when lines break
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 02:17:40 -07:00 |
|
|
snipe
|
12df310449
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 02:16:58 -07:00 |
|
|
snipe
|
61cf9ec009
|
Small conflict handling bits
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-22 00:00:44 -07:00 |
|
|
snipe
|
e27065fe16
|
Merge branch 'develop-v6-integration' into develop-v6-rc1
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/ResetDemoSettings.php
# app/Helpers/Helper.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/ComponentsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/DepreciationsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Requests/ImageUploadRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Http/Transformers/DepreciationsTransformer.php
# app/Listeners/CheckoutableListener.php
# app/Models/Accessory.php
# app/Models/Asset.php
# app/Models/Company.php
# app/Models/Ldap.php
# app/Models/User.php
# app/Presenters/AssetPresenter.php
# app/Presenters/CategoryPresenter.php
# composer.json
# composer.lock
# config/version.php
# database/factories/AssetModelFactory.php
# database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
# database/seeds/AssetModelSeeder.php
# package-lock.json
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/js/vue.js
# resources/lang/af/validation.php
# resources/lang/ar/admin/settings/general.php
# resources/lang/ar/validation.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/bg/validation.php
# resources/lang/cs/admin/settings/general.php
# resources/lang/cs/validation.php
# resources/lang/cy/help.php
# resources/lang/cy/validation.php
# resources/lang/da/admin/settings/general.php
# resources/lang/da/validation.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/validation.php
# resources/lang/el/validation.php
# resources/lang/en-GB/admin/settings/general.php
# resources/lang/en-GB/validation.php
# resources/lang/en-ID/admin/hardware/table.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/validation.php
# resources/lang/es-CO/admin/settings/general.php
# resources/lang/es-CO/auth/message.php
# resources/lang/es-CO/button.php
# resources/lang/es-CO/help.php
# resources/lang/es-CO/validation.php
# resources/lang/es-ES/admin/settings/general.php
# resources/lang/es-ES/auth/message.php
# resources/lang/es-ES/button.php
# resources/lang/es-ES/help.php
# resources/lang/es-ES/validation.php
# resources/lang/es-MX/admin/settings/general.php
# resources/lang/es-MX/validation.php
# resources/lang/es-VE/admin/settings/general.php
# resources/lang/es-VE/auth/message.php
# resources/lang/es-VE/button.php
# resources/lang/es-VE/help.php
# resources/lang/es-VE/validation.php
# resources/lang/et/validation.php
# resources/lang/fa/validation.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/fi/validation.php
# resources/lang/fil/validation.php
# resources/lang/fr/admin/settings/general.php
# resources/lang/fr/validation.php
# resources/lang/ga-IE/validation.php
# resources/lang/he/admin/settings/general.php
# resources/lang/he/general.php
# resources/lang/he/validation.php
# resources/lang/hr/validation.php
# resources/lang/hu/validation.php
# resources/lang/id/validation.php
# resources/lang/is/admin/categories/general.php
# resources/lang/is/admin/companies/message.php
# resources/lang/is/admin/companies/table.php
# resources/lang/is/admin/components/general.php
# resources/lang/is/admin/components/table.php
# resources/lang/is/admin/consumables/table.php
# resources/lang/is/admin/depreciations/general.php
# resources/lang/is/admin/depreciations/message.php
# resources/lang/is/admin/hardware/form.php
# resources/lang/is/admin/hardware/general.php
# resources/lang/is/admin/hardware/message.php
# resources/lang/is/admin/hardware/table.php
# resources/lang/is/admin/kits/general.php
# resources/lang/is/admin/licenses/form.php
# resources/lang/is/admin/licenses/general.php
# resources/lang/is/admin/locations/table.php
# resources/lang/is/admin/manufacturers/table.php
# resources/lang/is/admin/reports/message.php
# resources/lang/is/admin/settings/general.php
# resources/lang/is/admin/settings/message.php
# resources/lang/is/admin/statuslabels/message.php
# resources/lang/is/admin/suppliers/message.php
# resources/lang/is/admin/suppliers/table.php
# resources/lang/is/admin/users/table.php
# resources/lang/is/mail.php
# resources/lang/is/validation.php
# resources/lang/it/admin/settings/general.php
# resources/lang/it/validation.php
# resources/lang/iu/validation.php
# resources/lang/ja/mail.php
# resources/lang/ja/validation.php
# resources/lang/ko/validation.php
# resources/lang/lt/validation.php
# resources/lang/lv/validation.php
# resources/lang/mi/validation.php
# resources/lang/mk/validation.php
# resources/lang/ml-IN/validation.php
# resources/lang/mn/validation.php
# resources/lang/ms/validation.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/validation.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/validation.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/mail.php
# resources/lang/pt-BR/validation.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/validation.php
# resources/lang/ru/validation.php
# resources/lang/sl/validation.php
# resources/lang/sr-CS/admin/settings/general.php
# resources/lang/sr-CS/validation.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/sv-SE/auth/message.php
# resources/lang/sv-SE/button.php
# resources/lang/sv-SE/mail.php
# resources/lang/sv-SE/validation.php
# resources/lang/ta/validation.php
# resources/lang/th/validation.php
# resources/lang/tl/validation.php
# resources/lang/tr/mail.php
# resources/lang/tr/validation.php
# resources/lang/uk/admin/accessories/table.php
# resources/lang/uk/admin/asset_maintenances/message.php
# resources/lang/uk/admin/asset_maintenances/table.php
# resources/lang/uk/validation.php
# resources/lang/ur-PK/validation.php
# resources/lang/vi/admin/settings/general.php
# resources/lang/vi/validation.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/validation.php
# resources/lang/zh-HK/validation.php
# resources/lang/zh-TW/validation.php
# resources/lang/zu/validation.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# routes/api.php
|
2021-09-21 23:46:50 -07:00 |
|
|
snipe
|
b4a90045e6
|
Added totals to depreciation report footer
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 21:52:18 -07:00 |
|
|
snipe
|
9b78b25372
|
Grr. 100 should be 1000
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 21:28:59 -07:00 |
|
|
snipe
|
7df4f98e19
|
Bump number per page up to 1000
Use this shit at your own peril. Very large pages will load slowly, as these are very complex queries.
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 21:25:22 -07:00 |
|
|
snipe
|
dacdf788bc
|
Reverted erroneous german text in UK language files
|
2021-09-21 17:50:13 -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
|
c6b26965a0
|
Check for valid category name
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-13 15:47:13 -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
|
514f9aa64a
|
Fixed #9973 - add use_default_eula to categories API endpoint
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-10 20:23:49 -07:00 |
|
|
snipe
|
a4e307c4db
|
Updated languages
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-08 13:49:33 -07:00 |
|
|
snipe
|
cfaa6679af
|
Merge pull request #10031 from inietov/fixes/checkout_date_not_saved_in_asset_history
Fixed #10026: Checkout date not saved in asset history
|
2021-09-07 17:37:30 -07:00 |
|
|
snipe
|
387018c44e
|
Updated depreciation report blade to use server-side API
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-01 17:05:31 -07:00 |
|
|
Ivan Nieto Vivanco
|
e621eaf456
|
Change date showed in the activity report view, the condition is now on action_date
|
2021-09-01 13:58:17 -05:00 |
|
|
snipe
|
d5a7955e1d
|
Fixed #10024 - use string for dashboard in side nav instead of hard coded
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-31 22:25:00 -07:00 |
|
|
snipe
|
7e2def7896
|
Merge pull request #9880 from inietov/bug/fd18463/cannot_edit_departments
Fixes: Can't update departments if Full Company Support is activated
|
2021-08-30 19:40:59 -07:00 |
|
|
snipe
|
4abb9baa95
|
Merge remote-tracking branch 'origin/develop'
|
2021-08-24 15:29:41 -07:00 |
|
Godfrey M
|
a407fe9312
|
removed more dead space
|
2021-08-24 15:07:56 -07:00 |
|
|
Godfrey M
|
53ddf5ae04
|
removed dead space
|
2021-08-24 15:07:18 -07:00 |
|
|
Godfrey M
|
a197b730a1
|
fixed a layout issue with the month field in depreciations [ch17111]
|
2021-08-24 15:02:42 -07:00 |
|
|
Ivan Nieto Vivanco
|
830ba470dd
|
Change the used function to only affect single and double quotes
|
2021-08-23 22:10:59 -05:00 |
|
|
Ivan Nieto Vivanco
|
80fb24e861
|
Fix issue caused for single and double quotes when used as listbox's values
|
2021-08-23 22:00:01 -05:00 |
|
|
snipe
|
70f6753f50
|
Merge pull request #9979 from uberbrady/add_client_side_ldap_certs
Add client side ldap certs
|
2021-08-23 16:30:46 -07:00 |
|
|
snipe
|
4ec4e0f44e
|
Merge remote-tracking branch 'origin/develop'
|
2021-08-19 12:09:48 -07:00 |
|
Brady Wetherington
|
e28db2d221
|
Fix regression for NULL valued numbers in the summary calculation
|
2021-08-19 12:01:47 -07:00 |
|
|
snipe
|
24af2ab67a
|
Merge remote-tracking branch 'origin/develop'
|
2021-08-18 14:31:53 -07:00 |
|
|
Brady Wetherington
|
4519f6e180
|
Fixed sum total calculation on Bootstrap Table pages
|
2021-08-18 14:13:31 -07:00 |
|
|
snipe
|
04fa5f2022
|
Merge remote-tracking branch 'origin/develop'
|
2021-08-18 01:05:25 -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 |
|
|
snipe
|
f99602c039
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2021-08-18 00:47:33 -07:00 |
|
|
snipe
|
8a6c7269d3
|
Fixed border radius for bulk checkout field [ch16936]
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-18 00:44:55 -07:00 |
|
|
snipe
|
37f2c7beac
|
Nicer bulk asset select width
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-18 00:44:16 -07:00 |
|