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

2545 commits

Author SHA1 Message Date
snipe
29c584289f Merge remote-tracking branch 'origin/develop' 2021-08-14 14:09:31 -07:00
Godfrey M
01037cf9cb initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358] 2021-08-10 18:26:43 -07:00
Computroniks
8121d904e7
Licence cost calculation 
Licences use diffrent key to track quantity. sumFormatterQuantity has
been modified to detect which key to use.

Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
 2021-08-04 22:33:39 +01:00
Computroniks
f994af16da
Added function to calculate cost based on quantity 
sumFormatterQuantity takes the same input as sumFormatter but instead
of calculating the specified columns total it calculates the total
purchase cost of an item based upon its quantity. Also updated affected
pressenters to use this formatter.

Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
 2021-08-04 22:09:50 +01:00
NMC
976957ddd4 Add Maintained filed in licenses view and api. + Expires in API 2021-08-01 14:30:16 -04:00
Ivan Nieto Vivanco
1b8156ac7f Add a hidden field to handle departments inside Full Company Support config 2021-07-29 13:28:57 -05:00
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
Ivan Nieto Vivanco
35ffe8b902 Adds a check to know if the asset is checked out to the logged in user to allow check the state int the view 2021-07-20 18:56:22 -05: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
snipe
06806341c7 Nicer tab names for permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-08 15:57:41 -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
a12ae19e32 Try deferring the load so it doesn’t query the server server 7 times for login 
This doesn’t work?

Signed-off-by: snipe <snipe@snipe.net>
 2021-06-29 10:50:32 -07:00
snipe
3332bbe072 Removed unused properties on login 
This may be dumb anyway - we probably don’t need to make so many round trips to the server just to see if things are required or not… But I’d really like to standardize the validation across the system

Signed-off-by: snipe <snipe@snipe.net>
 2021-06-29 10:27:44 -07:00
snipe
704eb728bc Added livewire the login screen 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-29 02:16:57 -07:00
snipe
576e605f73 Make livewire less assy looking 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 22:40:18 -07:00
snipe
ebb0aa5532
Merge pull request #9766 from uberbrady/livewire_integration_v6 
Livewire integration for Snipe-IT v6
 2021-06-28 21:51:00 -07:00
Brady Wetherington
a6ac4f94f1 Breaking out field-listing into its own Livewire blade for use elsewhere 2021-06-28 21:00:20 -07:00
Brady Wetherington
ea1f1eb972 Get some basic Livewire going for 'edit model's default values. 2021-06-28 21:00:20 -07:00
Brady Wetherington
8e66abb926 Basic Laravel7 compatibility, starting getting Livewire going 2021-06-28 21:00:16 -07:00
snipe
dc125af029 Fixed locations link on homepage module 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 19:56:41 -07:00
snipe
2365634139 Added dashboard module for locations [ch9199] 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 19:46:56 -07:00
snipe
4af247f845 Added additional boxes to the dashboard 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 16:36:15 -07:00
snipe
d4e46ee41f Added comma in US currency format [ch16628] 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 16:14:32 -07:00
snipe
f504d7ef5f Merge remote-tracking branch 'origin/develop' 2021-06-28 13:12:10 -07:00
snipe
a016f4ecd0 Applies PR #9761 to integration 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 13:11:22 -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
1ea843248b Fixed #9729 - bulk edit order number capped at 20 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 20:04:45 -07:00
Brady Wetherington
8268aca9fc Removed Ziggy.baseUrl references for meta references that had baseUrl 2021-06-23 19:57:45 -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
b3ec4bb31b Porting PR #9720 to v6 integration 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 14:28:06 -07:00
snipe
ac52ea3463 Porting PR #9720 to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 14:27:15 -07:00
Brady Wetherington
9456a03a88 Almost finished with the routes which is...hopefully? The last thing? 2021-06-22 16:58:23 -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
snipe
3095a78664 Small tweaks to Dashboard controller 
Still gettiing a bizarre `Non-static method App\Http\Controllers\DashboardController::index() should not be called statically` error

Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 14:43:47 -07: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