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
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
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
fedf51dda4
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-23 18:29:47 -07:00
snipe
0f40ba2b34
Check for admin rights before displaying admin permission options
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-22 19:31:49 -07:00
snipe
39a702397a
Add user permissions message if the user is not an admin or better
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-22 19:05:02 -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
Godfrey M
941cba73b9
removed deadspace and unnecessary css changes
2021-09-21 19:27:17 -07:00
Godfrey M
4a0c8de82a
adds jquery eventlistner to monitor chart.js width and refresh accordingly
2021-09-21 19:13:09 -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
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
37f2c7beac
Nicer bulk asset select width
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-18 00:44:16 -07:00
snipe
b5bb74b8ca
Merge remote-tracking branch 'origin/develop'
2021-08-17 22:01:23 -07:00
snipe
cce808c784
Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]
...
Duplicates d4e46ee41f
2021-08-17 21:59:33 -07:00
Brady Wetherington
4d4badf830
Got the client-side LDAP setup working well enough for sync!
2021-08-17 14:43:36 -07:00
Godfrey M
cef0e424e1
adds a Floor value for depreciation models
2021-08-16 18:14:10 -07:00
snipe
29c584289f
Merge remote-tracking branch 'origin/develop'
2021-08-14 14:09:31 -07:00
Godfrey M
01037cf9cb
initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358]
2021-08-10 18:26:43 -07:00
Computroniks
8121d904e7
Licence cost calculation
...
Licences use diffrent key to track quantity. sumFormatterQuantity has
been modified to detect which key to use.
Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
2021-08-04 22:33:39 +01:00
Computroniks
f994af16da
Added function to calculate cost based on quantity
...
sumFormatterQuantity takes the same input as sumFormatter but instead
of calculating the specified columns total it calculates the total
purchase cost of an item based upon its quantity. Also updated affected
pressenters to use this formatter.
Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
2021-08-04 22:09:50 +01:00
NMC
976957ddd4
Add Maintained filed in licenses view and api. + Expires in API
2021-08-01 14:30:16 -04:00
Ivan Nieto Vivanco
1b8156ac7f
Add a hidden field to handle departments inside Full Company Support config
2021-07-29 13:28:57 -05:00
Jethro Nederhof
d8fdd1b408
Fix branding logo URL path
...
The current method adds an additional slash to the URL which results in the logo request producing a 404 error on for Storage drivers like S3 and GCS that don't automatically collapse additional forward slashes into single slashes.
E.g. with the current code my logo URL renders like `https://storage.googleapis.com/mybucketname/public//setting-logo-Al0aKMhmYz.svg ` (note the double slash after "public") when instead it should render like `https://storage.googleapis.com/mybucketname/public/setting-logo-Al0aKMhmYz.svg `
For a local driver this should work fine since webservers handle the additional slashes case, but for key-based storage this 404s.
Thanks for your work on Snipe-It, seems like a good system so far!
2021-07-28 14:55:34 +10:00
Ivan Nieto Vivanco
35ffe8b902
Adds a check to know if the asset is checked out to the logged in user to allow check the state int the view
2021-07-20 18:56:22 -05:00
snipe
4cfdaf89d8
Merge remote-tracking branch 'origin/develop'
2021-07-08 17:47:08 -07:00
Brady Wetherington
0ec2884c29
The custom settings section of SAML sometimes has bad linefeeds
2021-07-08 17:00:01 -07:00
snipe
f264cade7d
Merge remote-tracking branch 'origin/develop'
2021-07-08 16:05:32 -07:00
snipe
06806341c7
Nicer tab names for permissions
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-08 15:57:41 -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
a12ae19e32
Try deferring the load so it doesn’t query the server server 7 times for login
...
This doesn’t work?
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 10:50:32 -07:00
snipe
3332bbe072
Removed unused properties on login
...
This may be dumb anyway - we probably don’t need to make so many round trips to the server just to see if things are required or not… But I’d really like to standardize the validation across the system
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 10:27:44 -07:00
snipe
704eb728bc
Added livewire the login screen
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 02:16:57 -07:00
snipe
576e605f73
Make livewire less assy looking
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 22:40:18 -07:00
snipe
ebb0aa5532
Merge pull request #9766 from uberbrady/livewire_integration_v6
...
Livewire integration for Snipe-IT v6
2021-06-28 21:51:00 -07:00
Brady Wetherington
a6ac4f94f1
Breaking out field-listing into its own Livewire blade for use elsewhere
2021-06-28 21:00:20 -07:00
Brady Wetherington
ea1f1eb972
Get some basic Livewire going for 'edit model's default values.
2021-06-28 21:00:20 -07:00
Brady Wetherington
8e66abb926
Basic Laravel7 compatibility, starting getting Livewire going
2021-06-28 21:00:16 -07:00
snipe
dc125af029
Fixed locations link on homepage module
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 19:56:41 -07:00
snipe
2365634139
Added dashboard module for locations [ch9199]
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 19:46:56 -07:00
snipe
4af247f845
Added additional boxes to the dashboard
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 16:36:15 -07:00
snipe
d4e46ee41f
Added comma in US currency format [ch16628]
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 16:14:32 -07:00
snipe
f504d7ef5f
Merge remote-tracking branch 'origin/develop'
2021-06-28 13:12:10 -07:00
snipe
a016f4ecd0
Applies PR #9761 to integration
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 13:11:22 -07:00
snipe
30297e479e
Hide notes field by default
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 13:08:32 -07:00
snipe
a4fd0c9c6d
Fixed #9745 - added searchable, sortable notes field to status labels
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 11:52:57 -07:00
snipe
3ca3de9e4f
Merge remote-tracking branch 'origin/develop'
2021-06-23 20:05:38 -07: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
Brady Wetherington
8268aca9fc
Removed Ziggy.baseUrl references for meta references that had baseUrl
2021-06-23 19:57:45 -07:00
snipe
7b51bf4f51
Merge remote-tracking branch 'origin/develop'
2021-06-23 14:41:27 -07:00
snipe
4db5a8f62b
Merge pull request #9695 from Joly0/master
...
Update print.blade.php
2021-06-23 14:33:25 -07:00
snipe
b3ec4bb31b
Porting PR #9720 to v6 integration
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 14:28:06 -07:00
snipe
ac52ea3463
Porting PR #9720 to develop
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 14:27:15 -07:00
Brady Wetherington
9456a03a88
Almost finished with the routes which is...hopefully? The last thing?
2021-06-22 16:58:23 -07:00
bmkalle
a330dca7d4
Update company-select.blade.php
...
select should be disabled if full multiple companies is activated and the user isn't a superuser. otherwise the user get the ability to choose all companies.
2021-06-17 10:51:00 +02:00
Joly0
9a429952ff
update print.blade.php
2021-06-15 08:52:01 +02:00
snipe
3095a78664
Small tweaks to Dashboard controller
...
Still gettiing a bizarre `Non-static method App\Http\Controllers\DashboardController::index() should not be called statically` error
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 14:43:47 -07:00
Joly0
72f27ccc5b
Update print.blade.php
2021-06-11 11:05:39 +02:00
Ivan Nieto Vivanco
9f944ad497
Added the 'required' attribute to the input file n the upload file form modal. Added a validation for the UserFilesController if the user doesn't select any file to upload [ch16471].
2021-05-27 15:48:13 -05:00
snipe
9f2b4c721d
Allow password reset from user profile
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-26 15:32:23 -07:00
snipe
3f09d17389
Fixed typo “synchronization”
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-25 18:45:06 -07:00
snipe
9eea46adef
Fixed parse error in user print view
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-20 13:53:43 -07:00
Jonathon Reinhart
fd082addff
Fix incorrect case of ldap sync status string ( #9563 )
...
Fixes #9562
2021-05-12 19:15:39 -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
snipe
9aac3ae628
Fixed HTML causing two backup headers to appear
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-07 16:36:07 -07: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
snipe
d8d3fa2293
Only show department if it’s valid
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-05 10:13:19 -07:00
snipe
57b9b571dc
Fixed #9531 - highlight search box when filled, add clear button ( #9534 )
2021-05-04 22:00:34 -07:00
snipe
32f043c5df
Set the body skin style if one was overridden by the user profile
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:25:39 -07:00
snipe
23376c317e
Use correct URL for css for subdirs
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:22:02 -07:00
snipe
b3b02933a5
Removed duplicate code
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:21:48 -07:00
snipe
1d43eda21f
Features: improved UI for importer ( #9467 )
...
* Small UI improvements for importer
Signed-off-by: snipe <snipe@snipe.net>
* And UI backup improvements
Signed-off-by: snipe <snipe@snipe.net>
2021-04-21 20:16:17 -07:00
snipe
90f79eaf83
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-04-21 10:23:46 -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
snipe
d10d090d33
Moved status label help text to headline
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-20 15:31:07 -07:00
snipe
aa6b1456b2
Added help text to custom fields headline
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-20 15:29:43 -07:00
snipe
b2de0d4ade
Changed “Asset Categories” to “Categories” since there are more than asset categories now
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-20 15:29:22 -07:00
Peter Sarossy
cacb707a7f
Added #9355 : include Accessories and Consumables on the location reports ( #9356 )
2021-04-20 14:53:04 -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
Michael Pietsch
15e729f4b8
fix css when not runnin in webroot directory ( #9445 )
...
Co-authored-by: Michael Pietsch <skywalker-11@mi-pietsch.de>
2021-04-20 14:49:57 -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
e4acf8d795
Merge remote-tracking branch 'origin/master' into develop
2021-04-20 14:44:01 -07:00
snipe
e8adf8d44c
One more category fix
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-14 16:57:55 -07:00
snipe
b693e5202b
Check for category name
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-14 16:54:36 -07:00
snipe
e1c6d4ced7
Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Requests/SettingsSamlRequest.php
2021-04-14 15:15:07 -07:00
Joly0
31b2287a57
Update print.blade.php ( #9426 )
...
Fixes #9418
2021-04-14 10:20:36 -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
Godfrey Martinez
246cc0eaa8
Feature/ch16172/adding other fields to ldap sync settings ( #9416 )
...
* new branch, added manager as an additional field. Currently having DB issues
* WIP DB Issue with eloquent
* added department to LDAP sync
* removed unused variables
2021-04-14 10:17:57 -07:00
Brady Wetherington
bf344fd707
Merge branch 'develop'
...
mix-manifest I just picked one.
version.php will get bumped by hand
bootstrap table seems to just be another copy? Added it back.
2021-04-14 09:58:21 -07:00
Ivan Nieto Vivanco
9cf5fbd675
Logic added to handle when a cloned user is imported via LDAP. ( #9429 )
2021-04-14 09:19:25 -07:00
Ivan Nieto Vivanco
3824a50e8b
Fixes an issue with CSS when the 'skin' value in settings table is empty. ( #9423 )
2021-04-12 20:37:02 -07:00
snipe
bf2479c5d9
Fixed url to user-ridden style
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-06 20:36:13 -07:00
snipe
ba92d751a3
Removed depreciated Input:: facade
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-06 20:28:05 -07:00
Brady Wetherington
792a31cc7f
Merge branch 'develop'
2021-04-06 20:10:22 -07:00
snipe
390403ddb7
Fixed #9370 - listbox custom fields not decryoted on edit
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-06 05:59:31 -07:00
Joel Pittet
af8509c4d0
Allow NPM packages to build for production ( #9171 )
...
* add back changes before compiling assets
* new css location and mix manifest
* update papaparse, most vunerabilities attached to it
* update axios and papaparse for security releases
* removing security fixes that still allow npm run production to work
* Update lodash
2021-04-05 22:01:11 -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
Tetrachloromethane250
157d9e4ebb
Added #5977 : Add permission to view files attached to licenses ( #9264 )
...
* Add permission to view and modify files for licenses
* Actually use the permission
2021-04-05 21:51:47 -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
Godfrey Martinez
5ea759f615
Fixed #7211 , #9197 , #7864 , [ch15504] - Added additional LDAP fields to sync ( #9318 )
...
* LDAP and Active Directory has plenty of other [ch15504]
* removed department id from ldap sync
* removed department id from ldap sync
* Update 2021_03_18_184102_adds_several_ldap_fields.php
2021-04-05 19:26:04 -07:00
snipe
6f4215cfac
Fixed label name for field_values
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-31 14:07:30 -07:00
snipe
b5f7cb534e
Fixed element name
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-31 14:02:25 -07:00
snipe
70a7a8f20b
WTF. This shit is haunted.
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-30 08:00:27 -07:00
snipe
a5b67965f2
Fixed CSS path
...
(Fixes RB #14746 )
Signed-off-by: snipe <snipe@snipe.net>
2021-03-30 07:49:30 -07:00
Nikolay Didenko
06e641b782
Do not override per table data-id-cookie-table attribute by current route name globally ( #7835 )
2021-03-29 20:05:24 -07:00
Marc Leuser
90b7d34c69
Added #6695 : add API endpoint for license seats ( #8058 )
...
* remove miselading comment line
* added dedicated API endpoint for license seats
* don't display a seat name via API
it makes no sense and we don't have any particular sorting order
so the numbering would be inconsistent anyway
* reduce amount of IFs
* add sanity checks to show()
* fix goofed logging logic
* add tests for action log entries
2021-03-29 19:41:26 -07:00
NMC
3e934a1b96
Add a way for a user to override the site skin setting + fix mislabeled comment. ( #6891 )
...
* Add a way for a user to override the skin setting.
* Add site setting to allow user to change the skin.
* Fix skin list.
Co-authored-by: NMC <info@nmc-lab.com>
2021-03-29 19:09:23 -07:00
Eli Young
97fa9663b1
Fixed #9299 : Use correct SVG MIME type for uploads ( #9300 )
...
The correct MIME type of SVG is image/svg+xml. Out of an abundance of
caution, I am leaving in image/svg to avoid potentially causing issues
on very old browsers, but this can likely be removed without issue.
2021-03-15 16:42:11 -07:00
Ivan Nieto Vivanco
9ed226a0af
Fixes links in Models Actions, and to view the fieldset assigned to that Model. ( #9232 )
2021-03-01 13:08:29 -08:00
Joel Pittet
c979779249
Fixes a couple blade templates for relative URLs ( #9170 )
...
* Switched branch name to master
* Production assets for better contrast in dark mode skins
* Fixed #9115 : Duplicate column name 'provider' (#9137 )
* Sigh. Real assets
* fix blade templates with missing url() function wrapper for relative URLs
* Develop to master (#9195 )
* Added saml custom setting retrieveParametersFromServer to enable fixing SLO issues with Azure AD (#9187 )
* [FIX] Lite test email won't use the mail component (#9092 )
* [FIX] Lite test email won't use the mail component
* Revert "[FIX] Lite test email won't use the mail component"
This reverts commit 6dab9aa1a8887dcc7bbc
2021-02-26 15:59:36 -08:00
snipe
f37d5d3d03
Fixed #9085 - asset models not showing proper pagination
...
Huge thanks to @inietov for catching this one
2021-02-25 16:43:38 -08:00
snipe
57e52f0ba4
Fixed extraneous closing </i>
2021-02-25 13:35:05 -08:00
Oliver Walerys
c3166d491a
[FIX] Lite test email won't use the mail component ( #9092 )
...
* [FIX] Lite test email won't use the mail component
* Revert "[FIX] Lite test email won't use the mail component"
This reverts commit 6dab9aa1a8887dcc7bbc
2021-02-23 14:49:40 -08:00
snipe
c8f6318aba
Fixed funky layout in asset model modal window (broken HTML)
2021-02-19 10:51:56 -08:00
snipe
9d50e0e8d0
Fixed weird table formatting in expected checkin report
2021-02-17 13:44:35 -08:00
snipe
9deb4204c8
Fixed #9116 - incorrect parameter name sent to hardware.show in expected assets report
2021-02-17 13:41:08 -08:00
Ivan Nieto
12ff465cdb
Added feature: Checkbox Custom Fields as list of values. ( #9112 )
...
* Added functionality for checkboxes in custom fields. Similar to how radio buttons work.
* Added the same functionality when the custom fieldset is encrypted.
* Added missing bits, so the edit custom assets view shows what values have been already stored in database
2021-02-16 17:20:29 -08:00
snipe
49415806e1
Nicer formatting of the page if custom logout [ch15660]
2021-02-03 14:56:26 -08: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
snipe
fdb5b3baf1
Depreciation detail view fixes [ch15776] ( #9059 )
...
* Allow sorting by months for depreciation list view
* Added dataTableLayout to standardize the list display table
* Implement the dataTableLayout() on the list view blade
* Split the view into tabs so we can combine asset depreciations and license depreciations
* Updated depreciation view to use tabbed interface for assets and licenses
* Added asset models to depreciation details page
* Make asset model category sortable
* Added cateory as allowed to be sorted on
* Added category sort scope
* Removed offset variable
* Small fixes to asset modes display in depreciation to bulk edit models
2021-01-27 17:44:05 -08:00
Ivan Nieto
6772835efc
Added support for radio buttons in Custom Fields. ( #9053 )
2021-01-27 14:41:58 -08:00
snipe
fb482b0dd6
Fixed translation string in Depreciation view [ch15776]
2021-01-27 14:09:01 -08:00
snipe
0031fab0fe
Added termination date, depreciation in license column selection [ch14505] ( #9052 )
2021-01-27 01:34:32 -08:00
snipe
d19c6ab8e7
Use fadeIn/fadeOut for password reset page for nicer look
2021-01-26 20:05:01 -08:00
snipe
d14b1e3825
Added better visual cues for login ( #9051 )
...
* Added better visual cues for login
* Changed box header class to box-header with-border to match other screens
* Since we have all.js now, added class=“minimal” to use icheck
2021-01-26 19:57:39 -08:00
snipe
ba12ee9954
Specifically call out username in forgotten password
2021-01-26 18:00:50 -08:00
Lucas Pleß
f3a7467235
Added today as default Date for checkout Form. ( #8938 )
2021-01-26 12:06:58 -08:00
Ivan Nieto
2da6f9136f
Add 'Last Audit Date/Next Audit Date' filter to custom report ( #8989 )
...
* Add 'Last Audit Date/Next Audit Date' filter to custom report
* Added a constraint: cannot require a report with a Last Audit Date in the future.
2021-01-26 12:05:31 -08:00
snipe
75a8639a20
Fixed weird checkbox display
...
TODO: fix the 500 on the save
2021-01-12 18:16:42 -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
c00a1fa21b
Added new generic datepicker partial
2021-01-12 16:48:32 -08:00
Ivan Nieto
72f9fe444d
Fix for default parameters in JS functions IE ( #8973 )
...
* Small fix for IE which doesn't support default parameters in the function definition
* Stylistic changes for better comprehension
2021-01-05 19:25:30 -08:00
Evgeny
bbf7fbcff4
Localization digit separator feature. ( #8915 )
...
Provides an ability to localize the purchase_cost field in front-end hardware index table.
Has two digit separator formats in admin settings with comma and dot.
2020-12-15 11:49:13 -08:00
snipe
c0aa6c153e
Better callout for warning on api token page
2020-12-09 08:19:04 -08:00
snipe
5f76e03616
Clarified API url info in account > api
2020-12-09 08:14:44 -08:00
snipe
82d8b2ab82
Fixed weird parsing in newer markdown
2020-12-08 20:04:01 -08:00
snipe
4ac15daee7
Fixed #8147 - allow webp image format for public file uploads
2020-12-01 19:06:53 -08:00
snipe
bfc60864dd
Fixed typo on route for licenses
2020-11-30 20:46:45 -08:00
snipe
4882b01787
Added purchase order and order number to user > licenses view
2020-11-30 12:54:15 -08:00
snipe
f475bdbb2d
Fixed #8797 - use html_entity_decode in fullName presenter for User
2020-11-25 08:54:23 -08:00
snipe
6f99ce2b07
Branding page UI improvements (image previews inline)
2020-11-25 00:45:46 -08:00
snipe
76ee5a679b
Fixed #8810 - email logo was not being used in emails
2020-11-25 00:05:02 -08:00
snipe
973eacf6c3
Small fixes for SAML
...
The SAML routes are in a service provide (sigh), so they did not have the `web` middleware group assigned to it.
I also added some additional checks so that the setup blade won’t fail (the migrations wouldn’t have been run yet, so outside of a try/catch, it would return an error since those tables don’t exist.)
2020-11-24 13:51:02 -08:00
snipe
b2660002b9
Fixed #8781 - added asset count by status type ( #8806 )
2020-11-24 12:15:07 -08:00
johnson-yi
0cdd83aabf
Fixes #8584 , #8654 , #8727 - fixes and improvements for saml ( #8795 )
...
* Let onelogin/php-saml know to use 'X-Forwarded-*' headers if it is from a trusted proxy
* Gracefully handle the case where openssl_csr_new fails when openssl.cnf is invalid/missing
* Improve ui of saml sp metadata by displaying it's url and a download button
2020-11-20 18:54:25 -08:00
snipe
57d6a7d35e
Fixed #8753 - create-asset-from-model did not preselect the model
2020-11-18 13:59:02 -08:00
snipe
2ea805b7ed
Added search/sort by Location OU, added to listing
2020-11-17 22:17:07 -08:00
snipe
68487e1200
Added img-responsive class to preview images
2020-11-17 16:15:25 -08:00
snipe
f19b9a44fc
Fixed #8773 - wrong path for suppliers image on suppliers edit
2020-11-17 16:10:54 -08:00
snipe
4898b58bdb
Fixed #8765 - UI not indicating model is required
2020-11-17 13:40:15 -08:00
Brady Wetherington
a97b15ec96
Re-add LDAP "test login" feature to LDAP settings (helps with #8751 ) ( #8757 )
...
* Start work on re-adding back the "Test LDAP logins" feature to develop
* Add back-end method to allow LDAP test users to try to log in.
2020-11-16 21:23:08 -08:00
snipe
fbaf6e2494
Fixed #8747 - upload path for uploaded images
2020-11-16 16:39:02 -08:00
snipe
1f5bcf2475
Added option to download activity report
2020-11-13 16:25:05 -08:00
snipe
0c0de5e351
Added clarity in language as to what the activated flag does on LDAP screens
2020-11-13 11:52:34 -08:00
snipe
10cadecd14
Moved a few of the user edit fields to make more sense (optional stuff further down)
2020-11-13 11:52:09 -08:00
snipe
07936ea901
Changed asset name to asset tag in maintenances
2020-11-13 03:38:31 -08:00
snipe
df5cc7525e
Merge remote-tracking branch 'origin/develop'
2020-11-12 23:39:09 -08:00
snipe
75b8c3455c
Fixed #8609 - custom fieldsets not draggable anymore (regression)
2020-11-12 23:38:12 -08:00
snipe
81d38a0ded
Fixed #8733 - typo in unaccepted assets report
2020-11-12 23:26:05 -08:00
snipe
b2a8af2fa9
Fixed #8647 - Added additional help info on importer page
2020-11-12 22:46:51 -08:00
snipe
9d2363741e
Improved 2FA reset layout
2020-11-12 22:25:07 -08:00
snipe
9db191f0b2
Fixes for #8732 - Flysystem paths, migrator script
2020-11-12 21:46:06 -08:00
snipe
7765c87387
Fixed #8669 - Allow application/xml in SAML upload in Safari
2020-11-12 18:47:19 -08:00
snipe
caeea9f530
Merge remote-tracking branch 'origin/develop'
2020-11-12 15:27:49 -08:00
snipe
0fdfd013e7
Fixed #8715 - wrong API url for unaccepted assets
2020-11-12 15:26:50 -08:00
Dampfklon
be114176a2
Refactor Expected Checkin Notification into markdown and enable translation ( #8236 )
...
Co-authored-by: snipe <snipe@snipe.net>
2020-11-12 15:09:40 -08:00
Dampfklon
1f9b04405c
Enable translation of accept-asset page ( #8237 )
2020-11-12 15:07:45 -08:00
Dampfklon
5fb31a5a3f
Use translated salutation from other notifications ( #8234 )
2020-11-12 15:05:22 -08:00
snipe
5098d69c05
Fixed stupid auto-indent
2020-11-12 14:20:54 -08:00
snipe
b12de13041
Fixed markdown in expiring licenses alert
2020-11-12 14:10:45 -08:00
snipe
6a2e21f502
More in depth error reporting on mail test failure
2020-11-12 13:22:49 -08:00
snipe
fd7c0bc5fb
Use newer blade facade for requests
2020-11-10 08:36:18 -08:00
snipe
8c19b11e73
Fixed #8448 - “undefined” when testing email from quickstart
2020-11-10 01:48:18 -08:00
snipe
178ed82dc4
Fixed [ch9336] - Removed time stamp in Depreciation report
2020-11-10 01:13:13 -08:00
snipe
6757df5a2d
Added Checkout Date Time to Asset Details Page [ch1418]
2020-11-10 01:02:08 -08:00
snipe
895a544d4c
Fixed [ch15347] - added status in Depreciation Report
2020-11-09 23:56:16 -08:00
snipe
1cdf6f8263
Fixed #8673 - added category to accessories listing on Account > Assigned Assets
2020-11-09 23:05:19 -08:00
snipe
ec14a117b7
Display on the API token page the expiration in years
...
TODO: Translate these strings
2020-11-09 22:55:27 -08:00
snipe
ede20523f2
Fixed #8680 - location image path
2020-11-09 21:08:19 -08:00
Brady Wetherington
a5423649f4
This is the smallest set of changes we can use to work around a change in functionality
...
in Bootstrap Tables. This should remedy some of the issues we've been having with large
GET strings being sent to the back-end by the Assets system.
2020-11-09 17:36:07 -08:00
snipe
df5972c4fa
Fixed send creds checkbox in create user form
2020-11-03 13:07:15 -08:00
snipe
44e5fec707
Fixed #8603 - Use correct CSS path for signature-pad.min.css
2020-11-03 10:01:55 -08:00
snipe
c800662f0c
Use username for forgotten password
...
Since emails are not required to be unique
2020-11-02 23:57:00 -08:00
snipe
a55694da2f
Added validation to disallow password to be the same as username, email, etc
2020-11-02 20:03:26 -08:00
snipe
33bda9b6d1
Added blade option for same_pwd_as_user_fields
...
Disallows password form value to be the same as username, email, first name or last name
2020-11-02 17:47:25 -08:00
snipe
8ee9e5e059
Fixed #8537 - wrong sorting on dashboard
2020-10-23 18:33:10 -07:00
snipe
f357d9fc90
Include audit settings text in settings overview so they get picked up by the filter box
2020-10-23 18:13:28 -07:00
snipe
2aa8e1e76b
Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes
...
Fixes #8462 - move accessory notes into pivot table
2020-10-23 14:19:51 -07:00
snipe
b9a9949570
Use the form partial for avatars
2020-10-23 12:09:20 -07:00
snipe
bf9e53fbe7
Updated markdown templates
2020-10-23 06:55:23 -07:00
snipe
f68580b482
Make the email table wider
2020-10-23 06:55:04 -07:00
snipe
aec2f2a249
Fixed #8576 - switch to HTML from markdown
...
This is really stupid. A markdown table with over 3 columns doesn’t render correctly. :(
2020-10-23 06:54:45 -07:00
snipe
831da2d6d1
New mail vendor files
2020-10-23 06:17:07 -07:00
snipe
2263dae8f4
Fixed HTML
2020-10-23 04:07:55 -07:00
snipe
88f03e6b55
Added last_checkout and notes from pivot for accessories
2020-10-23 00:44:26 -07:00
snipe
5d112be49a
Fixed #8585 - requested assets page blank
2020-10-22 20:08:33 -07:00
snipe
496b176d4e
Fixed #8589 - unable to accept asset
2020-10-22 19:46:40 -07:00
snipe
c71086d2f3
Fixed #8590 - unable to checkin and delete from user view
2020-10-22 19:32:51 -07:00
snipe
a6d0209e93
Fixed #8567 - don’t require model for custom report
2020-10-21 12:23:27 -07:00
Bennett Blodinger
132f296f03
Fix typo
2020-10-20 08:13:52 -05:00
snipe
c1443aa6eb
Pull licenses, accessories, etc - the qty is not accurately reflected
2020-10-19 16:22:55 -07:00
snipe
714ad071ca
Add API endpoint to API keys page
...
// TODO - localize it
2020-10-09 14:46:11 -07:00
snipe
c0f9a35dea
Fixed password reset blade with correct username
2020-10-08 18:47:42 -07:00
snipe
b49c5dbf06
Clarified language
2020-10-05 20:43:28 -07:00
snipe
6234c6e5fc
Fixed typo
2020-10-05 20:35:27 -07:00
snipe
0cd19c87bf
Added utility to delete barcode cache from labels/barcodes setting
2020-10-05 20:34:17 -07:00
snipe
dafac4ceb3
Disable ldap_enabled on demo, fixed some incorrect error messages
2020-09-25 19:04:38 -07:00
snipe
98246de4c7
Disable SAML on the demo
2020-09-24 19:25:28 -07: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
Brady Wetherington
0e823a962b
Fix for #8424 - where the ldap_server setting was grayed out
2020-09-17 13:32:14 -07:00
snipe
002ca52c83
Standardize feature disabled messages in UI
2020-09-16 15:09:58 -07:00
Brady Wetherington
8331be05aa
Some fancy JS to enable/disable Slack-test based on field values
2020-09-16 13:15:39 -07:00
snipe
e8dfb71682
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
...
# Conflicts:
# resources/views/settings/slack.blade.php
2020-09-16 12:40:23 -07:00
snipe
7de685a1c1
Added demo disabled text on slack screen
2020-09-16 12:36:33 -07:00
snipe
b508482441
Merge pull request #8438 from snipe/features/nicer_slack_ui
...
Nicer slack settings UI
2020-09-16 12:29:58 -07:00
snipe
30f8431bfb
Added required field indicator
2020-09-16 12:29:20 -07:00
snipe
a3e738b283
Fixed #8442 - wrong CSS url path on /setup
2020-09-16 11:20:59 -07:00
snipe
74b96a7413
UI tweaks and updated JS to disable the save button if the settings are not correct
2020-09-15 23:14:10 -07:00
snipe
4fd5358aa8
Changed login attempts icon so it’s not the same as SAML
2020-09-15 20:27:01 -07:00
snipe
e8befe9afd
Increased favicon filesize max
2020-09-15 20:07:29 -07:00
snipe
d5f8e93d7c
Moved delete logo option higher for nicer layout
2020-09-15 19:52:34 -07:00
snipe
303388e1f5
Added a space between favicon help text blocks
2020-09-15 19:50:15 -07:00
snipe
9601bf6edd
Make “remove image” text clearer
2020-09-15 11:57:40 -07:00
snipe
3b6fb68ff1
Added space between padlock icon and demo warning text
2020-09-15 11:40:36 -07:00
snipe
bfd024fdfd
Merge pull request #8434 from inietov/bug/ch15182/make-all-of-the-this-feature-has-been-disabled
...
Thanks!
2020-09-15 11:21:35 -07:00
snipe
e464f0edf3
Small UI tweaks for kits
2020-09-15 10:15:14 -07:00
Ivan Nieto
291997c915
Change the class of a reusable element so the icon changes from a warning to a padlock
2020-09-15 01:32:46 -05:00
snipe
912401a0a0
Change warning icon to padlock icon
2020-09-12 12:07:56 -07:00
snipe
ec5daa387b
Better explanation for demo mode
2020-09-12 10:04:57 -07:00
snipe
e448b626e2
Removed pagaination from dashboard
2020-09-12 08:37:37 -07:00
snipe
ac2403e8fc
Fixed markdown issue in markdown notifications
2020-09-11 17:12:33 -07:00
snipe
cf545f0ed1
Fixed form layout on accessory checkin page
2020-09-11 16:20:56 -07:00
snipe
d3d64bd85c
Removed asset tag from accessory checkin markdown notification
2020-09-11 16:06:02 -07:00
snipe
0f22cf6807
Fixed #8428 - Added purchase cost column to user tabs
2020-09-11 11:48:51 -07:00
snipe
2f435a57c1
Fixed #8426 - show model number in custom fields model listing
2020-09-11 11:27:30 -07:00
snipe
82e0b1ffd8
Fixed [ch15130] - update the seeder to clear requested assets table
2020-09-08 18:29:02 -07:00
snipe
5b68a321a6
Added comapny formatter to asset maintenance report - fixes [ch15119]
2020-09-08 18:15:45 -07:00
snipe
251ef82741
Added company formatter to asset maintenance report
2020-09-08 18:14:21 -07:00
snipe
d9e7a457d4
Fixed regression on select menus [ch15093]
...
Custom report doesn’t pass an $item, so we have to check for that in that required check
2020-09-04 15:43:49 -07:00
snipe
249b9b7509
Fixed [ch15086] - [object object] in companies date displays
2020-09-03 19:40:17 -07:00
snipe
0eeeb24cae
Added data-validation=“required" to appropriate field partials
2020-09-03 16:59:42 -07:00
snipe
0503a51cae
Corrected validation to match model
2020-09-03 16:58:45 -07:00
snipe
c29ec6a100
Removed duplicate state field
2020-09-03 16:00:26 -07:00
snipe
a57ab29af6
Accessibility features for custom fields icons
2020-09-03 15:55:52 -07:00
snipe
b8ddbadd2b
Use icons for 2FA, LDAP, etc info on user view
2020-09-03 15:55:41 -07:00
snipe
3e120812e3
Removed 2FA reset button if the user is not enrolled in 2FA
2020-09-03 15:55:20 -07:00
snipe
3ea3e8b856
Updated user asset listing to use bootstrap-tables and asset endpoint [ch1389]
2020-09-03 15:12:51 -07:00
snipe
fb59405a87
User view can t be loaded [ch15079]
2020-09-03 14:07:30 -07:00
Ivan Nieto
3fcd83c499
Fixes some errors in forms using the deprecated Input:: facade
2020-09-03 13:42:33 -05:00
snipe
ed79eacb9d
Updated help text
2020-08-31 19:55:30 -07:00
snipe
a64e1be278
Fixed Input:: () vs request()
2020-08-31 17:18:09 -07:00
snipe
13216b8860
Fixed pGenerator (again)
2020-08-31 17:17:51 -07:00
snipe
453fc718d9
Merge branch 'develop' into integrations/2020-08-31-dev-into-master
...
# Conflicts:
# .all-contributorsrc
# .nvmrc
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/AssetsController.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/Models/Ldap.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/less/overrides.less
# resources/views/custom_fields/fieldsets/view.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
# tests/unit/UserTest.php
2020-08-31 12:44:03 -07:00
snipe
9c8ca6af21
Squashed commit of the following:
...
commit e321aeabae8ec99ff4337568ae9e37568ae9ec01a83216932ad9050c#8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
commit 32ad9050cf01a832169cbcad49ce73c6883489#8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist
Fixed #8335 - added assignedTo scope on status labels API call for assetlist
commit 3c6883489cbcad49ce79b5acca89d7e52919cf1b714576be429f3a5c48#8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
commit 29f3a5c48f134e8e6fb9714576be45b999c50a2512899294#8328 from snipe/fix_deprecation_report
Fix deprecation report for customers with many active assets
commit 51289929400291323502e0f6f9b839f1a6308002b999c50a2e9ca20e496e3906b245#8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation
Looks great, thank you!
commit e3906b245c9ca20e4964e0644dbbf456a74d88#8313 from snipe/improve_ldap_search_error_reporting
Improve ldap search error reporting
commit 456a74d88c799c059070c62d43a778b725bd0faee0644dbbf65b6925b00004ecad05#8105 from PeterUpfold/PeterUpfold-7661workaround
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
commit 5b6925b00cdf17a859bf24c43056ba606b7e905dd73ddad4779a39cf721e7410b16838994f3e15#8258 from ballertv/features/consumable-api
This looks great, thank you!
commit 7410b16835e955c983ab09e7d19b#8270 from snipe/improve_ad_useraccountcontrol_v4
Add new useraccountcontrol value for valid AD users
commit 8994f3e15ed23f1a77cae955c983a32fa17ac18eed41e454#8250 from snipe/features/adds_addr_city_state_to_importer
Added address, city, state and country to importer and city to bulk editor
commit b09e7d19b32fa17ac185b905154373b1e46f72#8254 from Godmartinz/gmartinez_adds_email_formats
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…
commit 3b1e46f72b0c1a1de2a220c9ae5818eed41e4549b750f4754fc17a06792a4f76cc6cfbb905154373Fixed #8247 - added notes field to user details display
commit daf748e531799a93c46a34aa12e22981a633288897757bd0#8239 from snipe/fixes/api_rtd_to_location_on_create
Set location_id to rtd_location_id on asset creation
commit 897757bd04c7125c393781a63328896e563f6e4b5320f5c677f69ae953https://github.com/snipe/snipe-it
commit 5320f5c67c7f69ae953bc79f8c1ba17f6fbabf#8227 from snipe/fix_select2_ajax_pulldowns
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 17f6fbabfac79f8c1baf12c92e30b536401fe0#8207 from EDVLeer/patch-1
Update snipeit.sh
commit e7a820f7c912c92e30b7fd10b755b0dbbb7680d9cf0dd5bbad25e53d8c7fec6ed256f89d433b41#8216 from snipe/features/checkout_license_to_all_users
Added CLI tool to checkout license to all users
commit 89d433b41ae2570ada6f45afe725a1536401fe0fec6ed256fb2aaa7bed2d339bdddc3cc9f1577a#8183 from snipe/features/merge_users
Added merge utility
commit cc9f1577a4ab1fe8be0c339bdddc3835b9cf4b707ccb41371e2e60a457bf2390d2160bb42801f6a00b051b8c#8164 from snipe/features/additional_security_headers
Additional security headers
commit 00b051b8c705b3a9ad7e4fb880384f43042ad841a716382ac436c8f7f4f1b42801f6aede4934f21946129f20#8163 from snipe/fixes/fix-for-css-on-column-selector
Fixed weird padlock display in asset listing with encrypted custom fields
commit 946129f206b941ef1e08d1aa11ec89de4934f21daf06e4205b10076b01#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 b10076b015af06e420569a2440dc4bbeae8efb22ac1c1636#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 2ac1c1636c004ecad059beae8efb21d14ab7e3e9839e5e56#8088 from Godmartinz/Label_Woes
Barcode resizing and text adjustment
commit 9839e5e566d14ab7e3e1#8053 to master
Signed-off-by: snipe <snipe@snipe.net>
commit e7f74d94c1e97cf011b6ed23505054001e721530f886837668210da6e8#8063 from dmeltzer/backport-8092
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
commit 8210da6e82f88683766be4385c0f8cFixes #8051 regression
Signed-off-by: snipe <snipe@snipe.net>
commit 0550fe0ffa7fb3a9b82c9a2ed804cecb1e87fe#8043 from snipe/features/backup-optional-in-import-and-ldap
Added option to disable backup in import
commit ecb1e87fe6f43df5f04195cc48e4229a2ed804cad20fad28e5ae813ddf75bb42109c0cf46ecf8ec0b9e821c0e69ee28c75131a8ba067020fd232e70ee4d69b1chttps://github.com/snipe/snipe-it
commit 0fd232e70dee4d69b1c531c535094d1ad11194#8041 from alek13/patch-1
use supported package for slack
commit d1ad111949https://github.com/maknz/slack/issues/94
commit 31c53509417eb70e17e05bb4f271a3dfcb4699#7993 from snipe/fixes/7989_column_selector
Fixed #7989 - Converted table heading icons in People to CSS glyphs
commit 3dfcb4699196eb96f964a2f08bd3bae009fbe59f5bb4f271aaFixed #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
snipe
e1cc003cec
Fixed backup urls for download
2020-08-28 18:22:37 -07:00
snipe
d25a05d748
Misc Flysystem/image upload request fixes
2020-08-26 11:53:36 -07:00
snipe
f385f3e928
Fixed user image upload
...
TODO: We should probably rename the avatar field on the user’s table, to make it more consistent with the other model images
2020-08-26 02:30:23 -07:00
snipe
a90d2ba077
Fixed suppliers upload
2020-08-24 18:53:33 -07:00
snipe
232e3f30aa
Fixed accessories “current image” path in edit form
2020-08-24 14:30:55 -07:00
Michael Pietsch
4f5374b2e8
enable use custom file based saml certificate/private key
2020-08-14 12:25:00 +02:00
snipe
19d8d7b146
Updated components and consumables to use storage facade
2020-08-12 13:02:54 -07:00
snipe
5b6925b00c
Removed debugging :(
2020-08-04 21:00:37 -07:00
snipe
df17a859bf
Changed modal IDs so manager creation modal works on user creation main page
2020-08-04 20:59:54 -07:00
snipe
24c43056ba
Moved pGenerator script to default layout footer
...
This fixes an issue where the password generator wouldn’t load in a modal in Chrome
2020-08-04 20:58:28 -07:00
snipe
4e0a9c7a94
Fart fix
...
I just…. don’t ask.
2020-08-03 12:35:34 -07:00
snipe
6a089f86f8
Fixed pathing for accessories
2020-08-03 11:17:56 -07:00
snipe
502b3c50a9
Fixed upload preview (fixed regression from #6736 )
...
This change appears to have been stomped on in one of the merges. :(
2020-07-31 14:36:50 -07:00
snipe
3e62a6ea2d
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-07-31 11:01:35 -07:00
snipe
eed41e4549
Moved address down further, fixed broken HTML
2020-07-21 16:57:32 -07:00
snipe
b750f4754f
Added city to bulk user importer
2020-07-21 16:49:54 -07:00
snipe
b905154373
Fixed #8247 - added notes field to user details display
2020-07-20 14:29:32 -07:00
snipe
81a6332889
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
2020-07-14 13:55:38 -07:00
Ivan Nieto
8fd4529fad
Change the form input name for serials in the view
2020-07-13 13:49:21 -05:00
snipe
12c92e30b7
Show whether or not the user was imported via LDAP in the view page
2020-07-10 16:21:27 -07:00
snipe
fd10b755b0
Removed the sr-only tag in table headers
...
It was breaking Bootstrap Tables column selector :(
2020-07-10 11:30:01 -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
snipe
b941ef1e08
Pulled CSS font awesome styles out of the blade and into overrides.css
2020-06-22 20:41:40 -07:00
Godfrey M
b10076b015
corrected an error where font-size for labels were static in settings.
2020-06-22 17:04:39 -07:00
snipe
a7eb89f6b6
Misc fixes for flysystem paths
2020-06-16 16:06:25 -07:00
snipe
7a785b4952
Updated a few flysystem settings
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-28 01:54:29 -07:00
Godfrey M
9839e5e566
adjusted for all label text, removed local variable
2020-05-27 12:27:40 -07:00
snipe
5b4e4c8dcd
Merge pull request #8061 from Godmartinz/develop
...
fixed a table header error
2020-05-26 19:52:14 -07:00
Godfrey M
e7f74d94c1
Label_Woes
2020-05-26 17:22:45 -07:00
Godfrey M
e97cf011b6
Label_Woes
2020-05-26 17:15:39 -07:00
Godfrey M
ed23505054
Label_Woes
2020-05-26 17:10:45 -07:00
Daniel Meltzer
7ea862787c
Refactor controller to use one method that shows all modals based on name.
2020-05-23 15:24:00 -04:00
Daniel Meltzer
7a76cb08a0
We accept xlsx in uploads
2020-05-23 11:36:47 -04:00
Daniel Meltzer
8210da6e82
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.
2020-05-20 10:29:27 -04:00
Daniel Meltzer
6a80f95769
Fix Missing Category selection in Asset Model Modal dialog.
...
A select html tag needs a full closing tag. <select /> is not valid.
This was causing the select2 js to barf and eat additional information.
2020-05-20 10:23:04 -04:00
Godfrey M
edd4797178
fixed a table header error
2020-05-19 16:59:09 -07:00
Daniel Meltzer
a6f90cb3fc
Assorted licenses UI fixes while testing.
...
* Rename licenses route checkin parameter to clarify it's purpose and
fix incorrect route in users view page.
* Checkin note can be nullable for checking in a license.
* License Seat view was only showing 20 license seats due to faulty
transformer logic.
2020-05-12 14:38:21 -04:00
snipe
9a2ed804ca
Fixed mismatched HTML header tags
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 20:28:42 -07:00
snipe
d20fad28e5
Use more modern request helper
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 20:28:24 -07:00
snipe
9ee28c7513
Switched to use info instead of danger on undeployable statuses
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 18:07:02 -07:00
Johnson Yi
572185ac96
Revised how saml sp info is displayed
2020-05-09 09:44:51 +10:00
Johnson Yi
b2930d6069
Added #542 : add saml authentication
2020-05-06 00:06:19 +10:00
snipe
8ecb7969df
Fixed incorrect route for saving groups
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-01 01:26:15 -07:00
snipe
31c5350941
Fixed incorrect route for groups edit
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-01 01:05:48 -07:00
snipe
8507bcd16b
Merge pull request #8008 from dmeltzer/component-checkinout-fixes
...
Component checkout/checkin fixes.
2020-04-30 17:49:22 -07:00
snipe
e47c44d055
Merge pull request #8007 from dmeltzer/permissions-form-cleanup
...
Permissions edit cleanups.
2020-04-30 17:48:24 -07:00
snipe
8bb3c01f78
Addressed merge issue for reset password for #7997
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-30 17:45:05 -07:00
Daniel Meltzer
bfba30058c
Fix incorrect routing.
2020-04-30 10:35:26 -04:00
Daniel Meltzer
debdccf5f1
Remove old help text translation that doesn't exist any more
2020-04-30 10:35:11 -04:00
Daniel Meltzer
358609720a
Component checkout/checkin fixes.
...
- Provide proper translated messages for checkin vs checkout
- Pass appropriate methods to the Checkout event, fixes an error on
checkin.
- Default to a value of 1 on checkin in UI to save a click sometimes.
2020-04-29 12:50:09 -04:00
Daniel Meltzer
42e1e9a0bd
Permissions edit cleanups.
...
- Make each section of permissions it's own tbody for better styling
- Remove extra separators when theres nothing to separate
- Vertically center radio buttons in header rows.
Still on the ideal list:
- Unify code between users and groups into one partial with
conditionals.
- Sticky header row or put the header row in each section.
2020-04-29 12:33:50 -04: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
c2f1fd4942
Make user form a little nicer looking
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-28 00:01:47 -07:00
snipe
412caebf69
Fixed logo uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 23:22:52 -07:00
snipe
b433b49469
Ficing webpack, CSS and JS (*whew* that sucked)
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 22:41:33 -07:00
snipe
f172747495
Handle parse error in custom fields edit per #7997
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 19:36:07 -07:00
snipe
6427f46a6b
Removed mix (switched to url()) for now until assets are fixed
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 19:35:21 -07:00
snipe
6847a331a7
Backport the column icon fix from master
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 05:55:38 -07:00
snipe
3dfcb46991
Minor formatting changes
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:41:08 -07:00
snipe
96eb96f964
Removed stray val (typo)
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:27:00 -07:00
snipe
a2f08bd3ba
Added comments
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:08:54 -07:00
snipe
e009fbe59f
Converted table heading icons in People to CSS glyphs
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:04:53 -07:00
snipe
5bb4f271aa
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 00:47:19 -07:00
snipe
bea3a7b982
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 00:39:32 -07:00
snipe
44962d1eb9
Switched to use Primary button
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:44:48 -07:00
snipe
e69461d797
Cleaned up LDAP sync blade
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:44:28 -07:00
snipe
b01e8720dc
Fixed ldap settings JS error
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 14:41:20 -07:00
snipe
c50b81ff19
Added resources
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:15:24 -07:00
snipe
b5cc845216
Removed vendor.js from setup blade
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:15:12 -07:00
snipe
3435485a46
Updated path to skin css
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 06:41:19 -07:00
snipe
82b6d2b31b
Fixed a few more tests
2020-04-21 21:13:00 -07: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
7a6ca5cb40
Tempt fix for css weirdness
...
TODO: figure out why overrides isn’t being compiled into css/dist/all.css
2020-04-21 11:03:32 -07:00
snipe
1d8c3a73ea
Use non-min version of skin until we can get the other webpack stuff sorted
2020-04-21 10:43:04 -07:00
snipe
e786ef8290
Pull branding back to develop normal
2020-04-21 10:42:37 -07:00
snipe
c38bbfc8bd
Removed title from more info link
2020-04-21 06:29:34 -07:00
snipe
be446eedb0
Updated html styles on settings index
2020-04-21 06:29:08 -07:00
snipe
dc6e329d96
Fixed name in comments
2020-04-21 06:18:24 -07:00
snipe
72b3228d82
Fixed HTML tags
2020-04-21 06:15:31 -07:00
snipe
cb71bcc4af
Switch to old() helper
2020-04-21 03:58:31 -07:00
snipe
58f6b2da5a
Fixing assets
2020-04-21 03:42:35 -07:00
snipe
b670371e0b
Ugggh… fixing a donked merge
2020-04-21 03:30:21 -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
7ebd21bc04
Added sr-only to the unstyles image upload button
2020-04-09 19:29:16 -07:00
snipe
83ee64f155
Added missing CSS class to text-only logo
2020-04-08 17:25:14 -07:00
snipe
a0f7fdc57a
Merge branch 'fixes/accessibility_fixes'
...
# Conflicts:
# public/css/build/all.css
# public/css/dist/all.css
# 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
2020-04-08 11:19:42 -07:00
snipe
1a5785a8d3
Fixed dashboard header size
2020-04-06 21:30:28 -07:00
snipe
320d660e83
Updated chartjs
2020-04-06 21:17:26 -07:00
snipe
fb903b2fda
Added comments, better indenting
2020-04-06 21:05:42 -07:00
snipe
7bf398aca4
More settings filter fixes
2020-04-06 20:47:05 -07:00
snipe
f6bb655383
Prevent form submission
2020-04-06 20:17:44 -07:00
snipe
19f71face9
Added filtering to settings page
2020-04-06 20:11:13 -07:00
snipe
d82b94e281
Pull blue stylesheet if no skin was selected
2020-04-06 19:04:49 -07:00
snipe
a8032ac388
Switched to btn-primary for submit
2020-04-02 18:38:54 -07:00
snipe
21d8225696
Use button primary for higher contrast
2020-04-02 18:33:26 -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
031adc3be4
Small display fixes to importer table
2020-04-01 19:51:36 -07:00
snipe
c906026acd
Merge branch 'master' into fixes/accessibility_fixes
2020-04-01 14:04:02 -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
120e224961
Add the ability to remove all group memberships in bulk
2020-04-01 06:35:13 -07:00
snipe
e27d69a31d
Remove viewport restrictions
2020-04-01 06:18:37 -07:00
Ivan Nieto
c492ba7245
Adding changes to 'upload-table' for being painted in CSS ( #7934 )
2020-04-01 05:24:05 -07:00
snipe
53658e365f
Removed duplicate HTML tag
2020-04-01 04:36:28 -07:00
snipe
4cfa0e36b1
Added labels to password reset
2020-04-01 04:30:54 -07:00
snipe
9d9b5d3885
Added form labels to auth screens
2020-04-01 04:29:54 -07:00
snipe
36f9905be0
Removed test code
2020-04-01 04:29:35 -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
4dcc1ffdbc
More form labels
2020-04-01 02:22:24 -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
b079d0d6d5
Use btn-primary for submit button
2020-03-31 23:38:10 -07:00
snipe
c6c75cc11f
Fixed missing </h3 tags
2020-03-31 23:36:56 -07:00
snipe
b188285bc9
Fixed empty table headings
2020-03-31 23:02:24 -07:00
snipe
6d659a84b8
Removed extra div tag
2020-03-31 22:53:58 -07:00
snipe
3e3828229d
Removed _tab from tab names
2020-03-31 22:52:21 -07:00
snipe
bf6a0f8d2f
Added aria-hidden
2020-03-31 22:50:38 -07:00
snipe
3873c4b253
Added aria form labels to upload modal
2020-03-31 22:50:29 -07:00
snipe
6cc23f69f9
Added aria form labels
2020-03-31 22:50:14 -07:00
snipe
a467a6999e
Use upload modal
2020-03-31 22:50:07 -07:00
snipe
e0eb10ca1e
Added aria-hidden tags
2020-03-31 22:49:49 -07:00
snipe
99c4c73c09
Fixed aria labels on dropdowns
2020-03-31 21:53:26 -07:00
snipe
bde45cbb34
Fixed h3 to h2 for semantic header levels
2020-03-31 21:30:24 -07:00
snipe
bfa9c0c528
Updated dark skins with updated styles
2020-03-31 20:58:54 -07:00
snipe
fe2261c88d
A few more aria-hidden fixes
2020-03-31 19:34:01 -07:00
snipe
6aeb3c0a47
Use divs instead of layout table on view
2020-03-31 19:27:21 -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
7854003ec2
Added sr-only text to “made with love” footer
2020-03-31 17:29:20 -07:00
snipe
c71dd9b68a
Added sr-only text
2020-03-31 17:29:06 -07:00
snipe
b8b9ac8a1b
Fixed mismatched <b>/<strong> tags
2020-03-28 18:00:46 -07:00
snipe
80ac2607cd
Added alt tags to assigned assets view
2020-03-28 18:00:19 -07:00
snipe
3552fb1fd8
Added alt tags to profile image
2020-03-28 18:00:05 -07:00
snipe
54a96b8453
Fixed <b> to <strong>
2020-03-28 17:30:17 -07:00
snipe
e9ddd1af81
Added th content on activity report
2020-03-28 04:00:26 -07:00
snipe
f0b9cd7820
Changed header for h2
2020-03-28 03:43:24 -07:00
snipe
59accca89d
Added form labelss
2020-03-28 03:43:08 -07:00
snipe
e72ebfb94b
Added placeholder text for modal header
2020-03-28 03:42:45 -07:00
snipe
0b7316d548
Changed side heading to h2
2020-03-28 03:42:27 -07:00
snipe
d0cf76989a
Fixed table headers for custom fields
2020-03-28 02:52:14 -07:00
snipe
5e4918579a
Added table headers
2020-03-28 02:41:27 -07:00
snipe
5a6c13e364
Added aria-hidden and sr-only tags to minus/collapse symbol
2020-03-28 01:37:49 -07:00
snipe
5c68353e62
Use non-min bs tables for now
2020-03-28 01:36:35 -07:00
snipe
53728e5c71
Removed whitespace
2020-03-28 01:36:22 -07:00
snipe
b965d170ab
Added accessibility features to bootstrap tables
2020-03-28 00:51:26 -07:00
snipe
a8f6bbd86a
Added alt text to image formatter in bootstrap tables
2020-03-27 22:01:24 -07:00
snipe
2a813244a2
Wrapped text in h5s, added aria hidden to icons
2020-03-27 21:45:27 -07:00
snipe
b50894fca1
Use a variable in the settings to determine what css classes to use
2020-03-27 21:44:50 -07:00
snipe
41fa2d1aa1
Added aria handlers and sr-only text
2020-03-27 21:44:32 -07:00
snipe
5858c90e71
Minor formatting change (spacing)
2020-03-27 15:50:01 -07:00
snipe
f0ef06ebe1
Added more alt tags
2020-03-27 15:35:29 -07:00
snipe
700f7de748
Added alt text to logo
2020-03-27 14:10:56 -07:00
snipe
af2ea7ac03
Added aria-hidden="true" to create dropdown in topnav
...
Since it’s technically duplicated content
2020-03-27 14:08:01 -07:00
snipe
690d8255c9
Removed the title attribute from the select2 output
...
It contains duplicate info since its auto-generated by select2
2020-03-27 14:07:30 -07:00
snipe
aded2193a2
Added aria-hidden="true" to top navigation elements
2020-03-27 13:29:00 -07:00
snipe
6d99b2a68c
Added “skip to content” link
2020-03-27 13:28:48 -07:00
snipe
55a619778f
Added language header
2020-03-25 16:32:33 -07:00
snipe
039f5da0e1
Add image upload to user edit [ch10508] ( #7877 )
...
* Use correct Request include
* Updated to use additional form request
* Added SVG sanitizer
* Added response method to form request
* Allow ImageUploadRequest to accept fieldname params, added SVG sanitization, fixed delete
* Fixed upload path for avatars
* Added fieldname variable to blade partial for image upload
* Added enctype="multipart/form-data" to form to allow uploads
* Added image field
* Updated Request::old() to use $request->old()
* Fixed derp in edit blade referring to $item when it should be $user
* Added svg+xml to image rule
2020-03-05 18:00:24 -08:00
snipe
d1a8d76d85
Set maxlength in password reset form to 250
2020-03-04 22:06:43 -08:00
snipe
03c5a42f5a
Fixes for flysystem paths :(
2020-02-11 20:22:55 -08:00
snipe
46a138c64b
Fixed id to statuslabel in sidenav
2020-02-10 12:36:48 -08:00
Fabian Grutschus
5becb93e6c
Added: allow appending of domain name to username when user tries to login ( #7790 )
2020-02-04 12:47:49 -08:00
Ivan Nieto
ab36784edd
Added a parameter that http://snipe-it.app/fields expected, without it that functionality was broken ( #7687 )
...
Nice!
2019-12-30 20:18:47 -08:00
snipe
b5db0b22f8
Switched to Request facade
...
I don’t know why my greps keep missing this shit.
2019-12-10 19:47:54 -08: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
de0b5a6149
Fixes #6440 - quote marks in the right place
2019-12-06 11:04:16 -08:00
Dustin B
8fd4e35244
Closes #6440 Print All Assigned - New Tab ( #7135 )
...
Should add the functionality to, by default open in a new tab and not reference back to the source page. Reduces overhead and should resolve #6440 .
Untested, need confirmation.
2019-12-06 11:00:01 -08:00
Valentyn Tulub
6ad1f51673
Added #6489 : show asset assignments under user assignments ( #7293 )
...
* Add a setting to show assets assigned to other assets #6489
* Update user's views to show assets assigned to other assets #6489
* Add ukrainian and russian translation for the feature #6489 in settings
2019-12-06 10:57:48 -08:00
snipe
88cf456386
Adding Dept to license seats ( #7609 )
...
* Adding Dept to license seats
* Added query scope to order by department
* Make license seat department sortable
* Disable license seat internal search - this never actually worked
2019-11-21 22:03:56 -08:00
snipe
d8049209ca
Fixed bug where deleted consumable would throw an error on print page
2019-11-21 21:43:54 -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
snipe
22d2ad9248
Fixes nested location selectlist ( #7483 )
...
* Rename child locations method
* Use Ajax dropdown for locations selectlist for edit/create
* Removed locations database call on edit/create blades for faster loading
* Updated locations controller to use the new iterator
* Increase pagination on locations controller to 500
We’re already loading all of that data up beforehand anyway, so no point in keeping the query smaller.
* Fixed the else to make codacy happy
* Improve the design and performance of the nested location selectlist (#7484 )
* Improve the design and performance of the nested location selectlist
* Fixed parse errors
* Removed debugging code/comments
2019-10-02 03:56:56 -07:00
Martin Berg
3dcef9aac9
Add support for custom remote user header ( #7370 )
2019-09-03 11:07:26 -07: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
60bb385cf7
Make status label required
2019-08-14 23:46:09 -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
0e93495ca2
Check that the user has assets and that the aset model is valid
2019-07-17 17:51:35 -07:00
snipe
77a6f6f400
Cap warranty months to 3 on the frontend blade
2019-07-17 12:15:15 -07:00
snipe
fecf8015a1
Added space between footer and custom message
2019-07-17 12:09:32 -07:00
snipe
79ab0d8dc2
Check for valid seat on hardware view
2019-07-17 12:09:18 -07:00
snipe
6736b1c4e7
Addresses #7238 - add PWA code to layout
...
Needs additional UX testing
2019-07-15 13:49:56 -07:00
snipe
087cdd859e
Fixed #7092 - handle weird port forwarding/port numbers for baseUrl
2019-05-29 14:57:58 -07:00
snipe
2dd31544fe
Increased image size to 800px, added lightboxes
2019-05-24 19:11:08 -07:00
snipe
237acdcff0
Show accessory image on view page
2019-05-24 18:22:57 -07:00
sreyemnayr
f85ac97d8c
Feedback for Kits; Fix checkins for accessories ( #7060 )
...
* Kits feedback
* Fix accessory checkin
2019-05-23 19:39:30 -07:00
snipe
f6ef139111
Fixed baseUrl is undefined error
...
I literally cannot figure out how this ever worked before.
2019-05-23 16:56:22 -07:00
snipe
b2eacb147b
Fixed #7046 - added user website url back into UI
2019-05-21 18:55:12 -07:00
Ivan Nieto
e40a5a70a5
RTF support added ( #7024 )
...
* Added the Gatte Facade to AssetsController
* Added the filetype RTF in the modal to upload files
* Added validation of RTF files
2019-05-15 15:47:40 -07:00
snipe
d016076806
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
2019-05-08 08:14:49 -04: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
e4a298ca2a
Added scope for both overdue and upcoming
2019-05-05 22:13:30 -04:00
snipe
00a8a2aff3
Fixed next audit date math
2019-05-05 20:00:05 -04:00
snipe
7d416d1175
Fixed :threshold placeholder
2019-05-05 19:57:23 -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
69614a7db4
Added gated sidenav items to left nav
2019-05-05 19:21:26 -04:00
snipe
8154d1116c
Added bootstrap-tables presenter formatter to display an audit button
2019-05-05 19:21:06 -04:00
snipe
e46cccdf90
Added upcoming audit report
...
TODO: Fid diff/threshold math
2019-05-04 17:52:17 -04:00
ajsy
0cdc7af611
Update print.blade.php
2019-05-03 15:22:01 +03:00
snipe
ce16eae508
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-05-02 15:20:52 -07:00
snipe
dc73dbfbfd
Fixed #6911 - note must be a string on license checkin
2019-05-02 15:20:47 -07:00
ajsy
878cfee5a2
Revert "Delete print.blade.php"
...
This reverts commit a0721412fa
2019-04-20 09:28:48 +03:00
ajsy
a0721412fa
Delete print.blade.php
2019-04-19 15:50:05 +03:00
ajsy
52add03e56
Update print.blade.php
...
replace string in serial number with x except last five character
2019-04-19 15:43:40 +03:00
ajsy
c974968821
Update view.blade.php
2019-04-19 14:03:09 +03:00
ajsy
f2242fa32e
Update view.blade.php
2019-04-19 13:20:41 +03:00
snipe
420e8bc85a
Allow phone number to be changed in Profile
2019-04-18 14:13:50 -04:00
snipe
ded1a59914
Removed help text for email images (since we embed them by default now)
...
Added help text for username format
2019-04-02 18:22:31 -07:00
snipe
37b8029d04
Fixed parse error on label settings
...
Also fixed [ch1362] - moving left/right
2019-04-02 18:04:31 -07:00
snipe
d01f9a701c
Fix double-encoding issue?
...
I assume there’s something new in Laravel 5.7/5.8 that’s causing the double escaping. I’m not seeing it everywhere, which is more confusing, TBH. :-/
2019-03-20 04:12:03 -07:00
snipe
bca82684a1
Merge branch 'hotfixes/2fa_qr' into develop
...
# Conflicts:
# .all-contributorsrc
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/ImportsController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Requests/ItemImportRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# composer.json
# composer.lock
# config/app.php
# config/version.php
# docker/startup.sh
# public/css/build/all.css
# public/css/dist/all.css
# 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
2019-03-20 02:17:02 -07:00
snipe
da015ec4a8
Fixed #6834 and #6402 - use inline QR code generation for 2FA ( #6840 )
...
* Fixed #6834 and #6402 - use inline QR code generation for
* Update auth controllers to use translations
* Updated composer lock
* Added comments
* Moar comments
* Typo
2019-03-20 01:24:31 -07:00
snipe
a874dbb0d0
Working attempt, but will try with old library for mininal footprint
2019-03-19 23:18:16 -07:00
snipe
0e1289f12f
Fixes #6821 - fixed 2 fa active for users list ( #6822 )
...
* Fixed #6821 - confusing UI for 2FA when 2FA is universally enforced
I also updated the language in the user’s listing table to clarify what “activated” means
* Added login enabled info to user view
* Clarified comments
* Added info about 2FA on user profile
Because why not
* Added nowrap to table, and added 2FA reset for superadmins
2019-03-18 11:59:02 -07:00
snipe
7b33f95e83
Fixes/import permissions mask ( #6826 )
...
* Check for empty headers in import
* Added import permission
* Fixed model path in docblock
* Added import gate to default blade
* Check if the user is an admin OR idf they have import permissions
* Walked back that admin permission
Since admins are bound by full company support, it makes less sense to let admins have this permission by default, versus having them specifically designated to the import permission
2019-03-18 11:58:08 -07:00
Tim Farmer
5893e25b43
Label bugs in alerts settings ( #6808 )
...
* Label bugs in alerts settings
Found another label bug where the alert_email label should be alerts_enabled.
* Update alerts.blade.php
2019-03-14 10:53:05 -07: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
snipe
55f727ef28
Fixed HTML labels on alerts setting page
...
Originally https://github.com/snipe/snipe-it/pull/6808/ by @timothyfarmer - I also updated the error class logic in the same block
2019-03-13 19:53:23 -07:00
snipe
6c71e72dcd
Fixed labels labels (wha?)
...
Wrong HTML labels for some fields in the Settings > Labels page.
Originally https://github.com/snipe/snipe-it/pull/6809 by @timothyfarmer but it was made against the wrong branch
2019-03-13 19:50:35 -07:00
snipe
1b0d855c00
Added translation, removed commented out code
2019-03-13 12:15:48 -07:00
ajsy
03c5b8e4ab
Create print.blade.php
2019-03-09 11:36:42 +03:00
ajsy
a958d56590
Update view.blade.php
2019-03-09 11:29:06 +03:00
snipe
7e8d337ed5
Moved kit icon
2019-03-08 16:49:05 -08:00
snipe
400907cc40
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-03-08 16:24:12 -08:00
snipe
61afdeac2e
Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop
2019-03-08 16:18:48 -08:00
Martin Meredith
55cbbf2b00
Fixes #6794 : Fix URLs to access some 'missing' images ( #6795 )
...
* Fix image path for Model view
* Fix URLs for images in account view
* Fix Supplier view Image URL
2019-03-08 12:47:37 -08:00
Martin Meredith
daf6d98a3b
Remove test data for Pie ( #6793 )
2019-03-08 12:46:47 -08:00
Tim Farmer
7deab0f53b
Label bugs in general settings ( #6801 )
...
* checkbox label bug
The checkbox label in general settings for require_accept_signature was set to full_multiple_companies_support instead so when you click the label for require accept signature it would check the wrong box.
* Update general.blade.php
* Update general.blade.php
Another label that is wrong in general settings
2019-03-08 12:24:24 -08: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
Dmitrii Minaev
16bb784e78
Codestyle & bug fixes
2019-02-28 01:37:58 +03:00
snipe
c47fa5ad1c
Fixed missing @endcan
2019-02-26 19:14:28 -08:00
Dmitrii Minaev
5f3a0bdea5
app\Services\PredefinedKitService.php rename to app\Services\PredefinedKitCheckoutService.php
...
add accessories and consumables tables
add selectlist api to:
app\Http\Controllers\Api\AccessoriesController.php
app\Http\Controllers\Api\ConsumablesController.php
app\Http\Controllers\Api\LicensesController.php
templates for selectlist
apply kit to user works
2019-02-19 22:19:00 +03:00
snipe
0000f487ac
Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop
...
# Conflicts:
# config/version.php
2019-02-13 23:02:21 -08:00
snipe
35ebe33e4e
Fixed #6703 - fixes password confirmation ( #6711 )
...
* Fixed #6703 - fixes password confirmation
* Removed debugging
* Fixed tests
* I guess we use 10 as the settings for password min in tests
* One more try to fix tests - confirmation won’t validate until password validates
2019-02-13 23:01:19 -08:00
snipe
230c9da1df
Fixed #6703 - fixes password confirmation
2019-02-13 21:30:15 -08:00
snipe
35898e4ca0
Added asset tag to maintenances report
2019-02-13 07:09:16 -08:00
snipe
533649f24e
Merge branch 'develop' into dev-master-integration
...
# Conflicts:
# .gitignore
# .travis.yml
# app/Console/Commands/LdapSync.php
# app/Console/Commands/SendExpectedCheckinAlerts.php
# app/Console/Commands/SendExpirationAlerts.php
# app/Console/Commands/SendInventoryAlerts.php
# app/Console/Kernel.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/Auth/ResetPasswordController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/UsersController.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/Importer.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/License.php
# app/Models/Location.php
# app/Models/Recipients/AlertRecipient.php
# app/Models/User.php
# app/Providers/AppServiceProvider.php
# composer.json
# composer.lock
# config/trustedproxy.php
# config/version.php
# 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/lang/ar/admin/settings/general.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/passwords.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/passwords.php
# resources/lang/es-ES/passwords.php
# resources/lang/es-MX/passwords.php
# resources/lang/es-VE/passwords.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/id/admin/settings/general.php
# resources/lang/id/passwords.php
# resources/lang/ja/passwords.php
# resources/lang/nl/passwords.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/passwords.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/passwords.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/admin/statuslabels/table.php
# resources/lang/ru/passwords.php
# resources/lang/sr-CS/general.php
# resources/lang/sr-CS/mail.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/passwords.php
# resources/lang/vi/admin/models/message.php
# resources/lang/vi/admin/users/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/views/importer/import.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/view.blade.php
# tests/unit/ImporterTest.php
2019-02-13 06:42:52 -08:00
snipe
2768ea692e
Removed extraneous js call
2019-02-13 04:24:37 -08:00
snipe
35e60fd151
Updated languages
2019-02-13 03:56:18 -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
Dmitrii Minaev
e01e0c5596
Add licenses, accessories and consumables table presenters app\Presenters\PredefinedKitPresenter.php resources\views\partials\bootstrap-table.blade.php
...
Add refresh licenses, accessories and consumables tables refresh when add a new element resources\assets\js\snipeit_modals.js
Some design fixes resources\views\kits\edit.blade.php
Add default value to form (template) resources\views\modals\kit-model.blade.php
New routes for kit accessories and kit consumables routes\api.php
New routes for kit models, kit accessories and kit consumables routes\web\kits.php
New templates
2019-01-27 23:19:24 +03:00
snipe
9d21fc85bc
Fixed #6644 - asset name not linked in Reports > Asset Maintenance Report
2019-01-25 20:59:54 -08:00
snipe
194d0733d4
Fixed #6644 - asset name not linked in Reports > Asset Maintenance Report
...
This report will likely be deprecated.
2019-01-25 20:57:14 -08:00
Ivan Nieto
7d982c9ea6
Import page is blank [ch90] ( #6636 )
2019-01-24 15:34:50 -08:00
Ivan Nieto
310ed0f1d3
Fix an issue when trying to checkin a license seat. [ch46] ( #6599 )
...
* Fix an issue when trying to checkin a license seat.
* Minor changes in the checkin view, so it can returns to the expected place where the checkin is launched.
2019-01-17 20:36:40 -08:00
snipe
1eace04ad9
Handle asset maintenances that do not have a valid asset associated
2019-01-16 02:26:42 -08:00
snipe
c055e3af21
Only try to return the asset tag link if a valid asset id has been passed
2019-01-16 02:19:35 -08:00
omyno
f0500e9797
Show user's signature in print view ( #6471 )
2019-01-15 14:03:40 -08:00
Wes Hulette
3e19509a49
Fixed : #6395 - Adjusted graph size ( #6518 )
...
* Fixed missing oauth tables during setup.
* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop
* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
* Fixed Pie Graph sizing on dashboard
Updated chart.js to 2.7.3
Added height to canvas
2019-01-15 14:02:49 -08:00
snipe
394d265b96
Added XML to uploadable file type - re: #6099
2018-12-12 16:45:09 -08:00
Wes Hulette
b38d07064b
Fixed : #5896 Custom fields of type "CUSTOM REGEX" are always saved as "ANY" ( #6381 )
...
* Fixed missing oauth tables during setup.
* Custom fields of type "CUSTOM REGEX" are always saved as "ANY"
Fixes #5896
* Updated per PR
Fixed spelling
* Fixed logic error
Moved conditional code from view to controller
Added getFromatType function for dropdown
2018-12-06 20:05:04 -08:00
Wes Hulette
34246ee4ef
[WIP] v5 Develop: New LDAP implementation ( #6352 )
...
* Fixed missing oauth tables during setup.
* WIP New LDAP implementation
* WIP New LDAP implementation
* WIP New LDAP implementation
Merge remote-tracking branch 'origin/WIP_LDAP' into WIP_LDAP
* WIP New LDAP implementation
Added Adldap2 to handle ldap intergration.
* Updated per PR quality review
* Added specific LDAP settings method
* Corrected version number
* Added return documentation
* Added imports
* Changed class to be injected into controller
* Updated with PR suggestions
2018-12-06 14:05:43 -08:00
snipe
09c4dd4891
Added ability to upload favicon and email logo
...
todo: refactor the image upload/resize for less copypasta
2018-12-05 19:56:12 -08:00
Minaev Dmitriy
0bbe499414
Kits checkout. But only with models.
2018-11-13 20:33:32 +03:00
Evgeny
dd7db95135
A couple hardcoded strings replaced in according with #6406 ( #6412 )
...
Hardcoded strings was replaced with corresponding placeholders.
Log statuses mentioned in #6406 wasn't translated cause it needs more separate complicated development
2018-11-08 15:20:44 -08:00
snipe
ea91d59ffc
Use username instead of email address in password reset ( #6382 )
...
* Switch to use username instead of email
* Fixed indenting
* Updated password language
* Updated blades to reflect username instead of email
* Changed password/reset controllers to use username instead of email
* Redirect to login page instead of repeating the password reset form
2018-10-31 18:03:24 -07:00
snipe
ce8d47b2b4
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-10-31 15:19:18 -07:00
snipe
65aef11ae3
Fixed #5879 - added user department filter for custom report
2018-10-31 15:19:13 -07: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
2cecd5e056
One more fix for #6175 (non-accessories)
2018-10-31 10:23:47 -07:00
snipe
5da9120870
Fixed #6175 - crashing when accessory has been deleted
...
My guess would be this crash (reported in #6175 ) was happening because of deleted accessories/accessory rows.
2018-10-31 10:23:32 -07:00
Minaev Dmitriy
9d5cd27575
New save mechanic
2018-10-31 16:06:38 +03:00
snipe
5faf8bfcd0
Fixed error on unaccepted asset report
2018-10-29 14:39:42 -07:00
snipe
f0e6a5c905
Fixed error on asset creation
2018-10-29 14:35:34 -07:00
snipe
e443a576f7
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-10-19 16:46:53 -07:00
snipe
20b26effdb
Fixed #6349 - add view permission for print all assigned
2018-10-19 16:46:46 -07:00
snipe
1a10aa0dda
Fixed #6349 - add view permission for print all assigned
2018-10-19 16:43:28 -07:00
Minaev Dmitriy
f1f7694835
Merge remote-tracking branch 'remotes/upstream/develop' into develop
2018-10-19 19:00:53 +03:00
Minaev Dmitriy
0e66c3cb56
Predefined kits test
2018-10-19 17:30:25 +03:00
Wes Hulette
465b69516d
Fixed : #6259 - Remove remote JS/CSS file loading ( #6330 )
...
* Fixed missing oauth tables during setup.
* Remove remote JS/CSS file loading
Updated gravatar to return to default image
* Updated default avatar path to user url
Removed local html5shim & response js files.
Removed copying html5shim & respond js file to public directory
2018-10-17 12:52:01 -07:00
snipe
2ded2ff53a
Make dashboard snapshots clickable
2018-10-15 18:19:30 -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
0dbce93d1b
Better logic for disallowing company selection when user is not a superadmin and FCS is enabled
2018-10-15 17:57:28 -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
835b461d7d
Fixed #6323 - typo in link for low inventory
2018-10-11 15:31:10 -07:00
snipe
b8f8d49927
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-10-11 15:29:48 -07:00
snipe
63a2727077
Fixed #6323 - typo in link for low inventory
2018-10-11 15:29:38 -07:00
Ivan Nieto
5516978f2e
#5696 proposed fix ( #6314 )
...
* Another 'or' caught in a blade template
* Added the requireAcceptance() method in LicenseSeat.php. Changed the permission in checkout-license mail to view.
* Getting right the permission in the view checkout-license
2018-10-11 14:08:09 -07:00
Wes Hulette
19ee62f704
Fixed: Missing JS file import ( #6320 )
...
* Fixed missing oauth tables during setup.
* Fixed missing JS import
2018-10-11 13:51:37 -07:00
snipe
c7596e7741
Fixed image not uploading on asset create
2018-10-09 17:31:52 -07:00
Wes Hulette
d715ecf41d
Fixed: Tooltips ( #6309 )
...
* Fixed missing oauth tables during setup.
* Fixed missing tooltips
Updated spelling in bootstrap-table.blade.php to use bootstrap data element.
Using custom jquery-ui without tooltips to fix conflict issue.
* Removed custom jQuery ui file added fix in bootstrap.js file
2018-10-09 15:20:27 -07:00
Wes Hulette
6818901f7d
Fixed: Admin LTE left menu bar not working ( #6308 )
...
* Fixed missing oauth tables during setup.
* Updated per AdminLTE upgrade guide.
2018-10-09 15:20:12 -07:00
snipe
a516e4278e
Remove company select option if the user is not an admin and FCS is enabled
2018-10-05 07:30:42 -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
snipe
476b58632b
Handle array of asset tags
...
TODO: figure out how to display validation errors more sanely
2018-10-05 04:34:47 -07:00
snipe
d4a97d0431
Increase max fields in multi-asset creation
2018-10-05 04:18:06 -07:00
snipe
ade9a0c995
Removed server-side validation right now
...
Getting an unexpected keyword ‘export’ error. I’ll come back to this.
2018-10-05 03:47:58 -07:00
snipe
7e33051c7a
Remove console logging
2018-10-05 03:44:30 -07:00
snipe
4a448ba5f9
Increment tag based on first
2018-10-05 03:43:40 -07:00
snipe
8e90ed00d8
Added alt tags to logo
2018-10-05 03:43:16 -07:00
snipe
81d8c1cc52
Fixed remove-asset-tag javascript on asset edit, added server side validation support
2018-10-05 02:51:14 -07:00
