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

6736 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 b46e2b5990 Merge remote-tracking branch 'origin/develop' 2021-06-30 01:03:05 -07: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 f504d7ef5f Merge remote-tracking branch 'origin/develop' 2021-06-28 13:12:10 -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 5b5b70e639 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2021-06-28 11:01:45 -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 3ca3de9e4f Merge remote-tracking branch 'origin/develop' 2021-06-23 20:05:38 -07: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 22152f0a8c Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 17:55:38 -07:00
snipe b5a75206fe Merge remote-tracking branch 'origin/develop' 2021-06-23 17:19:48 -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 6f3e156be6 Merge remote-tracking branch 'origin/develop' 2021-06-23 16:34:34 -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 335f4e50a5 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2021-06-23 16:07:01 -07:00
snipe 1808986bf5 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 16:06:30 -07:00
snipe bc0c887812 Merge remote-tracking branch 'origin/develop' 2021-06-23 16:05:19 -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 7b51bf4f51 Merge remote-tracking branch 'origin/develop' 2021-06-23 14:41:27 -07:00