lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
6235 commits 1 branch 0 tags 220 MiB
Commit graph

6235 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jethro Nederhof
d8fdd1b408
Fix branding logo URL path 
The current method adds an additional slash to the URL which results in the logo request producing a 404 error on for Storage drivers like S3 and GCS that don't automatically collapse additional forward slashes into single slashes.

E.g. with the current code my logo URL renders like `https://storage.googleapis.com/mybucketname/public//setting-logo-Al0aKMhmYz.svg` (note the double slash after "public") when instead it should render like `https://storage.googleapis.com/mybucketname/public/setting-logo-Al0aKMhmYz.svg`

For a local driver this should work fine since webservers handle the additional slashes case, but for key-based storage this 404s.

Thanks for your work on Snipe-It, seems like a good system so far!
 2021-07-28 14:55:34 +10:00
snipe
9a5d9eafeb
Merge pull request #9709 from morning-bird/master 
add CompanyableTrait
 2021-07-27 14:38:21 -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
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
snipe
0a2a8932d4
Merge pull request #9808 from inietov/bug/ch15453/selected_maintenance_history_columns_not_remembered 
Fixes [ch15453] Maintenance/History columns not remembered.
 2021-07-08 12:15:53 -07:00
Ivan Nieto Vivanco
d2e94dfc1c Added cookie option to assets Bootstrap Table to save the state of the table. 2021-07-08 14:05:40 -05:00
Petri Asikainen
4379ea61fa Just mention source of idea as code rewriten 2021-07-08 19:50:33 +03:00
Petri Asikainen
41deabf998 hand legacy image_source field 2021-07-07 09:33:48 +03:00
Petri Asikainen
7a424649c8 convert image_source field 
This reverts commit b2d3ba7410.
 2021-07-07 09:24:24 +03:00
Petri Asikainen
b2d3ba7410 Revert "Handle image_source with ConvertBase64ToFiles" 
This reverts commit 168d7f7004.
 2021-07-07 09:20:38 +03:00
Petri Asikainen
168d7f7004 Handle image_source with ConvertBase64ToFiles 2021-07-07 09:08:37 +03:00
snipe
60b8320b4b Updated production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-06 15:15:28 -07:00
snipe
721b749ae1 Merge remote-tracking branch 'origin/develop' 2021-07-06 15:13:39 -07:00
snipe
11d9b1ba45 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-06 15:09:03 -07:00
snipe
2f10d946ec Merge branch 'bug/ch16594/table-striping-on-dark-mode-skins-is-too' of https://github.com/Godmartinz/snipe-it into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	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-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/mix-manifest.json
 2021-07-06 15:08:20 -07:00
snipe
6e0355fa34
Merge pull request #9778 from inietov/fixes/users_departments_not_being_imported 
Fixes #9730. Remove an else statement that doesn't allow to continue the importer flow.
 2021-07-06 14:59:42 -07:00
Ivan Nieto Vivanco
131a285e2f Fixes Vue issue with the import process. 2021-07-06 15:59:45 -05:00
Petri Asikainen
f53cabee24 Better debug comment 2021-07-06 07:26:16 +03:00
Petri Asikainen
e275c9ee90 Fixed case again 2021-07-06 07:10:03 +03:00
Petri Asikainen
3d8acd1bd8 removed unused Bag-functions 2021-07-06 07:00:12 +03:00
Petri Asikainen
2169c62700 Merge branch 'feature/api-image-uploads-json' into feature/api-image-uploads 2021-07-06 06:55:54 +03:00
Petri Asikainen
c21b291484 keep using request 2021-07-06 06:51:07 +03:00
Petri Asikainen
c1bc2486ad keep using request 2021-07-06 06:49:19 +03:00
Petri Asikainen
e3166c2209 fix debug placement 2021-07-06 06:41:37 +03:00
Petri Asikainen
7a5b5c291d merged from develop 2021-07-06 06:38:32 +03:00
Petri Asikainen
d66ef233bf handle files via standard field 2021-07-06 06:25:37 +03:00
Petri Asikainen
013df747d7 debug trait 2021-07-05 09:59:19 +03:00
Petri Asikainen
02fb7ac03e Try without trait 2021-07-04 13:39:46 +03:00
Petri Asikainen
d48a9d549d Try without trait 2021-07-04 13:37:05 +03:00
Petri Asikainen
f59f3dbde4 case case again.. 2021-07-02 10:43:15 +03:00
Petri Asikainen
f4fa6836cb trait base64 encoded files 2021-07-02 10:29:26 +03:00
Petri Asikainen
e846e6ac76 trait base64 encoded files 2021-07-02 10:18:18 +03:00
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