Dampfklon
4418ad2340
Enable display of deleted acceptances, strike deleted users, add date, enable sorting
2021-10-07 21:03:46 +02:00
Dampfklon
12ee06deb6
add Download All Button, change route analogue to activity report
2021-10-07 21:01:50 +02:00
Dampfklon
9a9ca59544
Fix decprecated implode usage
2021-10-07 20:55:47 +02:00
Dampfklon
ed99532c30
Unaccepted Assets Report Actions (send reminder, delete) added
...
Unaccepted Assets Export fixed
2021-10-07 20:53:02 +02:00
snipe
ccd430ce07
Switched back down to debug level
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-06 12:38:21 -07:00
snipe
f306401e7e
Fixed SVG XSS vuln
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-06 12:26:45 -07:00
snipe
34eab88b7e
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 20:25:31 -07:00
snipe
b20c841a89
Fixed asset models restore
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 19:29:13 -07:00
snipe
52ea172e5d
Fix ID array
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:18:07 -07:00
Brady Wetherington
f3338667c7
Create new ParseCurrency helper and use it in the appropriate controllers
2021-09-28 18:20:39 -07:00
Brady Wetherington
f380da3f19
Try to ensure all currency output is formatted correctly.
2021-09-28 16:45:47 -07:00
NMC
c680977791
Merge branch 'develop' into api-licenses
2021-09-27 15:02:51 -04:00
snipe
d88c0ae5ec
Merge pull request #10103 from snipe/fixes/make_boolean_fields_nullable
...
Fixed issue when creating a status label via API - default_label and show_in_nav being not nullable
2021-09-26 13:41:52 -07:00
snipe
2f9582ee5c
Switched to loadMissing for performance
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-23 17:31:19 -07:00
snipe
3b7ce0091c
Load components in the assets API if components=true in API request
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-23 17:23:53 -07:00
snipe
3862b6476b
Merge pull request #10122 from inietov/fixes/api_issue_when_component_checkout
...
Fixes API Issue when checking out a component
2021-09-23 13:21:48 -07:00
Ivan Nieto Vivanco
7dfab3a6e2
Change the condition to 'bigger or equal' instead of just 'bigger than' in ComponentsController checkout api
2021-09-23 15:02:39 -05:00
snipe
a6b3aa5f04
Don't try to delete the file if there is no log entry
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-22 19:04:25 -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
0763c76a4e
Fixed scoping with leftjoin
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 20:54:24 -07:00
snipe
5d32c17a2e
Removed comments
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 20:01:36 -07:00
snipe
10ca7cffc3
Fixes for query scoping, ordering, and nicer readability
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 19:59:23 -07:00
snipe
61176335d7
Improved category_type with strtolower() to make it case insensitive
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 15:51:41 -07:00
Delta5
c8c3c7fbbd
Fixed issue with incorrect error message
2021-09-21 19:45:18 +00:00
Delta5
59302e1d19
Add restore to users api endpoint
2021-09-21 17:42:26 +00:00
snipe
b331bb33d9
Code fixes and a new migration
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 15:37:24 -07:00
snipe
8a93e1e796
Remove asset call on depreciation report controller method
...
We ajax this in now, so no need for it
Signed-off-by: snipe <snipe@snipe.net>
2021-09-15 13:49:53 -07:00
snipe
d96f877aa4
Default show_in_nav to 0
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-15 11:33:13 -07:00
snipe
80175cffdc
Fixed #9969 - added color, show_in_nav, and default_label to status labels API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-10 20:44:49 -07:00
snipe
2f25eb598b
Allow the Assets API controller to handle depreciation reports
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-01 17:33:39 -07:00
snipe
4293674f4a
Added a few more fields to the users API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-31 12:36:06 -07:00
snipe
aeae681326
Fixecd copypasta from state to zip
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-31 12:28:20 -07:00
snipe
4794f93224
Added additional fields for user search
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-31 12:24:53 -07:00
snipe
f58ed6bd1f
Merge pull request #9982 from Shankschn/master
...
Fixes: When using API CheckIn assets, there will be two CheckIn records in the Activity Report log for each asset.
2021-08-31 11:08:52 -07:00
Ivan Nieto Vivanco
d917ae51b7
Remove e() function from other input fields
2021-08-31 04:01:20 -05:00
Ivan Nieto Vivanco
e7470b5545
Remove e() function from the saved notes when updating an asset maintenance
2021-08-31 03:50:57 -05:00
snipe
085be16966
Merge remote-tracking branch 'origin/develop'
2021-08-25 14:45:41 -07:00
Ivan Nieto Vivanco
4a79c77630
Add a condition to checkin licenses assigned to Assets
2021-08-25 16:38:34 -05:00
snipe
4abb9baa95
Merge remote-tracking branch 'origin/develop'
2021-08-24 15:29:41 -07:00
Shanks
961e80404a
Update AssetsController.php
...
Fix:When using API CheckIn assets, there will be two CheckIn records in the Activity Report log for each asset.
2021-08-24 16:39:58 +08: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
9285697611
Merge remote-tracking branch 'origin/develop'
2021-08-20 17:30:52 -07:00
snipe
9687bcb41c
Fixed issue where consumables model number was not searchable
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-20 17:30:35 -07:00
snipe
24af2ab67a
Merge remote-tracking branch 'origin/develop'
2021-08-18 14:31:53 -07:00
snipe
7b447a2f16
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-08-18 14:31:38 -07:00
Ivan Nieto Vivanco
f04e23cacb
Add a small refactor so we not repeat logic
2021-08-18 15:22:53 -05:00
Ivan Nieto Vivanco
4207858a14
Fix the count in StatuslabelsController@getAssetsCountByStatuslabel() function that allows it to pass the correct index
...
Also edit the default color for assets with the Pending label, so it match the color in the docs
2021-08-18 14:08:35 -05:00
snipe
b88fde5dae
Nicer comment formatting
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-18 12:07:09 -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
James Emanuel
98285001ac
Fixing Typo on creating Depreciation
2021-08-16 15:33:17 +03:00
snipe
ef687fdc7b
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-14 14:07:04 -07:00
snipe
45caa8a90d
Added restore functionalty to asset API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-14 14:06:15 -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
NMC
4cfc4aec1d
fix false search in api.
2021-08-01 15:10:22 -04:00
NMC
976957ddd4
Add Maintained filed in licenses view and api. + Expires in API
2021-08-01 14:30:16 -04:00
snipe
cdc4940338
Merge pull request #9881 from inietov/fixes/integrity_constraint_violation__emailing_password_reset
...
Fixes Integrity constraint violation when emailing password reset.
2021-07-30 16:01:53 -07:00
Ivan Nieto Vivanco
27cdfbc579
Edit the log message
2021-07-29 16:14:52 -05:00
Ivan Nieto Vivanco
405545cd88
Add exception handling in the ForgotPasswordController
2021-07-29 16:02:45 -05:00
snipe
593e1234a5
Merge pull request #9797 from markbrule/fixes/search_parameter_checkedout_api
...
Fixed #9671 : wrap OR queries in sub-condition in checkedout search
2021-07-27 14:39:10 -07:00
Ivan Nieto Vivanco
38a2a0c1ee
Add the pertinent filters in Accessories and Consumables controllers
2021-07-26 12:59:15 -05:00
snipe
5f842d02ef
Fixed namespace
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-15 13:24:40 -07:00
Petri Asikainen
f753404197
missed this when rebasing
2021-07-15 12:26:14 +03:00
Petri Asikainen
5d999d2572
legacy image_source support for store
2021-07-15 12:26:14 +03:00
Petri Asikainen
2fc3ff671e
hand legacy image_source field
2021-07-15 12:26:14 +03:00
Petri Asikainen
89cc84f1d9
convert image_source field
...
This reverts commit b2d3ba7410
.
2021-07-15 12:26:14 +03:00
Petri Asikainen
f24138da44
Revert "Handle image_source with ConvertBase64ToFiles"
...
This reverts commit 168d7f7004
.
2021-07-15 12:26:14 +03:00
Petri Asikainen
a76b36cad9
Handle image_source with ConvertBase64ToFiles
2021-07-15 12:26:14 +03:00
Petri Asikainen
23f77b2894
Fixed case again
2021-07-15 12:26:14 +03:00
Petri Asikainen
6173aaa25c
fixed capitalization
2021-07-15 12:26:13 +03:00
Petri Asikainen
91af3f2661
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
4191dd39ea
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
2f3501bdc2
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
f1b8ce0a1b
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
6a21660c14
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
64c8767e81
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
0e7af80806
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
e95b15d553
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
bb269e0e5f
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
60f13c8d79
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
5081ca3512
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
b4380c8012
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
f6766c5f23
Support images and multipart requests
2021-07-15 12:26:07 +03:00
Petri Asikainen
8bbbb06c5e
testing image upload via api
2021-07-15 12:24:25 +03:00
Petri Asikainen
febf1ec20f
Support legacy image_source property
2021-07-14 13:09:50 +03:00
Petri Asikainen
7b12668af4
Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads
2021-07-13 17:23:44 +03:00
snipe
f785c3e759
Default to 1 if no qty is passed
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-08 16:04:52 -07:00
Petri Asikainen
41deabf998
hand legacy image_source field
2021-07-07 09:33:48 +03:00
Petri Asikainen
7a424649c8
convert image_source field
...
This reverts commit b2d3ba7410
.
2021-07-07 09:24:24 +03:00
Petri Asikainen
b2d3ba7410
Revert "Handle image_source with ConvertBase64ToFiles"
...
This reverts commit 168d7f7004
.
2021-07-07 09:20:38 +03:00
Petri Asikainen
168d7f7004
Handle image_source with ConvertBase64ToFiles
2021-07-07 09:08:37 +03:00
Mark Brule
f706c87cbc
wrap OR queries in sub-condition
2021-07-06 20:43:17 +00:00
Tobias Regnery
9e1d7ffb5d
Fix scope of departments for FullMultipleCompanySupport
...
If a user tries to view or edit a department from a different company
with FullMultipleCompanySupport enabled, there is a 403 error displayed.
Apply the correct company scope in order to only display the departments
from the own company in the departments view.
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
2021-07-06 09:45:46 +02:00
Petri Asikainen
e275c9ee90
Fixed case again
2021-07-06 07:10:03 +03:00
Petri Asikainen
347e742e88
merged current upstream/develop
2021-06-30 12:02:05 +03:00
snipe
868419b35b
Components checkin/checkout via API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-30 01:02:44 -07:00
Petri Asikainen
6048acc95d
fixed capitalization
2021-06-30 06:36:12 +03:00
Petri Asikainen
b0aa26e6cb
Support images and multipart requests
2021-06-29 14:25:20 +03:00
Petri Asikainen
b49733832c
Support images and multipart requests
2021-06-29 12:29:17 +03:00
Petri Asikainen
8c0be3aa87
Support images and multipart requests
2021-06-29 12:29:07 +03:00
Petri Asikainen
a936744e2e
Support images and multipart requests
2021-06-29 12:28:52 +03:00
Petri Asikainen
f9da83bc46
Support images and multipart requests
2021-06-29 12:28:42 +03:00
Petri Asikainen
fc8498972e
Support images and multipart requests
2021-06-29 12:28:32 +03:00
Petri Asikainen
4ba75291e4
Support images and multipart requests
2021-06-29 12:27:18 +03:00
Petri Asikainen
a7b1e31776
Support images and multipart requests
2021-06-29 12:27:08 +03:00
Petri Asikainen
604a0b6df1
Support images and multipart requests
2021-06-29 12:26:59 +03:00
Petri Asikainen
4ed9788a0e
Support images and multipart requests
2021-06-29 12:26:45 +03:00
Petri Asikainen
e8a4059db9
Support images and multipart requests
2021-06-29 12:26:24 +03:00
Petri Asikainen
aa402bf896
Support images and multipart requests
2021-06-29 12:26:15 +03:00
Petri Asikainen
8d4219759e
Support images and multipart requests
2021-06-29 12:25:47 +03: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
a016f4ecd0
Applies PR #9761 to integration
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 13:11:22 -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
Petri Asikainen
e0c5205e9b
save images
2021-06-28 08:11:33 +03:00
Petri Asikainen
695bf1e15f
save images
2021-06-28 07:58:08 +03:00
Petri Asikainen
0e2efb6573
Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads
2021-06-27 14:38:55 +03:00
snipe
e44a25126d
Merge pull request #9676 from inietov/fixes/asset_checkin_api_doesnt_send_notification
...
Fixes #9666 Asset checkin via api doesn't send notification.
2021-06-23 14:35:07 -07:00
Petri Asikainen
491a788cd0
testing image upload via api
2021-06-23 11:22:41 +03:00
snipe
dc157f8f78
Add components and users count to dashboard
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-19 16:16:18 -07: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
Laravel Shift
802dc9240d
Shift bindings
...
PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.
2021-06-10 20:16:56 +00:00
Laravel Shift
934afa036f
Adopt Laravel coding style
...
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.
You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.
[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
2021-06-10 20:15:52 +00:00
Travis Miller
4f6b1bb12d
Fixed #9680 : Use Eloquent’s withCount
method to count Statuslabel assets
2021-06-09 11:52:04 -05:00
Ivan Nieto Vivanco
bb227cafb2
Added event to trigger the notification.
2021-06-08 13:16:13 -05: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
kcoyo
cee6f0d579
Update LoginController.php
...
Fixed #9607 - Sessions expire for SAML/RemoteUser/LDAP
2021-05-25 16:37:34 -07:00
sh1hab
f43413bdc3
Feature snipe#9378 update
2021-05-21 10:19:04 +06:00
Marc Leuser
4030789786
fix LicenseSeatsController method documentation ( #9584 )
...
in an attempt to get the automatic API reference generation to work
2021-05-14 16:14:32 -07:00
Ivan Nieto Vivanco
36a43642d8
Changed the orderBy clause inside the custom reports function that forms the CSV to be 'id' so making it a unique value and don't causes repeated items. [ch14587] ( #9535 )
2021-05-04 23:50:02 -07:00
markbrule
6c1553167d
issue #9422 - pivot ID was being used as a user_id ( #9512 )
2021-05-04 22:27:01 -07:00
Tom Misilo
a6bbe1fec3
Delete file from assets folder, not just the ref. ( #9525 )
2021-05-04 22:18:22 -07:00
snipe
cee5eea121
Use 24-hour date format for audit
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-30 15:37:39 -07:00
snipe
c6726015f7
Added missing use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-30 14:52:08 -07:00
snipe
315bcb6b38
Added use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-23 14:26:57 -07:00
Steven
82f73eb9e2
Added user locale to REST API GET /api/users response; ( #9486 )
...
* Clearer reporting on import
Signed-off-by: snipe <snipe@snipe.net>
* Try adding text/x-Algol68 to import
Signed-off-by: snipe <snipe@snipe.net>
* Added user locale to REST API GET /api/users response;
Co-authored-by: snipe <snipe@snipe.net>
2021-04-23 12:09:00 -07:00
Brady Wetherington
72a813f23d
This fixes the controller signature error people are getting with LDAP logins ( #9466 )
2021-04-21 10:23:32 -07:00
aranar-pro
5127727730
Fixed #9424 : import history adds asset model to assigned user and respects checkin date ( #9350 )
...
* Fixed #9294 : Assets import history. Behaviour based on Checkin Date added, including assigning checked out items to users.
* Fixed #9294 : Fixed asset import history to respect checkin and update user with checked out items.
* Fixed #9294 : whitespace and comment cleanup for merge
* Fixed #9294 : Fixed asset import history to respect checkin and update user with checked out items.
2021-04-20 21:25:17 -07:00
snipe
c17eaaad69
Check that the field is valid before checking to see count()
...
This mostly affects the demo, since the seeder updates info often
Signed-off-by: snipe <snipe@snipe.net>
2021-04-20 15:10:28 -07:00
snipe
e286ff0be3
Added show() redirect for CustomFields::show()
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-20 15:09:23 -07:00
Brady Wetherington
2a28f5e66c
(Maybe?) Fixes the problem where we always need LDAP enabled ( #9321 )
...
* I *think* this fixes the problem where we need LDAP even if we aren't using it?
* Pull the LdapAd dependency out of the AuthController constructor
2021-04-20 14:53:47 -07:00
Ivan Nieto Vivanco
36bc47c61c
Handle regex format when assigned from API ( #9443 )
2021-04-20 14:44:47 -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
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
792a31cc7f
Merge branch 'develop'
2021-04-06 20:10:22 -07:00
snipe
e47e2e3754
Fixed #9404 - include note in accessory API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-06 10:57:30 -07:00
snipe
3ffa3534a0
Use environmental variables in memory limits
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-05 21:47:57 -07:00
snipe
b9bab05ac3
Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# resources/views/users/print.blade.php
2021-04-05 20:55:49 -07:00
snipe
df72f92bc0
Brings PR #6744 up to parity with previous changes - Set custom field's default value when creating a new asset using the API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-05 20:16:06 -07:00