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
5380 commits 101 branches 268 tags 288 MiB
Commit graph

5380 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M e97cf011b6 Label_Woes 2020-05-26 17:15:39 -07:00
Godfrey M ed23505054 Label_Woes 2020-05-26 17:10:45 -07:00
Daniel Meltzer b3fe47bfa7
Remove/Reorganize logic to make codacy happier. 2020-05-23 15:24:10 -04:00
Daniel Meltzer 1e5d40f32e
Clean up extra code in notifications files. 2020-05-23 15:24:10 -04:00
Daniel Meltzer f0546bf689
Clean up Transformers and extract an isDeletable() method to models where it makes sense. 2020-05-23 15:24:10 -04:00
Daniel Meltzer 136df9418f
Deadcode-- 2020-05-23 15:24:10 -04:00
Daniel Meltzer 7ea862787c
Refactor controller to use one method that shows all modals based on name. 2020-05-23 15:24:00 -04:00
Daniel Meltzer 25d6ceee6e
Remove old code. 2020-05-23 12:18:27 -04:00
Daniel Meltzer 4fef065010
Refactor big switch to lookup in array. A bit cleaner/codacy happier. 2020-05-23 12:17:56 -04:00
Daniel Meltzer fe74394ae6
Short circuit checkout logic to prevent iterating if we're not checking out to an asset 2020-05-23 11:48:02 -04:00
Daniel Meltzer 7a76cb08a0
We accept xlsx in uploads 2020-05-23 11:36:47 -04:00
Daniel Meltzer c70bd62a0f
Missing includes. Fix by using the request object instead of facade. 2020-05-23 11:36:16 -04:00
Daniel Meltzer ad1db2c640
Fix incorrectly named parameter. 2020-05-23 10:26:56 -04:00
Daniel Meltzer 2e936a9883
Sync paveit command with new database tables. 2020-05-23 09:08:32 -04:00
snipe 3db4480bba
Merge pull request #8062 from dmeltzer/fix-modal-select-html 
Fix Missing Category selection in Asset Model Modal dialog.
 2020-05-20 10:24:20 -07:00
snipe 001e721530
Merge pull request #8063 from dmeltzer/backport-8092 
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
 2020-05-20 10:21:52 -07:00
Daniel Meltzer 8210da6e82
Fix Missing Category selection in Asset Model Modal dialog. 
A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.
 2020-05-20 10:29:27 -04:00
Daniel Meltzer 6a80f95769
Fix Missing Category selection in Asset Model Modal dialog. 
A select html tag needs a full closing tag.  <select /> is not valid.
This was causing the select2 js to barf and eat additional information.
 2020-05-20 10:23:04 -04:00
Godfrey M edd4797178 fixed a table header error 2020-05-19 16:59:09 -07:00
snipe f88683766b
Roll back previous change 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-14 00:55:47 -07:00
snipe e4385c0f8c
Fixes #8051 regression 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-14 00:48:30 -07:00
Charlotte Dunois 7f8c6fe282
Take gravatar email into account in presenter 2020-05-13 20:30:47 +02:00
snipe 8cc9e61983
Ugh 
Sorry, my local testing environment is fscked right now :(

Signed-off-by: snipe <snipe@snipe.net>
 2020-05-12 20:38:32 -07:00
snipe c5560e466e
Removed fieldset from test 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-12 20:17:35 -07:00
snipe 157a2ee869
Merge pull request #8048 from dmeltzer/license-importer-checkout-fix 
License importer checkout fixes
 2020-05-12 13:51:36 -07:00
snipe de7ee40863
Fixed failing test 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-12 11:52:08 -07:00
Daniel Meltzer a6f90cb3fc
Assorted licenses UI fixes while testing. 
* Rename licenses route checkin parameter to clarify it's purpose and
fix incorrect route in users view page.
* Checkin note can be nullable for checking in a license.
* License Seat view was only showing 20 license seats due to faulty
transformer logic.
 2020-05-12 14:38:21 -04:00
Daniel Meltzer 1321304720
Importer UI: Removed misleading checked out to field. Add full name and asset tag fields to licenses. 2020-05-12 14:38:21 -04:00
Daniel Meltzer e4888b23e2
Save User ID when checking out a license. Also buff up importing tests to confirm license can be checked out. 2020-05-12 14:38:20 -04:00
snipe 274f82893f
Regenerate session ID on logout 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-12 10:38:00 -07:00
snipe 0550fe0ffa
Fix for session fixation vulnerability 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-12 10:31:54 -07:00
snipe 730632e2eb
Apply PR #8043 to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 22:57:55 -07:00
snipe 7fb3a9b82c
Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap 
Added option to disable backup in import
 2020-05-11 22:41:36 -07:00
Brady Wetherington b03f8a2425 Tweak to Flysystem's filesystems.php to make it work with Snipe-IT 2020-05-11 21:41:56 -07:00
snipe ecb1e87fe6
Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:45:15 -07:00
snipe f43df5f041
Fixed form label 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:44:46 -07:00
snipe 95cc48e422
Added option to disable backup in import 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:41:10 -07:00
snipe 9a2ed804ca
Fixed mismatched HTML header tags 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:28:42 -07:00
snipe d20fad28e5
Use more modern request helper 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:28:24 -07:00
snipe ae813ddf75
Add @alek13 as a contributor 2020-05-11 18:11:16 -07:00
snipe bb42109c0c
Added a clarifying comment 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 18:10:45 -07:00
snipe f46ecf8ec0
Updated composer lock 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 18:07:20 -07:00
snipe b9e821c0e6
Small fix for Group Functional Tests 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 18:07:14 -07:00
snipe 9ee28c7513
Switched to use info instead of danger on undeployable statuses 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 18:07:02 -07:00
snipe 1a8ba06702
Merge branch 'master' of https://github.com/snipe/snipe-it 2020-05-11 17:53:32 -07:00
snipe 0fd232e70d
Fixed group functional test 
(We had changed the minimum to 2 instead of 3)

Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 17:53:24 -07:00
snipe ee4d69b1c5
Merge pull request #8041 from alek13/patch-1 
use supported package for slack
 2020-05-11 17:52:45 -07:00
snipe d22be8ee0e
Merge pull request #8036 from johnson-yi/features/saml_auth 
Additional updates/fixes for saml
 2020-05-11 17:04:37 -07:00
Alexander Chibrikin d1ad111949
use supported package for slack 
see https://github.com/maknz/slack/issues/94
 2020-05-11 20:31:13 +03:00
Johnson Yi 572185ac96 Revised how saml sp info is displayed 2020-05-09 09:44:51 +10:00