snyk-bot
3fedcc6766
fix: upgrade bootstrap-table from 1.18.2 to 1.18.3
...
Snyk has created this PR to upgrade bootstrap-table from 1.18.2 to 1.18.3.
See this package in npm:
https://www.npmjs.com/package/bootstrap-table
See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=upgrade-pr
2021-08-07 21:41:02 +00:00
snyk-bot
892ae9cf91
fix: upgrade tableexport.jquery.plugin from 1.10.21 to 1.10.26
...
Snyk has created this PR to upgrade tableexport.jquery.plugin from 1.10.21 to 1.10.26.
See this package in npm:
https://www.npmjs.com/package/tableexport.jquery.plugin
See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=upgrade-pr
2021-08-07 21:40:51 +00:00
snyk-bot
9ae6591aa3
fix: Dockerfile.alpine to reduce vulnerabilities
...
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-ALPINE313-APKTOOLS-1533754
2021-08-07 21:38:53 +00:00
Tobias Regnery
eced1ab77f
Fix advanced search with serial and another field
...
The advanced search in /hardware produces incorrect results if the serial is combined with another field like category.
There is a typo as the fieldname 'product_key' doesn't exist. Change this to 'serial'.
Also change the last If-Statement from ->orWhere() to ->where(). Now additional fields like custom fields can be combined with other searches in an And-Clause.
I think this function could be simplified further, but this is the minimal bugfix.
2021-08-05 15:07:28 +02: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
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
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
snipe
9a5d9eafeb
Merge pull request #9709 from morning-bird/master
...
add CompanyableTrait
2021-07-27 14:38:21 -07:00
snipe
071325f368
Merge pull request #9824 from PetriAsi/feature/api-image-uploads-v6
...
Added #9594 : Feature/api image uploads for v6
2021-07-27 14:35:16 -07:00
snipe
eca15bd49b
Merge pull request #9837 from Godmartinz/chore/ch16531/update-demo-photos-of-iphones-to-be-more
...
Update demo photos of iPhones to be more [ch16531]
2021-07-27 14:34:52 -07:00
snipe
476ab2888c
Merge pull request #9852 from Godmartinz/develop-v6-integration
...
adds newer versions of devices for demo
2021-07-27 14:34:15 -07:00
snipe
5f077cc33a
Merge pull request #9858 from dampfklon/fix-dockerfile-v6
...
Add new php extension dependencies for v6
2021-07-27 14:32:23 -07:00
snipe
d2fc98b685
Merge pull request #9861 from inietov/fixes/consumables_accessories_not_correctly_displayed_via_locations
...
Fixes #9853 Consumables/Accessories not correctly displayed via Locations
2021-07-26 14:49:05 -07:00
Ivan Nieto Vivanco
38a2a0c1ee
Add the pertinent filters in Accessories and Consumables controllers
2021-07-26 12:59:15 -05:00
Dampfklon
20df7be2f4
add new php extensions dependencies for v6
2021-07-24 23:15:17 +02:00
snipe
75d4a46fff
Merge pull request #9856 from inietov/bug/ch15413/model_number_is_not_on_accessory_import_dropdown
...
Fixes: Model Number is not on the Accessory import dropdown of mappable fields [ch15413]
2021-07-24 01:05:26 -07:00
Ivan Nieto Vivanco
0f1c48cb6f
Add the field model_number to Accessory importer
2021-07-24 02:38:44 -05:00
Godfrey M
013e168883
adds newer versions of devices for demo
2021-07-21 15:12:27 -07: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
Godfrey M
9fb911146f
Update demo photos of iPhones to be more [ch16531]
2021-07-19 12:26:04 -07:00
snipe
615bdd0499
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-15 13:29:07 -07:00
snipe
33e92c975a
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2021-07-15 13:29:00 -07: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
d50294e8e2
Just mention source of idea as code rewriten
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
1936fc2ea9
Better debug comment
2021-07-15 12:26:14 +03:00
Petri Asikainen
23f77b2894
Fixed case again
2021-07-15 12:26:14 +03:00
Petri Asikainen
15dd7061ed
removed unused Bag-functions
2021-07-15 12:26:14 +03:00
Petri Asikainen
5f81488679
fix debug placement
2021-07-15 12:26:14 +03:00
Petri Asikainen
c894e8ceb3
handle files via standard field
2021-07-15 12:26:14 +03:00
Petri Asikainen
bbe964c6b2
debug trait
2021-07-15 12:26:14 +03:00
Petri Asikainen
2325b1d8c2
Try without trait
2021-07-15 12:26:14 +03:00
Petri Asikainen
948a741935
case case again..
2021-07-15 12:26:14 +03:00
Petri Asikainen
d7d3681d71
trait base64 encoded files
2021-07-15 12:26:13 +03:00
Petri Asikainen
e6d432423d
trait base64 encoded files
2021-07-15 12:26:13 +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
