DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
4996 commits 95 branches 267 tags 294 MiB
Commit graph

4996 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 8b4a9aa382 Fixes to history importer 2019-08-13 18:15:42 -07:00
snipe 99cd552d5c History importer fixes 2019-08-13 18:00:21 -07:00
snipe 6c7e5cb9cf Merge branch 'master' of https://github.com/snipe/snipe-it 2019-08-10 17:49:23 -07:00
snipe 6ebb01a081 Group related variables in .env 2019-08-10 17:48:03 -07:00
Greg Stamper 5591c861b9 Update README.md (#7334) 
Add reference to CSV importer.
 2019-08-07 23:12:46 -07:00
snipe d37280567d Fixed CVE-2019-10742 
https://nvd.nist.gov/vuln/detail/CVE-2019-10742
 2019-08-06 21:11:38 -07:00
snipe e7b0ee2539 Added accessories checkout/checkin API endpoint 2019-08-02 15:08:26 -07:00
snipe 1608dba7dd Commenting again? 2019-07-31 14:29:19 -07:00
snipe f721dac2ca Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 
# Conflicts:
#	app/Models/Asset.php
 2019-07-31 14:26:46 -07:00
snipe a4629977e7 Added comments to the ByFilter query scope for clarity 2019-07-31 14:24:38 -07:00
snipe c593b3645c Added comments to the ByFilter query scope for clarity 2019-07-31 14:24:01 -07:00
Ivan Nieto 28ae90fa8a 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) 2019-07-31 13:55:21 -07:00
Ivan Nieto f407b86aa8 Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7318) 
💥 Nice work, Ivan!
 2019-07-31 13:54:55 -07:00
snipe c7be25078e Bumped version 2019-07-26 13:02:47 -07:00
snipe 3dc2cc9f22
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
 2019-07-26 12:38:31 -07:00
snipe ab86e42b2e Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name 2019-07-26 12:37:38 -07:00
snipe 9af9ed9eb9 Add @mskrip as a contributor 2019-07-24 11:01:28 -07:00
snipe 250a797339 Fixed #7250 - permission issue for API fieldsets and fields endpoints 
This applies the change from #7294 to master
 2019-07-24 11:00:42 -07:00
Marián Skrip 8a1f6b74e8 Fix permission issue for API fieldsets and fields endpoints (#7294) 
Close snipe/snipe-it#7250
 2019-07-24 10:57:09 -07:00
snipe a0f3fc6d76 Bumped hash 2019-07-18 14:37:54 -07:00
snipe 74e647fea7 Apply fix from PR #7273 to master 2019-07-18 14:37:48 -07:00
snipe 55ee90b25d
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
 2019-07-18 14:32:23 -07:00
snipe eec445fcf5
Command to fix custom field unicode conversion differences between PHP versions (#7263) 2019-07-18 14:30:18 -07:00
Ivan Nieto af1857b6ee Fix for the issue when the user tries to query assets due for audit without appropiate configuration [ch9625] (#7273) 
* Added propper routes to the controller

* Logic to handle the not setted ->audit_warning_days variable

* Change the variable name for more clarity

* Got rid of the unnecesary if sentence in sake of brevity

* Adding the null coalesce operator so it can properly handle when the setting is null
 2019-07-18 14:08:55 -07:00
snipe cef22c3158 Caps asset warranty to 20 years 2019-07-18 09:49:58 -07:00
snipe 61fb38087e Bumped hash 2019-07-17 17:55:53 -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 444e250609 Fixed countable() strings on user destroy 2019-07-17 17:51:13 -07:00
snipe 77a6f6f400 Cap warranty months to 3 on the frontend blade 2019-07-17 12:15:15 -07:00
snipe 15bfd07f30 Cap warranty months to three characters 
Filles rollbar 209
 2019-07-17 12:13: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 b4b6d6b571 Comment clarification on #7186 2019-07-15 15:31:09 -07:00
snipe 8c73a47afb Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed 2019-07-15 15:27:02 -07:00
snipe f82ffe378c Merge branch 'master' of https://github.com/snipe/snipe-it 2019-07-15 14:11:18 -07:00
snipe 984c2a8fd4 Better log message for bad LDAP connection 2019-07-15 14:10:57 -07:00
snipe 6736b1c4e7 Addresses #7238 - add PWA code to layout 
Needs additional UX testing
 2019-07-15 13:49:56 -07:00
Ivan Nieto d409be6d43 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
 2019-07-15 13:02:44 -07:00
Thomas Misilo e1b33f3087 Spelling Correction (#7206) 
Fixed Spelling for the word reqrite, to be rewrite.
 2019-06-27 18:33:13 -07:00
snipe 740d5a6846 Downgrading rollbar for Laravel 5.5 2019-06-25 18:07:21 -07:00
snipe d19df4ded8 Bumped version 2019-06-24 14:43:44 -07:00
Kasey 03a4512406 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
 2019-06-19 14:21:53 -07:00
snipe de992e4df3 Fixed LDAP password blanking on save 2019-06-14 17:20:37 -07:00
snipe a85251aa83 Fixed #7164 - change table name to permission_groups 2019-06-14 10:37:20 -07:00
Diogenes S. Jesus 4c61d330e6 fix Paginator (#7157) 2019-06-14 09:54:09 -07:00
snipe 26a1181765 Possible fix for reporting/admin migration back in time 2019-06-12 18:53:53 -07:00
snipe cef030cf55 Fixed permission insert 
//TODO

Handle this via model
 2019-06-12 18:39:55 -07:00
snipe 2bfa05fd2d Back in time fix FOR #7145 for new installs on MySQL 8+ 2019-06-12 16:24:55 -07:00
snipe 30904dd019 Reduce minimum group name length to 2 (from 3) 
eg: IT
 2019-06-12 15:56:19 -07:00
snipe 1d0d25db37 Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility 2019-06-12 15:51:47 -07:00