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

7335 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M e6e68934f7 adds a months depreciated variable 2022-02-14 09:13:14 -08:00
Godfrey M cdc402fa04 WIP formula for linear Depreciation has been corrected. still one variable left to fix. 2022-02-14 09:01:42 -08:00
snipe 885ab64c2e Merge branch 'master' of https://github.com/snipe/snipe-it 2022-02-13 12:01:59 -07:00
snipe 8624531f78 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-13 12:01:37 -07:00
snipe 1c0a96b0ce Added gate to supplier 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-13 11:58:12 -07:00
snipe db0c0e7908
Merge pull request #10665 from snipe/fixes/adds_gate_to_supplier_view 
Adds gate to supplier
 2022-02-13 10:56:55 -08:00
snipe d77a47765e Adds gate to supplier 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-13 11:53:45 -07:00
snipe 05c0819776 Updated language string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-11 15:55:42 -08:00
snipe 16f963fa3d Merge branch 'master' of https://github.com/snipe/snipe-it 2022-02-11 13:07:29 -08:00
snipe e032cf1fda Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-11 13:07:26 -08:00
snipe 10c26f38c4
Merge pull request #10662 from snipe/fixes/tighter_security_on_select_lists 
Added additional gate for selectlists
 2022-02-11 12:48:55 -08:00
snipe d6b8222371 Refactor to combine permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-11 12:48:30 -08:00
snipe 2c5abaaea4 Fixed copypasta 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-11 12:32:09 -08:00
snipe c1a0653847 Restrict to update or create gate methods for select lists 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-11 12:31:11 -08:00
snipe 9226c8292d Fixed typos in comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-11 12:02:14 -08:00
snipe 5fafa81dc1 Forgot components 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-11 11:57:29 -08:00
snipe b30d1dce89 Removed selectlist 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-11 11:55:24 -08:00
snipe 2dad27eed6 Added additional gate for selectlists 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-11 11:46:14 -08:00
snipe de6f922e54 Fixed migration 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-10 22:44:46 -08:00
snipe f5ffda8053 Ahem. 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-10 22:43:51 -08:00
snipe 99541f0bee Fixed string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-10 21:05:23 -08:00
snipe 8b8e93d703 Fixed #10659 - wrong translation string reference 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-10 21:03:09 -08:00
snipe 5703b95de3
Merge pull request #10657 from snipe/fixes/handle_deleted_auditor 
Fixed - Check for valid user before trying to present the auditor name
 2022-02-10 20:14:24 -08:00
snipe d406dc43c2 Check for valid user before trying to present the auditor name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-10 20:13:02 -08:00
snipe 2ce44bd4e6 Line break for easier debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-10 20:06:55 -08:00
snyk-bot 15b96f304b
fix: upgrade jquery-ui from 1.13.0 to 1.13.1 
Snyk has created this PR to upgrade jquery-ui from 1.13.0 to 1.13.1.

See this package in npm:
https://www.npmjs.com/package/jquery-ui

See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
 2022-02-11 01:11:13 +00:00
snipe ed931ef0cd
Merge pull request #10654 from inietov/fixes/trying_to_get_property_checkin_email_of_non-object 
Fixes  ErrorException: Trying to get property 'checkin_email' of non-object [sc-17568]
 2022-02-10 12:23:50 -08:00
Ivan Nieto Vivanco f36de6c670 Validates if model and model->category exist before return the checkin_email property 2022-02-10 13:53:49 -06:00
Ivan Nieto Vivanco bf4ee18123 Validates if model and model->category exist before return the checkin_email property 2022-02-10 11:58:55 -06:00
snipe 70af10ae6c
Merge pull request #10640 from JonathonReinhart/10552-add-checkin-api-date 
Fix #10552: Add checkin_at parameter to /hardware/:id/checkin API
 2022-02-10 09:54:20 -08:00
snipe 9892e5bf60
Merge pull request #10646 from snipe/fixes/check_field_exist_before_detaching 
Check that the field exists before trying to detach it from the fieldset
 2022-02-09 16:33:02 -08:00
snipe b9a8d45c07 Better messaging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-09 16:30:42 -08:00
snipe 7794c2f44b Check that the fieldset exists before trying to detach it from the fieldset 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-09 16:16:16 -08:00
snipe eedc14401a Switch to searching on semicolon instead of & 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-09 15:55:22 -08:00
snipe 4e14d70427 Added jobtitle to unescaper 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-09 15:50:44 -08:00
snipe 2a71690aaf Added license_name to unescaper 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-09 15:17:57 -08:00
snipe e4da00ca82 Catch potential validation errors on unescape tool 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-09 15:09:49 -08:00
snipe 4fd14e5859 Added slightly more output because wtf? 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-09 15:05:28 -08:00
snipe 441f1fbb64 Remove html_entities_decode restriction 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-09 14:56:36 -08:00
snipe bf194d7794 Regenerate JS assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-09 14:43:30 -08:00
snipe d06e3dd892 Merge branch 'master' of https://github.com/snipe/snipe-it 2022-02-09 14:40:33 -08:00
snipe 6b25b53462
Merge pull request #10628 from inietov/fixes/default_values_dont_allow_checkbox_radio 
Fixes #10299 Default Values do not allow Checkbox/Radio Buttons
 2022-02-09 14:39:46 -08:00
Ivan Nieto Vivanco 6d79c9f3e2 Save the default values for custom fields with same format than Assets do for actual values 2022-02-09 13:41:33 -06:00
Ivan Nieto Vivanco a36957dd77 Finish the implementation of custom fields default values for checkboxes 2022-02-09 13:12:42 -06:00
Ivan Nieto Vivanco 2f3499e4b9 Show checkboxes a little less assy, actually save the data checked by them 2022-02-09 10:49:10 -06:00
Jonathon Reinhart 3536d08477 Add checkin_at parameter to /hardware/:id/checkin API 
Fixes #10552
 2022-02-08 20:23:09 -05:00
snipe ee3166cdc2 Add @savornicesei as a contributor 2022-02-08 15:38:20 -08:00
snipe 2852359225
Merge pull request #10638 from uberbrady/report_invalid_json_develop 
Report invalid json develop
 2022-02-08 12:27:29 -08:00
Brady Wetherington c300e7c7f6 Remove extraneous backslash 2022-02-08 12:23:15 -08:00
Brady Wetherington fb890fbc30 Properly alert when invalid JSON is submitted to something that wants JSON 2022-02-08 12:22:59 -08:00