Commit graph

6221 commits

Author SHA1 Message Date
Petri Asikainen e15159b9c3 trait base64 encoded files 2021-07-02 10:17:29 +03:00
Ivan Nieto Vivanco 5545457536 Remove an else statement that doesn't allow to continue the importer flow. 2021-07-01 14:26:03 -05:00
snipe 19994e2097
Merge pull request #9774 from uberbrady/snipeit_restore_php73
Better debugging output, and remove non-PHP-7.3-compatible option
2021-06-30 15:22:48 -07:00
Brady Wetherington 102591b009 Better debugging output, and remove non-PHP-7.3-compatible option 2021-06-30 14:53:08 -07: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
snipe df7e0e5630 Fixed company resource route
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 23:46:25 -07:00
Petri Asikainen 6048acc95d fixed capitalization 2021-06-30 06:36:12 +03:00
snipe 86b3f8349a
Merge pull request #9768 from svpernova09/vagrant-ansible-fix
Fix APP_ENV/APP_DEBUG typo overwriting the APP_ENV in Vagrant Playbook
2021-06-29 07:57:14 -07:00
Joe Ferguson fbf5c705db
Fix APP_ENV/APP_DEBUG typo overwriting the APP_ENV in Vagrant Playbook 2021-06-29 08:12:01 -05: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
Godfrey M aba912001d Table striping on dark mode skins is too [ch16594] 2021-06-28 20:41:56 -07:00
snipe 15b82997ca
Merge pull request #9764 from uberbrady/develop
Regenerate assets after repairing Vue integration
2021-06-28 16:58:05 -07:00
Brady Wetherington dce1dd41c8 Regenerate assets after repairing Vue integration 2021-06-28 16:38:05 -07:00
snipe 9ba7e7a0f3
Merge pull request #9761 from snipe/features/9745_add_notes_to_statuslabels
Added #9745 - adds searchable, sortable notes to statuslabels index
2021-06-28 13:09:24 -07:00
snipe 30297e479e Hide notes field by default
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 13:08:32 -07:00
snipe 19413a63da Make notes field searchable on status labels
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 11:53:17 -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
snipe 6521f16b80 Bumped version
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 11:00:34 -07:00
snipe 9b2cb19f22 Fixed #9743 - Vue screens not loading
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 10:59:34 -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 174d53aff9 Fixed #9729 - order number maxlength updated to 200
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 20:05:22 -07:00
snipe 3f39cff225
Merge pull request #9738 from Godmartinz/bug/ch16594/table-striping-on-dark-mode-skins-is-too
corrected a link color in the dark mode yellow skin
2021-06-23 16:39:02 -07:00
Godfrey M a37edd5c5b darkened back-sub-alt more 2021-06-23 16:34:41 -07:00
snipe 7d1c2199ed Attempted to re-bound to lowest php version possible
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 16:29:43 -07:00
Godfrey M f199098a59 undid the color change for links, darkened the back-sub-alt 2021-06-23 16:29:21 -07:00
snipe 1808986bf5 Bumped version
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 16:06:30 -07:00
snipe d8191f738c Updated flysystem to 1.1.4 for critical security update
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 16:04:42 -07:00
snipe 450183c55c Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-06-23 14:41:10 -07: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
snipe c801305c9b
Merge pull request #9681 from tulsaschoolsdata/9680-fix-statuslabels-asset-count
Fixed #9680: Use Eloquent’s `withCount` method to count Statuslabel assets
2021-06-23 14:34:34 -07:00
snipe 4db5a8f62b
Merge pull request #9695 from Joly0/master
Update print.blade.php
2021-06-23 14:33:25 -07:00
snipe 7b4cc5044b Add @derdeagle as a contributor 2021-06-23 14:31:48 -07:00
snipe 1c1ebdf44d
Merge pull request #9706 from derdeagle/develop
Fixes #9705: Prevent syntax error in startup.sh
2021-06-23 14:31:32 -07:00
snipe c684e5f481 Add @PetriAsi as a contributor 2021-06-23 14:31:16 -07:00
snipe 1bc4d1b997
Merge pull request #9717 from PetriAsi/fix/accessories-bulk-set-min-amt
Added #9716: Allow to bulk update accessories min_amt
2021-06-23 14:28:59 -07:00