DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 22:49:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7449 commits 101 branches 268 tags 288 MiB
Commit graph

7449 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe 7a117a22c8
Merge pull request #10637 from uberbrady/report_invalid_json 
Alert when invalid JSON is submitted to something that wants it
 2022-02-08 12:17:20 -08:00
Brady Wetherington 9a66f6a254 Remove extraneous backslash 2022-02-08 12:09:40 -08:00
Brady Wetherington 5e94726ec1 Properly alert when invalid JSON is submitted to something that wants JSON 2022-02-08 12:05:05 -08:00
snipe 66c3559e1c
Merge pull request #10636 from inietov/fixes/inconsistencies_between_checkout_checkin_dates_master 
Fixes #10627 Inconsistencies between checkout/checkin dates on asset history and activity log for master branch
 2022-02-08 10:19:16 -08:00
snipe ad52f9df72
Merge pull request #10635 from inietov/fixes/inconsistencies_between_checkout_checkin_dates 
Fixes #10627 Inconsistencies between checkout/checkin dates on asset history and activity log
 2022-02-08 10:18:52 -08:00
Ivan Nieto Vivanco 413e44be2f Add custom date to checkin actionlogs and show it in the history of the asset tab 2022-02-08 11:58:23 -06:00
Ivan Nieto Vivanco d71aa859fc Add custom date to checkin actionlogs and show it in the history of the asset tab 2022-02-08 11:43:24 -06:00
snipe ebc35c4519
Merge pull request #10630 from JonathonReinhart/10629-checkin-API-error-status 
Fix /hardware/{id}/checkin API response on error
 2022-02-08 08:54:17 -08:00
Jonathon Reinhart cd963179fd Fix /hardware/{id}/checkin API response on error 
Fixes #10629
 2022-02-08 01:08:42 -05:00
Ivan Nieto Vivanco 796a0ebdaa Add initial support for default values in checkboxes customfields 2022-02-07 22:17:40 -06:00
snipe 474f24e40e Merge branch 'master' of https://github.com/snipe/snipe-it 2022-02-07 18:27:59 -08:00
snipe b3a0f86431 Temp fix for weird JSON format in history 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-07 18:27:55 -08:00
snipe 959074f836
Merge pull request #10625 from inietov/fixes/checkin_checkout_api_routes_broken 
Fixes #10614 Checkin/Checkout API route's broken
 2022-02-07 11:56:48 -08:00
Ivan Nieto Vivanco b4d2b1322f Pass ID of the checkin/checkout assets in API 2022-02-07 13:43:13 -06:00
snipe a77c51c5f2
Merge pull request #10624 from uberbrady/develop_fix_secure_hosts_in_subdirectory 
(Develop) fix secure hosts in subdirectory
 2022-02-07 11:41:33 -08:00
Brady Wetherington a15c0adc79 Fix "secure hostnames" feature for subdirectory-based Snipe-IT installs 2022-02-07 11:33:38 -08:00
snipe 1a31231569
Merge pull request #10623 from uberbrady/fix_secure_hosts_in_subdirectory 
Fixes #10577 - Fix "secure hostnames" feature for subdirectory-based Snipe-IT installs
 2022-02-07 11:33:33 -08:00
Brady Wetherington f1d4087317 Fix "secure hostnames" feature for subdirectory-based Snipe-IT installs 2022-02-07 11:26:54 -08:00
snipe f2b8091b31
Merge pull request #10622 from Godmartinz/bug/sc-18678/add-required-field-marker-to-default-currency 
Fixed Bug/sc 18678/add required field marker to default currency
 2022-02-07 10:34:27 -08:00
Godfrey M 67882f5531 Removed untracked fileseetvert "adding untracked files" 
This reverts commit 9d0b163c11.
 2022-02-07 10:23:24 -08:00
Godfrey M 5a70bba51b changed model for default currency requirement check 2022-02-07 09:51:35 -08:00
Godfrey M 9d0b163c11 adding untracked files 2022-02-07 08:58:49 -08:00
snipe f4069e00cd
Merge pull request #10611 from uberbrady/master 
D'oh! Migration fails on empty settings table :(
 2022-02-03 20:07:01 -08:00
Brady Wetherington 8650faf0d8 D'oh! Migration fails on empty settings table :( 2022-02-03 20:04:33 -08:00
snipe 796ef741e8
Merge pull request #10610 from uberbrady/fixes/ldap_active_status 
Fixes #10563 - Rework the LDAP sync command to better handle the active flag
 2022-02-03 19:45:41 -08:00
Brady Wetherington 36ae6f9430 Yanked debugging code, tightened up comments. 2022-02-03 19:41:16 -08:00
Brady Wetherington 1945b97b72 Just trying to really tighten up on the LDAP Active Flag and how we parse it. 2022-02-03 19:04:56 -08:00
Brady Wetherington 392e61688d Rework the LDAP sync command to better handle the active flag 2022-02-03 15:01:45 -08:00
snipe db82e06665 Fixed migration with invalid LDAP prepopulation value 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-02 18:22:51 -08:00
snipe ac5c6123bc Fixes #10563 - LDAP active flag - hopefully? 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-02 18:07:34 -08:00
snipe 8add47739e
Merge pull request #10604 from inietov/fixes/column_activated_cannot_be_null 
Fixes: Column activated cannot be null [sc-18528]
 2022-02-02 12:21:31 -08:00
snipe c0cc90066f
Merge pull request #10605 from inietov/fixes/column_activated_cannot_be_null_develop 
Fixes: Column activated cannot be null for develop [sc-18528]
 2022-02-02 12:16:39 -08:00
Ivan Nieto Vivanco fa2f8409f9 Add a casting to a truthy/falsy that needs to be integer 2022-02-02 14:09:23 -06:00
Ivan Nieto Vivanco eac8e0bdba Add a casting to a truthy/falsy that needs to be integer 2022-02-02 13:54:57 -06:00
snipe ce154a2382
Merge pull request #10455 from adagioajanes/features/quickscan_checkin 
Added #10454: Quick Scan Checkin
 2022-02-01 20:19:45 -08:00
snipe 06a5ea1530 Fixed duplicate use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-01 18:57:45 -08:00
snipe 99c4fd8f84 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-01 18:56:18 -08:00
snipe d2655c1092 Bumped RC version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-01 18:54:46 -08:00