DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 15:44:11 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
6235 commits 97 branches 266 tags 291 MiB
Commit graph

1669 commits

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 4cfdaf89d8 Merge remote-tracking branch 'origin/develop' 2021-07-08 17:47:08 -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
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
snipe f504d7ef5f Merge remote-tracking branch 'origin/develop' 2021-06-28 13:12:10 -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 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 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 7b51bf4f51 Merge remote-tracking branch 'origin/develop' 2021-06-23 14:41:27 -07:00
snipe 4db5a8f62b
Merge pull request #9695 from Joly0/master 
Update print.blade.php
 2021-06-23 14:33:25 -07:00
snipe ac52ea3463 Porting PR #9720 to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 14:27:15 -07:00
bmkalle a330dca7d4
Update company-select.blade.php 
select should be disabled if full multiple companies is activated and the user isn't a superuser. otherwise the user get the ability to choose all companies.
 2021-06-17 10:51:00 +02:00
Joly0 9a429952ff update print.blade.php 2021-06-15 08:52:01 +02:00
Joly0 72f27ccc5b Update print.blade.php 2021-06-11 11:05:39 +02:00
Ivan Nieto Vivanco 9f944ad497 Added the 'required' attribute to the input file n the upload file form modal. Added a validation for the UserFilesController if the user doesn't select any file to upload [ch16471]. 2021-05-27 15:48:13 -05:00
snipe 9f2b4c721d Allow password reset from user profile 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-26 15:32:23 -07:00
snipe 3f09d17389 Fixed typo “synchronization” 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-25 18:45:06 -07:00
snipe 9eea46adef Fixed parse error in user print view 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-20 13:53:43 -07:00
Jonathon Reinhart fd082addff
Fix incorrect case of ldap sync status string (#9563) 
Fixes #9562
 2021-05-12 19:15:39 -07:00
snipe 76897f3a3a Make label printing from asset page more consistent with normal UI 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-12 17:08:53 -07:00
tbrconnect a29ef73346
Feature #3088 Print labels from asset detail page (#9559) 
This PR adds a "Generate Label" button to the detail asset page as
described in #3088.

Fixes #3088

Co-authored-by: tilmann.bitterberg <tilmann@tbrglobal.com>
 2021-05-12 13:38:26 -07:00
Brady Wetherington 62199f6255
Manually re-add support for Label Logos in Labels (#9552) 2021-05-07 17:01:32 -07:00
snipe 9aac3ae628 Fixed HTML causing two backup headers to appear 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-07 16:36:07 -07:00
snipe ece627b3a3 Small fixes for location printing when relationships are missing/invalid, per #9521 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-05 10:23:46 -07:00
snipe d8d3fa2293 Only show department if it’s valid 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-05 10:13:19 -07:00
snipe 57b9b571dc
Fixed #9531 - highlight search box when filled, add clear button (#9534) 2021-05-04 22:00:34 -07:00
snipe 32f043c5df Set the body skin style if one was overridden by the user profile 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:25:39 -07:00
snipe 23376c317e Use correct URL for css for subdirs 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:22:02 -07:00
snipe b3b02933a5 Removed duplicate code 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:21:48 -07:00
snipe 1d43eda21f
Features: improved UI for importer (#9467) 
* Small UI improvements for importer

Signed-off-by: snipe <snipe@snipe.net>

* And UI backup improvements

Signed-off-by: snipe <snipe@snipe.net>
 2021-04-21 20:16:17 -07:00
snipe 90f79eaf83 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-04-21 10:23:46 -07:00
aranar-pro 5127727730
Fixed #9424: import history adds asset model to assigned user and respects checkin date (#9350) 
* Fixed #9294: Assets import history. Behaviour based on Checkin Date added, including assigning checked out items to users.

* Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items.

* Fixed #9294: whitespace and comment cleanup for merge

* Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items.
 2021-04-20 21:25:17 -07:00
snipe d10d090d33 Moved status label help text to headline 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-20 15:31:07 -07:00
snipe aa6b1456b2 Added help text to custom fields headline 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-20 15:29:43 -07:00
snipe b2de0d4ade Changed “Asset Categories” to “Categories” since there are more than asset categories now 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-20 15:29:22 -07:00
Peter Sarossy cacb707a7f
Added #9355: include Accessories and Consumables on the location reports (#9356) 2021-04-20 14:53:04 -07:00
Supapong Areeprasertkul b28b245acc
Update labels.blade.php (#8441) 
- Make the qr_size bigger when no barcode printed.
- BUG: Missing unit of font size for .qr-text class.
- Reduce padding-right to remove the additional space above text when print from Google Chrome. (I do not know the cause. I tried "box-sizing: border-box" without success.)
 2021-04-20 14:52:17 -07:00
Michael Pietsch 15e729f4b8
fix css when not runnin in webroot directory (#9445) 
Co-authored-by: Michael Pietsch <skywalker-11@mi-pietsch.de>
 2021-04-20 14:49:57 -07:00
Masudul Haque Shihab f3831fe010
Fixed #9447 change route parameter name in locations view (#9456) 2021-04-20 14:49:05 -07:00
snipe e4acf8d795 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 14:44:01 -07:00
snipe e8adf8d44c One more category fix 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 16:57:55 -07:00
snipe b693e5202b Check for category name 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 16:54:36 -07:00
snipe e1c6d4ced7 Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Requests/SettingsSamlRequest.php
 2021-04-14 15:15:07 -07:00
Joly0 31b2287a57
Update print.blade.php (#9426) 
Fixes #9418
 2021-04-14 10:20:36 -07:00
Godfrey Martinez 5fab1d6f0d
FIxes Sum of purchase cost of components not taking quantity into account in Asset View > Components tab (#9424) 
* git commit -m

* added text
 2021-04-14 10:19:40 -07:00
Godfrey Martinez 246cc0eaa8
Feature/ch16172/adding other fields to ldap sync settings (#9416) 
* new branch, added manager as an additional field. Currently having DB issues

* WIP DB Issue with eloquent

* added department to LDAP sync

* removed unused variables
 2021-04-14 10:17:57 -07:00
Brady Wetherington bf344fd707 Merge branch 'develop' 
mix-manifest I just picked one.
version.php will get bumped by hand
bootstrap table seems to just be another copy? Added it back.
 2021-04-14 09:58:21 -07:00
Ivan Nieto Vivanco 9cf5fbd675
Logic added to handle when a cloned user is imported via LDAP. (#9429) 2021-04-14 09:19:25 -07:00