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

6549 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M 9fb911146f Update demo photos of iPhones to be more [ch16531] 2021-07-19 12:26:04 -07:00
snipe 615bdd0499 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-15 13:29:07 -07:00
snipe 33e92c975a Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2021-07-15 13:29:00 -07:00
snipe 5f842d02ef Fixed namespace 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-15 13:24:40 -07:00
Petri Asikainen f753404197 missed this when rebasing 2021-07-15 12:26:14 +03:00
Petri Asikainen 5d999d2572 legacy image_source support for store 2021-07-15 12:26:14 +03:00
Petri Asikainen d50294e8e2 Just mention source of idea as code rewriten 2021-07-15 12:26:14 +03:00
Petri Asikainen 2fc3ff671e hand legacy image_source field 2021-07-15 12:26:14 +03:00
Petri Asikainen 89cc84f1d9 convert image_source field 
This reverts commit b2d3ba7410.
 2021-07-15 12:26:14 +03:00
Petri Asikainen f24138da44 Revert "Handle image_source with ConvertBase64ToFiles" 
This reverts commit 168d7f7004.
 2021-07-15 12:26:14 +03:00
Petri Asikainen a76b36cad9 Handle image_source with ConvertBase64ToFiles 2021-07-15 12:26:14 +03:00
Petri Asikainen 1936fc2ea9 Better debug comment 2021-07-15 12:26:14 +03:00
Petri Asikainen 23f77b2894 Fixed case again 2021-07-15 12:26:14 +03:00
Petri Asikainen 15dd7061ed removed unused Bag-functions 2021-07-15 12:26:14 +03:00
Petri Asikainen 5f81488679 fix debug placement 2021-07-15 12:26:14 +03:00
Petri Asikainen c894e8ceb3 handle files via standard field 2021-07-15 12:26:14 +03:00
Petri Asikainen bbe964c6b2 debug trait 2021-07-15 12:26:14 +03:00
Petri Asikainen 2325b1d8c2 Try without trait 2021-07-15 12:26:14 +03:00
Petri Asikainen 948a741935 case case again.. 2021-07-15 12:26:14 +03:00
Petri Asikainen d7d3681d71 trait base64 encoded files 2021-07-15 12:26:13 +03:00
Petri Asikainen e6d432423d trait base64 encoded files 2021-07-15 12:26:13 +03:00
Petri Asikainen 6173aaa25c fixed capitalization 2021-07-15 12:26:13 +03:00
Petri Asikainen 91af3f2661 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen 4191dd39ea Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen 2f3501bdc2 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen f1b8ce0a1b Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen 6a21660c14 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen 64c8767e81 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen 0e7af80806 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen e95b15d553 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen bb269e0e5f Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen 60f13c8d79 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen 5081ca3512 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen b4380c8012 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen f6766c5f23 Support images and multipart requests 2021-07-15 12:26:07 +03:00
Petri Asikainen 8bbbb06c5e testing image upload via api 2021-07-15 12:24:25 +03:00
snipe f5ba47fcdd
Merge pull request #9829 from Godmartinz/bug/ch16602/make-non-linked-striped-text-the-same-for 
Make non linked striped text the same for [ch16602]
 2021-07-14 14:54:18 -07:00
Godfrey M 44612e5eb7 Make non linked striped text the same for [ch16602] 2021-07-14 14:50:45 -07:00
snipe 6b7d5ed5a4 Merge remote-tracking branch 'origin/develop' 2021-07-14 11:35:47 -07:00
snipe 5e76d50f2d
Merge pull request #9825 from PetriAsi/feature/api-image-uploads 
Fixed #9767 : Feature/api image uploads legacy image_source property  support
 2021-07-14 10:24:40 -07:00
Petri Asikainen febf1ec20f Support legacy image_source property 2021-07-14 13:09:50 +03:00
Petri Asikainen fa8b0964ed Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads 2021-07-14 13:06:39 +03:00
snipe a0798a68d9
Merge pull request #9767 from PetriAsi/feature/api-image-uploads 
Added #9594 : Feature api image uploads and remove
 2021-07-13 09:36:35 -07:00
Petri Asikainen 7b12668af4 Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads 2021-07-13 17:23:44 +03:00
snipe 4cfdaf89d8 Merge remote-tracking branch 'origin/develop' 2021-07-08 17:47:08 -07:00
snipe b307d2858c
Merge pull request #9809 from uberbrady/fix_saml_custom_settings 
The custom settings section of SAML sometimes has bad linefeeds
 2021-07-08 17:16:37 -07:00
Brady Wetherington 0ec2884c29 The custom settings section of SAML sometimes has bad linefeeds 2021-07-08 17:00:01 -07:00
snipe f264cade7d Merge remote-tracking branch 'origin/develop' 2021-07-08 16:05:32 -07:00
snipe 8ea3acc943 Fixed route ordering (FIFO) 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-08 16:05:07 -07:00
snipe f785c3e759 Default to 1 if no qty is passed 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-08 16:04:52 -07:00